GitLab

at 2026-05-06T12:22:31+01:00

fixup! BB 42583: Modify moz-support-link for Base Browser.

BB 44903: Use upstream's `support-page` rather than custom `tor-manual-page`.

fixup! BB 41916: Letterboxing preferences UI

BB 44903: Use upstream's `support-page` rather than custom `tor-manual-page`.

fixup! BB 40925: Implemented the Security Level component

BB 44903: Use upstream's `support-page` rather than custom `tor-manual-page`.

fixup! TB 30237: Add v3 onion services client authentication prompt

TB 44904: Use setting config for onion site settings.

fixup! Tor Browser strings

TB 44904: Merge the onion site settings strings.

fixup! Tor Browser localization migration scripts.

TB 44904: Migrate onion sites setting strings.

-# Copyright (c) 2020, The Tor Project, Inc.

-

-<groupbox id="torOnionServiceKeys" orient="vertical"

-          data-category="panePrivacy" hidden="true">

-  <label><html:h2

-    data-l10n-id="onion-site-authentication-preferences-heading"

-  ></html:h2></label>

-  <hbox>

-    <description

-      class="description-deemphasized description-with-side-element"

-      flex="1"

-    >

-      <html:span

-        id="torOnionServiceKeys-overview"

-        data-l10n-id="onion-site-authentication-preferences-overview"

-      ></html:span>

-      <label

-        id="torOnionServiceKeys-learnMore"

-        class="learnMore text-link"

-        is="text-link"

-        href="about:manual#onion-services_onion-service-authentication"

-        useoriginprincipal="true"

-        data-l10n-id="onion-site-authentication-preferences-learn-more"

-      />

-    </description>

-    <vbox align="end">

-      <html:button

-        id="torOnionServiceKeys-savedKeys"

-        class="accessory-button"

-        data-l10n-id="onion-site-authentication-preferences-saved-keys-button"

-      ></html:button>

-    </vbox>

-  </hbox>

-</groupbox>
-// Copyright (c) 2020, The Tor Project, Inc.

-

-"use strict";

-

-/* import-globals-from /browser/components/preferences/preferences.js */

-

-/**

- * Onion site preferences.

- */

-var OnionServicesAuthPreferences = {

-  init() {

-    document

-      .getElementById("torOnionServiceKeys-savedKeys")

-      .addEventListener("click", () => {

-        gSubDialog.open(

-          "chrome://browser/content/onionservices/savedKeysDialog.xhtml"

-        );

-      });

-  },

-};
     <html:span data-l10n-id="letterboxing-overview"></html:span>

     <html:a

       is="moz-support-link"

-      tor-manual-page="anti-fingerprinting_letterboxing"

+      support-page="tor-manual:anti-fingerprinting_letterboxing"

       data-l10n-id="letterboxing-learn-more"

     ></html:a>

   </description>

       },

     ],

   },

+  onionSiteAuthentication: {

+    l10nId: "onion-site-authentication-group",

+    headingLevel: 2,

+    supportPage: "tor-manual:onion-services_onion-service-authentication",

+    items: [

+      {

+        id: "onionSiteSavedKeys",

+        control: "moz-box-button",

+        l10nId: "onion-site-authentication-saved-keys-button",

+      },

+    ],

+  },

   // Hide the payments and addresses settings. tor-browser#44460.

   // NOTE: "payments" and "addresses" are usually configured in

   // FormAutofillPreferences.sys.mjs. But this never runs because the "autofill"

 <html:setting-group groupid="passwords" hidden="true" data-category="panePrivacy" />

-#include ../onionservices/content/authPreferences.inc.xhtml

+<html:setting-group groupid="onionSiteAuthentication" hidden="true" data-category="panePrivacy" />

 <html:setting-group data-category="panePrivacy" data-subcategory="payment-methods-autofill credit-card-autofill" groupid="payments" data-group="formAutofill" hidden="true" />

 <html:setting-group data-category="panePrivacy" data-subcategory="addresses-autofill address-autofill" groupid="addresses" data-group="formAutofill" hidden="true" />

     : null

 );

-XPCOMUtils.defineLazyScriptGetter(

-  this,

-  ["OnionServicesAuthPreferences"],

-  "chrome://browser/content/onionservices/authPreferences.js"

-);

-

 // TODO: module import via ChromeUtils.defineModuleGetter

 XPCOMUtils.defineLazyScriptGetter(

   this,

   pref: "signon.management.page.breach-alerts.enabled",

 });

+Preferences.addSetting({

+  id: "onionSiteSavedKeys",

+  onUserClick: () => {

+    gSubDialog.open(

+      "chrome://browser/content/onionservices/savedKeysDialog.xhtml"

+    );

+  },

+});

+

 /**

  * This class is used to create Settings that are used to warn the user about

  * potential misconfigurations. It should be passed into Preferences.addSetting

     initSettingGroup("browsingProtection");

     initSettingGroup("cookiesAndSiteData");

     initSettingGroup("cookiesAndSiteData2");

+    initSettingGroup("onionSiteAuthentication");

     initSettingGroup("certificates");

     initSettingGroup("ipprotection");

     // NOTE: "payments" and "addresses" are usually initialised by

     this._initTrackingProtectionExtensionControl();

     this._ensureTrackingProtectionExceptionListMigration();

     this._initProfilesInfo();

-    OnionServicesAuthPreferences.init();

     this._initSecurityLevel();

     Preferences.get("privacy.trackingprotection.enabled").on(

     <html:a

       is="moz-support-link"

       id="securityLevel-learnMore"

-      tor-manual-page="security-settings"

+      support-page="tor-manual:security-settings"

       data-l10n-id="security-level-panel-learn-more-link"

     ></html:a>

     <html:img id="securityLevel-background-image" alt="" />

       ></html:span>

       <html:a

         is="moz-support-link"

-        tor-manual-page="security-settings"

+        support-page="tor-manual:security-settings"

         data-l10n-id="security-level-preferences-learn-more-link"

       ></html:a>

     </description>

 export default class MozSupportLink extends HTMLAnchorElement {

   static SUPPORT_URL = "https://www.mozilla.org/";

   static get observedAttributes() {

-    // We add tor-manual-page for pages hosted at tor project. Also shared with

-    // base-browser/mullvad-browser. See tor-browser#42583.

-    return ["support-page", "utm-content", "tor-manual-page"];

+    return ["support-page", "utm-content"];

   }

   /**

   }

   attributeChangedCallback(attrName) {

-    if (

-      attrName === "support-page" ||

-      attrName === "utm-content" ||

-      attrName === "tor-manual-page"

-    ) {

+    if (attrName === "support-page" || attrName === "utm-content") {

       this.#setHref();

     }

   }

   #setHref() {

-    let torManualPage = this.getAttribute("tor-manual-page");

-    if (torManualPage) {

+    let supportPage = this.getAttribute("support-page") ?? "";

+    // Support pages that start with "tor-manual:" are meant to point to the

+    // Tor Project's support pages. See tor-browser#44903.

+    const torManualPrefix = "tor-manual:";

+    if (supportPage.startsWith(torManualPrefix)) {

+      const torManualPage = supportPage.substring(torManualPrefix.length);

       this.href = `about:manual#${torManualPage}`;

       return;

     }

-    let supportPage = this.getAttribute("support-page") ?? "";

     // For base-browser we sometimes want to override firefox support links with

     // our own.

     // See tor-browser#40899.

 page-info-onion-site-encryption-plain = Connection encrypted (Onion site)

 ## Onion site authentication preferences.

-## "Onion site" is an abbreviation of "onion website": a website whose domain URL ends in ".onion", which is reachable through the Tor network.

-onion-site-authentication-preferences-heading = Onion site authentication

-onion-site-authentication-preferences-overview = Some onion sites require that you identify yourself with a key (a kind of password) before you can access them.

-onion-site-authentication-preferences-learn-more = Learn more

-onion-site-authentication-preferences-saved-keys-button = Saved keys…

+# "Onion site" is an abbreviation of "onion website": a website whose domain URL ends in ".onion", which is reachable through the Tor network.

+# Here "key" is a noun, and refers to a special code that gives the user access to a website.

+onion-site-authentication-group =

+    .label = Onion site authentication

+    .description = Some onion sites require that you identify yourself with a key (a kind of password) before you can access them.

+# Here "key" is a noun, and refers to a special code that gives the user access to a website.

+onion-site-authentication-saved-keys-button =

+    .label = Saved keys…

 ## Onion site saved keys dialog.

 ## "Onion site" is an abbreviation of "onion website": a website whose domain URL ends in ".onion", which is reachable through the Tor network.

+from fluent.migrate.helpers import transforms_from

+

+

+def migrate(ctx):

+    ctx.add_transforms(

+        "tor-browser.ftl",

+        "tor-browser.ftl",

+        transforms_from(

+            """

+onion-site-authentication-group =

+    .label = { COPY_PATTERN(path, "onion-site-authentication-preferences-heading") }

+    .description = { COPY_PATTERN(path, "onion-site-authentication-preferences-overview") }

+onion-site-authentication-saved-keys-button =

+    .label = { COPY_PATTERN(path, "onion-site-authentication-preferences-saved-keys-button") }

+""",

+            path="tor-browser.ftl",

+        ),

+    )

morgan pushed to branch tor-browser-150.0a1-16.0-2 at The Tor Project / Applications / Tor Browser

Commits:

11 changed files:

Changes: