Merge autoland to mozilla central a=merge

erichdongubler-mozilla · Jul 16, 2024 · bc029d0 · bc029d0
2 parents 243d67b + 4da259a
commit bc029d0
Show file tree

Hide file tree

Showing 263 changed files with 8,152 additions and 2,627 deletions.
diff --git a/.cargo/config.toml.in b/.cargo/config.toml.in
@@ -60,9 +60,9 @@ git = "https://github.com/mozilla-spidermonkey/jsparagus"
 rev = "61f399c53a641ebd3077c1f39f054f6d396a633c"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/mozilla/application-services?rev=46acbeb2cee2fb7f024b6ff5943bdfdb6cc53151"]
+[source."git+https://github.com/mozilla/application-services?rev=8fd08c6f2f8acd38579bd3142fecda9272957b72"]
 git = "https://github.com/mozilla/application-services"
-rev = "46acbeb2cee2fb7f024b6ff5943bdfdb6cc53151"
+rev = "8fd08c6f2f8acd38579bd3142fecda9272957b72"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/mozilla/audioipc?rev=3495905752a4263827f5d43737f9ca3ed0243ce0"]

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -217,14 +217,14 @@ warp = { git = "https://github.com/seanmonstar/warp", rev = "9d081461ae1167eb321
 malloc_size_of_derive = { path = "xpcom/rust/malloc_size_of_derive" }
 
 # application-services overrides to make updating them all simpler.
-interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "46acbeb2cee2fb7f024b6ff5943bdfdb6cc53151" }
-relevancy = { git = "https://github.com/mozilla/application-services", rev = "46acbeb2cee2fb7f024b6ff5943bdfdb6cc53151" }
-sql-support = { git = "https://github.com/mozilla/application-services", rev = "46acbeb2cee2fb7f024b6ff5943bdfdb6cc53151" }
-suggest = { git = "https://github.com/mozilla/application-services", rev = "46acbeb2cee2fb7f024b6ff5943bdfdb6cc53151" }
-sync15 = { git = "https://github.com/mozilla/application-services", rev = "46acbeb2cee2fb7f024b6ff5943bdfdb6cc53151" }
-tabs = { git = "https://github.com/mozilla/application-services", rev = "46acbeb2cee2fb7f024b6ff5943bdfdb6cc53151" }
-viaduct = { git = "https://github.com/mozilla/application-services", rev = "46acbeb2cee2fb7f024b6ff5943bdfdb6cc53151" }
-webext-storage = { git = "https://github.com/mozilla/application-services", rev = "46acbeb2cee2fb7f024b6ff5943bdfdb6cc53151" }
+interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "8fd08c6f2f8acd38579bd3142fecda9272957b72" }
+relevancy = { git = "https://github.com/mozilla/application-services", rev = "8fd08c6f2f8acd38579bd3142fecda9272957b72" }
+sql-support = { git = "https://github.com/mozilla/application-services", rev = "8fd08c6f2f8acd38579bd3142fecda9272957b72" }
+suggest = { git = "https://github.com/mozilla/application-services", rev = "8fd08c6f2f8acd38579bd3142fecda9272957b72" }
+sync15 = { git = "https://github.com/mozilla/application-services", rev = "8fd08c6f2f8acd38579bd3142fecda9272957b72" }
+tabs = { git = "https://github.com/mozilla/application-services", rev = "8fd08c6f2f8acd38579bd3142fecda9272957b72" }
+viaduct = { git = "https://github.com/mozilla/application-services", rev = "8fd08c6f2f8acd38579bd3142fecda9272957b72" }
+webext-storage = { git = "https://github.com/mozilla/application-services", rev = "8fd08c6f2f8acd38579bd3142fecda9272957b72" }
 
 # Patch mio 0.8.8 to use windows-sys 0.52 (backport https://github.com/tokio-rs/mio/commit/eea9e3e0c469480e5c59c01e6c3c7e5fd88f0848)
 mio_0_8 = { package = "mio", git = "https://github.com/glandium/mio", rev = "9a2ef335c366044ffe73b1c4acabe50a1daefe05" }

diff --git a/browser/base/content/webext-panels.js b/browser/base/content/webext-panels.js
@@ -41,6 +41,10 @@ function getBrowser(panel) {
   browser.setAttribute("tooltip", "aHTMLTooltip");
   browser.setAttribute("autocompletepopup", "PopupAutoComplete");
 
+  if (gAllowTransparentBrowser) {
+    browser.setAttribute("transparent", "true");
+  }
+
   // Ensure that the browser is going to run in the same bc group as the other
   // extension pages from the same addon.
   browser.setAttribute(
@@ -175,3 +179,10 @@ function loadPanel(extensionId, extensionUrl, browserStyle) {
     browser.fixupAndLoadURIString(extensionUrl, { triggeringPrincipal });
   });
 }
+
+XPCOMUtils.defineLazyPreferenceGetter(
+  this,
+  "gAllowTransparentBrowser",
+  "browser.tabs.allow_transparent_browser",
+  false
+);
diff --git a/browser/components/backup/BackupService.sys.mjs b/browser/components/backup/BackupService.sys.mjs
@@ -570,6 +570,13 @@ export class BackupService extends EventTarget {
     this.dispatchEvent(new CustomEvent("BackupService:StateUpdate"));
   }
 
+  /**
+   * True if a recovery is currently in progress.
+   *
+   * @type {boolean}
+   */
+  #recoveryInProgress = false;
+
   /**
    * An object holding the current state of the BackupService instance, for
    * the purposes of representing it in the user interface. Ideally, this would
@@ -2280,75 +2287,85 @@ export class BackupService extends EventTarget {
     profilePath = PathUtils.profileDir,
     profileRootPath = null
   ) {
-    const RECOVERY_FILE_DEST_PATH = PathUtils.join(
-      profilePath,
-      BackupService.PROFILE_FOLDER_NAME,
-      BackupService.RECOVERY_ZIP_FILE_NAME
-    );
-    await this.extractCompressedSnapshotFromArchive(
-      archivePath,
-      RECOVERY_FILE_DEST_PATH,
-      recoveryCode
-    );
-
-    let encState = null;
-    if (recoveryCode) {
-      // We were passed a recovery code and made it to this line. That implies
-      // that the backup was encrypted, and the recovery code was the correct
-      // one to decrypt it. We now generate a new ArchiveEncryptionState with
-      // that recovery code to write into the recovered profile.
-      ({ instance: encState } = await lazy.ArchiveEncryptionState.initialize(
-        recoveryCode
-      ));
-    }
-
-    const RECOVERY_FOLDER_DEST_PATH = PathUtils.join(
-      profilePath,
-      BackupService.PROFILE_FOLDER_NAME,
-      "recovery"
-    );
-    await this.decompressRecoveryFile(
-      RECOVERY_FILE_DEST_PATH,
-      RECOVERY_FOLDER_DEST_PATH
-    );
-
-    // Now that we've decompressed it, reclaim some disk space by getting rid of
-    // the ZIP file.
-    try {
-      await IOUtils.remove(RECOVERY_FILE_DEST_PATH);
-    } catch (_) {
-      lazy.logConsole.warn("Could not remove ", RECOVERY_FILE_DEST_PATH);
+    // No concurrent recoveries.
+    if (this.#recoveryInProgress) {
+      lazy.logConsole.warn("Recovery attempt already in progress");
+      return null;
     }
 
     try {
-      // We're using a try/finally here to clean up the temporary OSKeyStore.
-      // We need to make sure that cleanup occurs _after_ the recovery has
-      // either fully succeeded, or fully failed. We await the return value
-      // of recoverFromSnapshotFolder so that the finally will not execute
-      // until after recoverFromSnapshotFolder has finished resolving or
-      // rejecting.
-      let newProfile = await this.recoverFromSnapshotFolder(
-        RECOVERY_FOLDER_DEST_PATH,
-        shouldLaunch,
-        profileRootPath,
-        encState
+      this.#recoveryInProgress = true;
+      const RECOVERY_FILE_DEST_PATH = PathUtils.join(
+        profilePath,
+        BackupService.PROFILE_FOLDER_NAME,
+        BackupService.RECOVERY_ZIP_FILE_NAME
       );
-      return newProfile;
-    } finally {
-      // If we had decrypted a backup, we would have created the temporary
-      // recovery OSKeyStore row with the label
-      // BackupService.RECOVERY_OSKEYSTORE_LABEL, which we will now delete,
-      // no matter if we succeeded or failed to recover.
-      //
-      // Note that according to nsIOSKeyStore, this is a no-op in the event that
-      // no secret exists at BackupService.RECOVERY_OSKEYSTORE_LABEL, so we're
-      // fine to do this even if we were recovering from an unencrypted
-      // backup.
+      await this.extractCompressedSnapshotFromArchive(
+        archivePath,
+        RECOVERY_FILE_DEST_PATH,
+        recoveryCode
+      );
+
+      let encState = null;
       if (recoveryCode) {
-        await lazy.nativeOSKeyStore.asyncDeleteSecret(
-          BackupService.RECOVERY_OSKEYSTORE_LABEL
+        // We were passed a recovery code and made it to this line. That implies
+        // that the backup was encrypted, and the recovery code was the correct
+        // one to decrypt it. We now generate a new ArchiveEncryptionState with
+        // that recovery code to write into the recovered profile.
+        ({ instance: encState } = await lazy.ArchiveEncryptionState.initialize(
+          recoveryCode
+        ));
+      }
+
+      const RECOVERY_FOLDER_DEST_PATH = PathUtils.join(
+        profilePath,
+        BackupService.PROFILE_FOLDER_NAME,
+        "recovery"
+      );
+      await this.decompressRecoveryFile(
+        RECOVERY_FILE_DEST_PATH,
+        RECOVERY_FOLDER_DEST_PATH
+      );
+
+      // Now that we've decompressed it, reclaim some disk space by getting rid of
+      // the ZIP file.
+      try {
+        await IOUtils.remove(RECOVERY_FILE_DEST_PATH);
+      } catch (_) {
+        lazy.logConsole.warn("Could not remove ", RECOVERY_FILE_DEST_PATH);
+      }
+      try {
+        // We're using a try/finally here to clean up the temporary OSKeyStore.
+        // We need to make sure that cleanup occurs _after_ the recovery has
+        // either fully succeeded, or fully failed. We await the return value
+        // of recoverFromSnapshotFolder so that the finally will not execute
+        // until after recoverFromSnapshotFolder has finished resolving or
+        // rejecting.
+        let newProfile = await this.recoverFromSnapshotFolder(
+          RECOVERY_FOLDER_DEST_PATH,
+          shouldLaunch,
+          profileRootPath,
+          encState
         );
+        return newProfile;
+      } finally {
+        // If we had decrypted a backup, we would have created the temporary
+        // recovery OSKeyStore row with the label
+        // BackupService.RECOVERY_OSKEYSTORE_LABEL, which we will now delete,
+        // no matter if we succeeded or failed to recover.
+        //
+        // Note that according to nsIOSKeyStore, this is a no-op in the event that
+        // no secret exists at BackupService.RECOVERY_OSKEYSTORE_LABEL, so we're
+        // fine to do this even if we were recovering from an unencrypted
+        // backup.
+        if (recoveryCode) {
+          await lazy.nativeOSKeyStore.asyncDeleteSecret(
+            BackupService.RECOVERY_OSKEYSTORE_LABEL
+          );
+        }
       }
+    } finally {
+      this.#recoveryInProgress = false;
     }
   }
 

diff --git a/browser/components/backup/actors/BackupUIChild.sys.mjs b/browser/components/backup/actors/BackupUIChild.sys.mjs
@@ -65,10 +65,18 @@ export class BackupUIChild extends JSWindowActorChild {
       });
     } else if (event.type == "BackupUI:RestoreFromBackupFile") {
       let { backupFile, backupPassword } = event.detail;
-      this.sendAsyncMessage("RestoreFromBackupFile", {
+      event.target.recoveryInProgress = true;
+      event.target.recoveryErrorCode = 0;
+      let result = await this.sendQuery("RestoreFromBackupFile", {
         backupFile,
         backupPassword,
       });
+      event.target.recoveryInProgress = false;
+      if (result.success) {
+        event.target.restoreFromBackupDialogEl?.close();
+      } else {
+        event.target.recoveryErrorCode = result.errorCode;
+      }
     } else if (event.type == "BackupUI:RestoreFromBackupChooseFile") {
       this.sendAsyncMessage("RestoreFromBackupChooseFile");
     } else if (event.type == "BackupUI:ToggleEncryption") {