- tbb-commits - lists.torproject.org

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.11.0esr-14.5-1] 5 commits: fixup! BB 40925: Implemented the Security Level component
by ma1 (＠ma1) 10 Jun '25

10 Jun '25

ma1 pushed to branch mullvad-browser-128.11.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 84c77940 by Henry Wilkes at 2025-06-10T12:38:13+02:00 fixup! BB 40925: Implemented the Security Level component TB 43783: Prompt user for a restart if their security level preferences are not aligned at startup or mid-session. Also handle failures to apply NoScript settings. - - - - - 2fc667c6 by Henry Wilkes at 2025-06-10T12:38:16+02:00 fixup! BB 40069: Add helpers for … [View More]message passing with extensions TB 43783: Allow the browser to wait for the NoScript settings to be applied. - - - - - c9771be6 by Henry Wilkes at 2025-06-10T12:38:19+02:00 fixup! Base Browser strings TB 43783: Add security level prompt strings. - - - - - 9adaa2c2 by Henry Wilkes at 2025-06-10T12:38:22+02:00 fixup! Base Browser strings TB 43782: Add strings for new security level UX flow. - - - - - c9bf0837 by Henry Wilkes at 2025-06-10T12:38:24+02:00 fixup! BB 40925: Implemented the Security Level component TB 43782: Update security level UI for new UX flow. In addition, we drop the distinction between the security levels in the UI when the user has a custom security level. I.e. we always show shield as unfilled but with a yellow dot in the toolbar, and we just call it "Custom" rather than "Standard Custom", etc. - - - - - 17 changed files: - browser/components/BrowserGlue.sys.mjs - + browser/components/securitylevel/SecurityLevelUIUtils.sys.mjs - browser/components/securitylevel/content/securityLevel.js - browser/components/securitylevel/content/securityLevelButton.css - + browser/components/securitylevel/content/securityLevelDialog.js - + browser/components/securitylevel/content/securityLevelDialog.xhtml - browser/components/securitylevel/content/securityLevelPanel.css - browser/components/securitylevel/content/securityLevelPanel.inc.xhtml - browser/components/securitylevel/content/securityLevelPreferences.css - browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml - browser/components/securitylevel/jar.mn - browser/components/securitylevel/moz.build - + browser/modules/SecurityLevelRestartNotification.sys.mjs - browser/modules/moz.build - toolkit/components/extensions/ExtensionParent.sys.mjs - toolkit/components/securitylevel/SecurityLevel.sys.mjs - toolkit/locales/en-US/toolkit/global/base-browser.ftl Changes: ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -82,6 +82,8 @@ ChromeUtils.defineESModuleGetters(lazy, { ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs", SearchSERPCategorization: "resource:///modules/SearchSERPTelemetry.sys.mjs", SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs", + SecurityLevelRestartNotification: + "resource:///modules/SecurityLevelRestartNotification.sys.mjs", SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs", SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", ShellService: "resource:///modules/ShellService.sys.mjs", @@ -1938,6 +1940,8 @@ BrowserGlue.prototype = { lazy.DoHController.init(); + lazy.SecurityLevelRestartNotification.ready(); + ClipboardPrivacy.startup(); this._firstWindowTelemetry(aWindow); ===================================== browser/components/securitylevel/SecurityLevelUIUtils.sys.mjs ===================================== @@ -0,0 +1,73 @@ +/** + * Common methods for the desktop security level components. + */ +export const SecurityLevelUIUtils = { + /** + * Create an element that gives a description of the security level. To be + * used in the settings. + * + * @param {string} level - The security level to describe. + * @param {Document} doc - The document where the element will be inserted. + * + * @returns {Element} - The newly created element. + */ + createDescriptionElement(level, doc) { + const el = doc.createElement("div"); + el.classList.add("security-level-description"); + + let l10nIdSummary; + let bullets; + switch (level) { + case "standard": + l10nIdSummary = "security-level-summary-standard"; + break; + case "safer": + l10nIdSummary = "security-level-summary-safer"; + bullets = [ + "security-level-preferences-bullet-https-only-javascript", + "security-level-preferences-bullet-limit-font-and-symbols", + "security-level-preferences-bullet-limit-media", + ]; + break; + case "safest": + l10nIdSummary = "security-level-summary-safest"; + bullets = [ + "security-level-preferences-bullet-disabled-javascript", + "security-level-preferences-bullet-limit-font-and-symbols-and-images", + "security-level-preferences-bullet-limit-media", + ]; + break; + case "custom": + l10nIdSummary = "security-level-summary-custom"; + break; + default: + throw Error(`Unhandled level: ${level}`); + } + + const summaryEl = doc.createElement("div"); + summaryEl.classList.add("security-level-summary"); + doc.l10n.setAttributes(summaryEl, l10nIdSummary); + + el.append(summaryEl); + + if (!bullets) { + return el; + } + + const listEl = doc.createElement("ul"); + listEl.classList.add("security-level-description-extra"); + // Add a mozilla styling class as well: + listEl.classList.add("privacy-extra-information"); + for (const l10nId of bullets) { + const bulletEl = doc.createElement("li"); + bulletEl.classList.add("security-level-description-bullet"); + + doc.l10n.setAttributes(bulletEl, l10nId); + + listEl.append(bulletEl); + } + + el.append(listEl); + return el; + }, +}; ===================================== browser/components/securitylevel/content/securityLevel.js ===================================== @@ -1,9 +1,10 @@ "use strict"; -/* global AppConstants, Services, openPreferences, XPCOMUtils */ +/* global AppConstants, Services, openPreferences, XPCOMUtils, gSubDialog */ ChromeUtils.defineESModuleGetters(this, { SecurityLevelPrefs: "resource://gre/modules/SecurityLevel.sys.mjs", + SecurityLevelUIUtils: "resource:///modules/SecurityLevelUIUtils.sys.mjs", }); /* @@ -35,12 +36,8 @@ var SecurityLevelButton = { _anchorButton: null, _configUIFromPrefs() { - const level = SecurityLevelPrefs.securityLevel; - if (!level) { - return; - } - const custom = SecurityLevelPrefs.securityCustom; - this._button.setAttribute("level", custom ? `${level}_custom` : level); + const level = SecurityLevelPrefs.securityLevelSummary; + this._button.setAttribute("level", level); let l10nIdLevel; switch (level) { @@ -53,15 +50,12 @@ var SecurityLevelButton = { case "safest": l10nIdLevel = "security-level-toolbar-button-safest"; break; + case "custom": + l10nIdLevel = "security-level-toolbar-button-custom"; + break; default: throw Error(`Unhandled level: ${level}`); } - if (custom) { - // Don't distinguish between the different levels when in the custom - // state. We just want to emphasise that it is custom rather than any - // specific level. - l10nIdLevel = "security-level-toolbar-button-custom"; - } document.l10n.setAttributes(this._button, l10nIdLevel); }, @@ -164,12 +158,7 @@ var SecurityLevelPanel = { panel: document.getElementById("securityLevel-panel"), background: document.getElementById("securityLevel-background"), levelName: document.getElementById("securityLevel-level"), - customName: document.getElementById("securityLevel-custom"), summary: document.getElementById("securityLevel-summary"), - restoreDefaultsButton: document.getElementById( - "securityLevel-restoreDefaults" - ), - settingsButton: document.getElementById("securityLevel-settings"), }; const learnMoreEl = document.getElementById("securityLevel-learnMore"); @@ -177,12 +166,11 @@ var SecurityLevelPanel = { this.hide(); }); - this._elements.restoreDefaultsButton.addEventListener("command", () => { - this.restoreDefaults(); - }); - this._elements.settingsButton.addEventListener("command", () => { - this.openSecuritySettings(); - }); + document + .getElementById("securityLevel-settings") + .addEventListener("command", () => { + this.openSecuritySettings(); + }); this._elements.panel.addEventListener("popupshown", () => { // Bring focus into the panel by focusing the default button. @@ -199,19 +187,7 @@ var SecurityLevelPanel = { } // get security prefs - const level = SecurityLevelPrefs.securityLevel; - const custom = SecurityLevelPrefs.securityCustom; - - // only visible when user is using custom settings - this._elements.customName.hidden = !custom; - this._elements.restoreDefaultsButton.hidden = !custom; - if (custom) { - this._elements.settingsButton.removeAttribute("default"); - this._elements.restoreDefaultsButton.setAttribute("default", "true"); - } else { - this._elements.settingsButton.setAttribute("default", "true"); - this._elements.restoreDefaultsButton.removeAttribute("default"); - } + const level = SecurityLevelPrefs.securityLevelSummary; // Descriptions change based on security level this._elements.background.setAttribute("level", level); @@ -230,12 +206,13 @@ var SecurityLevelPanel = { l10nIdLevel = "security-level-panel-level-safest"; l10nIdSummary = "security-level-summary-safest"; break; + case "custom": + l10nIdLevel = "security-level-panel-level-custom"; + l10nIdSummary = "security-level-summary-custom"; + break; default: throw Error(`Unhandled level: ${level}`); } - if (custom) { - l10nIdSummary = "security-level-summary-custom"; - } document.l10n.setAttributes(this._elements.levelName, l10nIdLevel); document.l10n.setAttributes(this._elements.summary, l10nIdSummary); @@ -269,13 +246,6 @@ var SecurityLevelPanel = { this._elements.panel.hidePopup(); }, - restoreDefaults() { - SecurityLevelPrefs.securityCustom = false; - // Move focus to the settings button since restore defaults button will - // become hidden. - this._elements.settingsButton.focus(); - }, - openSecuritySettings() { openPreferences("privacy-securitylevel"); this.hide(); @@ -301,59 +271,64 @@ var SecurityLevelPanel = { var SecurityLevelPreferences = { _securityPrefsBranch: null, + /** - * The notification box shown when the user has a custom security setting. - * - * @type {Element} - */ - _customNotification: null, - /** - * The radiogroup for this preference. - * - * @type {Element} - */ - _radiogroup: null, - /** - * A list of radio options and their containers. + * The element that shows the current security level. * - * @type {Array<object>} + * @type {?Element} */ - _radioOptions: null, + _currentEl: null, _populateXUL() { - this._customNotification = document.getElementById( - "securityLevel-customNotification" + this._currentEl = document.getElementById("security-level-current"); + const changeButton = document.getElementById("security-level-change"); + const badgeEl = this._currentEl.querySelector( + ".security-level-current-badge" ); - document - .getElementById("securityLevel-restoreDefaults") - .addEventListener("command", () => { - SecurityLevelPrefs.securityCustom = false; - }); - - this._radiogroup = document.getElementById("securityLevel-radiogroup"); - this._radioOptions = Array.from( - this._radiogroup.querySelectorAll(".securityLevel-radio-option"), - container => { - return { container, radio: container.querySelector("radio") }; - } - ); + for (const { level, nameId } of [ + { level: "standard", nameId: "security-level-panel-level-standard" }, + { level: "safer", nameId: "security-level-panel-level-safer" }, + { level: "safest", nameId: "security-level-panel-level-safest" }, + { level: "custom", nameId: "security-level-panel-level-custom" }, + ]) { + // Classes that control visibility: + // security-level-current-standard + // security-level-current-safer + // security-level-current-safest + // security-level-current-custom + const visibilityClass = `security-level-current-${level}`; + const nameEl = document.createElement("div"); + nameEl.classList.add("security-level-name", visibilityClass); + document.l10n.setAttributes(nameEl, nameId); + + const descriptionEl = SecurityLevelUIUtils.createDescriptionElement( + level, + document + ); + descriptionEl.classList.add(visibilityClass); + + this._currentEl.insertBefore(nameEl, badgeEl); + this._currentEl.insertBefore(descriptionEl, changeButton); + } - this._radiogroup.addEventListener("select", () => { - SecurityLevelPrefs.securityLevel = this._radiogroup.value; + changeButton.addEventListener("click", () => { + this._openDialog(); }); }, + _openDialog() { + gSubDialog.open( + "chrome://browser/content/securitylevel/securityLevelDialog.xhtml", + { features: "resizable=yes" } + ); + }, + _configUIFromPrefs() { - this._radiogroup.value = SecurityLevelPrefs.securityLevel; - const isCustom = SecurityLevelPrefs.securityCustom; - this._radiogroup.disabled = isCustom; - this._customNotification.hidden = !isCustom; - // Have the container's selection CSS class match the selection state of the - // radio elements. - for (const { container, radio } of this._radioOptions) { - container.classList.toggle("selected", radio.selected); - } + // Set a data-current-level attribute for showing the current security + // level, and hiding the rest. + this._currentEl.dataset.currentLevel = + SecurityLevelPrefs.securityLevelSummary; }, init() { ===================================== browser/components/securitylevel/content/securityLevelButton.css ===================================== @@ -7,12 +7,6 @@ toolbarbutton#security-level-button[level="safer"] { toolbarbutton#security-level-button[level="safest"] { list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safest"); } -toolbarbutton#security-level-button[level="standard_custom"] { +toolbarbutton#security-level-button[level="custom"] { list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#standard_custom"); } -toolbarbutton#security-level-button[level="safer_custom"] { - list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safer_custom"); -} -toolbarbutton#security-level-button[level="safest_custom"] { - list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safest_custom"); -} ===================================== browser/components/securitylevel/content/securityLevelDialog.js ===================================== @@ -0,0 +1,188 @@ +"use strict"; + +const { SecurityLevelPrefs } = ChromeUtils.importESModule( + "resource://gre/modules/SecurityLevel.sys.mjs" +); +const { SecurityLevelUIUtils } = ChromeUtils.importESModule( + "resource:///modules/SecurityLevelUIUtils.sys.mjs" +); + +const gSecurityLevelDialog = { + /** + * The security level when this dialog was opened. + * + * @type {string} + */ + _prevLevel: SecurityLevelPrefs.securityLevelSummary, + /** + * The security level currently selected. + * + * @type {string} + */ + _selectedLevel: "", + /** + * The radiogroup for this preference. + * + * @type {?Element} + */ + _radiogroup: null, + /** + * A list of radio options and their containers. + * + * @type {?Array<{ container: Element, radio: Element }>} + */ + _radioOptions: null, + + /** + * Initialise the dialog. + */ + async init() { + const dialog = document.getElementById("security-level-dialog"); + dialog.addEventListener("dialogaccept", event => { + if (this._acceptButton.disabled) { + event.preventDefault(); + return; + } + this._commitChange(); + }); + + this._acceptButton = dialog.getButton("accept"); + + document.l10n.setAttributes( + this._acceptButton, + "security-level-dialog-save-restart" + ); + + this._radiogroup = document.getElementById("security-level-radiogroup"); + + this._radioOptions = Array.from( + this._radiogroup.querySelectorAll(".security-level-radio-container"), + container => { + return { + container, + radio: container.querySelector(".security-level-radio"), + }; + } + ); + + for (const { container, radio } of this._radioOptions) { + const level = radio.value; + radio.id = `security-level-radio-${level}`; + const currentEl = container.querySelector( + ".security-level-current-badge" + ); + currentEl.id = `security-level-current-badge-${level}`; + const descriptionEl = SecurityLevelUIUtils.createDescriptionElement( + level, + document + ); + descriptionEl.classList.add("indent"); + descriptionEl.id = `security-level-description-${level}`; + + // Wait for the full translation of the element before adding it to the + // DOM. In particular, we want to make sure the elements have text before + // we measure the maxHeight below. + await document.l10n.translateFragment(descriptionEl); + document.l10n.pauseObserving(); + container.append(descriptionEl); + document.l10n.resumeObserving(); + + if (level === this._prevLevel) { + currentEl.hidden = false; + // When the currentEl is visible, include it in the accessible name for + // the radio option. + // NOTE: The currentEl has an accessible name which includes punctuation + // to help separate it's content from the security level name. + // E.g. "Standard (Current level)". + radio.setAttribute("aria-labelledby", `${radio.id} ${currentEl.id}`); + } else { + currentEl.hidden = true; + } + // We point the accessible description to the wrapping + // .security-level-description element, rather than its children + // that define the actual text content. This means that when the + // privacy-extra-information is shown or hidden, its text content is + // included or excluded from the accessible description, respectively. + radio.setAttribute("aria-describedby", descriptionEl.id); + } + + // We want to reserve the maximum height of the radiogroup so that the + // dialog has enough height when the user switches options. So we cycle + // through the options and measure the height when they are selected to set + // a minimum height that fits all of them. + // NOTE: At the time of implementation, at this point the dialog may not + // yet have the "subdialog" attribute, which means it is missing the + // common.css stylesheet from its shadow root, which effects the size of the + // .radio-check element and the font. Therefore, we have duplicated the + // import of common.css in SecurityLevelDialog.xhtml to ensure it is applied + // at this earlier stage. + let maxHeight = 0; + for (const { container } of this._radioOptions) { + container.classList.add("selected"); + maxHeight = Math.max( + maxHeight, + this._radiogroup.getBoundingClientRect().height + ); + container.classList.remove("selected"); + } + this._radiogroup.style.minHeight = `${maxHeight}px`; + + if (this._prevLevel !== "custom") { + this._selectedLevel = this._prevLevel; + this._radiogroup.value = this._prevLevel; + } else { + this._radiogroup.selectedItem = null; + } + + this._radiogroup.addEventListener("select", () => { + this._selectedLevel = this._radiogroup.value; + this._updateSelected(); + }); + + this._updateSelected(); + }, + + /** + * Update the UI in response to a change in selection. + */ + _updateSelected() { + this._acceptButton.disabled = + !this._selectedLevel || this._selectedLevel === this._prevLevel; + // Have the container's `selected` CSS class match the selection state of + // the radio elements. + for (const { container, radio } of this._radioOptions) { + container.classList.toggle("selected", radio.selected); + } + }, + + /** + * Commit the change in security level and restart the browser. + */ + _commitChange() { + SecurityLevelPrefs.setSecurityLevelBeforeRestart(this._selectedLevel); + Services.startup.quit( + Services.startup.eAttemptQuit | Services.startup.eRestart + ); + }, +}; + +// Initial focus is not visible, even if opened with a keyboard. We avoid the +// default handler and manage the focus ourselves, which will paint the focus +// ring by default. +// NOTE: A side effect is that the focus ring will show even if the user opened +// with a mouse event. +// TODO: Remove this once bugzilla bug 1708261 is resolved. +document.subDialogSetDefaultFocus = () => { + document.getElementById("security-level-radiogroup").focus(); +}; + +// Delay showing and sizing the subdialog until it is fully initialised. +document.mozSubdialogReady = new Promise(resolve => { + window.addEventListener( + "DOMContentLoaded", + () => { + gSecurityLevelDialog.init().finally(resolve); + }, + { once: true } + ); +}); ===================================== browser/components/securitylevel/content/securityLevelDialog.xhtml ===================================== @@ -0,0 +1,86 @@ +<?xml version="1.0"?> + +<window + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml" + data-l10n-id="security-level-dialog-window" +> + <dialog id="security-level-dialog" buttons="accept,cancel"> + <linkset> + <html:link rel="stylesheet" href="chrome://global/skin/global.css" /> +  + <html:link + rel="stylesheet" + href="chrome://global/skin/in-content/common.css" + /> + <html:link + rel="stylesheet" + href="chrome://browser/skin/preferences/preferences.css" + /> + <html:link + rel="stylesheet" + href="chrome://browser/skin/preferences/privacy.css" + /> + <html:link + rel="stylesheet" + href="chrome://browser/content/securitylevel/securityLevelPreferences.css" + /> + + <html:link rel="localization" href="branding/brand.ftl" /> + <html:link rel="localization" href="toolkit/global/base-browser.ftl" /> + </linkset> + + <script src="chrome://browser/content/securitylevel/securityLevelDialog.js" /> + + <description data-l10n-id="security-level-dialog-restart-description" /> + + <radiogroup id="security-level-radiogroup" class="highlighting-group"> + <html:div + class="security-level-radio-container security-level-grid privacy-detailedoption info-box-container" + > + <radio + class="security-level-radio security-level-name" + value="standard" + data-l10n-id="security-level-preferences-level-standard" + /> + <html:div + class="security-level-current-badge" + data-l10n-id="security-level-preferences-current-badge" + ></html:div> + </html:div> + <html:div + class="security-level-radio-container security-level-grid privacy-detailedoption info-box-container" + > + <radio + class="security-level-radio security-level-name" + value="safer" + data-l10n-id="security-level-preferences-level-safer" + /> + <html:div + class="security-level-current-badge" + data-l10n-id="security-level-preferences-current-badge" + ></html:div> + </html:div> + <html:div + class="security-level-radio-container security-level-grid privacy-detailedoption info-box-container" + > + <radio + class="security-level-radio security-level-name" + value="safest" + data-l10n-id="security-level-preferences-level-safest" + /> + <html:div + class="security-level-current-badge" + data-l10n-id="security-level-preferences-current-badge" + ></html:div> + </html:div> + </radiogroup> + </dialog> +</window> ===================================== browser/components/securitylevel/content/securityLevelPanel.css ===================================== @@ -23,7 +23,7 @@ background-position-x: right var(--background-inline-offset); } -#securityLevel-background[level="standard"] { +#securityLevel-background:is([level="standard"], [level="custom"]) { background-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#standard"); } @@ -49,14 +49,6 @@ font-weight: 600; } -#securityLevel-custom { - border-radius: 4px; - background-color: var(--warning-icon-bgcolor); - color: black; - padding: 0.4em 0.5em; - margin-inline-start: 1em; -} - #securityLevel-summary { padding-inline-end: 5em; max-width: 20em; ===================================== browser/components/securitylevel/content/securityLevelPanel.inc.xhtml ===================================== @@ -15,10 +15,6 @@ <vbox id="securityLevel-background" class="panel-subview-body"> <html:p id="securityLevel-subheading"> <html:span id="securityLevel-level"></html:span> - <html:span - id="securityLevel-custom" - data-l10n-id="security-level-panel-custom-badge" - ></html:span> </html:p> <html:p id="securityLevel-summary"></html:p> <html:a @@ -32,12 +28,8 @@ <button id="securityLevel-settings" class="footer-button" + default="true" data-l10n-id="security-level-panel-open-settings-button" /> - <button - id="securityLevel-restoreDefaults" - class="footer-button" - data-l10n-id="security-level-restore-defaults-button" - /> </html:moz-button-group> </panel> ===================================== browser/components/securitylevel/content/securityLevelPreferences.css ===================================== @@ -1,26 +1,166 @@ -#securityLevel-groupbox { - --section-highlight-background-color: color-mix(in srgb, var(--in-content-accent-color) 20%, transparent); +.security-level-grid { + display: grid; + grid-template: + "icon name badge button" min-content + "icon summary summary button" auto + "icon extra extra ." auto + / max-content max-content 1fr max-content; } -#securityLevel-customNotification { - /* Spacing similar to #fpiIncompatibilityWarning. */ - margin-block: 16px; +.security-level-icon { + grid-area: icon; + align-self: start; + width: 24px; + height: 24px; + -moz-context-properties: fill; + fill: var(--in-content-icon-color); + margin-block-start: var(--space-xsmall); + margin-inline-end: var(--space-large); } -.info-icon.securityLevel-custom-warning-icon { - list-style-image: url("chrome://global/skin/icons/warning.svg"); +.security-level-current-badge { + grid-area: badge; + align-self: center; + justify-self: start; + white-space: nowrap; + background: var(--background-color-information); + color: inherit; + font-size: var(--font-size-small); + border-radius: var(--border-radius-circle); + margin-inline-start: var(--space-small); + padding-block: var(--space-xsmall); + padding-inline: var(--space-small); } -#securityLevel-customHeading { +.security-level-current-badge span { + /* Still accessible to screen reader, but not visual. + * Keep inline, but with no layout width. */ + display: inline-block; + width: 1px; + margin-inline-end: -1px; + clip-path: inset(50%); +} + +@media (prefers-contrast) and (not (forced-colors)) { + .security-level-current-badge { + /* Match the checkbox/radio colors. */ + background: var(--color-accent-primary); + color: var(--button-text-color-primary); + } +} + +@media (forced-colors) { + .security-level-current-badge { + /* Match the checkbox/radio/selected colors. */ + background: SelectedItem; + color: SelectedItemText; + } +} + +.security-level-name { + grid-area: name; font-weight: bold; + align-self: center; + white-space: nowrap; +} + +.security-level-description { + display: grid; + grid-column: summary-start / extra-end; + grid-row: summary-start / extra-end; + grid-template-rows: subgrid; + grid-template-columns: subgrid; + margin-block-start: var(--space-small); +} + +.security-level-summary { + grid-area: summary; +} + +.security-level-description-extra { + grid-area: extra; + margin-block: var(--space-medium) 0; + margin-inline: var(--space-large) 0; + padding: 0; +} + +.security-level-description-bullet:not(:last-child) { + margin-block-end: var(--space-medium); +} + +/* Tweak current security level display. */ + +#security-level-current { + margin-block-start: var(--space-large); + background: var(--in-content-box-background); + border: 1px solid var(--in-content-box-border-color); + border-radius: var(--border-radius-small); + padding: var(--space-medium); +} + +#security-level-change { + grid-area: button; + align-self: center; + margin: 0; + margin-inline-start: var(--space-large); +} + +/* Adjust which content is visible depending on the current security level. */ + +#security-level-current:not([data-current-level="standard"]) .security-level-current-standard { + display: none; +} + +#security-level-current:not([data-current-level="safer"]) .security-level-current-safer { + display: none; +} + +#security-level-current:not([data-current-level="safest"]) .security-level-current-safest { + display: none; +} + +#security-level-current:not([data-current-level="custom"]) .security-level-current-custom { + display: none; +} + +#security-level-current[data-current-level="standard"] .security-level-icon { + content: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#standard"); +} + +#security-level-current[data-current-level="safer"] .security-level-icon { + content: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safer"); +} + +#security-level-current[data-current-level="safest"] .security-level-icon { + content: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safest"); +} + +#security-level-current[data-current-level="custom"] .security-level-icon { + content: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#standard_custom"); +} + +/* Tweak security level dialog. */ + +#security-level-radiogroup { + margin-block: var(--space-large) var(--space-xlarge); +} + +.security-level-radio-container { + padding-block: var(--space-large); +} + +#security-level-radiogroup .security-level-radio { + margin: 0; } -#securityLevel-radiogroup[disabled] { - opacity: 0.5; +#security-level-radiogroup .radio-label-box { + /* .security-level-current-badge already has a margin. */ + margin: 0; } -/* Overwrite the rule in common-shared.css so we don't get 0.25 opacity overall - * on the radio text. */ -#securityLevel-radiogroup[disabled] radio[disabled] .radio-label-box { - opacity: 1.0; +#security-level-radiogroup .privacy-detailedoption.security-level-radio-container:not(.selected) .security-level-description-extra { + /* .privacy-detailedoption uses visibility: hidden, which does not work with + * our grid display (the margin is still reserved) so we use display: none + * instead. */ + display: none; } ===================================== browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml ===================================== @@ -17,112 +17,19 @@ data-l10n-id="security-level-preferences-learn-more-link" ></html:a> </description> - <hbox - id="securityLevel-customNotification" - class="info-box-container" - flex="1" - > - <hbox class="info-icon-container"> - <image class="info-icon securityLevel-custom-warning-icon"/> - </hbox> - <vbox flex="1"> - <label - id="securityLevel-customHeading" - data-l10n-id="security-level-preferences-custom-heading" - /> - <description - id="securityLevel-customDescription" - data-l10n-id="security-level-summary-custom" - flex="1" - /> - </vbox> - <hbox align="center"> - <button - id="securityLevel-restoreDefaults" - data-l10n-id="security-level-restore-defaults-button" - /> - </hbox> - </hbox> - <radiogroup id="securityLevel-radiogroup"> - <vbox class="securityLevel-radio-option privacy-detailedoption info-box-container"> - <radio - value="standard" - data-l10n-id="security-level-preferences-level-standard" - aria-describedby="securityLevelSummary-standard" - /> - <vbox id="securityLevelSummary-standard" class="indent"> - <label data-l10n-id="security-level-summary-standard" /> - </vbox> - </vbox> - <vbox class="securityLevel-radio-option privacy-detailedoption info-box-container"> -  - <radio - value="safer" - data-l10n-id="security-level-preferences-level-safer" - aria-describedby="securityLevelSummary-safer" - /> - <vbox id="securityLevelSummary-safer" class="indent"> - <label data-l10n-id="security-level-summary-safer" /> - <vbox class="privacy-extra-information"> - <vbox class="indent"> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-https-only-javascript" - /> - </hbox> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-limit-font-and-symbols" - /> - </hbox> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-limit-media" - /> - </hbox> - </vbox> - </vbox> - </vbox> - </vbox> - <vbox class="securityLevel-radio-option privacy-detailedoption info-box-container"> - <radio - value="safest" - data-l10n-id="security-level-preferences-level-safest" - aria-describedby="securityLevelSummary-safest" - /> - <vbox id="securityLevelSummary-safest" class="indent"> - <label data-l10n-id="security-level-summary-safest" /> - <vbox class="privacy-extra-information"> - <vbox class="indent"> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-disabled-javascript" - /> - </hbox> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-limit-font-and-symbols-and-images" - /> - </hbox> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-limit-media" - /> - </hbox> - </vbox> - </vbox> - </vbox> - </vbox> - </radiogroup> + <html:div id="security-level-current" class="security-level-grid"> + <html:img + class="security-level-icon" + alt="" + /> + <html:div + class="security-level-current-badge" + data-l10n-id="security-level-preferences-current-badge" + ></html:div> + <html:button + id="security-level-change" + data-l10n-id="security-level-preferences-change-button" + ></html:button> + </html:div> </vbox> </groupbox> ===================================== browser/components/securitylevel/jar.mn ===================================== @@ -4,3 +4,5 @@ browser.jar: content/browser/securitylevel/securityLevelButton.css (content/securityLevelButton.css) content/browser/securitylevel/securityLevelPreferences.css (content/securityLevelPreferences.css) content/browser/securitylevel/securityLevelIcon.svg (content/securityLevelIcon.svg) + content/browser/securitylevel/securityLevelDialog.xhtml (content/securityLevelDialog.xhtml) + content/browser/securitylevel/securityLevelDialog.js (content/securityLevelDialog.js) ===================================== browser/components/securitylevel/moz.build ===================================== @@ -1 +1,5 @@ JAR_MANIFESTS += ["jar.mn"] + +EXTRA_JS_MODULES += [ + "SecurityLevelUIUtils.sys.mjs", +] ===================================== browser/modules/SecurityLevelRestartNotification.sys.mjs ===================================== @@ -0,0 +1,72 @@ +const lazy = {}; + +ChromeUtils.defineESModuleGetters(lazy, { + BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs", + SecurityLevelPrefs: "resource://gre/modules/SecurityLevel.sys.mjs", +}); + +ChromeUtils.defineLazyGetter(lazy, "NotificationStrings", function () { + return new Localization([ + "branding/brand.ftl", + "toolkit/global/base-browser.ftl", + ]); +}); + +/** + * Interface for showing the security level restart notification on desktop. + */ +export const SecurityLevelRestartNotification = { + /** + * Whether we have already been initialised. + * + * @type {boolean} + */ + _initialized: false, + + /** + * Called when the UI is ready to show a notification. + */ + ready() { + if (this._initialized) { + return; + } + this._initialized = true; + lazy.SecurityLevelPrefs.setRestartNotificationHandler(this); + }, + + /** + * Show the restart notification, and perform the restart if the user agrees. + */ + async tryRestartBrowser() { + const [titleText, bodyText, primaryButtonText, secondaryButtonText] = + await lazy.NotificationStrings.formatValues([ + { id: "security-level-restart-prompt-title" }, + { id: "security-level-restart-prompt-body" }, + { id: "security-level-restart-prompt-button-restart" }, + { id: "security-level-restart-prompt-button-ignore" }, + ]); + const buttonFlags = + Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_0 + + Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_1; + + const propBag = await Services.prompt.asyncConfirmEx( + lazy.BrowserWindowTracker.getTopWindow()?.browsingContext ?? null, + Services.prompt.MODAL_TYPE_INTERNAL_WINDOW, + titleText, + bodyText, + buttonFlags, + primaryButtonText, + secondaryButtonText, + null, + null, + null, + {} + ); + + if (propBag.get("buttonNumClicked") === 0) { + Services.startup.quit( + Services.startup.eAttemptQuit | Services.startup.eRestart + ); + } + }, +}; ===================================== browser/modules/moz.build ===================================== @@ -126,6 +126,7 @@ EXTRA_JS_MODULES += [ "PermissionUI.sys.mjs", "ProcessHangMonitor.sys.mjs", "Sanitizer.sys.mjs", + "SecurityLevelRestartNotification.sys.mjs", "SelectionChangedMenulist.sys.mjs", "SiteDataManager.sys.mjs", "SitePermissions.sys.mjs", ===================================== toolkit/components/extensions/ExtensionParent.sys.mjs ===================================== @@ -2345,6 +2345,7 @@ async function torSendExtensionMessage(extensionId, message) { const result = await ProxyMessenger.conduit.castRuntimeMessage("messenger", { extensionId, holder: new StructuredCloneHolder("torSendExtensionMessage", null, message), + query: true, firstResponse: true, sender: { id: extensionId, ===================================== toolkit/components/securitylevel/SecurityLevel.sys.mjs ===================================== @@ -16,6 +16,7 @@ const BrowserTopics = Object.freeze({ // The Security Settings prefs in question. const kSliderPref = "browser.security_level.security_slider"; const kCustomPref = "browser.security_level.security_custom"; +const kNoScriptInitedPref = "browser.security_level.noscript_inited"; // __getPrefValue(prefName)__ // Returns the current value of a preference, regardless of its type. @@ -32,11 +33,11 @@ var getPrefValue = function (prefName) { } }; -// __bindPref(prefName, prefHandler, init)__ +// __bindPref(prefName, prefHandler)__ // Applies prefHandler whenever the value of the pref changes. // If init is true, applies prefHandler to the current value. -// Returns a zero-arg function that unbinds the pref. -var bindPref = function (prefName, prefHandler, init = false) { +// Returns the observer that was added. +var bindPref = function (prefName, prefHandler) { let update = () => { prefHandler(getPrefValue(prefName)); }, @@ -48,21 +49,9 @@ var bindPref = function (prefName, prefHandler, init = false) { }, }; Services.prefs.addObserver(prefName, observer); - if (init) { - update(); - } - return () => { - Services.prefs.removeObserver(prefName, observer); - }; + return observer; }; -// __bindPrefAndInit(prefName, prefHandler)__ -// Applies prefHandler to the current value of pref specified by prefName. -// Re-applies prefHandler whenever the value of the pref changes. -// Returns a zero-arg function that unbinds the pref. -var bindPrefAndInit = (prefName, prefHandler) => - bindPref(prefName, prefHandler, true); - async function waitForExtensionMessage(extensionId, checker = () => {}) { const { torWaitForExtensionMessage } = lazy.ExtensionParent; if (torWaitForExtensionMessage) { @@ -74,7 +63,7 @@ async function waitForExtensionMessage(extensionId, checker = () => {}) { async function sendExtensionMessage(extensionId, message) { const { torSendExtensionMessage } = lazy.ExtensionParent; if (torSendExtensionMessage) { - return torSendExtensionMessage(extensionId, message); + return await torSendExtensionMessage(extensionId, message); } return undefined; } @@ -199,14 +188,8 @@ var initializeNoScriptControl = () => { // `browser.runtime.onMessage.addListener(...)` in NoScript's bg/main.js. // TODO: Is there a better way? - let sendNoScriptSettings = settings => - sendExtensionMessage(noscriptID, settings); - - // __setNoScriptSafetyLevel(safetyLevel)__. - // Set NoScript settings according to a particular safety level - // (security slider level): 0 = Standard, 1 = Safer, 2 = Safest - let setNoScriptSafetyLevel = safetyLevel => - sendNoScriptSettings(noscriptSettings(safetyLevel)); + let sendNoScriptSettings = async settings => + await sendExtensionMessage(noscriptID, settings); // __securitySliderToSafetyLevel(sliderState)__. // Converts the "browser.security_level.security_slider" pref value @@ -216,36 +199,46 @@ var initializeNoScriptControl = () => { // Wait for the first message from NoScript to arrive, and then // bind the security_slider pref to the NoScript settings. - let messageListener = a => { + let messageListener = async a => { try { logger.debug("Message received from NoScript:", a); - let noscriptPersist = Services.prefs.getBoolPref( - "browser.security_level.noscript_persist", - false - ); + const persistPref = "browser.security_level.noscript_persist"; + let noscriptPersist = Services.prefs.getBoolPref(persistPref, false); let noscriptInited = Services.prefs.getBoolPref( - "browser.security_level.noscript_inited", + kNoScriptInitedPref, false ); - // Set the noscript safety level once if we have never run noscript - // before, or if we are not allowing noscript per-site settings to be - // persisted between browser sessions. Otherwise make sure that the - // security slider position, if changed, will rewrite the noscript - // settings. - bindPref( - kSliderPref, - sliderState => - setNoScriptSafetyLevel(securitySliderToSafetyLevel(sliderState)), - !noscriptPersist || !noscriptInited - ); - if (!noscriptInited) { - Services.prefs.setBoolPref( - "browser.security_level.noscript_inited", - true + // Set the noscript safety level once at startup. + // If a user has set noscriptPersist, then we only send this if the + // security level was changed in a previous session. + // NOTE: We do not re-send this when the security_slider preference + // changes mid-session because this should always require a restart. + if (noscriptPersist && noscriptInited) { + logger.warn( + `Not initialising NoScript since the user has set ${persistPref}` ); + return; } + // Read the security level, even if the user has the "custom" + // preference. + const securityIndex = Services.prefs.getIntPref(kSliderPref, 0); + const safetyLevel = securitySliderToSafetyLevel(securityIndex); + // May throw if NoScript fails to apply the settings: + const noscriptResult = await sendNoScriptSettings( + noscriptSettings(safetyLevel) + ); + // Mark the NoScript extension as initialised so we do not reset it + // at the next startup for noscript_persist users. + Services.prefs.setBoolPref(kNoScriptInitedPref, true); + logger.info("NoScript successfully initialised."); + // In the future NoScript may tell us more about how it applied our + // settings, e.g. if user is overriding per-site permissions. + // Up to NoScript 12.6 noscriptResult is undefined. + logger.debug("NoScript response:", noscriptResult); } catch (e) { - logger.exception(e); + logger.error("Could not apply NoScript settings", e); + // Treat as a custom security level for the rest of the session. + Services.prefs.setBoolPref(kCustomPref, true); } }; waitForExtensionMessage(noscriptID, a => a.__meta.name === "started").then( @@ -254,6 +247,8 @@ var initializeNoScriptControl = () => { logger.info("Listening for messages from NoScript."); } catch (e) { logger.exception(e); + // Treat as a custom security level for the rest of the session. + Services.prefs.setBoolPref(kCustomPref, true); } }; @@ -283,16 +278,60 @@ const kSecuritySettings = { // ### Prefs +/** + * Amend the security level index to a standard value. + * + * @param {integer} index - The input index value. + * @returns {integer} - A standard index value. + */ +function fixupIndex(index) { + if (!Number.isInteger(index) || index < 1 || index > 4) { + // Unexpected value out of range, go to the "safest" level as a fallback. + return 1; + } + if (index === 3) { + // Migrate from old medium-low (3) to new medium (2). + return 2; + } + return index; +} + +/** + * A list of preference observers that should be disabled whilst we write our + * preference values. + * + * @type {{ prefName: string, observer: object }[]} + */ +const prefObservers = []; + // __write_setting_to_prefs(settingIndex)__. // Take a given setting index and write the appropriate pref values // to the pref database. var write_setting_to_prefs = function (settingIndex) { - Object.keys(kSecuritySettings).forEach(prefName => - Services.prefs.setBoolPref( - prefName, - kSecuritySettings[prefName][settingIndex] - ) - ); + settingIndex = fixupIndex(settingIndex); + // Don't want to trigger our internal observers when setting ourselves. + for (const { prefName, observer } of prefObservers) { + Services.prefs.removeObserver(prefName, observer); + } + try { + // Make sure noscript is re-initialised at the next startup when the + // security level changes. + Services.prefs.setBoolPref(kNoScriptInitedPref, false); + Services.prefs.setIntPref(kSliderPref, settingIndex); + // NOTE: We do not clear kCustomPref. Instead, we rely on the preference + // being cleared on the next startup. + Object.keys(kSecuritySettings).forEach(prefName => + Services.prefs.setBoolPref( + prefName, + kSecuritySettings[prefName][settingIndex] + ) + ); + } finally { + // Re-add the observers. + for (const { prefName, observer } of prefObservers) { + Services.prefs.addObserver(prefName, observer); + } + } }; // __read_setting_from_prefs()__. @@ -321,24 +360,6 @@ var read_setting_from_prefs = function (prefNames) { return null; }; -// __watch_security_prefs(onSettingChanged)__. -// Whenever a pref bound to the security slider changes, onSettingChanged -// is called with the new security setting value (1,2,3,4 or null). -// Returns a zero-arg function that ends this binding. -var watch_security_prefs = function (onSettingChanged) { - let prefNames = Object.keys(kSecuritySettings); - let unbindFuncs = []; - for (let prefName of prefNames) { - unbindFuncs.push( - bindPrefAndInit(prefName, () => - onSettingChanged(read_setting_from_prefs()) - ) - ); - } - // Call all the unbind functions. - return () => unbindFuncs.forEach(unbind => unbind()); -}; - // __initialized__. // Have we called initialize() yet? var initializedSecPrefs = false; @@ -354,36 +375,82 @@ var initializeSecurityPrefs = function () { } logger.info("Initializing security-prefs.js"); initializedSecPrefs = true; - // When security_custom is set to false, apply security_slider setting - // to the security-sensitive prefs. - bindPrefAndInit(kCustomPref, function (custom) { - if (custom === false) { - write_setting_to_prefs(Services.prefs.getIntPref(kSliderPref)); - } - }); - // If security_slider is given a new value, then security_custom should - // be set to false. - bindPref(kSliderPref, function (prefIndex) { + + const wasCustom = Services.prefs.getBoolPref(kCustomPref, false); + // For new profiles with no user preference, the security level should be "4" + // and it should not be custom. + let desiredIndex = Services.prefs.getIntPref(kSliderPref, 4); + desiredIndex = fixupIndex(desiredIndex); + // Make sure the user has a set preference user value. + Services.prefs.setIntPref(kSliderPref, desiredIndex); + Services.prefs.setBoolPref(kCustomPref, wasCustom); + + // Make sure that the preference values at application startup match the + // expected values for the desired security level. See tor-browser#43783. + + // NOTE: We assume that the controlled preference values that are read prior + // to profile-after-change do not change in value before this method is + // called. I.e. we expect the current preference values to match the + // preference values that were used during the application initialisation. + const effectiveIndex = read_setting_from_prefs(); + + if (wasCustom && effectiveIndex !== null) { + logger.info(`Custom startup values match index ${effectiveIndex}`); + // Do not consider custom any more. + // NOTE: This level needs to be set before it is read elsewhere. In + // particular, for the NoScript addon. Services.prefs.setBoolPref(kCustomPref, false); - write_setting_to_prefs(prefIndex); + Services.prefs.setIntPref(kSliderPref, effectiveIndex); + } else if (!wasCustom && effectiveIndex !== desiredIndex) { + // NOTE: We assume all our controlled preferences require a restart. + // In practice, only a subset of these preferences may actually require a + // restart, so we could switch their values. But we treat them all the same + // for simplicity, consistency and stability in case mozilla changes the + // restart requirements. + logger.info(`Startup values do not match for index ${desiredIndex}`); + SecurityLevelPrefs.requireRestart(); + } + + // Start listening for external changes to the controlled preferences. + prefObservers.push({ + prefName: kCustomPref, + observer: bindPref(kCustomPref, custom => { + // Custom flag was removed mid-session. Requires a restart to apply the + // security level. + if (custom === false) { + logger.info("Custom flag was cleared externally"); + SecurityLevelPrefs.requireRestart(); + } + }), }); - // If a security-sensitive pref changes, then decide if the set of pref values - // constitutes a security_slider setting or a custom value. - watch_security_prefs(settingIndex => { - if (settingIndex === null) { - Services.prefs.setBoolPref(kCustomPref, true); - } else { - Services.prefs.setIntPref(kSliderPref, settingIndex); - Services.prefs.setBoolPref(kCustomPref, false); - } + prefObservers.push({ + prefName: kSliderPref, + observer: bindPref(kSliderPref, () => { + // Security level was changed mid-session. Requires a restart to apply. + logger.info("Security level was changed externally"); + SecurityLevelPrefs.requireRestart(); + }), }); - // Migrate from old medium-low (3) to new medium (2). - if ( - Services.prefs.getBoolPref(kCustomPref) === false && - Services.prefs.getIntPref(kSliderPref) === 3 - ) { - Services.prefs.setIntPref(kSliderPref, 2); - write_setting_to_prefs(2); + + for (const prefName of Object.keys(kSecuritySettings)) { + prefObservers.push({ + prefName, + observer: bindPref(prefName, () => { + logger.warn( + `The controlled preference ${prefName} was changed externally.` + + " Treating as a custom security level." + ); + // Something outside of this module changed the preference value for a + // preference we control. + // Always treat as a custom security level for the rest of this session, + // even if the new preference values match a pre-set security level. We + // do this because some controlled preferences require a restart to be + // properly applied. See tor-browser#43783. + // In the case where it does match a pre-set security level, the custom + // flag will be cleared at the next startup. + Services.prefs.setBoolPref(kCustomPref, true); + }), + }); } logger.info("security-prefs.js initialization complete"); @@ -437,8 +504,9 @@ export class SecurityLevel { init() { migratePreferences(); - initializeNoScriptControl(); + // Fixup our preferences before we pass on the security level to NoScript. initializeSecurityPrefs(); + initializeNoScriptControl(); } observe(aSubject, aTopic) { @@ -448,10 +516,19 @@ export class SecurityLevel { } } +/** + * @typedef {object} SecurityLevelRestartNotificationHandler + * + * An object that can serve the user a restart notification. + * + * @property {Function} tryRestartBrowser - The method that should be called to + * ask the user to restart the browser. + */ + /* Security Level Prefs - Getters and Setters for relevant torbutton prefs + Getters and Setters for relevant security level prefs */ export const SecurityLevelPrefs = { SecurityLevels: Object.freeze({ @@ -462,6 +539,14 @@ export const SecurityLevelPrefs = { security_slider_pref: "browser.security_level.security_slider", security_custom_pref: "browser.security_level.security_custom", + /** + * The current security level preference. + * + * This ignores any custom settings the user may have changed, and just + * gives the underlying security level. + * + * @type {?string} + */ get securityLevel() { // Set the default return value to 0, which won't match anything in // SecurityLevels. @@ -471,18 +556,146 @@ export const SecurityLevelPrefs = { )?.[0]; }, - set securityLevel(level) { - const val = this.SecurityLevels[level]; - if (val !== undefined) { - Services.prefs.setIntPref(this.security_slider_pref, val); - } + /** + * Set the desired security level just before a restart. + * + * The caller must restart the browser after calling this method. + * + * @param {string} level - The name of the new security level to set. + */ + setSecurityLevelBeforeRestart(level) { + write_setting_to_prefs(this.SecurityLevels[level]); }, + /** + * Whether the user has any custom setting values that do not match a pre-set + * security level. + * + * @type {boolean} + */ get securityCustom() { return Services.prefs.getBoolPref(this.security_custom_pref); }, - set securityCustom(val) { - Services.prefs.setBoolPref(this.security_custom_pref, val); + /** + * A summary of the current security level. + * + * If the user has some custom settings, this returns "custom". Otherwise + * returns the name of the security level. + * + * @type {string} + */ + get securityLevelSummary() { + if (this.securityCustom) { + return "custom"; + } + return this.securityLevel ?? "custom"; + }, + + /** + * Whether the browser should be restarted to apply the security level. + * + * @type {boolean} + */ + _needRestart: false, + + /** + * The external handler that can show a notification to the user, if any. + * + * @type {?SecurityLevelRestartNotificationHandler} + */ + _restartNotificationHandler: null, + + /** + * Set the external handler for showing notifications to the user. + * + * This should only be called once per session once the handler is ready to + * show a notification, which may occur immediately during this call. + * + * @param {SecurityLevelRestartNotificationHandler} handler - The new handler + * to use. + */ + setRestartNotificationHandler(handler) { + logger.info("Restart notification handler is set"); + this._restartNotificationHandler = handler; + if (this._needRestart) { + // Show now using the new handler. + this._tryShowRestartNotification(); + } + }, + + /** + * A promise for any ongoing notification prompt task. + * + * @type {Promise} + */ + _restartNotificationPromise: null, + + /** + * Try show a notification to the user. + * + * If no notification handler has been attached yet, this will do nothing. + */ + async _tryShowRestartNotification() { + if (!this._restartNotificationHandler) { + logger.info("Missing a restart notification handler"); + // This may be added later in the session. + return; + } + + const prevPromise = this._restartNotificationPromise; + let resolve; + ({ promise: this._restartNotificationPromise, resolve } = + Promise.withResolvers()); + await prevPromise; + + try { + await this._restartNotificationHandler?.tryRestartBrowser(); + } finally { + // Allow the notification to be shown again. + resolve(); + } + }, + + /** + * Mark the session as requiring a restart to apply a change in security + * level. + * + * The security level will immediately be switched to "custom", and the user + * may be shown a notification to restart the browser. + */ + requireRestart() { + logger.warn("The browser needs to be restarted to set the security level"); + // Treat as a custom security level for the rest of the session. + // At the next startup, the custom flag may be cleared if the settings are + // as expected. + Services.prefs.setBoolPref(kCustomPref, true); + this._needRestart = true; + + // NOTE: We need to change the controlled security level preferences in + // response to the desired change in security level. We could either: + // 1. Only change the controlled preferences after the user confirms a + // restart. Or + // 2. Change the controlled preferences and then try and ask the user to + // restart. + // + // We choose the latter: + // 1. To allow users to manually restart. + // 2. If the user ignores or misses the notification, they will at least be + // in the correct state when the browser starts again. Although they will + // be in a custom/undefined state in the mean time. + // 3. Currently Android relies on triggering the change in security level + // by setting the browser.security_level.security_slider preference + // value. So it currently uses this path. So we need to set the values + // now, before it preforms a restart. + // TODO: Have android use the `setSecurityLevelBeforeRestart` method + // instead of setting the security_slider preference value directly, so that + // it knows exactly when it can restart the browser. tor-browser#43820 + write_setting_to_prefs(Services.prefs.getIntPref(kSliderPref, 0)); + // NOTE: Even though we have written the preferences, the session should + // still be marked as "custom" because: + // 1. Some preferences require a browser restart to be applied. + // 2. NoScript has not been updated with the new settings. + this._tryShowRestartNotification(); }, }; /* Security Level Prefs */ ===================================== toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== @@ -128,10 +128,6 @@ security-level-toolbar-button-custom = # Uses sentence case in English (US). security-level-panel-heading = Security level - -security-level-panel-level-standard = Standard -security-level-panel-level-safer = Safer -security-level-panel-level-safest = Safest security-level-panel-learn-more-link = Learn more # Button to open security level settings. security-level-panel-open-settings-button = Settings… @@ -141,6 +137,19 @@ security-level-panel-open-settings-button = Settings… security-level-preferences-heading = Security Level security-level-preferences-overview = Disable certain web features that can be used to attack your security and anonymity. security-level-preferences-learn-more-link = Learn more +# Text for a badge that labels the currently active security level. +# The text in between '<span>' and '</span>' should contain some kind of bracket, like '(' and ')', or other punctuation used in your language to separate out text from its surrounding context. This will not be visible, but will be use for screen readers to make it clear that the text is not part of the same sentence. For example, in US English this would be read as "(Current level)", and the full line of text would be read as "Safest (Current level)". +security-level-preferences-current-badge = <span>(</span>Current level<span>)</span> +security-level-preferences-change-button = Change… + +## Security level settings dialog. + +security-level-dialog-window = + .title = Change security level + +# '-brand-short-name' is the localized browser name, like "Tor Browser". +security-level-dialog-restart-description = You will need to restart { -brand-short-name } to apply any changes. This will close all windows and tabs. + security-level-preferences-level-standard = .label = Standard security-level-preferences-level-safer = @@ -148,6 +157,16 @@ security-level-preferences-level-safer = security-level-preferences-level-safest = .label = Safest +security-level-dialog-save-restart = + .label = Save and restart + +## Security level names shown in the security panel and settings. + +security-level-panel-level-standard = Standard +security-level-panel-level-safer = Safer +security-level-panel-level-safest = Safest +security-level-panel-level-custom = Custom + ## Security level summaries shown in security panel and settings. security-level-summary-standard = All browser and website features are enabled. @@ -166,13 +185,13 @@ security-level-preferences-bullet-limit-font-and-symbols-and-images = Some fonts ## Custom security level. ## Some custom preferences configuration has placed the user outside one of the standard three levels. -# Shown in the security level panel as an orange badge next to the expected level. -security-level-panel-custom-badge = Custom -# Shown in the security level settings in a warning box. -security-level-preferences-custom-heading = Custom security level configured # Description of custom state and recommended action. # Shown in the security level panel and settings. security-level-summary-custom = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. -# Button to undo custom changes to the security level and place the user in one of the standard security levels. -# Shown in the security level panel and settings. -security-level-restore-defaults-button = Restore defaults + +## Security level restart prompt. + +security-level-restart-prompt-title = Your security level settings require a restart +security-level-restart-prompt-body = You must restart { -brand-short-name } for your security level settings to be applied. This will close all your windows and tabs. +security-level-restart-prompt-button-restart = Restart +security-level-restart-prompt-button-ignore = Ignore View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/c2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/c2… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/tor-browser][base-browser-128.11.0esr-14.5-1] 5 commits: fixup! BB 40925: Implemented the Security Level component
by ma1 (＠ma1) 10 Jun '25

10 Jun '25

ma1 pushed to branch base-browser-128.11.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: f0e5e82c by Henry Wilkes at 2025-06-10T12:36:21+02:00 fixup! BB 40925: Implemented the Security Level component TB 43783: Prompt user for a restart if their security level preferences are not aligned at startup or mid-session. Also handle failures to apply NoScript settings. - - - - - c60e8848 by Henry Wilkes at 2025-06-10T12:36:29+02:00 fixup! BB 40069: Add helpers for message … [View More]passing with extensions TB 43783: Allow the browser to wait for the NoScript settings to be applied. - - - - - 0ac7500f by Henry Wilkes at 2025-06-10T12:36:32+02:00 fixup! Base Browser strings TB 43783: Add security level prompt strings. - - - - - 7aa2426e by Henry Wilkes at 2025-06-10T12:36:49+02:00 fixup! Base Browser strings TB 43782: Add strings for new security level UX flow. - - - - - 8366be53 by Henry Wilkes at 2025-06-10T12:36:51+02:00 fixup! BB 40925: Implemented the Security Level component TB 43782: Update security level UI for new UX flow. In addition, we drop the distinction between the security levels in the UI when the user has a custom security level. I.e. we always show shield as unfilled but with a yellow dot in the toolbar, and we just call it "Custom" rather than "Standard Custom", etc. - - - - - 17 changed files: - browser/components/BrowserGlue.sys.mjs - + browser/components/securitylevel/SecurityLevelUIUtils.sys.mjs - browser/components/securitylevel/content/securityLevel.js - browser/components/securitylevel/content/securityLevelButton.css - + browser/components/securitylevel/content/securityLevelDialog.js - + browser/components/securitylevel/content/securityLevelDialog.xhtml - browser/components/securitylevel/content/securityLevelPanel.css - browser/components/securitylevel/content/securityLevelPanel.inc.xhtml - browser/components/securitylevel/content/securityLevelPreferences.css - browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml - browser/components/securitylevel/jar.mn - browser/components/securitylevel/moz.build - + browser/modules/SecurityLevelRestartNotification.sys.mjs - browser/modules/moz.build - toolkit/components/extensions/ExtensionParent.sys.mjs - toolkit/components/securitylevel/SecurityLevel.sys.mjs - toolkit/locales/en-US/toolkit/global/base-browser.ftl Changes: ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -82,6 +82,8 @@ ChromeUtils.defineESModuleGetters(lazy, { ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs", SearchSERPCategorization: "resource:///modules/SearchSERPTelemetry.sys.mjs", SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs", + SecurityLevelRestartNotification: + "resource:///modules/SecurityLevelRestartNotification.sys.mjs", SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs", SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", ShellService: "resource:///modules/ShellService.sys.mjs", @@ -1954,6 +1956,8 @@ BrowserGlue.prototype = { lazy.DoHController.init(); + lazy.SecurityLevelRestartNotification.ready(); + ClipboardPrivacy.startup(); this._firstWindowTelemetry(aWindow); ===================================== browser/components/securitylevel/SecurityLevelUIUtils.sys.mjs ===================================== @@ -0,0 +1,73 @@ +/** + * Common methods for the desktop security level components. + */ +export const SecurityLevelUIUtils = { + /** + * Create an element that gives a description of the security level. To be + * used in the settings. + * + * @param {string} level - The security level to describe. + * @param {Document} doc - The document where the element will be inserted. + * + * @returns {Element} - The newly created element. + */ + createDescriptionElement(level, doc) { + const el = doc.createElement("div"); + el.classList.add("security-level-description"); + + let l10nIdSummary; + let bullets; + switch (level) { + case "standard": + l10nIdSummary = "security-level-summary-standard"; + break; + case "safer": + l10nIdSummary = "security-level-summary-safer"; + bullets = [ + "security-level-preferences-bullet-https-only-javascript", + "security-level-preferences-bullet-limit-font-and-symbols", + "security-level-preferences-bullet-limit-media", + ]; + break; + case "safest": + l10nIdSummary = "security-level-summary-safest"; + bullets = [ + "security-level-preferences-bullet-disabled-javascript", + "security-level-preferences-bullet-limit-font-and-symbols-and-images", + "security-level-preferences-bullet-limit-media", + ]; + break; + case "custom": + l10nIdSummary = "security-level-summary-custom"; + break; + default: + throw Error(`Unhandled level: ${level}`); + } + + const summaryEl = doc.createElement("div"); + summaryEl.classList.add("security-level-summary"); + doc.l10n.setAttributes(summaryEl, l10nIdSummary); + + el.append(summaryEl); + + if (!bullets) { + return el; + } + + const listEl = doc.createElement("ul"); + listEl.classList.add("security-level-description-extra"); + // Add a mozilla styling class as well: + listEl.classList.add("privacy-extra-information"); + for (const l10nId of bullets) { + const bulletEl = doc.createElement("li"); + bulletEl.classList.add("security-level-description-bullet"); + + doc.l10n.setAttributes(bulletEl, l10nId); + + listEl.append(bulletEl); + } + + el.append(listEl); + return el; + }, +}; ===================================== browser/components/securitylevel/content/securityLevel.js ===================================== @@ -1,9 +1,10 @@ "use strict"; -/* global AppConstants, Services, openPreferences, XPCOMUtils */ +/* global AppConstants, Services, openPreferences, XPCOMUtils, gSubDialog */ ChromeUtils.defineESModuleGetters(this, { SecurityLevelPrefs: "resource://gre/modules/SecurityLevel.sys.mjs", + SecurityLevelUIUtils: "resource:///modules/SecurityLevelUIUtils.sys.mjs", }); /* @@ -35,12 +36,8 @@ var SecurityLevelButton = { _anchorButton: null, _configUIFromPrefs() { - const level = SecurityLevelPrefs.securityLevel; - if (!level) { - return; - } - const custom = SecurityLevelPrefs.securityCustom; - this._button.setAttribute("level", custom ? `${level}_custom` : level); + const level = SecurityLevelPrefs.securityLevelSummary; + this._button.setAttribute("level", level); let l10nIdLevel; switch (level) { @@ -53,15 +50,12 @@ var SecurityLevelButton = { case "safest": l10nIdLevel = "security-level-toolbar-button-safest"; break; + case "custom": + l10nIdLevel = "security-level-toolbar-button-custom"; + break; default: throw Error(`Unhandled level: ${level}`); } - if (custom) { - // Don't distinguish between the different levels when in the custom - // state. We just want to emphasise that it is custom rather than any - // specific level. - l10nIdLevel = "security-level-toolbar-button-custom"; - } document.l10n.setAttributes(this._button, l10nIdLevel); }, @@ -164,12 +158,7 @@ var SecurityLevelPanel = { panel: document.getElementById("securityLevel-panel"), background: document.getElementById("securityLevel-background"), levelName: document.getElementById("securityLevel-level"), - customName: document.getElementById("securityLevel-custom"), summary: document.getElementById("securityLevel-summary"), - restoreDefaultsButton: document.getElementById( - "securityLevel-restoreDefaults" - ), - settingsButton: document.getElementById("securityLevel-settings"), }; const learnMoreEl = document.getElementById("securityLevel-learnMore"); @@ -177,12 +166,11 @@ var SecurityLevelPanel = { this.hide(); }); - this._elements.restoreDefaultsButton.addEventListener("command", () => { - this.restoreDefaults(); - }); - this._elements.settingsButton.addEventListener("command", () => { - this.openSecuritySettings(); - }); + document + .getElementById("securityLevel-settings") + .addEventListener("command", () => { + this.openSecuritySettings(); + }); this._elements.panel.addEventListener("popupshown", () => { // Bring focus into the panel by focusing the default button. @@ -199,19 +187,7 @@ var SecurityLevelPanel = { } // get security prefs - const level = SecurityLevelPrefs.securityLevel; - const custom = SecurityLevelPrefs.securityCustom; - - // only visible when user is using custom settings - this._elements.customName.hidden = !custom; - this._elements.restoreDefaultsButton.hidden = !custom; - if (custom) { - this._elements.settingsButton.removeAttribute("default"); - this._elements.restoreDefaultsButton.setAttribute("default", "true"); - } else { - this._elements.settingsButton.setAttribute("default", "true"); - this._elements.restoreDefaultsButton.removeAttribute("default"); - } + const level = SecurityLevelPrefs.securityLevelSummary; // Descriptions change based on security level this._elements.background.setAttribute("level", level); @@ -230,12 +206,13 @@ var SecurityLevelPanel = { l10nIdLevel = "security-level-panel-level-safest"; l10nIdSummary = "security-level-summary-safest"; break; + case "custom": + l10nIdLevel = "security-level-panel-level-custom"; + l10nIdSummary = "security-level-summary-custom"; + break; default: throw Error(`Unhandled level: ${level}`); } - if (custom) { - l10nIdSummary = "security-level-summary-custom"; - } document.l10n.setAttributes(this._elements.levelName, l10nIdLevel); document.l10n.setAttributes(this._elements.summary, l10nIdSummary); @@ -269,13 +246,6 @@ var SecurityLevelPanel = { this._elements.panel.hidePopup(); }, - restoreDefaults() { - SecurityLevelPrefs.securityCustom = false; - // Move focus to the settings button since restore defaults button will - // become hidden. - this._elements.settingsButton.focus(); - }, - openSecuritySettings() { openPreferences("privacy-securitylevel"); this.hide(); @@ -301,59 +271,64 @@ var SecurityLevelPanel = { var SecurityLevelPreferences = { _securityPrefsBranch: null, + /** - * The notification box shown when the user has a custom security setting. - * - * @type {Element} - */ - _customNotification: null, - /** - * The radiogroup for this preference. - * - * @type {Element} - */ - _radiogroup: null, - /** - * A list of radio options and their containers. + * The element that shows the current security level. * - * @type {Array<object>} + * @type {?Element} */ - _radioOptions: null, + _currentEl: null, _populateXUL() { - this._customNotification = document.getElementById( - "securityLevel-customNotification" + this._currentEl = document.getElementById("security-level-current"); + const changeButton = document.getElementById("security-level-change"); + const badgeEl = this._currentEl.querySelector( + ".security-level-current-badge" ); - document - .getElementById("securityLevel-restoreDefaults") - .addEventListener("command", () => { - SecurityLevelPrefs.securityCustom = false; - }); - - this._radiogroup = document.getElementById("securityLevel-radiogroup"); - this._radioOptions = Array.from( - this._radiogroup.querySelectorAll(".securityLevel-radio-option"), - container => { - return { container, radio: container.querySelector("radio") }; - } - ); + for (const { level, nameId } of [ + { level: "standard", nameId: "security-level-panel-level-standard" }, + { level: "safer", nameId: "security-level-panel-level-safer" }, + { level: "safest", nameId: "security-level-panel-level-safest" }, + { level: "custom", nameId: "security-level-panel-level-custom" }, + ]) { + // Classes that control visibility: + // security-level-current-standard + // security-level-current-safer + // security-level-current-safest + // security-level-current-custom + const visibilityClass = `security-level-current-${level}`; + const nameEl = document.createElement("div"); + nameEl.classList.add("security-level-name", visibilityClass); + document.l10n.setAttributes(nameEl, nameId); + + const descriptionEl = SecurityLevelUIUtils.createDescriptionElement( + level, + document + ); + descriptionEl.classList.add(visibilityClass); + + this._currentEl.insertBefore(nameEl, badgeEl); + this._currentEl.insertBefore(descriptionEl, changeButton); + } - this._radiogroup.addEventListener("select", () => { - SecurityLevelPrefs.securityLevel = this._radiogroup.value; + changeButton.addEventListener("click", () => { + this._openDialog(); }); }, + _openDialog() { + gSubDialog.open( + "chrome://browser/content/securitylevel/securityLevelDialog.xhtml", + { features: "resizable=yes" } + ); + }, + _configUIFromPrefs() { - this._radiogroup.value = SecurityLevelPrefs.securityLevel; - const isCustom = SecurityLevelPrefs.securityCustom; - this._radiogroup.disabled = isCustom; - this._customNotification.hidden = !isCustom; - // Have the container's selection CSS class match the selection state of the - // radio elements. - for (const { container, radio } of this._radioOptions) { - container.classList.toggle("selected", radio.selected); - } + // Set a data-current-level attribute for showing the current security + // level, and hiding the rest. + this._currentEl.dataset.currentLevel = + SecurityLevelPrefs.securityLevelSummary; }, init() { ===================================== browser/components/securitylevel/content/securityLevelButton.css ===================================== @@ -7,12 +7,6 @@ toolbarbutton#security-level-button[level="safer"] { toolbarbutton#security-level-button[level="safest"] { list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safest"); } -toolbarbutton#security-level-button[level="standard_custom"] { +toolbarbutton#security-level-button[level="custom"] { list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#standard_custom"); } -toolbarbutton#security-level-button[level="safer_custom"] { - list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safer_custom"); -} -toolbarbutton#security-level-button[level="safest_custom"] { - list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safest_custom"); -} ===================================== browser/components/securitylevel/content/securityLevelDialog.js ===================================== @@ -0,0 +1,188 @@ +"use strict"; + +const { SecurityLevelPrefs } = ChromeUtils.importESModule( + "resource://gre/modules/SecurityLevel.sys.mjs" +); +const { SecurityLevelUIUtils } = ChromeUtils.importESModule( + "resource:///modules/SecurityLevelUIUtils.sys.mjs" +); + +const gSecurityLevelDialog = { + /** + * The security level when this dialog was opened. + * + * @type {string} + */ + _prevLevel: SecurityLevelPrefs.securityLevelSummary, + /** + * The security level currently selected. + * + * @type {string} + */ + _selectedLevel: "", + /** + * The radiogroup for this preference. + * + * @type {?Element} + */ + _radiogroup: null, + /** + * A list of radio options and their containers. + * + * @type {?Array<{ container: Element, radio: Element }>} + */ + _radioOptions: null, + + /** + * Initialise the dialog. + */ + async init() { + const dialog = document.getElementById("security-level-dialog"); + dialog.addEventListener("dialogaccept", event => { + if (this._acceptButton.disabled) { + event.preventDefault(); + return; + } + this._commitChange(); + }); + + this._acceptButton = dialog.getButton("accept"); + + document.l10n.setAttributes( + this._acceptButton, + "security-level-dialog-save-restart" + ); + + this._radiogroup = document.getElementById("security-level-radiogroup"); + + this._radioOptions = Array.from( + this._radiogroup.querySelectorAll(".security-level-radio-container"), + container => { + return { + container, + radio: container.querySelector(".security-level-radio"), + }; + } + ); + + for (const { container, radio } of this._radioOptions) { + const level = radio.value; + radio.id = `security-level-radio-${level}`; + const currentEl = container.querySelector( + ".security-level-current-badge" + ); + currentEl.id = `security-level-current-badge-${level}`; + const descriptionEl = SecurityLevelUIUtils.createDescriptionElement( + level, + document + ); + descriptionEl.classList.add("indent"); + descriptionEl.id = `security-level-description-${level}`; + + // Wait for the full translation of the element before adding it to the + // DOM. In particular, we want to make sure the elements have text before + // we measure the maxHeight below. + await document.l10n.translateFragment(descriptionEl); + document.l10n.pauseObserving(); + container.append(descriptionEl); + document.l10n.resumeObserving(); + + if (level === this._prevLevel) { + currentEl.hidden = false; + // When the currentEl is visible, include it in the accessible name for + // the radio option. + // NOTE: The currentEl has an accessible name which includes punctuation + // to help separate it's content from the security level name. + // E.g. "Standard (Current level)". + radio.setAttribute("aria-labelledby", `${radio.id} ${currentEl.id}`); + } else { + currentEl.hidden = true; + } + // We point the accessible description to the wrapping + // .security-level-description element, rather than its children + // that define the actual text content. This means that when the + // privacy-extra-information is shown or hidden, its text content is + // included or excluded from the accessible description, respectively. + radio.setAttribute("aria-describedby", descriptionEl.id); + } + + // We want to reserve the maximum height of the radiogroup so that the + // dialog has enough height when the user switches options. So we cycle + // through the options and measure the height when they are selected to set + // a minimum height that fits all of them. + // NOTE: At the time of implementation, at this point the dialog may not + // yet have the "subdialog" attribute, which means it is missing the + // common.css stylesheet from its shadow root, which effects the size of the + // .radio-check element and the font. Therefore, we have duplicated the + // import of common.css in SecurityLevelDialog.xhtml to ensure it is applied + // at this earlier stage. + let maxHeight = 0; + for (const { container } of this._radioOptions) { + container.classList.add("selected"); + maxHeight = Math.max( + maxHeight, + this._radiogroup.getBoundingClientRect().height + ); + container.classList.remove("selected"); + } + this._radiogroup.style.minHeight = `${maxHeight}px`; + + if (this._prevLevel !== "custom") { + this._selectedLevel = this._prevLevel; + this._radiogroup.value = this._prevLevel; + } else { + this._radiogroup.selectedItem = null; + } + + this._radiogroup.addEventListener("select", () => { + this._selectedLevel = this._radiogroup.value; + this._updateSelected(); + }); + + this._updateSelected(); + }, + + /** + * Update the UI in response to a change in selection. + */ + _updateSelected() { + this._acceptButton.disabled = + !this._selectedLevel || this._selectedLevel === this._prevLevel; + // Have the container's `selected` CSS class match the selection state of + // the radio elements. + for (const { container, radio } of this._radioOptions) { + container.classList.toggle("selected", radio.selected); + } + }, + + /** + * Commit the change in security level and restart the browser. + */ + _commitChange() { + SecurityLevelPrefs.setSecurityLevelBeforeRestart(this._selectedLevel); + Services.startup.quit( + Services.startup.eAttemptQuit | Services.startup.eRestart + ); + }, +}; + +// Initial focus is not visible, even if opened with a keyboard. We avoid the +// default handler and manage the focus ourselves, which will paint the focus +// ring by default. +// NOTE: A side effect is that the focus ring will show even if the user opened +// with a mouse event. +// TODO: Remove this once bugzilla bug 1708261 is resolved. +document.subDialogSetDefaultFocus = () => { + document.getElementById("security-level-radiogroup").focus(); +}; + +// Delay showing and sizing the subdialog until it is fully initialised. +document.mozSubdialogReady = new Promise(resolve => { + window.addEventListener( + "DOMContentLoaded", + () => { + gSecurityLevelDialog.init().finally(resolve); + }, + { once: true } + ); +}); ===================================== browser/components/securitylevel/content/securityLevelDialog.xhtml ===================================== @@ -0,0 +1,86 @@ +<?xml version="1.0"?> + +<window + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml" + data-l10n-id="security-level-dialog-window" +> + <dialog id="security-level-dialog" buttons="accept,cancel"> + <linkset> + <html:link rel="stylesheet" href="chrome://global/skin/global.css" /> +  + <html:link + rel="stylesheet" + href="chrome://global/skin/in-content/common.css" + /> + <html:link + rel="stylesheet" + href="chrome://browser/skin/preferences/preferences.css" + /> + <html:link + rel="stylesheet" + href="chrome://browser/skin/preferences/privacy.css" + /> + <html:link + rel="stylesheet" + href="chrome://browser/content/securitylevel/securityLevelPreferences.css" + /> + + <html:link rel="localization" href="branding/brand.ftl" /> + <html:link rel="localization" href="toolkit/global/base-browser.ftl" /> + </linkset> + + <script src="chrome://browser/content/securitylevel/securityLevelDialog.js" /> + + <description data-l10n-id="security-level-dialog-restart-description" /> + + <radiogroup id="security-level-radiogroup" class="highlighting-group"> + <html:div + class="security-level-radio-container security-level-grid privacy-detailedoption info-box-container" + > + <radio + class="security-level-radio security-level-name" + value="standard" + data-l10n-id="security-level-preferences-level-standard" + /> + <html:div + class="security-level-current-badge" + data-l10n-id="security-level-preferences-current-badge" + ></html:div> + </html:div> + <html:div + class="security-level-radio-container security-level-grid privacy-detailedoption info-box-container" + > + <radio + class="security-level-radio security-level-name" + value="safer" + data-l10n-id="security-level-preferences-level-safer" + /> + <html:div + class="security-level-current-badge" + data-l10n-id="security-level-preferences-current-badge" + ></html:div> + </html:div> + <html:div + class="security-level-radio-container security-level-grid privacy-detailedoption info-box-container" + > + <radio + class="security-level-radio security-level-name" + value="safest" + data-l10n-id="security-level-preferences-level-safest" + /> + <html:div + class="security-level-current-badge" + data-l10n-id="security-level-preferences-current-badge" + ></html:div> + </html:div> + </radiogroup> + </dialog> +</window> ===================================== browser/components/securitylevel/content/securityLevelPanel.css ===================================== @@ -23,7 +23,7 @@ background-position-x: right var(--background-inline-offset); } -#securityLevel-background[level="standard"] { +#securityLevel-background:is([level="standard"], [level="custom"]) { background-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#standard"); } @@ -49,14 +49,6 @@ font-weight: 600; } -#securityLevel-custom { - border-radius: 4px; - background-color: var(--warning-icon-bgcolor); - color: black; - padding: 0.4em 0.5em; - margin-inline-start: 1em; -} - #securityLevel-summary { padding-inline-end: 5em; max-width: 20em; ===================================== browser/components/securitylevel/content/securityLevelPanel.inc.xhtml ===================================== @@ -15,10 +15,6 @@ <vbox id="securityLevel-background" class="panel-subview-body"> <html:p id="securityLevel-subheading"> <html:span id="securityLevel-level"></html:span> - <html:span - id="securityLevel-custom" - data-l10n-id="security-level-panel-custom-badge" - ></html:span> </html:p> <html:p id="securityLevel-summary"></html:p> <html:a @@ -32,12 +28,8 @@ <button id="securityLevel-settings" class="footer-button" + default="true" data-l10n-id="security-level-panel-open-settings-button" /> - <button - id="securityLevel-restoreDefaults" - class="footer-button" - data-l10n-id="security-level-restore-defaults-button" - /> </html:moz-button-group> </panel> ===================================== browser/components/securitylevel/content/securityLevelPreferences.css ===================================== @@ -1,26 +1,166 @@ -#securityLevel-groupbox { - --section-highlight-background-color: color-mix(in srgb, var(--in-content-accent-color) 20%, transparent); +.security-level-grid { + display: grid; + grid-template: + "icon name badge button" min-content + "icon summary summary button" auto + "icon extra extra ." auto + / max-content max-content 1fr max-content; } -#securityLevel-customNotification { - /* Spacing similar to #fpiIncompatibilityWarning. */ - margin-block: 16px; +.security-level-icon { + grid-area: icon; + align-self: start; + width: 24px; + height: 24px; + -moz-context-properties: fill; + fill: var(--in-content-icon-color); + margin-block-start: var(--space-xsmall); + margin-inline-end: var(--space-large); } -.info-icon.securityLevel-custom-warning-icon { - list-style-image: url("chrome://global/skin/icons/warning.svg"); +.security-level-current-badge { + grid-area: badge; + align-self: center; + justify-self: start; + white-space: nowrap; + background: var(--background-color-information); + color: inherit; + font-size: var(--font-size-small); + border-radius: var(--border-radius-circle); + margin-inline-start: var(--space-small); + padding-block: var(--space-xsmall); + padding-inline: var(--space-small); } -#securityLevel-customHeading { +.security-level-current-badge span { + /* Still accessible to screen reader, but not visual. + * Keep inline, but with no layout width. */ + display: inline-block; + width: 1px; + margin-inline-end: -1px; + clip-path: inset(50%); +} + +@media (prefers-contrast) and (not (forced-colors)) { + .security-level-current-badge { + /* Match the checkbox/radio colors. */ + background: var(--color-accent-primary); + color: var(--button-text-color-primary); + } +} + +@media (forced-colors) { + .security-level-current-badge { + /* Match the checkbox/radio/selected colors. */ + background: SelectedItem; + color: SelectedItemText; + } +} + +.security-level-name { + grid-area: name; font-weight: bold; + align-self: center; + white-space: nowrap; +} + +.security-level-description { + display: grid; + grid-column: summary-start / extra-end; + grid-row: summary-start / extra-end; + grid-template-rows: subgrid; + grid-template-columns: subgrid; + margin-block-start: var(--space-small); +} + +.security-level-summary { + grid-area: summary; +} + +.security-level-description-extra { + grid-area: extra; + margin-block: var(--space-medium) 0; + margin-inline: var(--space-large) 0; + padding: 0; +} + +.security-level-description-bullet:not(:last-child) { + margin-block-end: var(--space-medium); +} + +/* Tweak current security level display. */ + +#security-level-current { + margin-block-start: var(--space-large); + background: var(--in-content-box-background); + border: 1px solid var(--in-content-box-border-color); + border-radius: var(--border-radius-small); + padding: var(--space-medium); +} + +#security-level-change { + grid-area: button; + align-self: center; + margin: 0; + margin-inline-start: var(--space-large); +} + +/* Adjust which content is visible depending on the current security level. */ + +#security-level-current:not([data-current-level="standard"]) .security-level-current-standard { + display: none; +} + +#security-level-current:not([data-current-level="safer"]) .security-level-current-safer { + display: none; +} + +#security-level-current:not([data-current-level="safest"]) .security-level-current-safest { + display: none; +} + +#security-level-current:not([data-current-level="custom"]) .security-level-current-custom { + display: none; +} + +#security-level-current[data-current-level="standard"] .security-level-icon { + content: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#standard"); +} + +#security-level-current[data-current-level="safer"] .security-level-icon { + content: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safer"); +} + +#security-level-current[data-current-level="safest"] .security-level-icon { + content: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safest"); +} + +#security-level-current[data-current-level="custom"] .security-level-icon { + content: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#standard_custom"); +} + +/* Tweak security level dialog. */ + +#security-level-radiogroup { + margin-block: var(--space-large) var(--space-xlarge); +} + +.security-level-radio-container { + padding-block: var(--space-large); +} + +#security-level-radiogroup .security-level-radio { + margin: 0; } -#securityLevel-radiogroup[disabled] { - opacity: 0.5; +#security-level-radiogroup .radio-label-box { + /* .security-level-current-badge already has a margin. */ + margin: 0; } -/* Overwrite the rule in common-shared.css so we don't get 0.25 opacity overall - * on the radio text. */ -#securityLevel-radiogroup[disabled] radio[disabled] .radio-label-box { - opacity: 1.0; +#security-level-radiogroup .privacy-detailedoption.security-level-radio-container:not(.selected) .security-level-description-extra { + /* .privacy-detailedoption uses visibility: hidden, which does not work with + * our grid display (the margin is still reserved) so we use display: none + * instead. */ + display: none; } ===================================== browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml ===================================== @@ -17,112 +17,19 @@ data-l10n-id="security-level-preferences-learn-more-link" ></html:a> </description> - <hbox - id="securityLevel-customNotification" - class="info-box-container" - flex="1" - > - <hbox class="info-icon-container"> - <image class="info-icon securityLevel-custom-warning-icon"/> - </hbox> - <vbox flex="1"> - <label - id="securityLevel-customHeading" - data-l10n-id="security-level-preferences-custom-heading" - /> - <description - id="securityLevel-customDescription" - data-l10n-id="security-level-summary-custom" - flex="1" - /> - </vbox> - <hbox align="center"> - <button - id="securityLevel-restoreDefaults" - data-l10n-id="security-level-restore-defaults-button" - /> - </hbox> - </hbox> - <radiogroup id="securityLevel-radiogroup"> - <vbox class="securityLevel-radio-option privacy-detailedoption info-box-container"> - <radio - value="standard" - data-l10n-id="security-level-preferences-level-standard" - aria-describedby="securityLevelSummary-standard" - /> - <vbox id="securityLevelSummary-standard" class="indent"> - <label data-l10n-id="security-level-summary-standard" /> - </vbox> - </vbox> - <vbox class="securityLevel-radio-option privacy-detailedoption info-box-container"> -  - <radio - value="safer" - data-l10n-id="security-level-preferences-level-safer" - aria-describedby="securityLevelSummary-safer" - /> - <vbox id="securityLevelSummary-safer" class="indent"> - <label data-l10n-id="security-level-summary-safer" /> - <vbox class="privacy-extra-information"> - <vbox class="indent"> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-https-only-javascript" - /> - </hbox> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-limit-font-and-symbols" - /> - </hbox> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-limit-media" - /> - </hbox> - </vbox> - </vbox> - </vbox> - </vbox> - <vbox class="securityLevel-radio-option privacy-detailedoption info-box-container"> - <radio - value="safest" - data-l10n-id="security-level-preferences-level-safest" - aria-describedby="securityLevelSummary-safest" - /> - <vbox id="securityLevelSummary-safest" class="indent"> - <label data-l10n-id="security-level-summary-safest" /> - <vbox class="privacy-extra-information"> - <vbox class="indent"> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-disabled-javascript" - /> - </hbox> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-limit-font-and-symbols-and-images" - /> - </hbox> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-limit-media" - /> - </hbox> - </vbox> - </vbox> - </vbox> - </vbox> - </radiogroup> + <html:div id="security-level-current" class="security-level-grid"> + <html:img + class="security-level-icon" + alt="" + /> + <html:div + class="security-level-current-badge" + data-l10n-id="security-level-preferences-current-badge" + ></html:div> + <html:button + id="security-level-change" + data-l10n-id="security-level-preferences-change-button" + ></html:button> + </html:div> </vbox> </groupbox> ===================================== browser/components/securitylevel/jar.mn ===================================== @@ -4,3 +4,5 @@ browser.jar: content/browser/securitylevel/securityLevelButton.css (content/securityLevelButton.css) content/browser/securitylevel/securityLevelPreferences.css (content/securityLevelPreferences.css) content/browser/securitylevel/securityLevelIcon.svg (content/securityLevelIcon.svg) + content/browser/securitylevel/securityLevelDialog.xhtml (content/securityLevelDialog.xhtml) + content/browser/securitylevel/securityLevelDialog.js (content/securityLevelDialog.js) ===================================== browser/components/securitylevel/moz.build ===================================== @@ -1 +1,5 @@ JAR_MANIFESTS += ["jar.mn"] + +EXTRA_JS_MODULES += [ + "SecurityLevelUIUtils.sys.mjs", +] ===================================== browser/modules/SecurityLevelRestartNotification.sys.mjs ===================================== @@ -0,0 +1,72 @@ +const lazy = {}; + +ChromeUtils.defineESModuleGetters(lazy, { + BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs", + SecurityLevelPrefs: "resource://gre/modules/SecurityLevel.sys.mjs", +}); + +ChromeUtils.defineLazyGetter(lazy, "NotificationStrings", function () { + return new Localization([ + "branding/brand.ftl", + "toolkit/global/base-browser.ftl", + ]); +}); + +/** + * Interface for showing the security level restart notification on desktop. + */ +export const SecurityLevelRestartNotification = { + /** + * Whether we have already been initialised. + * + * @type {boolean} + */ + _initialized: false, + + /** + * Called when the UI is ready to show a notification. + */ + ready() { + if (this._initialized) { + return; + } + this._initialized = true; + lazy.SecurityLevelPrefs.setRestartNotificationHandler(this); + }, + + /** + * Show the restart notification, and perform the restart if the user agrees. + */ + async tryRestartBrowser() { + const [titleText, bodyText, primaryButtonText, secondaryButtonText] = + await lazy.NotificationStrings.formatValues([ + { id: "security-level-restart-prompt-title" }, + { id: "security-level-restart-prompt-body" }, + { id: "security-level-restart-prompt-button-restart" }, + { id: "security-level-restart-prompt-button-ignore" }, + ]); + const buttonFlags = + Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_0 + + Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_1; + + const propBag = await Services.prompt.asyncConfirmEx( + lazy.BrowserWindowTracker.getTopWindow()?.browsingContext ?? null, + Services.prompt.MODAL_TYPE_INTERNAL_WINDOW, + titleText, + bodyText, + buttonFlags, + primaryButtonText, + secondaryButtonText, + null, + null, + null, + {} + ); + + if (propBag.get("buttonNumClicked") === 0) { + Services.startup.quit( + Services.startup.eAttemptQuit | Services.startup.eRestart + ); + } + }, +}; ===================================== browser/modules/moz.build ===================================== @@ -126,6 +126,7 @@ EXTRA_JS_MODULES += [ "PermissionUI.sys.mjs", "ProcessHangMonitor.sys.mjs", "Sanitizer.sys.mjs", + "SecurityLevelRestartNotification.sys.mjs", "SelectionChangedMenulist.sys.mjs", "SiteDataManager.sys.mjs", "SitePermissions.sys.mjs", ===================================== toolkit/components/extensions/ExtensionParent.sys.mjs ===================================== @@ -2345,6 +2345,7 @@ async function torSendExtensionMessage(extensionId, message) { const result = await ProxyMessenger.conduit.castRuntimeMessage("messenger", { extensionId, holder: new StructuredCloneHolder("torSendExtensionMessage", null, message), + query: true, firstResponse: true, sender: { id: extensionId, ===================================== toolkit/components/securitylevel/SecurityLevel.sys.mjs ===================================== @@ -16,6 +16,7 @@ const BrowserTopics = Object.freeze({ // The Security Settings prefs in question. const kSliderPref = "browser.security_level.security_slider"; const kCustomPref = "browser.security_level.security_custom"; +const kNoScriptInitedPref = "browser.security_level.noscript_inited"; // __getPrefValue(prefName)__ // Returns the current value of a preference, regardless of its type. @@ -32,11 +33,11 @@ var getPrefValue = function (prefName) { } }; -// __bindPref(prefName, prefHandler, init)__ +// __bindPref(prefName, prefHandler)__ // Applies prefHandler whenever the value of the pref changes. // If init is true, applies prefHandler to the current value. -// Returns a zero-arg function that unbinds the pref. -var bindPref = function (prefName, prefHandler, init = false) { +// Returns the observer that was added. +var bindPref = function (prefName, prefHandler) { let update = () => { prefHandler(getPrefValue(prefName)); }, @@ -48,21 +49,9 @@ var bindPref = function (prefName, prefHandler, init = false) { }, }; Services.prefs.addObserver(prefName, observer); - if (init) { - update(); - } - return () => { - Services.prefs.removeObserver(prefName, observer); - }; + return observer; }; -// __bindPrefAndInit(prefName, prefHandler)__ -// Applies prefHandler to the current value of pref specified by prefName. -// Re-applies prefHandler whenever the value of the pref changes. -// Returns a zero-arg function that unbinds the pref. -var bindPrefAndInit = (prefName, prefHandler) => - bindPref(prefName, prefHandler, true); - async function waitForExtensionMessage(extensionId, checker = () => {}) { const { torWaitForExtensionMessage } = lazy.ExtensionParent; if (torWaitForExtensionMessage) { @@ -74,7 +63,7 @@ async function waitForExtensionMessage(extensionId, checker = () => {}) { async function sendExtensionMessage(extensionId, message) { const { torSendExtensionMessage } = lazy.ExtensionParent; if (torSendExtensionMessage) { - return torSendExtensionMessage(extensionId, message); + return await torSendExtensionMessage(extensionId, message); } return undefined; } @@ -187,14 +176,8 @@ var initializeNoScriptControl = () => { // `browser.runtime.onMessage.addListener(...)` in NoScript's bg/main.js. // TODO: Is there a better way? - let sendNoScriptSettings = settings => - sendExtensionMessage(noscriptID, settings); - - // __setNoScriptSafetyLevel(safetyLevel)__. - // Set NoScript settings according to a particular safety level - // (security slider level): 0 = Standard, 1 = Safer, 2 = Safest - let setNoScriptSafetyLevel = safetyLevel => - sendNoScriptSettings(noscriptSettings(safetyLevel)); + let sendNoScriptSettings = async settings => + await sendExtensionMessage(noscriptID, settings); // __securitySliderToSafetyLevel(sliderState)__. // Converts the "browser.security_level.security_slider" pref value @@ -204,36 +187,46 @@ var initializeNoScriptControl = () => { // Wait for the first message from NoScript to arrive, and then // bind the security_slider pref to the NoScript settings. - let messageListener = a => { + let messageListener = async a => { try { logger.debug("Message received from NoScript:", a); - let noscriptPersist = Services.prefs.getBoolPref( - "browser.security_level.noscript_persist", - false - ); + const persistPref = "browser.security_level.noscript_persist"; + let noscriptPersist = Services.prefs.getBoolPref(persistPref, false); let noscriptInited = Services.prefs.getBoolPref( - "browser.security_level.noscript_inited", + kNoScriptInitedPref, false ); - // Set the noscript safety level once if we have never run noscript - // before, or if we are not allowing noscript per-site settings to be - // persisted between browser sessions. Otherwise make sure that the - // security slider position, if changed, will rewrite the noscript - // settings. - bindPref( - kSliderPref, - sliderState => - setNoScriptSafetyLevel(securitySliderToSafetyLevel(sliderState)), - !noscriptPersist || !noscriptInited - ); - if (!noscriptInited) { - Services.prefs.setBoolPref( - "browser.security_level.noscript_inited", - true + // Set the noscript safety level once at startup. + // If a user has set noscriptPersist, then we only send this if the + // security level was changed in a previous session. + // NOTE: We do not re-send this when the security_slider preference + // changes mid-session because this should always require a restart. + if (noscriptPersist && noscriptInited) { + logger.warn( + `Not initialising NoScript since the user has set ${persistPref}` ); + return; } + // Read the security level, even if the user has the "custom" + // preference. + const securityIndex = Services.prefs.getIntPref(kSliderPref, 0); + const safetyLevel = securitySliderToSafetyLevel(securityIndex); + // May throw if NoScript fails to apply the settings: + const noscriptResult = await sendNoScriptSettings( + noscriptSettings(safetyLevel) + ); + // Mark the NoScript extension as initialised so we do not reset it + // at the next startup for noscript_persist users. + Services.prefs.setBoolPref(kNoScriptInitedPref, true); + logger.info("NoScript successfully initialised."); + // In the future NoScript may tell us more about how it applied our + // settings, e.g. if user is overriding per-site permissions. + // Up to NoScript 12.6 noscriptResult is undefined. + logger.debug("NoScript response:", noscriptResult); } catch (e) { - logger.exception(e); + logger.error("Could not apply NoScript settings", e); + // Treat as a custom security level for the rest of the session. + Services.prefs.setBoolPref(kCustomPref, true); } }; waitForExtensionMessage(noscriptID, a => a.__meta.name === "started").then( @@ -242,6 +235,8 @@ var initializeNoScriptControl = () => { logger.info("Listening for messages from NoScript."); } catch (e) { logger.exception(e); + // Treat as a custom security level for the rest of the session. + Services.prefs.setBoolPref(kCustomPref, true); } }; @@ -271,16 +266,60 @@ const kSecuritySettings = { // ### Prefs +/** + * Amend the security level index to a standard value. + * + * @param {integer} index - The input index value. + * @returns {integer} - A standard index value. + */ +function fixupIndex(index) { + if (!Number.isInteger(index) || index < 1 || index > 4) { + // Unexpected value out of range, go to the "safest" level as a fallback. + return 1; + } + if (index === 3) { + // Migrate from old medium-low (3) to new medium (2). + return 2; + } + return index; +} + +/** + * A list of preference observers that should be disabled whilst we write our + * preference values. + * + * @type {{ prefName: string, observer: object }[]} + */ +const prefObservers = []; + // __write_setting_to_prefs(settingIndex)__. // Take a given setting index and write the appropriate pref values // to the pref database. var write_setting_to_prefs = function (settingIndex) { - Object.keys(kSecuritySettings).forEach(prefName => - Services.prefs.setBoolPref( - prefName, - kSecuritySettings[prefName][settingIndex] - ) - ); + settingIndex = fixupIndex(settingIndex); + // Don't want to trigger our internal observers when setting ourselves. + for (const { prefName, observer } of prefObservers) { + Services.prefs.removeObserver(prefName, observer); + } + try { + // Make sure noscript is re-initialised at the next startup when the + // security level changes. + Services.prefs.setBoolPref(kNoScriptInitedPref, false); + Services.prefs.setIntPref(kSliderPref, settingIndex); + // NOTE: We do not clear kCustomPref. Instead, we rely on the preference + // being cleared on the next startup. + Object.keys(kSecuritySettings).forEach(prefName => + Services.prefs.setBoolPref( + prefName, + kSecuritySettings[prefName][settingIndex] + ) + ); + } finally { + // Re-add the observers. + for (const { prefName, observer } of prefObservers) { + Services.prefs.addObserver(prefName, observer); + } + } }; // __read_setting_from_prefs()__. @@ -309,24 +348,6 @@ var read_setting_from_prefs = function (prefNames) { return null; }; -// __watch_security_prefs(onSettingChanged)__. -// Whenever a pref bound to the security slider changes, onSettingChanged -// is called with the new security setting value (1,2,3,4 or null). -// Returns a zero-arg function that ends this binding. -var watch_security_prefs = function (onSettingChanged) { - let prefNames = Object.keys(kSecuritySettings); - let unbindFuncs = []; - for (let prefName of prefNames) { - unbindFuncs.push( - bindPrefAndInit(prefName, () => - onSettingChanged(read_setting_from_prefs()) - ) - ); - } - // Call all the unbind functions. - return () => unbindFuncs.forEach(unbind => unbind()); -}; - // __initialized__. // Have we called initialize() yet? var initializedSecPrefs = false; @@ -342,36 +363,82 @@ var initializeSecurityPrefs = function () { } logger.info("Initializing security-prefs.js"); initializedSecPrefs = true; - // When security_custom is set to false, apply security_slider setting - // to the security-sensitive prefs. - bindPrefAndInit(kCustomPref, function (custom) { - if (custom === false) { - write_setting_to_prefs(Services.prefs.getIntPref(kSliderPref)); - } - }); - // If security_slider is given a new value, then security_custom should - // be set to false. - bindPref(kSliderPref, function (prefIndex) { + + const wasCustom = Services.prefs.getBoolPref(kCustomPref, false); + // For new profiles with no user preference, the security level should be "4" + // and it should not be custom. + let desiredIndex = Services.prefs.getIntPref(kSliderPref, 4); + desiredIndex = fixupIndex(desiredIndex); + // Make sure the user has a set preference user value. + Services.prefs.setIntPref(kSliderPref, desiredIndex); + Services.prefs.setBoolPref(kCustomPref, wasCustom); + + // Make sure that the preference values at application startup match the + // expected values for the desired security level. See tor-browser#43783. + + // NOTE: We assume that the controlled preference values that are read prior + // to profile-after-change do not change in value before this method is + // called. I.e. we expect the current preference values to match the + // preference values that were used during the application initialisation. + const effectiveIndex = read_setting_from_prefs(); + + if (wasCustom && effectiveIndex !== null) { + logger.info(`Custom startup values match index ${effectiveIndex}`); + // Do not consider custom any more. + // NOTE: This level needs to be set before it is read elsewhere. In + // particular, for the NoScript addon. Services.prefs.setBoolPref(kCustomPref, false); - write_setting_to_prefs(prefIndex); + Services.prefs.setIntPref(kSliderPref, effectiveIndex); + } else if (!wasCustom && effectiveIndex !== desiredIndex) { + // NOTE: We assume all our controlled preferences require a restart. + // In practice, only a subset of these preferences may actually require a + // restart, so we could switch their values. But we treat them all the same + // for simplicity, consistency and stability in case mozilla changes the + // restart requirements. + logger.info(`Startup values do not match for index ${desiredIndex}`); + SecurityLevelPrefs.requireRestart(); + } + + // Start listening for external changes to the controlled preferences. + prefObservers.push({ + prefName: kCustomPref, + observer: bindPref(kCustomPref, custom => { + // Custom flag was removed mid-session. Requires a restart to apply the + // security level. + if (custom === false) { + logger.info("Custom flag was cleared externally"); + SecurityLevelPrefs.requireRestart(); + } + }), }); - // If a security-sensitive pref changes, then decide if the set of pref values - // constitutes a security_slider setting or a custom value. - watch_security_prefs(settingIndex => { - if (settingIndex === null) { - Services.prefs.setBoolPref(kCustomPref, true); - } else { - Services.prefs.setIntPref(kSliderPref, settingIndex); - Services.prefs.setBoolPref(kCustomPref, false); - } + prefObservers.push({ + prefName: kSliderPref, + observer: bindPref(kSliderPref, () => { + // Security level was changed mid-session. Requires a restart to apply. + logger.info("Security level was changed externally"); + SecurityLevelPrefs.requireRestart(); + }), }); - // Migrate from old medium-low (3) to new medium (2). - if ( - Services.prefs.getBoolPref(kCustomPref) === false && - Services.prefs.getIntPref(kSliderPref) === 3 - ) { - Services.prefs.setIntPref(kSliderPref, 2); - write_setting_to_prefs(2); + + for (const prefName of Object.keys(kSecuritySettings)) { + prefObservers.push({ + prefName, + observer: bindPref(prefName, () => { + logger.warn( + `The controlled preference ${prefName} was changed externally.` + + " Treating as a custom security level." + ); + // Something outside of this module changed the preference value for a + // preference we control. + // Always treat as a custom security level for the rest of this session, + // even if the new preference values match a pre-set security level. We + // do this because some controlled preferences require a restart to be + // properly applied. See tor-browser#43783. + // In the case where it does match a pre-set security level, the custom + // flag will be cleared at the next startup. + Services.prefs.setBoolPref(kCustomPref, true); + }), + }); } logger.info("security-prefs.js initialization complete"); @@ -425,8 +492,9 @@ export class SecurityLevel { init() { migratePreferences(); - initializeNoScriptControl(); + // Fixup our preferences before we pass on the security level to NoScript. initializeSecurityPrefs(); + initializeNoScriptControl(); } observe(aSubject, aTopic) { @@ -436,10 +504,19 @@ export class SecurityLevel { } } +/** + * @typedef {object} SecurityLevelRestartNotificationHandler + * + * An object that can serve the user a restart notification. + * + * @property {Function} tryRestartBrowser - The method that should be called to + * ask the user to restart the browser. + */ + /* Security Level Prefs - Getters and Setters for relevant torbutton prefs + Getters and Setters for relevant security level prefs */ export const SecurityLevelPrefs = { SecurityLevels: Object.freeze({ @@ -450,6 +527,14 @@ export const SecurityLevelPrefs = { security_slider_pref: "browser.security_level.security_slider", security_custom_pref: "browser.security_level.security_custom", + /** + * The current security level preference. + * + * This ignores any custom settings the user may have changed, and just + * gives the underlying security level. + * + * @type {?string} + */ get securityLevel() { // Set the default return value to 0, which won't match anything in // SecurityLevels. @@ -459,18 +544,146 @@ export const SecurityLevelPrefs = { )?.[0]; }, - set securityLevel(level) { - const val = this.SecurityLevels[level]; - if (val !== undefined) { - Services.prefs.setIntPref(this.security_slider_pref, val); - } + /** + * Set the desired security level just before a restart. + * + * The caller must restart the browser after calling this method. + * + * @param {string} level - The name of the new security level to set. + */ + setSecurityLevelBeforeRestart(level) { + write_setting_to_prefs(this.SecurityLevels[level]); }, + /** + * Whether the user has any custom setting values that do not match a pre-set + * security level. + * + * @type {boolean} + */ get securityCustom() { return Services.prefs.getBoolPref(this.security_custom_pref); }, - set securityCustom(val) { - Services.prefs.setBoolPref(this.security_custom_pref, val); + /** + * A summary of the current security level. + * + * If the user has some custom settings, this returns "custom". Otherwise + * returns the name of the security level. + * + * @type {string} + */ + get securityLevelSummary() { + if (this.securityCustom) { + return "custom"; + } + return this.securityLevel ?? "custom"; + }, + + /** + * Whether the browser should be restarted to apply the security level. + * + * @type {boolean} + */ + _needRestart: false, + + /** + * The external handler that can show a notification to the user, if any. + * + * @type {?SecurityLevelRestartNotificationHandler} + */ + _restartNotificationHandler: null, + + /** + * Set the external handler for showing notifications to the user. + * + * This should only be called once per session once the handler is ready to + * show a notification, which may occur immediately during this call. + * + * @param {SecurityLevelRestartNotificationHandler} handler - The new handler + * to use. + */ + setRestartNotificationHandler(handler) { + logger.info("Restart notification handler is set"); + this._restartNotificationHandler = handler; + if (this._needRestart) { + // Show now using the new handler. + this._tryShowRestartNotification(); + } + }, + + /** + * A promise for any ongoing notification prompt task. + * + * @type {Promise} + */ + _restartNotificationPromise: null, + + /** + * Try show a notification to the user. + * + * If no notification handler has been attached yet, this will do nothing. + */ + async _tryShowRestartNotification() { + if (!this._restartNotificationHandler) { + logger.info("Missing a restart notification handler"); + // This may be added later in the session. + return; + } + + const prevPromise = this._restartNotificationPromise; + let resolve; + ({ promise: this._restartNotificationPromise, resolve } = + Promise.withResolvers()); + await prevPromise; + + try { + await this._restartNotificationHandler?.tryRestartBrowser(); + } finally { + // Allow the notification to be shown again. + resolve(); + } + }, + + /** + * Mark the session as requiring a restart to apply a change in security + * level. + * + * The security level will immediately be switched to "custom", and the user + * may be shown a notification to restart the browser. + */ + requireRestart() { + logger.warn("The browser needs to be restarted to set the security level"); + // Treat as a custom security level for the rest of the session. + // At the next startup, the custom flag may be cleared if the settings are + // as expected. + Services.prefs.setBoolPref(kCustomPref, true); + this._needRestart = true; + + // NOTE: We need to change the controlled security level preferences in + // response to the desired change in security level. We could either: + // 1. Only change the controlled preferences after the user confirms a + // restart. Or + // 2. Change the controlled preferences and then try and ask the user to + // restart. + // + // We choose the latter: + // 1. To allow users to manually restart. + // 2. If the user ignores or misses the notification, they will at least be + // in the correct state when the browser starts again. Although they will + // be in a custom/undefined state in the mean time. + // 3. Currently Android relies on triggering the change in security level + // by setting the browser.security_level.security_slider preference + // value. So it currently uses this path. So we need to set the values + // now, before it preforms a restart. + // TODO: Have android use the `setSecurityLevelBeforeRestart` method + // instead of setting the security_slider preference value directly, so that + // it knows exactly when it can restart the browser. tor-browser#43820 + write_setting_to_prefs(Services.prefs.getIntPref(kSliderPref, 0)); + // NOTE: Even though we have written the preferences, the session should + // still be marked as "custom" because: + // 1. Some preferences require a browser restart to be applied. + // 2. NoScript has not been updated with the new settings. + this._tryShowRestartNotification(); }, }; /* Security Level Prefs */ ===================================== toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== @@ -128,10 +128,6 @@ security-level-toolbar-button-custom = # Uses sentence case in English (US). security-level-panel-heading = Security level - -security-level-panel-level-standard = Standard -security-level-panel-level-safer = Safer -security-level-panel-level-safest = Safest security-level-panel-learn-more-link = Learn more # Button to open security level settings. security-level-panel-open-settings-button = Settings… @@ -141,6 +137,19 @@ security-level-panel-open-settings-button = Settings… security-level-preferences-heading = Security Level security-level-preferences-overview = Disable certain web features that can be used to attack your security and anonymity. security-level-preferences-learn-more-link = Learn more +# Text for a badge that labels the currently active security level. +# The text in between '<span>' and '</span>' should contain some kind of bracket, like '(' and ')', or other punctuation used in your language to separate out text from its surrounding context. This will not be visible, but will be use for screen readers to make it clear that the text is not part of the same sentence. For example, in US English this would be read as "(Current level)", and the full line of text would be read as "Safest (Current level)". +security-level-preferences-current-badge = <span>(</span>Current level<span>)</span> +security-level-preferences-change-button = Change… + +## Security level settings dialog. + +security-level-dialog-window = + .title = Change security level + +# '-brand-short-name' is the localized browser name, like "Tor Browser". +security-level-dialog-restart-description = You will need to restart { -brand-short-name } to apply any changes. This will close all windows and tabs. + security-level-preferences-level-standard = .label = Standard security-level-preferences-level-safer = @@ -148,6 +157,16 @@ security-level-preferences-level-safer = security-level-preferences-level-safest = .label = Safest +security-level-dialog-save-restart = + .label = Save and restart + +## Security level names shown in the security panel and settings. + +security-level-panel-level-standard = Standard +security-level-panel-level-safer = Safer +security-level-panel-level-safest = Safest +security-level-panel-level-custom = Custom + ## Security level summaries shown in security panel and settings. security-level-summary-standard = All browser and website features are enabled. @@ -166,13 +185,13 @@ security-level-preferences-bullet-limit-font-and-symbols-and-images = Some fonts ## Custom security level. ## Some custom preferences configuration has placed the user outside one of the standard three levels. -# Shown in the security level panel as an orange badge next to the expected level. -security-level-panel-custom-badge = Custom -# Shown in the security level settings in a warning box. -security-level-preferences-custom-heading = Custom security level configured # Description of custom state and recommended action. # Shown in the security level panel and settings. security-level-summary-custom = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. -# Button to undo custom changes to the security level and place the user in one of the standard security levels. -# Shown in the security level panel and settings. -security-level-restore-defaults-button = Restore defaults + +## Security level restart prompt. + +security-level-restart-prompt-title = Your security level settings require a restart +security-level-restart-prompt-body = You must restart { -brand-short-name } for your security level settings to be applied. This will close all your windows and tabs. +security-level-restart-prompt-button-restart = Restart +security-level-restart-prompt-button-ignore = Ignore View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4d4584… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4d4584… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.0a1-15.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 10 Jun '25

10 Jun '25

Pier Angelo Vendrame pushed to branch mullvad-browser-140.0a1-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 500300ab by hackademix at 2025-06-10T11:12:21+02:00 fixup! Firefox preference overrides. BB 43811: Block 0.0.0.0 - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -536,6 +536,11 @@ pref("network.proxy.… [View More]

1 0

[Git][tpo/applications/tor-browser][base-browser-140.0a1-15.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 10 Jun '25

10 Jun '25

Pier Angelo Vendrame pushed to branch base-browser-140.0a1-15.0-1 at The Tor Project / Applications / Tor Browser Commits: aec824b3 by hackademix at 2025-06-10T11:12:00+02:00 fixup! Firefox preference overrides. BB 43811: Block 0.0.0.0 - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -536,6 +536,11 @@ pref("network.proxy.failover_direct", … [View More]

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.0a1-15.0-1] 3 commits: fixup! [android] Modify build system
by Pier Angelo Vendrame (＠pierov) 10 Jun '25

10 Jun '25

Pier Angelo Vendrame pushed to branch tor-browser-140.0a1-15.0-1 at The Tor Project / Applications / Tor Browser Commits: cdecf99e by Dan Ballard at 2025-06-10T11:10:58+02:00 fixup! [android] Modify build system Bug 43809: allow tba-fetch-deps to download from nightlies - - - - - 4eec3120 by Dan Ballard at 2025-06-10T11:11:07+02:00 fixup! TB 42669: [android] Use custom no-op app-services Bug 43809: allow tba-fetch-deps to download nightlies - - - - - 469928c7 by hackademix at 2025-06-… [View More]10T11:11:13+02:00 fixup! Firefox preference overrides. BB 43811: Block 0.0.0.0 - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - mobile/android/fenix/tools/tba-fetch-deps.sh Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -536,6 +536,11 @@ pref("network.proxy.failover_direct", false, locked); // alters content load order in a page. See tor-browser#24686 pref("network.http.tailing.enabled", true, locked); +// Block 0.0.0.0 +// https://bugzilla.mozilla.org/show_bug.cgi?id=1889130 +// tor-browser#43811 +pref("network.socket.ip_addr_any.disabled", true); + // tor-browser#23044: Make sure we don't have any GIO supported protocols // (defense in depth measure). // As of Firefox 118 (Bug 1843763), upstream does not add any protocol by ===================================== mobile/android/fenix/tools/tba-fetch-deps.sh ===================================== @@ -1,24 +1,55 @@ #!/bin/bash +if [ $# -eq 0 ]; then + echo "Usage: ./tba-fetch-deps.sh --\$MODE" + echo " modes:" + echo " --nightly Downloads the needed assets from the nightlies build server. Use when local version matches nightly build server version." + echo " --tbb PATH Harvest most recently built assets from PATH assuming it points to a tor-browser-build dir. Use when local version does NOT match nightly build server version." + exit -1 +fi + +TBB_BUILD_06="https://tb-build-06.torproject.org/~tb-builder/tor-browser-build/out" + +if [[ $1 == "--tbb" && -z $2 ]]; then + echo "--tbb needs path to tor-browser-build dir" + exit -1 +fi +TBB_PATH=$2 + cd "$(dirname $(realpath "$0"))/.." if [ -z "$TOR_BROWSER_BUILD" ]; then TOR_BROWSER_BUILD=../../../../tor-browser-build fi -tor_expert_bundle_aar="$(ls -1td "$TOR_BROWSER_BUILD/out/tor-expert-bundle-aar/"tor-expert-bundle-aar-* | head -1)" -if [ -z "tor_expert_bundle_aar" ]; then +echo "Fetching tor-expert-bundle.aar..." + +if [[ $1 == "--tbb" ]]; then + tor_expert_bundle_aar="$(ls -1td "$TOR_BROWSER_BUILD/out/tor-expert-bundle-aar/"tor-expert-bundle-aar-* | head -1)" + cp "$tor_expert_bundle_aar"/* app/ +else + tor_expert_bundle_aar_dirname="$(curl -s $TBB_BUILD_06/tor-expert-bundle-aar/ | sed -nE 's/.*href=\"(tor-expert-bundle-aar-[0-9a-z\.\-]*).*/\1/p')" + curl -o app/tor-expert-bundle.aar $TBB_BUILD_06/tor-expert-bundle-aar/$tor_expert_bundle_aar_dirname/tor-expert-bundle.aar +fi + +if [ -z app/tor_expert_bundle.aar ]; then echo "Cannot find Tor Expert Bundle arr artifacts!" exit 2 fi +echo "" -cp "$tor_expert_bundle_aar"/* app/ +echo "Fetching noscript..." -noscript="$(find "$TOR_BROWSER_BUILD/out/browser" -name 'noscript*.xpi' -print | sort | tail -1)" mkdir -p "app/src/main/assets/extensions" -if [ -f "$noscript" ]; then - cp "$noscript" "app/src/main/assets/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" + +if [[ $1 == "--tbb" ]]; then + noscript="$(find "$TOR_BROWSER_BUILD/out/browser" -name 'noscript*.xpi' -print | sort | tail -1)" + cp "$noscript" "app/src/main/assets/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" +else + noscript_fname="$(curl -s $TBB_BUILD_06/browser/ | sed -nE 's/.*href=\"(noscript-[0-9a-z\.\-]*).*/\1/p')" + curl -o "app/src/main/assets/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" $TBB_BUILD_06/browser/$noscript_fname fi +echo "" if [ -z "$GRADLE_MAVEN_REPOSITORIES" ]; then GRADLE_MAVEN_REPOSITORIES="$HOME/.m2/repository" @@ -47,7 +78,18 @@ if [ "$os" = "unsupported" ] || [ "$arch" = "unsupported" ]; then exit 2 fi -app_services="$(ls -1t "$TOR_BROWSER_BUILD/out/application-services/"application-services*.tar.zst | head -1)" +echo "Fetching application-services..." + +if [[ $1 == "--tbb" ]]; then + app_services="$(ls -1t "$TOR_BROWSER_BUILD/out/application-services/"application-services*.tar.zst | head -1)" + tar -C /tmp -xf "$app_services" +else + app_services_fname="$(curl -s $TBB_BUILD_06/application-services/ | sed -nE 's/.*href=\"(application-services-[0-9a-z\.\-]*).*/\1/p')" + app_services=/tmp/$app_services_fname + curl -o $app_services $TBB_BUILD_06/application-services/$app_services_fname + tar -C /tmp -xf "$app_services" + rm "$app_services" +fi mkdir -p "$GRADLE_MAVEN_REPOSITORIES/org/mozilla" if [ -f "$app_services" ]; then tar -C /tmp -xf "$app_services" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7ff9d2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7ff9d2… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/tor-browser-build][main] Update rbm for rbm#40084
by boklm (＠boklm) 09 Jun '25

09 Jun '25

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 269e782c by Nicolas Vigier at 2025-06-09T19:02:07+02:00 Update rbm for rbm#40084 - - - - - 1 changed file: - rbm Changes: ===================================== rbm ===================================== @@ -1 +1 @@ -Subproject commit f04c4f217ad8dbd0caa87d45713a6de576cf0534 +Subproject commit 263693c984a467d971bb7b2c1cdeb6f1800eab2f View it on GitLab: https://gitlab.torproject.org/tpo/… [View More]

1 0

[Git][tpo/applications/rbm][main] Bug 40084: Always use bash for the debug terminal
by boklm (＠boklm) 09 Jun '25

09 Jun '25

boklm pushed to branch main at The Tor Project / Applications / RBM Commits: 263693c9 by Beatriz Rizental at 2025-06-09T15:16:11+02:00 Bug 40084: Always use bash for the debug terminal - - - - - 1 changed file: - lib/RBM.pm Changes: ===================================== lib/RBM.pm ===================================== @@ -1291,9 +1291,10 @@ sub build_run { if (project_config($project, 'debug', $options)) { print STDERR $error, "\nOpening debug … [View More]

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-140.0a1-15.0-1-build1
by Pier Angelo Vendrame (＠pierov) 09 Jun '25

09 Jun '25

Pier Angelo Vendrame pushed new tag mullvad-browser-140.0a1-15.0-1-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.0a1-15.0-1] 32 commits: MB 38: Mullvad Browser configuration
by Pier Angelo Vendrame (＠pierov) 09 Jun '25

09 Jun '25

Pier Angelo Vendrame pushed to branch mullvad-browser-140.0a1-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: f2f8c7b0 by Pier Angelo Vendrame at 2025-06-09T14:34:33+02:00 MB 38: Mullvad Browser configuration - - - - - fe36d578 by Pier Angelo Vendrame at 2025-06-09T14:34:36+02:00 fixup! MB 38: Mullvad Browser configuration TB 43653: Remove the unused spoofOsInUserAgentHeader pref. - - - - - 81d8c579 by Pier Angelo Vendrame at 2025-06-09T14:34:36+02:00 MB 1: Mullvad … [View More]Browser branding See also: mullvad-browser#5: Product name and directory customization mullvad-browser#12: Create new branding directories and integrate Mullvad icons+branding mullvad-browser#14: Remove Default Built-in bookmarks mullvad-browser#35: Add custom PDF icons for Windows builds mullvad-browser#48: Replace Mozilla copyright and legal trademarks in mullvadbrowser.exe metadata mullvad-browser#51: Update trademark string mullvad-browser#104: Update shipped dll metadata copyright/licensing info mullvad-browser#107: Add alpha and nightly icons - - - - - dd91f446 by Henry Wilkes at 2025-06-09T14:34:37+02:00 fixup! MB 1: Mullvad Browser branding MB 411: Set startup.homepage_override_url on mb-nightly to be used instead of app.releaseNotesURL.aboutDialog. - - - - - 00c95c6c by Henry Wilkes at 2025-06-09T14:34:37+02:00 Mullvad Browser strings This commit adds strings needed by the following Mullvad Browser patches. - - - - - 64d807af by Pier Angelo Vendrame at 2025-06-09T14:34:37+02:00 MB 20: Allow packaged-addons in PBM. We install a few addons from the distribution directory, but they are not automatically enabled for PBM mode. This commit modifies the code that installs them to also add the PBM permission to the known ones. - - - - - 4092c498 by Pier Angelo Vendrame at 2025-06-09T14:34:38+02:00 MB 63: Customize some about pages for Mullvad Browser Also: mullvad-browser#57: Purge unneeded about: pages - - - - - 7a37de83 by Pier Angelo Vendrame at 2025-06-09T14:46:01+02:00 MB 37: Customization for the about dialog - - - - - 27402bca by Henry Wilkes at 2025-06-09T14:46:04+02:00 MB 39: Add home page about:mullvad-browser - - - - - 93cb2b3f by Henry Wilkes at 2025-06-09T14:46:04+02:00 fixup! MB 39: Add home page about:mullvad-browser MB 411: Use the same update URL in about:mullvad-browser as the about dialog. - - - - - 67ea76c6 by hackademix at 2025-06-09T14:46:04+02:00 MB 97: Remove UI cues to install new extensions. - - - - - 02795f60 by hackademix at 2025-06-09T14:46:05+02:00 MB 47: uBlock Origin customization - - - - - ffe7343a by Pier Angelo Vendrame at 2025-06-09T14:46:05+02:00 MB 21: Disable the password manager This commit disables the about:login page and removes the "Login and Password" section of about:preferences. We do not do anything to the real password manager of Firefox, that is in toolkit: it contains C++ parts that make it difficult to actually prevent it from being built.. Finally, we modify the the function that opens about:login to report an error in the console so that we can quickly get a backtrace to the code that tries to use it. - - - - - 4296e61b by Pier Angelo Vendrame at 2025-06-09T14:46:06+02:00 MB 112: Updater customization for Mullvad Browser MB 71: Set the updater base URL to Mullvad domain - - - - - 12d78c5e by Henry Wilkes at 2025-06-09T14:46:06+02:00 fixup! MB 112: Updater customization for Mullvad Browser MB 411: Drop mullvadbrowser.post_update.url. Also, no longer require an override page to be set to open about:mullvad-browser after an update. - - - - - 6044fcd4 by Nicolas Vigier at 2025-06-09T14:46:07+02:00 MB 79: Add Mullvad Browser MAR signing keys MB 256: Add mullvad-browser nightly mar signing key - - - - - 4d8a26d3 by Pier Angelo Vendrame at 2025-06-09T14:46:07+02:00 MB 34: Hide unsafe and unwanted preferences UI about:preferences allow to override some of our defaults, that could be fingeprintable or have some other unwanted consequences. - - - - - 28633dd0 by Pier Angelo Vendrame at 2025-06-09T14:46:08+02:00 MB 160: Disable the cookie exceptions button Besides disabling the "Delete on close checkbox", disable also the "Manage Exceptions" button when always using PBM. - - - - - edce653e by hackademix at 2025-06-09T14:46:08+02:00 MB 163: prevent uBlock Origin from being uninstalled/disabled - - - - - abc0b3cc by Richard Pospesel at 2025-06-09T14:46:08+02:00 MB 188: Customize Gitlab Issue and Merge templates - - - - - 1411471a by Morgan at 2025-06-09T14:46:09+02:00 fixup! MB 188: Customize Gitlab Issue and Merge templates - - - - - 5d5ab465 by rui hildt at 2025-06-09T14:47:34+02:00 MB 213: Customize the search engines list MB 328: Refactor the search engine patch. Upstream switched to a completely different search engine configuration between ESR 115 and ESR 128. We moved our configuration to a couple of JSON files that do not follow upstream's schemas, as they are overcomplicated for our needs. Also, we keep the old search engine extensions for now, as upstream also kept them, and planned of removing them with Bug 1885953. - - - - - 7c27497e by hackademix at 2025-06-09T14:47:37+02:00 MB 214: Enable cross-tab identity leak protection in "quiet" mode - - - - - 22abb47b by Pier Angelo Vendrame at 2025-06-09T14:47:38+02:00 MB 80: Enable Mullvad Browser as a default browser - - - - - e60746ec by Pier Angelo Vendrame at 2025-06-09T14:47:38+02:00 MB 320: Temporarily disable WebRTC and WDBA on Windows. WebRTC should be re-enabled when tor-browser#42758 is resolved, and and the default browser agent when in general we make this feature work again. - - - - - db7dd12a by Henry Wilkes at 2025-06-09T14:47:38+02:00 MB 329: Customize toolbar for mullvad-browser. - - - - - 182438d7 by Henry Wilkes at 2025-06-09T14:47:39+02:00 Add CI for Mullvad Browser - - - - - 44371309 by Henry Wilkes at 2025-06-09T14:47:39+02:00 MB 419: Mullvad Browser migration procedures. This commit implements the the Mullvad Browser's version of _migrateUI. - - - - - 71158a0f by Pier Angelo Vendrame at 2025-06-09T14:47:40+02:00 fixup! MB 1: Mullvad Browser branding TB 43776: Mark branding files for l10n merge. - - - - - c3f5e9a6 by Pier Angelo Vendrame at 2025-06-09T14:47:40+02:00 fixup! MB 80: Enable Mullvad Browser as a default browser Comment a definition since mingw now defines it as well. - - - - - 878c58b5 by Pier Angelo Vendrame at 2025-06-09T14:47:40+02:00 fixup! MB 39: Add home page about:mullvad-browser Drop the unnecessary font CSP directive. Debug builds complain about this, and they crash with a failed assertion. - - - - - 3ebd9dbf by Pier Angelo Vendrame at 2025-06-09T15:31:41+02:00 fixup! Base Browser strings BB 43849: Remove a useless lint exclusion. Probably it was a rebase error. - - - - - 271 changed files: - .gitlab/ci/jobs/update-translations.yml - .gitlab/issue_templates/000 Bug Report.md - .gitlab/issue_templates/010 Proposal.md - .gitlab/issue_templates/020 Web Compatibility.md - .gitlab/issue_templates/030 Test.md - .gitlab/issue_templates/040 Feature.md - .gitlab/issue_templates/060 Rebase - Alpha.md - .gitlab/issue_templates/061 Rebase - Stable.md - .gitlab/issue_templates/063 Rebase - Rapid.md - .gitlab/issue_templates/090 Emergency Security Issue.md - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Rapid.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - .gitlab/merge_request_templates/Default.md - + .gitlab/merge_request_templates/Rebase.md - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/module.ver - browser/app/firefox.exe.manifest → browser/app/mullvadbrowser.exe.manifest - + browser/app/profile/000-mullvad-browser.js - browser/app/profile/001-base-profile.js - browser/base/content/aboutDialog.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-places.js - browser/base/content/browser.js - browser/base/content/default-bookmarks.html - browser/base/content/nsContextMenu.sys.mjs - browser/base/content/overrides/app-license.html - browser/base/content/pageinfo/pageInfo.xhtml - browser/base/content/utilityOverlay.js - browser/branding/branding-common.mozbuild - + browser/branding/mb-alpha/VisualElements_150.png - + browser/branding/mb-alpha/VisualElements_70.png - + browser/branding/mb-alpha/configure.sh - + browser/branding/mb-alpha/content/about-logo.png - + browser/branding/mb-alpha/content/about-logo.svg - + browser/branding/mb-alpha/content/about-logo(a)2x.png - + browser/branding/mb-alpha/content/about-wordmark.svg - + browser/branding/mb-alpha/content/about.png - + browser/branding/mb-alpha/content/aboutDialog.css - + browser/branding/mb-alpha/content/firefox-wordmark.svg - + browser/branding/mb-alpha/content/icon128.png - + browser/branding/mb-alpha/content/icon16.png - + browser/branding/mb-alpha/content/icon256.png - + browser/branding/mb-alpha/content/icon32.png - + browser/branding/mb-alpha/content/icon48.png - + browser/branding/mb-alpha/content/icon64.png - + browser/branding/mb-alpha/content/jar.mn - + browser/branding/mb-alpha/content/moz.build - + browser/branding/mb-alpha/content/mullvad-branding.css - + browser/branding/mb-alpha/default128.png - + browser/branding/mb-alpha/default16.png - + browser/branding/mb-alpha/default22.png - + browser/branding/mb-alpha/default24.png - + browser/branding/mb-alpha/default256.png - + browser/branding/mb-alpha/default32.png - + browser/branding/mb-alpha/default48.png - + browser/branding/mb-alpha/default64.png - + browser/branding/mb-alpha/document.icns - + browser/branding/mb-alpha/document.ico - + browser/branding/mb-alpha/document_pdf.ico - + browser/branding/mb-alpha/firefox.icns - + browser/branding/mb-alpha/firefox.ico - + browser/branding/mb-alpha/firefox.svg - + browser/branding/mb-alpha/locales/en-US/brand.ftl - + browser/branding/mb-alpha/locales/en-US/brand.properties - + browser/branding/mb-alpha/locales/jar.mn - + browser/branding/mb-alpha/locales/moz.build - + browser/branding/mb-alpha/locales/mullvad-about-wordmark-en.ftl - + browser/branding/mb-alpha/moz.build - + browser/branding/mb-alpha/mullvadbrowser.VisualElementsManifest.xml - + browser/branding/mb-alpha/newtab.ico - + browser/branding/mb-alpha/newwindow.ico - + browser/branding/mb-alpha/pbmode.ico - + browser/branding/mb-alpha/pref/firefox-branding.js - + browser/branding/mb-nightly/VisualElements_150.png - + browser/branding/mb-nightly/VisualElements_70.png - + browser/branding/mb-nightly/configure.sh - + browser/branding/mb-nightly/content/about-logo.png - + browser/branding/mb-nightly/content/about-logo.svg - + browser/branding/mb-nightly/content/about-logo(a)2x.png - + browser/branding/mb-nightly/content/about-wordmark.svg - + browser/branding/mb-nightly/content/about.png - + browser/branding/mb-nightly/content/aboutDialog.css - + browser/branding/mb-nightly/content/firefox-wordmark.svg - + browser/branding/mb-nightly/content/icon128.png - + browser/branding/mb-nightly/content/icon16.png - + browser/branding/mb-nightly/content/icon256.png - + browser/branding/mb-nightly/content/icon32.png - + browser/branding/mb-nightly/content/icon48.png - + browser/branding/mb-nightly/content/icon64.png - + browser/branding/mb-nightly/content/jar.mn - + browser/branding/mb-nightly/content/moz.build - + browser/branding/mb-nightly/content/mullvad-branding.css - + browser/branding/mb-nightly/default128.png - + browser/branding/mb-nightly/default16.png - + browser/branding/mb-nightly/default22.png - + browser/branding/mb-nightly/default24.png - + browser/branding/mb-nightly/default256.png - + browser/branding/mb-nightly/default32.png - + browser/branding/mb-nightly/default48.png - + browser/branding/mb-nightly/default64.png - + browser/branding/mb-nightly/document.icns - + browser/branding/mb-nightly/document.ico - + browser/branding/mb-nightly/document_pdf.ico - + browser/branding/mb-nightly/firefox.icns - + browser/branding/mb-nightly/firefox.ico - + browser/branding/mb-nightly/firefox.svg - + browser/branding/mb-nightly/locales/en-US/brand.ftl - + browser/branding/mb-nightly/locales/en-US/brand.properties - + browser/branding/mb-nightly/locales/jar.mn - + browser/branding/mb-nightly/locales/moz.build - + browser/branding/mb-nightly/locales/mullvad-about-wordmark-en.ftl - + browser/branding/mb-nightly/moz.build - + browser/branding/mb-nightly/mullvadbrowser.VisualElementsManifest.xml - + browser/branding/mb-nightly/newtab.ico - + browser/branding/mb-nightly/newwindow.ico - + browser/branding/mb-nightly/pbmode.ico - + browser/branding/mb-nightly/pref/firefox-branding.js - + browser/branding/mb-release/VisualElements_150.png - + browser/branding/mb-release/VisualElements_70.png - + browser/branding/mb-release/configure.sh - + browser/branding/mb-release/content/about-logo.png - + browser/branding/mb-release/content/about-logo.svg - + browser/branding/mb-release/content/about-logo(a)2x.png - + browser/branding/mb-release/content/about-wordmark.svg - + browser/branding/mb-release/content/about.png - + browser/branding/mb-release/content/aboutDialog.css - + browser/branding/mb-release/content/firefox-wordmark.svg - + browser/branding/mb-release/content/icon128.png - + browser/branding/mb-release/content/icon16.png - + browser/branding/mb-release/content/icon256.png - + browser/branding/mb-release/content/icon32.png - + browser/branding/mb-release/content/icon48.png - + browser/branding/mb-release/content/icon64.png - + browser/branding/mb-release/content/jar.mn - + browser/branding/mb-release/content/moz.build - + browser/branding/mb-release/content/mullvad-branding.css - + browser/branding/mb-release/default128.png - + browser/branding/mb-release/default16.png - + browser/branding/mb-release/default22.png - + browser/branding/mb-release/default24.png - + browser/branding/mb-release/default256.png - + browser/branding/mb-release/default32.png - + browser/branding/mb-release/default48.png - + browser/branding/mb-release/default64.png - + browser/branding/mb-release/document.icns - + browser/branding/mb-release/document.ico - + browser/branding/mb-release/document_pdf.ico - + browser/branding/mb-release/firefox.icns - + browser/branding/mb-release/firefox.ico - + browser/branding/mb-release/firefox.svg - + browser/branding/mb-release/locales/en-US/brand.ftl - + browser/branding/mb-release/locales/en-US/brand.properties - + browser/branding/mb-release/locales/jar.mn - + browser/branding/mb-release/locales/moz.build - + browser/branding/mb-release/locales/mullvad-about-wordmark-en.ftl - + browser/branding/mb-release/moz.build - + browser/branding/mb-release/mullvadbrowser.VisualElementsManifest.xml - + browser/branding/mb-release/newtab.ico - + browser/branding/mb-release/newwindow.ico - + browser/branding/mb-release/pbmode.ico - + browser/branding/mb-release/pref/firefox-branding.js - browser/components/BrowserContentHandler.sys.mjs - browser/components/BrowserGlue.sys.mjs - browser/components/DesktopActorRegistry.sys.mjs - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/customizableui/CustomizableUI.sys.mjs - browser/components/moz.build - + browser/components/mullvad-browser/AboutMullvadBrowserChild.sys.mjs - + browser/components/mullvad-browser/AboutMullvadBrowserParent.sys.mjs - + browser/components/mullvad-browser/content/2728-sparkles.svg - + browser/components/mullvad-browser/content/aboutMullvadBrowser.css - + browser/components/mullvad-browser/content/aboutMullvadBrowser.html - + browser/components/mullvad-browser/content/aboutMullvadBrowser.js - + browser/components/mullvad-browser/jar.mn - + browser/components/mullvad-browser/moz.build - browser/components/newtab/AboutNewTabRedirector.sys.mjs - browser/components/preferences/home.inc.xhtml - browser/components/preferences/main.js - browser/components/preferences/preferences.xhtml - browser/components/preferences/privacy.inc.xhtml - browser/components/preferences/privacy.js - browser/components/preferences/search.inc.xhtml - + browser/components/search/extensions/brave/favicon.svg - + browser/components/search/extensions/brave/manifest.json - + browser/components/search/extensions/ddg-html/favicon.ico - + browser/components/search/extensions/ddg-html/manifest.json - browser/components/search/extensions/ddg/manifest.json - + browser/components/search/extensions/metager/favicon.ico - + browser/components/search/extensions/metager/manifest.json - + browser/components/search/extensions/mojeek/favicon.ico - + browser/components/search/extensions/mojeek/manifest.json - + browser/components/search/extensions/mullvad-leta/favicon.svg - + browser/components/search/extensions/mullvad-leta/manifest.json - + browser/components/search/extensions/startpage/favicon.png - + browser/components/search/extensions/startpage/manifest.json - browser/components/shell/ShellService.sys.mjs - browser/components/shell/WindowsDefaultBrowser.cpp - browser/components/shell/nsWindowsShellService.cpp - browser/config/mozconfigs/base-browser - + browser/config/mozconfigs/mullvad-browser - browser/installer/package-manifest.in - browser/installer/windows/nsis/updater_append.ini - browser/locales/l10n.toml - browser/modules/HomePage.sys.mjs - browser/moz.build - browser/moz.configure - config/create_rc.py - devtools/client/aboutdebugging/src/actions/runtimes.js - devtools/client/aboutdebugging/src/components/sidebar/Sidebar.js - devtools/client/jar.mn - devtools/client/themes/images/aboutdebugging-firefox-aurora.svg - devtools/client/themes/images/aboutdebugging-firefox-beta.svg - devtools/client/themes/images/aboutdebugging-firefox-logo.svg - devtools/client/themes/images/aboutdebugging-firefox-nightly.svg - devtools/client/themes/images/aboutdebugging-firefox-release.svg - + devtools/client/themes/images/aboutdebugging-mullvadbrowser-logo.svg - docshell/base/nsAboutRedirector.cpp - docshell/build/components.conf - moz.configure - mozconfig-linux-aarch64 - mozconfig-linux-aarch64-dev - mozconfig-linux-x86_64 - mozconfig-linux-x86_64-asan - mozconfig-linux-x86_64-dev - mozconfig-macos - mozconfig-macos-dev - mozconfig-windows-x86_64 - + other-licenses/nsis/Contrib/ApplicationID/Makefile - other-licenses/nsis/Contrib/ApplicationID/Set.cpp - + other-licenses/nsis/Contrib/CityHash/Makefile - toolkit/components/extensions/child/ext-storage.js - toolkit/components/extensions/parent/ext-storage.js - toolkit/components/passwordmgr/LoginHelper.sys.mjs - toolkit/components/search/AppProvidedSearchEngine.sys.mjs - toolkit/components/search/SearchService.sys.mjs - + toolkit/components/search/content/brave.svg - + toolkit/components/search/content/duckduckgo.ico - + toolkit/components/search/content/metager.ico - + toolkit/components/search/content/mojeek.ico - + toolkit/components/search/content/mullvad-leta.svg - + toolkit/components/search/content/mullvadBrowserSearchEngineIcons.json - + toolkit/components/search/content/mullvadBrowserSearchEngines.json - + toolkit/components/search/content/startpage.png - + toolkit/components/search/jar.mn - toolkit/components/search/moz.build - toolkit/components/securitylevel/SecurityLevel.sys.mjs - + toolkit/content/aboutRightsMullvad.xhtml - + toolkit/content/aboutTelemetryMullvad.xhtml - toolkit/content/jar.mn - toolkit/content/widgets/moz-support-link/moz-support-link.mjs - + toolkit/locales/en-US/toolkit/global/mullvad-browser.ftl - toolkit/mozapps/defaultagent/EventLog.h - toolkit/mozapps/defaultagent/SetDefaultBrowser.cpp - toolkit/mozapps/extensions/AddonManager.sys.mjs - toolkit/mozapps/extensions/content/aboutaddons.css - toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs - toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs - toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der - toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der - toolkit/mozapps/update/updater/release_primary.der - toolkit/mozapps/update/updater/release_secondary.der - + toolkit/themes/shared/icons/mullvadbrowser.png - toolkit/themes/shared/minimal-toolkit.jar.inc.mn - toolkit/xre/nsAppRunner.cpp - tools/lint/fluent-lint/exclusions.yml - widget/windows/WinTaskbar.cpp - widget/windows/moz.build The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/fe… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/fe… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/tor-browser][base-browser-140.0a1-15.0-1] fixup! Base Browser strings
by Pier Angelo Vendrame (＠pierov) 09 Jun '25

09 Jun '25

Pier Angelo Vendrame pushed to branch base-browser-140.0a1-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 31278d7b by Pier Angelo Vendrame at 2025-06-09T15:33:02+02:00 fixup! Base Browser strings BB 43849: Remove a useless lint exclusion. Probably it was a rebase error. - - - - - 1 changed file: - tools/lint/fluent-lint/exclusions.yml Changes: ===================================== tools/lint/fluent-lint/exclusions.yml ===================================== @@ -84,9 +… [View More]

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.0a1-15.0-1] fixup! Base Browser strings
by Pier Angelo Vendrame (＠pierov) 09 Jun '25

09 Jun '25

Pier Angelo Vendrame pushed to branch tor-browser-140.0a1-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 7ff9d211 by Pier Angelo Vendrame at 2025-06-09T15:10:39+02:00 fixup! Base Browser strings BB 43849: Remove a useless lint exclusion. Probably it was a rebase error. - - - - - 1 changed file: - tools/lint/fluent-lint/exclusions.yml Changes: ===================================== tools/lint/fluent-lint/exclusions.yml ===================================== @@ -84,9 +84,… [View More]

1 0

[Git][tpo/applications/mullvad-browser] Pushed new branch mullvad-browser-140.0a1-15.0-1
by Pier Angelo Vendrame (＠pierov) 09 Jun '25

09 Jun '25

Pier Angelo Vendrame pushed new branch mullvad-browser-140.0a1-15.0-1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag FIREFOX_NIGHTLY_140_END
by Pier Angelo Vendrame (＠pierov) 09 Jun '25

09 Jun '25

Pier Angelo Vendrame pushed new tag FIREFOX_NIGHTLY_140_END at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/FIREF… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag base-browser-140.0a1-15.0-1-build1
by Pier Angelo Vendrame (＠pierov) 09 Jun '25

09 Jun '25

Pier Angelo Vendrame pushed new tag base-browser-140.0a1-15.0-1-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/base-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41444: Temporarily disable artifact generation for macos and windows
by boklm (＠boklm) 09 Jun '25

09 Jun '25

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 95699a34 by Nicolas Vigier at 2025-06-06T09:01:42+02:00 Bug 41444: Temporarily disable artifact generation for macos and windows - - - - - 2 changed files: - projects/browser/build - projects/firefox/build Changes: ===================================== projects/browser/build ===================================== @@ -429,7 +429,7 @@ cd $distdir popd [% END %] -[% IF c("var/nightly") -%] +[% … [View More]

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.11.0esr-14.5-1] 3 commits: fixup! TB 40026 [android]: Implement Security Level settings on Android.
by Dan Ballard (＠dan) 05 Jun '25

05 Jun '25

Dan Ballard pushed to branch tor-browser-128.11.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 1f3d54f3 by clairehurst at 2025-06-04T12:43:41+02:00 fixup! TB 40026 [android]: Implement Security Level settings on Android. TB 43786: Add new UX flow for changing security level (Android) - - - - - 4c264ede by clairehurst at 2025-06-04T12:43:41+02:00 fixup! [android] Implement Android-native Connection Assist UI TB 43786: Add new UX flow for changing security level (… [View More]Android) - - - - - 80613d52 by clairehurst at 2025-06-04T12:43:42+02:00 fixup! [android] TBA strings TB 43786: Add new UX flow for changing security level (Android) - - - - - 18 changed files: - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/SearchUseCases.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - − mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TorSecurityLevelFragment.kt - − mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/SecurityLevel.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorSecurityLevel.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorSecurityLevelFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt - + mobile/android/fenix/app/src/main/res/layout/fragment_tor_security_level_preferences.xml - mobile/android/fenix/app/src/main/res/navigation/nav_graph.xml - mobile/android/fenix/app/src/main/res/values/preference_keys.xml - mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml - mobile/android/fenix/app/src/main/res/xml/preferences.xml - − mobile/android/fenix/app/src/main/res/xml/tor_security_level_preferences.xml Changes: ===================================== mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt ===================================== @@ -1335,9 +1335,7 @@ class GeckoEngine( override var torSecurityLevel: Int get() = runtime.settings.torSecurityLevel set(value) { - value.let { - runtime.settings.torSecurityLevel = it - } + runtime.settings.torSecurityLevel = value } override var spoofEnglish: Boolean ===================================== mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt ===================================== @@ -254,6 +254,12 @@ abstract class Settings { /** * Setting to control the current security level + * + * 4 -> STANDARD + * + * 2 -> SAFER + * + * 1 -> SAFEST */ open var torSecurityLevel: Int by UnsupportedSetting() ===================================== mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/SearchUseCases.kt ===================================== @@ -76,12 +76,7 @@ class SearchUseCases( flags: EngineSession.LoadUrlFlags = EngineSession.LoadUrlFlags.none(), additionalHeaders: Map<String, String>? = null, ) { - var securityLevel: Int - try { - securityLevel = settings?.torSecurityLevel ?: 0 - } catch (e: UnsupportedSettingException) { - securityLevel = 0 - } + val securityLevel : Int = settings!!.torSecurityLevel val searchUrl = searchEngine?.let { searchEngine.buildSearchUrl(searchTerms, securityLevel) } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms, securityLevel) @@ -172,12 +167,7 @@ class SearchUseCases( flags: EngineSession.LoadUrlFlags = EngineSession.LoadUrlFlags.none(), additionalHeaders: Map<String, String>? = null, ) { - var securityLevel: Int - try { - securityLevel = settings?.torSecurityLevel ?: 0 - } catch (e: UnsupportedSettingException) { - securityLevel = 0 - } + val securityLevel : Int = settings!!.torSecurityLevel val searchUrl = searchEngine?.let { searchEngine.buildSearchUrl(searchTerms, securityLevel) } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms, securityLevel) ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -1439,6 +1439,15 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorAn private const val PWA_RECENTLY_USED_THRESHOLD = DateUtils.DAY_IN_MILLIS * 30L } + fun restartApplication() { + startActivity( + Intent(applicationContext, HomeActivity::class.java).addFlags( + Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK, + ), + ) + shutDown() + } + fun shutDown() : Nothing { finishAndRemoveTask() exitProcess(0) ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt ===================================== @@ -157,7 +157,7 @@ class Core( cookieBannerHandlingGlobalRules = context.settings().shouldEnableCookieBannerGlobalRules, cookieBannerHandlingGlobalRulesSubFrames = context.settings().shouldEnableCookieBannerGlobalRulesSubFrame, emailTrackerBlockingPrivateBrowsing = false, - torSecurityLevel = context.settings().torSecurityLevel().intRepresentation, + torSecurityLevel = context.settings().torSecurityLevel, spoofEnglish = context.settings().spoofEnglish, ) ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt ===================================== @@ -13,6 +13,7 @@ import android.os.Build import android.os.Bundle import android.os.Handler import android.os.Looper +import android.util.Log import android.view.LayoutInflater import android.view.WindowManager import android.widget.Toast @@ -67,7 +68,7 @@ import org.mozilla.fenix.ext.showToolbar import org.mozilla.fenix.nimbus.FxNimbus import org.mozilla.fenix.perf.ProfilerViewModel import org.mozilla.fenix.settings.account.AccountUiView -import org.mozilla.fenix.tor.SecurityLevel +import org.mozilla.fenix.tor.TorSecurityLevel import org.mozilla.fenix.tor.QuickstartViewModel import org.mozilla.fenix.utils.Settings import kotlin.system.exitProcess @@ -353,7 +354,7 @@ class SettingsFragment : PreferenceFragmentCompat(), UserInteractionHandler { SettingsFragmentDirections.actionSettingsFragmentToPrivateBrowsingFragment() } - resources.getString(R.string.pref_key_tor_security_level_settings) -> { + resources.getString(R.string.pref_key_tor_security_level) -> { SettingsFragmentDirections.actionSettingsFragmentToTorSecurityLevelFragment() } @@ -852,14 +853,14 @@ class SettingsFragment : PreferenceFragmentCompat(), UserInteractionHandler { @VisibleForTesting internal fun setupSecurityLevelPreference() { val securityLevelPreference = - requirePreference<Preference>(R.string.pref_key_tor_security_level_settings) - securityLevelPreference.summary = context?.settings()?.torSecurityLevel()?.let { - when (it) { - SecurityLevel.STANDARD -> getString(R.string.tor_security_level_standard_option) - SecurityLevel.SAFER -> getString(R.string.tor_security_level_safer_option) - SecurityLevel.SAFEST -> getString(R.string.tor_security_level_safest_option) + requirePreference<Preference>(R.string.pref_key_tor_security_level) + securityLevelPreference.summary = + when (requireContext().settings().torSecurityLevel) { + TorSecurityLevel.STANDARD.level -> getString(R.string.tor_security_level_standard) + TorSecurityLevel.SAFER.level -> getString(R.string.tor_security_level_safer) + TorSecurityLevel.SAFEST.level -> getString(R.string.tor_security_level_safest) + else -> throw Exception("Unexpected TorSecurityLevel of ${requireContext().settings().torSecurityLevel}") } - } } @VisibleForTesting ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TorSecurityLevelFragment.kt deleted ===================================== @@ -1,81 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.fenix.settings - -import android.os.Bundle -import androidx.preference.PreferenceFragmentCompat -import org.mozilla.fenix.R -import org.mozilla.fenix.ext.components -import org.mozilla.fenix.ext.settings -import org.mozilla.fenix.ext.showToolbar -import org.mozilla.fenix.tor.SecurityLevel -import org.mozilla.fenix.tor.SecurityLevelUtil -import org.mozilla.fenix.utils.view.GroupableRadioButton -import org.mozilla.fenix.utils.view.addToRadioGroup -import org.mozilla.fenix.utils.view.uncheckAll - -/** - * Lets the user choose their security level - */ -@Suppress("SpreadOperator") -class TorSecurityLevelFragment : PreferenceFragmentCompat() { - private val securityLevelRadioGroups = mutableListOf<GroupableRadioButton>() - private var previousSecurityLevel: SecurityLevel? = null - - override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { - setPreferencesFromResource(R.xml.tor_security_level_preferences, rootKey) - - val currentLevel: SecurityLevel? = context?.components?.let { - try { - SecurityLevelUtil.getSecurityLevelFromInt( - it.core.engine.settings.torSecurityLevel - ) - } catch (e: IllegalStateException) { - // The default state is 0. If we get an invalid state then - // default to Standard (4). - SecurityLevel.STANDARD - } - } - - if (currentLevel == null) { - throw IllegalStateException("context or Components is null.") - } - - val radioSafer = bindSecurityLevelRadio(SecurityLevel.SAFER) - val radioSafest = bindSecurityLevelRadio(SecurityLevel.SAFEST) - val radioStandard = bindSecurityLevelRadio(SecurityLevel.STANDARD) - - securityLevelRadioGroups.addAll(mutableListOf(radioSafer, radioSafest, radioStandard)) - // `*` is Kotlin's "spread" operator, for expanding an Array as a vararg. - addToRadioGroup(*securityLevelRadioGroups.toTypedArray()) - - securityLevelRadioGroups.uncheckAll() - val securityLevelRadioButton = requirePreference<RadioButtonPreference>(currentLevel.preferenceKey) - // Cache this for later comparison in the OnPreferenceChangeListener - previousSecurityLevel = currentLevel - securityLevelRadioButton.setCheckedWithoutClickListener(true) - } - - private fun bindSecurityLevelRadio( - level: SecurityLevel - ): RadioButtonPreference { - val radio = requirePreference<RadioButtonPreference>(level.preferenceKey) - - radio.summary = getString(level.contentDescriptionRes) - - radio.apply { - setOnPreferenceChangeListener<Boolean> { preference, isChecked -> - if (isChecked && (previousSecurityLevel!! != level)) { - preference.context.components.core.engine.settings.torSecurityLevel = - level.intRepresentation - previousSecurityLevel = level - } - true - } - } - - return radio - } -} ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/SecurityLevel.kt deleted ===================================== @@ -1,53 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.fenix.tor - -import android.os.Parcelable -import androidx.annotation.StringRes -import kotlinx.parcelize.Parcelize -import org.mozilla.fenix.R - - -const val SECURITY_LEVEL_STANDARD = 4 -const val SECURITY_LEVEL_SAFER = 2 -const val SECURITY_LEVEL_SAFEST = 1 - -@Parcelize -enum class SecurityLevel( - @StringRes val preferenceKey: Int, - @StringRes val contentDescriptionRes: Int, - val intRepresentation: Int -) : Parcelable { - - STANDARD( - preferenceKey = R.string.pref_key_tor_security_level_standard_option, - contentDescriptionRes = R.string.tor_security_level_standard_description, - intRepresentation = SECURITY_LEVEL_STANDARD - ), - SAFER( - preferenceKey = R.string.pref_key_tor_security_level_safer_option, - contentDescriptionRes = R.string.tor_security_level_safer_description, - intRepresentation = SECURITY_LEVEL_SAFER - ), - SAFEST( - preferenceKey = R.string.pref_key_tor_security_level_safest_option, - contentDescriptionRes = R.string.tor_security_level_safest_description, - intRepresentation = SECURITY_LEVEL_SAFEST - ); - - - -} - -object SecurityLevelUtil { - fun getSecurityLevelFromInt(level: Int): SecurityLevel { - return when (level) { - SECURITY_LEVEL_STANDARD -> SecurityLevel.STANDARD - SECURITY_LEVEL_SAFER -> SecurityLevel.SAFER - SECURITY_LEVEL_SAFEST -> SecurityLevel.SAFEST - else -> throw IllegalStateException("Security Level $level is not valid") - } - } -} ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt ===================================== @@ -343,7 +343,7 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler { if (screen.torBootstrapButton2ShouldOpenSettings) { openTorConnectionSettings() } else if (screen.torBootstrapButton2ShouldRestartApp) { - restartApplication() + (requireActivity() as HomeActivity).restartApplication() } else { torConnectionAssistViewModel.cancelTorBootstrap() } @@ -404,15 +404,6 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler { openSettings(requireContext().getString(R.string.pref_key_connection)) } - private fun restartApplication() { - startActivity( - Intent(requireContext(), HomeActivity::class.java).addFlags( - Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK, - ), - ) - Runtime.getRuntime().exit(0) - } - override fun onBackPressed(): Boolean { torConnectionAssistViewModel.handleBackButtonPressed(requireActivity() as HomeActivity) return true ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorSecurityLevel.kt ===================================== @@ -0,0 +1,13 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.fenix.tor + +import android.os.Parcelable +import kotlinx.parcelize.Parcelize + +@Parcelize +enum class TorSecurityLevel(val level: Int) : Parcelable { + STANDARD(4), SAFER(2), SAFEST(1) +} ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorSecurityLevelFragment.kt ===================================== @@ -0,0 +1,144 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.fenix.tor + +import android.content.Context +import android.os.Bundle +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.Toast +import androidx.appcompat.content.res.AppCompatResources +import androidx.fragment.app.Fragment +import org.mozilla.fenix.HomeActivity +import org.mozilla.fenix.R +import org.mozilla.fenix.ext.components +import org.mozilla.fenix.databinding.FragmentTorSecurityLevelPreferencesBinding +import androidx.core.content.edit + +class TorSecurityLevelFragment : Fragment() { + private var _binding: FragmentTorSecurityLevelPreferencesBinding? = null + private val binding get() = _binding!! + + private val tag = "TorSecurityLevelFrag" + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle?, + ): View { + _binding = FragmentTorSecurityLevelPreferencesBinding.inflate( + inflater, container, false, + ) + + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + binding.description.text = getString(R.string.tor_security_level_warning, getString(R.string.app_name)) + + updateSaveAndRestartButtonUI() + + val currentLevel: Int = requireContext().components.core.engine.settings.torSecurityLevel + + when (currentLevel) { + TorSecurityLevel.STANDARD.level -> { + binding.standardPreference.text = + getString(R.string.tor_security_level_standard_current_level) + binding.securityLevelRadioGroup.check(binding.standardPreference.id) + } + + TorSecurityLevel.SAFER.level -> { + binding.saferPreference.text = + getString(R.string.tor_security_level_safer_current_level) + binding.securityLevelRadioGroup.check(binding.saferPreference.id) + } + + TorSecurityLevel.SAFEST.level -> { + binding.safestPreference.text = + getString(R.string.tor_security_level_safest_current_level) + binding.securityLevelRadioGroup.check(binding.safestPreference.id) + } + } + + binding.securityLevelRadioGroup.setOnCheckedChangeListener { _, checkedId -> + binding.saveAndRestartButton.isEnabled = when (checkedId) { + binding.standardPreference.id -> currentLevel != TorSecurityLevel.STANDARD.level + binding.saferPreference.id -> currentLevel != TorSecurityLevel.SAFER.level + binding.safestPreference.id -> currentLevel != TorSecurityLevel.SAFEST.level + else -> throw Exception("unexpected checkedID of $checkedId") + } + + updateSaveAndRestartButtonUI() + } + + binding.saveAndRestartButton.setOnClickListener { + + Toast.makeText( + requireContext(), + R.string.tor_security_level_restarting, + Toast.LENGTH_SHORT, + ).show() + + val selectedSecurityLevel: Int = + when (binding.securityLevelRadioGroup.checkedRadioButtonId) { + binding.standardPreference.id -> TorSecurityLevel.STANDARD.level + binding.saferPreference.id -> TorSecurityLevel.SAFER.level + binding.safestPreference.id -> TorSecurityLevel.SAFEST.level + else -> throw Exception("Unexpected checkedRadioButtonId of ${binding.securityLevelRadioGroup.checkedRadioButtonId}") + } + + requireContext().components.core.geckoRuntime.settings.torSecurityLevel = selectedSecurityLevel + + requireActivity().getSharedPreferences("fenix_preferences", Context.MODE_PRIVATE).edit( + commit = true, + ) { + putInt( + requireContext().getString(R.string.pref_key_tor_security_level), + selectedSecurityLevel, + ) + } + + Thread.sleep(1000) + + (requireActivity() as HomeActivity).restartApplication() + } + + binding.cancelButton.setOnClickListener { + requireActivity().onBackPressed() + } + } + + private fun updateSaveAndRestartButtonUI() { + binding.saveAndRestartButton.apply { + if (binding.saveAndRestartButton.isEnabled) { + backgroundTintList = AppCompatResources.getColorStateList( + requireContext(), + R.color.connect_button_purple, + ) + setTextColor( + AppCompatResources.getColorStateList( + requireContext(), + R.color.photonLightGrey05, + ), + ) + } else { + backgroundTintList = AppCompatResources.getColorStateList( + requireContext(), + R.color.disabled_connect_button_purple, + ) + setTextColor( + AppCompatResources.getColorStateList( + requireContext(), + R.color.disabled_text_gray_purple, + ), + ) + } + } + } +} ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -52,7 +52,8 @@ import org.mozilla.fenix.settings.registerOnSharedPreferenceChangeListener import org.mozilla.fenix.settings.sitepermissions.AUTOPLAY_BLOCK_ALL import org.mozilla.fenix.settings.sitepermissions.AUTOPLAY_BLOCK_AUDIBLE import org.mozilla.fenix.wallpapers.Wallpaper -import org.mozilla.fenix.tor.SecurityLevel +import org.mozilla.fenix.settings.SettingsFragment +import org.mozilla.fenix.tor.TorSecurityLevel import java.security.InvalidParameterException import java.util.UUID @@ -299,31 +300,55 @@ class Settings(private val appContext: Context) : PreferencesHolder { false, ) - var standardSecurityLevel by booleanPreference( - appContext.getPreferenceKey(SecurityLevel.STANDARD.preferenceKey), - default = true + private var oldStandardSecurityLevel by booleanPreference( + appContext.getPreferenceKey(R.string.pref_key_tor_security_level_standard_option), + default = false ) - var saferSecurityLevel by booleanPreference( - appContext.getPreferenceKey(SecurityLevel.SAFER.preferenceKey), + private var oldSaferSecurityLevel by booleanPreference( + appContext.getPreferenceKey(R.string.pref_key_tor_security_level_safer_option), default = false ) - var safestSecurityLevel by booleanPreference( - appContext.getPreferenceKey(SecurityLevel.SAFEST.preferenceKey), + private var oldSafestSecurityLevel by booleanPreference( + appContext.getPreferenceKey(R.string.pref_key_tor_security_level_safest_option), default = false ) - // torSecurityLevel is defined as the first |true| preference, - // beginning at the safest level. - // If multiple preferences are true, then that is a bug and the - // highest |true| security level is chosen. - // Standard is the default level. - fun torSecurityLevel(): SecurityLevel = when { - safestSecurityLevel -> SecurityLevel.SAFEST - saferSecurityLevel -> SecurityLevel.SAFER - standardSecurityLevel -> SecurityLevel.STANDARD - else -> SecurityLevel.STANDARD + /** + * Backing property that should used only for the [SettingsFragment] UI + * + * 4 -> STANDARD + * + * 2 -> SAFER + * + * 1 -> SAFEST + */ + var torSecurityLevel by intPreference( + appContext.getPreferenceKey(R.string.pref_key_tor_security_level), + migrateTorSecurityLevel() ?: 4, + ) + + /** + * Remove in 15.0 release. + */ + private fun migrateTorSecurityLevel(): Int? { + return when { + oldSafestSecurityLevel -> { + TorSecurityLevel.SAFEST.level + } + oldSaferSecurityLevel -> { + TorSecurityLevel.SAFER.level + } + oldStandardSecurityLevel -> { + TorSecurityLevel.STANDARD.level + } + else -> null + }.also { + oldSafestSecurityLevel = false + oldSaferSecurityLevel = false + oldStandardSecurityLevel = false + } } var spoofEnglish by booleanPreference( ===================================== mobile/android/fenix/app/src/main/res/layout/fragment_tor_security_level_preferences.xml ===================================== @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <TextView + android:id="@+id/description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:lineSpacingExtra="6dp" + android:paddingHorizontal="24dp" + android:paddingVertical="16dp" + android:text="@string/tor_security_level_warning" + android:textColor="@color/photonLightGrey40" + android:textSize="14sp" + app:layout_constraintTop_toTopOf="parent" /> + + <RadioGroup + android:id="@+id/security_level_radio_group" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="16dp" + app:layout_constraintTop_toBottomOf="@+id/description"> + + <RadioButton + android:id="@+id/standard_preference" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/tor_security_level_standard" + android:textColor="@color/photonLightGrey05" + android:textSize="16sp" /> + + <TextView + android:id="@+id/standard_preference_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="32dp" + android:text="@string/tor_security_level_standard_description" + android:textColor="@color/photonLightGrey40" /> + + <RadioButton + android:id="@+id/safer_preference" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/tor_security_level_safer" + android:textColor="@color/photonLightGrey05" + android:textSize="16sp" /> + + <TextView + android:id="@+id/safer_preference_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="32dp" + android:text="@string/tor_security_level_safer_description" + android:textColor="@color/photonLightGrey40" /> + + <RadioButton + android:id="@+id/safest_preference" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/tor_security_level_safest" + android:textColor="@color/photonLightGrey05" + android:textSize="16sp" /> + + <TextView + android:id="@+id/safest_preference_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="32dp" + android:text="@string/tor_security_level_safest_description" + android:textColor="@color/photonLightGrey40" /> + </RadioGroup> + + <Button + android:id="@+id/save_and_restart_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="24dp" + android:layout_marginEnd="24dp" + android:layout_marginBottom="8dp" + android:background="@drawable/rounded_corners" + android:backgroundTint="@color/connect_button_purple" + android:enabled="false" + android:minWidth="360dp" + android:text="@string/tor_security_level_save_and_restart_tor_browser" + android:textAlignment="center" + android:textAllCaps="false" + android:textColor="@color/photonLightGrey05" + android:textSize="14sp" + android:textStyle="bold" + app:layout_constraintBottom_toTopOf="@id/cancel_button" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + + <Button + android:id="@+id/cancel_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="24dp" + android:layout_marginEnd="24dp" + android:layout_marginBottom="8dp" + android:background="@drawable/rounded_corners" + android:backgroundTint="@color/configure_connection_button_white" + android:minWidth="360dp" + android:text="@string/btn_cancel" + android:textAlignment="center" + android:textAllCaps="false" + android:textColor="@color/photonDarkGrey90" + android:textSize="14sp" + android:textStyle="bold" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> +</androidx.constraintlayout.widget.ConstraintLayout> ===================================== mobile/android/fenix/app/src/main/res/navigation/nav_graph.xml ===================================== @@ -907,7 +907,7 @@ android:label="@string/preferences_customize" /> <fragment android:id="@+id/torSecurityLevelFragment" - android:name="org.mozilla.fenix.settings.TorSecurityLevelFragment" + android:name="org.mozilla.fenix.tor.TorSecurityLevelFragment" android:label="@string/preferences_tor_security_level_options" /> <fragment android:id="@+id/privateBrowsingFragment" ===================================== mobile/android/fenix/app/src/main/res/values/preference_keys.xml ===================================== @@ -406,6 +406,9 @@ <string name="pref_key_https_everywhere_removed" translatable="false">pref_key_https_everywhere_removed</string>  + <string name="pref_key_tor_security_level" translatable="false">pref_key_tor_security_level</string> + +  <string name="pref_key_tor_security_level_settings" translatable="false">pref_key_tor_security_level_settings</string> <string name="pref_key_tor_security_level_standard_option" translatable="false">pref_key_tor_security_level_standard_option</string> <string name="pref_key_tor_security_level_safer_option" translatable="false">pref_key_tor_security_level_safer_option</string> ===================================== mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -36,12 +36,19 @@ <string name="preferences_tor_security_level_options">Security Level</string>  - <string name="tor_security_level_standard_option">Standard</string> +  + <string name="tor_security_level_warning">You will need to restart %s to apply any changes. This will close all tabs.</string> + <string name="tor_security_level_standard">Standard</string> + <string name="tor_security_level_standard_current_level">Standard (current level)</string> <string name="tor_security_level_standard_description">All Tor Browser and website features are enabled.</string> - <string name="tor_security_level_safer_option">Safer</string> + <string name="tor_security_level_safer">Safer</string> + <string name="tor_security_level_safer_current_level">Safer (current level)</string> <string name="tor_security_level_safer_description">Disable website features that are often dangerous, causing some sites to lose functionality.</string> - <string name="tor_security_level_safest_option">Safest</string> + <string name="tor_security_level_safest">Safest</string> + <string name="tor_security_level_safest_current_level">Safest (current level)</string> <string name="tor_security_level_safest_description">Only allow website features required for static sites and basic services. These changes affect images, media, and scripts.</string> + <string name="tor_security_level_save_and_restart_tor_browser">Save and restart</string> + <string name="tor_security_level_restarting">Restarting</string> <string name="btn_cancel">Cancel</string> ===================================== mobile/android/fenix/app/src/main/res/xml/preferences.xml ===================================== @@ -103,7 +103,7 @@ android:layout="@layout/preference_category_no_icon_style"> <androidx.preference.Preference - android:key="@string/pref_key_tor_security_level_settings" + android:key="@string/pref_key_tor_security_level" app:iconSpaceReserved="false" android:title="@string/preferences_tor_security_level_options" /> ===================================== mobile/android/fenix/app/src/main/res/xml/tor_security_level_preferences.xml deleted ===================================== @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - <org.mozilla.fenix.settings.RadioButtonPreference - android:defaultValue="true" - android:key="@string/pref_key_tor_security_level_standard_option" - android:summary="@string/tor_security_level_standard_description" - android:title="@string/tor_security_level_standard_option" /> - <org.mozilla.fenix.settings.RadioButtonPreference - android:defaultValue="false" - android:key="@string/pref_key_tor_security_level_safer_option" - android:summary="@string/tor_security_level_safer_description" - android:title="@string/tor_security_level_safer_option" /> - <org.mozilla.fenix.settings.RadioButtonPreference - android:defaultValue="false" - android:key="@string/pref_key_tor_security_level_safest_option" - android:summary="@string/tor_security_level_safest_description" - android:title="@string/tor_security_level_safest_option" /> -</androidx.preference.PreferenceScreen> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/298a04… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/298a04… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/tor-browser-build][main] Bump Firefox version to 128.11.0esr for nightly builds.
by ma1 (＠ma1) 04 Jun '25

04 Jun '25

ma1 pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 7ee7d341 by hackademix at 2025-06-04T16:33:57+02:00 Bump Firefox version to 128.11.0esr for nightly builds. - - - - - 2 changed files: - projects/firefox/config - projects/geckoview/config Changes: ===================================== projects/firefox/config ===================================== @@ -16,7 +16,7 @@ container: use_container: 1 var: - firefox_platform_version: '128.10.0' + … [View More]

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.11.0esr-14.5-1] 6 commits: fixup! BB 40925: Implemented the Security Level component
by ma1 (＠ma1) 04 Jun '25

04 Jun '25

ma1 pushed to branch tor-browser-128.11.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 62b83143 by Henry Wilkes at 2025-05-27T10:28:07+01:00 fixup! BB 40925: Implemented the Security Level component TB 43783: Prompt user for a restart if their security level preferences are not aligned at startup or mid-session. Also handle failures to apply NoScript settings. - - - - - 02472976 by Henry Wilkes at 2025-05-27T10:28:08+01:00 fixup! BB 40069: Add helpers for message … [View More]passing with extensions TB 43783: Allow the browser to wait for the NoScript settings to be applied. - - - - - 84244779 by Henry Wilkes at 2025-05-27T10:28:09+01:00 fixup! Base Browser strings TB 43783: Add security level prompt strings. - - - - - 7a8bfa8e by Henry Wilkes at 2025-05-27T10:28:10+01:00 fixup! TB 40026 [android]: Implement Security Level settings on Android. TB 43783: Expose SecurityLevelPrefs.setSecurityLevelAndRestart to android integration. - - - - - 8d29eede by Henry Wilkes at 2025-05-28T15:35:57+01:00 fixup! Base Browser strings TB 43782: Add strings for new security level UX flow. - - - - - 298a0418 by Henry Wilkes at 2025-05-28T15:35:58+01:00 fixup! BB 40925: Implemented the Security Level component TB 43782: Update security level UI for new UX flow. In addition, we drop the distinction between the security levels in the UI when the user has a custom security level. I.e. we always show shield as unfilled but with a yellow dot in the toolbar, and we just call it "Custom" rather than "Standard Custom", etc. - - - - - 19 changed files: - browser/components/BrowserGlue.sys.mjs - + browser/components/securitylevel/SecurityLevelUIUtils.sys.mjs - browser/components/securitylevel/content/securityLevel.js - browser/components/securitylevel/content/securityLevelButton.css - + browser/components/securitylevel/content/securityLevelDialog.js - + browser/components/securitylevel/content/securityLevelDialog.xhtml - browser/components/securitylevel/content/securityLevelPanel.css - browser/components/securitylevel/content/securityLevelPanel.inc.xhtml - browser/components/securitylevel/content/securityLevelPreferences.css - browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml - browser/components/securitylevel/jar.mn - browser/components/securitylevel/moz.build - + browser/modules/SecurityLevelRestartNotification.sys.mjs - browser/modules/moz.build - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorAndroidIntegration.java - toolkit/components/extensions/ExtensionParent.sys.mjs - toolkit/components/securitylevel/SecurityLevel.sys.mjs - toolkit/locales/en-US/toolkit/global/base-browser.ftl - toolkit/modules/TorAndroidIntegration.sys.mjs Changes: ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -82,6 +82,8 @@ ChromeUtils.defineESModuleGetters(lazy, { ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs", SearchSERPCategorization: "resource:///modules/SearchSERPTelemetry.sys.mjs", SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs", + SecurityLevelRestartNotification: + "resource:///modules/SecurityLevelRestartNotification.sys.mjs", SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs", SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", ShellService: "resource:///modules/ShellService.sys.mjs", @@ -2030,6 +2032,8 @@ BrowserGlue.prototype = { lazy.DragDropFilter.init(); + lazy.SecurityLevelRestartNotification.ready(); + lazy.TorProviderBuilder.firstWindowLoaded(); lazy.TorSettingsNotification.ready(); ===================================== browser/components/securitylevel/SecurityLevelUIUtils.sys.mjs ===================================== @@ -0,0 +1,73 @@ +/** + * Common methods for the desktop security level components. + */ +export const SecurityLevelUIUtils = { + /** + * Create an element that gives a description of the security level. To be + * used in the settings. + * + * @param {string} level - The security level to describe. + * @param {Document} doc - The document where the element will be inserted. + * + * @returns {Element} - The newly created element. + */ + createDescriptionElement(level, doc) { + const el = doc.createElement("div"); + el.classList.add("security-level-description"); + + let l10nIdSummary; + let bullets; + switch (level) { + case "standard": + l10nIdSummary = "security-level-summary-standard"; + break; + case "safer": + l10nIdSummary = "security-level-summary-safer"; + bullets = [ + "security-level-preferences-bullet-https-only-javascript", + "security-level-preferences-bullet-limit-font-and-symbols", + "security-level-preferences-bullet-limit-media", + ]; + break; + case "safest": + l10nIdSummary = "security-level-summary-safest"; + bullets = [ + "security-level-preferences-bullet-disabled-javascript", + "security-level-preferences-bullet-limit-font-and-symbols-and-images", + "security-level-preferences-bullet-limit-media", + ]; + break; + case "custom": + l10nIdSummary = "security-level-summary-custom"; + break; + default: + throw Error(`Unhandled level: ${level}`); + } + + const summaryEl = doc.createElement("div"); + summaryEl.classList.add("security-level-summary"); + doc.l10n.setAttributes(summaryEl, l10nIdSummary); + + el.append(summaryEl); + + if (!bullets) { + return el; + } + + const listEl = doc.createElement("ul"); + listEl.classList.add("security-level-description-extra"); + // Add a mozilla styling class as well: + listEl.classList.add("privacy-extra-information"); + for (const l10nId of bullets) { + const bulletEl = doc.createElement("li"); + bulletEl.classList.add("security-level-description-bullet"); + + doc.l10n.setAttributes(bulletEl, l10nId); + + listEl.append(bulletEl); + } + + el.append(listEl); + return el; + }, +}; ===================================== browser/components/securitylevel/content/securityLevel.js ===================================== @@ -1,9 +1,10 @@ "use strict"; -/* global AppConstants, Services, openPreferences, XPCOMUtils */ +/* global AppConstants, Services, openPreferences, XPCOMUtils, gSubDialog */ ChromeUtils.defineESModuleGetters(this, { SecurityLevelPrefs: "resource://gre/modules/SecurityLevel.sys.mjs", + SecurityLevelUIUtils: "resource:///modules/SecurityLevelUIUtils.sys.mjs", }); /* @@ -35,12 +36,8 @@ var SecurityLevelButton = { _anchorButton: null, _configUIFromPrefs() { - const level = SecurityLevelPrefs.securityLevel; - if (!level) { - return; - } - const custom = SecurityLevelPrefs.securityCustom; - this._button.setAttribute("level", custom ? `${level}_custom` : level); + const level = SecurityLevelPrefs.securityLevelSummary; + this._button.setAttribute("level", level); let l10nIdLevel; switch (level) { @@ -53,15 +50,12 @@ var SecurityLevelButton = { case "safest": l10nIdLevel = "security-level-toolbar-button-safest"; break; + case "custom": + l10nIdLevel = "security-level-toolbar-button-custom"; + break; default: throw Error(`Unhandled level: ${level}`); } - if (custom) { - // Don't distinguish between the different levels when in the custom - // state. We just want to emphasise that it is custom rather than any - // specific level. - l10nIdLevel = "security-level-toolbar-button-custom"; - } document.l10n.setAttributes(this._button, l10nIdLevel); }, @@ -164,12 +158,7 @@ var SecurityLevelPanel = { panel: document.getElementById("securityLevel-panel"), background: document.getElementById("securityLevel-background"), levelName: document.getElementById("securityLevel-level"), - customName: document.getElementById("securityLevel-custom"), summary: document.getElementById("securityLevel-summary"), - restoreDefaultsButton: document.getElementById( - "securityLevel-restoreDefaults" - ), - settingsButton: document.getElementById("securityLevel-settings"), }; const learnMoreEl = document.getElementById("securityLevel-learnMore"); @@ -177,12 +166,11 @@ var SecurityLevelPanel = { this.hide(); }); - this._elements.restoreDefaultsButton.addEventListener("command", () => { - this.restoreDefaults(); - }); - this._elements.settingsButton.addEventListener("command", () => { - this.openSecuritySettings(); - }); + document + .getElementById("securityLevel-settings") + .addEventListener("command", () => { + this.openSecuritySettings(); + }); this._elements.panel.addEventListener("popupshown", () => { // Bring focus into the panel by focusing the default button. @@ -199,19 +187,7 @@ var SecurityLevelPanel = { } // get security prefs - const level = SecurityLevelPrefs.securityLevel; - const custom = SecurityLevelPrefs.securityCustom; - - // only visible when user is using custom settings - this._elements.customName.hidden = !custom; - this._elements.restoreDefaultsButton.hidden = !custom; - if (custom) { - this._elements.settingsButton.removeAttribute("default"); - this._elements.restoreDefaultsButton.setAttribute("default", "true"); - } else { - this._elements.settingsButton.setAttribute("default", "true"); - this._elements.restoreDefaultsButton.removeAttribute("default"); - } + const level = SecurityLevelPrefs.securityLevelSummary; // Descriptions change based on security level this._elements.background.setAttribute("level", level); @@ -230,12 +206,13 @@ var SecurityLevelPanel = { l10nIdLevel = "security-level-panel-level-safest"; l10nIdSummary = "security-level-summary-safest"; break; + case "custom": + l10nIdLevel = "security-level-panel-level-custom"; + l10nIdSummary = "security-level-summary-custom"; + break; default: throw Error(`Unhandled level: ${level}`); } - if (custom) { - l10nIdSummary = "security-level-summary-custom"; - } document.l10n.setAttributes(this._elements.levelName, l10nIdLevel); document.l10n.setAttributes(this._elements.summary, l10nIdSummary); @@ -269,13 +246,6 @@ var SecurityLevelPanel = { this._elements.panel.hidePopup(); }, - restoreDefaults() { - SecurityLevelPrefs.securityCustom = false; - // Move focus to the settings button since restore defaults button will - // become hidden. - this._elements.settingsButton.focus(); - }, - openSecuritySettings() { openPreferences("privacy-securitylevel"); this.hide(); @@ -301,59 +271,64 @@ var SecurityLevelPanel = { var SecurityLevelPreferences = { _securityPrefsBranch: null, + /** - * The notification box shown when the user has a custom security setting. - * - * @type {Element} - */ - _customNotification: null, - /** - * The radiogroup for this preference. - * - * @type {Element} - */ - _radiogroup: null, - /** - * A list of radio options and their containers. + * The element that shows the current security level. * - * @type {Array<object>} + * @type {?Element} */ - _radioOptions: null, + _currentEl: null, _populateXUL() { - this._customNotification = document.getElementById( - "securityLevel-customNotification" + this._currentEl = document.getElementById("security-level-current"); + const changeButton = document.getElementById("security-level-change"); + const badgeEl = this._currentEl.querySelector( + ".security-level-current-badge" ); - document - .getElementById("securityLevel-restoreDefaults") - .addEventListener("command", () => { - SecurityLevelPrefs.securityCustom = false; - }); - - this._radiogroup = document.getElementById("securityLevel-radiogroup"); - this._radioOptions = Array.from( - this._radiogroup.querySelectorAll(".securityLevel-radio-option"), - container => { - return { container, radio: container.querySelector("radio") }; - } - ); + for (const { level, nameId } of [ + { level: "standard", nameId: "security-level-panel-level-standard" }, + { level: "safer", nameId: "security-level-panel-level-safer" }, + { level: "safest", nameId: "security-level-panel-level-safest" }, + { level: "custom", nameId: "security-level-panel-level-custom" }, + ]) { + // Classes that control visibility: + // security-level-current-standard + // security-level-current-safer + // security-level-current-safest + // security-level-current-custom + const visibilityClass = `security-level-current-${level}`; + const nameEl = document.createElement("div"); + nameEl.classList.add("security-level-name", visibilityClass); + document.l10n.setAttributes(nameEl, nameId); + + const descriptionEl = SecurityLevelUIUtils.createDescriptionElement( + level, + document + ); + descriptionEl.classList.add(visibilityClass); + + this._currentEl.insertBefore(nameEl, badgeEl); + this._currentEl.insertBefore(descriptionEl, changeButton); + } - this._radiogroup.addEventListener("select", () => { - SecurityLevelPrefs.securityLevel = this._radiogroup.value; + changeButton.addEventListener("click", () => { + this._openDialog(); }); }, + _openDialog() { + gSubDialog.open( + "chrome://browser/content/securitylevel/securityLevelDialog.xhtml", + { features: "resizable=yes" } + ); + }, + _configUIFromPrefs() { - this._radiogroup.value = SecurityLevelPrefs.securityLevel; - const isCustom = SecurityLevelPrefs.securityCustom; - this._radiogroup.disabled = isCustom; - this._customNotification.hidden = !isCustom; - // Have the container's selection CSS class match the selection state of the - // radio elements. - for (const { container, radio } of this._radioOptions) { - container.classList.toggle("selected", radio.selected); - } + // Set a data-current-level attribute for showing the current security + // level, and hiding the rest. + this._currentEl.dataset.currentLevel = + SecurityLevelPrefs.securityLevelSummary; }, init() { ===================================== browser/components/securitylevel/content/securityLevelButton.css ===================================== @@ -7,12 +7,6 @@ toolbarbutton#security-level-button[level="safer"] { toolbarbutton#security-level-button[level="safest"] { list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safest"); } -toolbarbutton#security-level-button[level="standard_custom"] { +toolbarbutton#security-level-button[level="custom"] { list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#standard_custom"); } -toolbarbutton#security-level-button[level="safer_custom"] { - list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safer_custom"); -} -toolbarbutton#security-level-button[level="safest_custom"] { - list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safest_custom"); -} ===================================== browser/components/securitylevel/content/securityLevelDialog.js ===================================== @@ -0,0 +1,188 @@ +"use strict"; + +const { SecurityLevelPrefs } = ChromeUtils.importESModule( + "resource://gre/modules/SecurityLevel.sys.mjs" +); +const { SecurityLevelUIUtils } = ChromeUtils.importESModule( + "resource:///modules/SecurityLevelUIUtils.sys.mjs" +); + +const gSecurityLevelDialog = { + /** + * The security level when this dialog was opened. + * + * @type {string} + */ + _prevLevel: SecurityLevelPrefs.securityLevelSummary, + /** + * The security level currently selected. + * + * @type {string} + */ + _selectedLevel: "", + /** + * The radiogroup for this preference. + * + * @type {?Element} + */ + _radiogroup: null, + /** + * A list of radio options and their containers. + * + * @type {?Array<{ container: Element, radio: Element }>} + */ + _radioOptions: null, + + /** + * Initialise the dialog. + */ + async init() { + const dialog = document.getElementById("security-level-dialog"); + dialog.addEventListener("dialogaccept", event => { + if (this._acceptButton.disabled) { + event.preventDefault(); + return; + } + this._commitChange(); + }); + + this._acceptButton = dialog.getButton("accept"); + + document.l10n.setAttributes( + this._acceptButton, + "security-level-dialog-save-restart" + ); + + this._radiogroup = document.getElementById("security-level-radiogroup"); + + this._radioOptions = Array.from( + this._radiogroup.querySelectorAll(".security-level-radio-container"), + container => { + return { + container, + radio: container.querySelector(".security-level-radio"), + }; + } + ); + + for (const { container, radio } of this._radioOptions) { + const level = radio.value; + radio.id = `security-level-radio-${level}`; + const currentEl = container.querySelector( + ".security-level-current-badge" + ); + currentEl.id = `security-level-current-badge-${level}`; + const descriptionEl = SecurityLevelUIUtils.createDescriptionElement( + level, + document + ); + descriptionEl.classList.add("indent"); + descriptionEl.id = `security-level-description-${level}`; + + // Wait for the full translation of the element before adding it to the + // DOM. In particular, we want to make sure the elements have text before + // we measure the maxHeight below. + await document.l10n.translateFragment(descriptionEl); + document.l10n.pauseObserving(); + container.append(descriptionEl); + document.l10n.resumeObserving(); + + if (level === this._prevLevel) { + currentEl.hidden = false; + // When the currentEl is visible, include it in the accessible name for + // the radio option. + // NOTE: The currentEl has an accessible name which includes punctuation + // to help separate it's content from the security level name. + // E.g. "Standard (Current level)". + radio.setAttribute("aria-labelledby", `${radio.id} ${currentEl.id}`); + } else { + currentEl.hidden = true; + } + // We point the accessible description to the wrapping + // .security-level-description element, rather than its children + // that define the actual text content. This means that when the + // privacy-extra-information is shown or hidden, its text content is + // included or excluded from the accessible description, respectively. + radio.setAttribute("aria-describedby", descriptionEl.id); + } + + // We want to reserve the maximum height of the radiogroup so that the + // dialog has enough height when the user switches options. So we cycle + // through the options and measure the height when they are selected to set + // a minimum height that fits all of them. + // NOTE: At the time of implementation, at this point the dialog may not + // yet have the "subdialog" attribute, which means it is missing the + // common.css stylesheet from its shadow root, which effects the size of the + // .radio-check element and the font. Therefore, we have duplicated the + // import of common.css in SecurityLevelDialog.xhtml to ensure it is applied + // at this earlier stage. + let maxHeight = 0; + for (const { container } of this._radioOptions) { + container.classList.add("selected"); + maxHeight = Math.max( + maxHeight, + this._radiogroup.getBoundingClientRect().height + ); + container.classList.remove("selected"); + } + this._radiogroup.style.minHeight = `${maxHeight}px`; + + if (this._prevLevel !== "custom") { + this._selectedLevel = this._prevLevel; + this._radiogroup.value = this._prevLevel; + } else { + this._radiogroup.selectedItem = null; + } + + this._radiogroup.addEventListener("select", () => { + this._selectedLevel = this._radiogroup.value; + this._updateSelected(); + }); + + this._updateSelected(); + }, + + /** + * Update the UI in response to a change in selection. + */ + _updateSelected() { + this._acceptButton.disabled = + !this._selectedLevel || this._selectedLevel === this._prevLevel; + // Have the container's `selected` CSS class match the selection state of + // the radio elements. + for (const { container, radio } of this._radioOptions) { + container.classList.toggle("selected", radio.selected); + } + }, + + /** + * Commit the change in security level and restart the browser. + */ + _commitChange() { + SecurityLevelPrefs.setSecurityLevelBeforeRestart(this._selectedLevel); + Services.startup.quit( + Services.startup.eAttemptQuit | Services.startup.eRestart + ); + }, +}; + +// Initial focus is not visible, even if opened with a keyboard. We avoid the +// default handler and manage the focus ourselves, which will paint the focus +// ring by default. +// NOTE: A side effect is that the focus ring will show even if the user opened +// with a mouse event. +// TODO: Remove this once bugzilla bug 1708261 is resolved. +document.subDialogSetDefaultFocus = () => { + document.getElementById("security-level-radiogroup").focus(); +}; + +// Delay showing and sizing the subdialog until it is fully initialised. +document.mozSubdialogReady = new Promise(resolve => { + window.addEventListener( + "DOMContentLoaded", + () => { + gSecurityLevelDialog.init().finally(resolve); + }, + { once: true } + ); +}); ===================================== browser/components/securitylevel/content/securityLevelDialog.xhtml ===================================== @@ -0,0 +1,86 @@ +<?xml version="1.0"?> + +<window + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml" + data-l10n-id="security-level-dialog-window" +> + <dialog id="security-level-dialog" buttons="accept,cancel"> + <linkset> + <html:link rel="stylesheet" href="chrome://global/skin/global.css" /> +  + <html:link + rel="stylesheet" + href="chrome://global/skin/in-content/common.css" + /> + <html:link + rel="stylesheet" + href="chrome://browser/skin/preferences/preferences.css" + /> + <html:link + rel="stylesheet" + href="chrome://browser/skin/preferences/privacy.css" + /> + <html:link + rel="stylesheet" + href="chrome://browser/content/securitylevel/securityLevelPreferences.css" + /> + + <html:link rel="localization" href="branding/brand.ftl" /> + <html:link rel="localization" href="toolkit/global/base-browser.ftl" /> + </linkset> + + <script src="chrome://browser/content/securitylevel/securityLevelDialog.js" /> + + <description data-l10n-id="security-level-dialog-restart-description" /> + + <radiogroup id="security-level-radiogroup" class="highlighting-group"> + <html:div + class="security-level-radio-container security-level-grid privacy-detailedoption info-box-container" + > + <radio + class="security-level-radio security-level-name" + value="standard" + data-l10n-id="security-level-preferences-level-standard" + /> + <html:div + class="security-level-current-badge" + data-l10n-id="security-level-preferences-current-badge" + ></html:div> + </html:div> + <html:div + class="security-level-radio-container security-level-grid privacy-detailedoption info-box-container" + > + <radio + class="security-level-radio security-level-name" + value="safer" + data-l10n-id="security-level-preferences-level-safer" + /> + <html:div + class="security-level-current-badge" + data-l10n-id="security-level-preferences-current-badge" + ></html:div> + </html:div> + <html:div + class="security-level-radio-container security-level-grid privacy-detailedoption info-box-container" + > + <radio + class="security-level-radio security-level-name" + value="safest" + data-l10n-id="security-level-preferences-level-safest" + /> + <html:div + class="security-level-current-badge" + data-l10n-id="security-level-preferences-current-badge" + ></html:div> + </html:div> + </radiogroup> + </dialog> +</window> ===================================== browser/components/securitylevel/content/securityLevelPanel.css ===================================== @@ -23,7 +23,7 @@ background-position-x: right var(--background-inline-offset); } -#securityLevel-background[level="standard"] { +#securityLevel-background:is([level="standard"], [level="custom"]) { background-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#standard"); } @@ -49,14 +49,6 @@ font-weight: 600; } -#securityLevel-custom { - border-radius: 4px; - background-color: var(--warning-icon-bgcolor); - color: black; - padding: 0.4em 0.5em; - margin-inline-start: 1em; -} - #securityLevel-summary { padding-inline-end: 5em; max-width: 20em; ===================================== browser/components/securitylevel/content/securityLevelPanel.inc.xhtml ===================================== @@ -15,10 +15,6 @@ <vbox id="securityLevel-background" class="panel-subview-body"> <html:p id="securityLevel-subheading"> <html:span id="securityLevel-level"></html:span> - <html:span - id="securityLevel-custom" - data-l10n-id="security-level-panel-custom-badge" - ></html:span> </html:p> <html:p id="securityLevel-summary"></html:p> <html:a @@ -32,12 +28,8 @@ <button id="securityLevel-settings" class="footer-button" + default="true" data-l10n-id="security-level-panel-open-settings-button" /> - <button - id="securityLevel-restoreDefaults" - class="footer-button" - data-l10n-id="security-level-restore-defaults-button" - /> </html:moz-button-group> </panel> ===================================== browser/components/securitylevel/content/securityLevelPreferences.css ===================================== @@ -1,26 +1,166 @@ -#securityLevel-groupbox { - --section-highlight-background-color: color-mix(in srgb, var(--in-content-accent-color) 20%, transparent); +.security-level-grid { + display: grid; + grid-template: + "icon name badge button" min-content + "icon summary summary button" auto + "icon extra extra ." auto + / max-content max-content 1fr max-content; } -#securityLevel-customNotification { - /* Spacing similar to #fpiIncompatibilityWarning. */ - margin-block: 16px; +.security-level-icon { + grid-area: icon; + align-self: start; + width: 24px; + height: 24px; + -moz-context-properties: fill; + fill: var(--in-content-icon-color); + margin-block-start: var(--space-xsmall); + margin-inline-end: var(--space-large); } -.info-icon.securityLevel-custom-warning-icon { - list-style-image: url("chrome://global/skin/icons/warning.svg"); +.security-level-current-badge { + grid-area: badge; + align-self: center; + justify-self: start; + white-space: nowrap; + background: var(--background-color-information); + color: inherit; + font-size: var(--font-size-small); + border-radius: var(--border-radius-circle); + margin-inline-start: var(--space-small); + padding-block: var(--space-xsmall); + padding-inline: var(--space-small); } -#securityLevel-customHeading { +.security-level-current-badge span { + /* Still accessible to screen reader, but not visual. + * Keep inline, but with no layout width. */ + display: inline-block; + width: 1px; + margin-inline-end: -1px; + clip-path: inset(50%); +} + +@media (prefers-contrast) and (not (forced-colors)) { + .security-level-current-badge { + /* Match the checkbox/radio colors. */ + background: var(--color-accent-primary); + color: var(--button-text-color-primary); + } +} + +@media (forced-colors) { + .security-level-current-badge { + /* Match the checkbox/radio/selected colors. */ + background: SelectedItem; + color: SelectedItemText; + } +} + +.security-level-name { + grid-area: name; font-weight: bold; + align-self: center; + white-space: nowrap; +} + +.security-level-description { + display: grid; + grid-column: summary-start / extra-end; + grid-row: summary-start / extra-end; + grid-template-rows: subgrid; + grid-template-columns: subgrid; + margin-block-start: var(--space-small); +} + +.security-level-summary { + grid-area: summary; +} + +.security-level-description-extra { + grid-area: extra; + margin-block: var(--space-medium) 0; + margin-inline: var(--space-large) 0; + padding: 0; +} + +.security-level-description-bullet:not(:last-child) { + margin-block-end: var(--space-medium); +} + +/* Tweak current security level display. */ + +#security-level-current { + margin-block-start: var(--space-large); + background: var(--in-content-box-background); + border: 1px solid var(--in-content-box-border-color); + border-radius: var(--border-radius-small); + padding: var(--space-medium); +} + +#security-level-change { + grid-area: button; + align-self: center; + margin: 0; + margin-inline-start: var(--space-large); +} + +/* Adjust which content is visible depending on the current security level. */ + +#security-level-current:not([data-current-level="standard"]) .security-level-current-standard { + display: none; +} + +#security-level-current:not([data-current-level="safer"]) .security-level-current-safer { + display: none; +} + +#security-level-current:not([data-current-level="safest"]) .security-level-current-safest { + display: none; +} + +#security-level-current:not([data-current-level="custom"]) .security-level-current-custom { + display: none; +} + +#security-level-current[data-current-level="standard"] .security-level-icon { + content: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#standard"); +} + +#security-level-current[data-current-level="safer"] .security-level-icon { + content: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safer"); +} + +#security-level-current[data-current-level="safest"] .security-level-icon { + content: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safest"); +} + +#security-level-current[data-current-level="custom"] .security-level-icon { + content: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#standard_custom"); +} + +/* Tweak security level dialog. */ + +#security-level-radiogroup { + margin-block: var(--space-large) var(--space-xlarge); +} + +.security-level-radio-container { + padding-block: var(--space-large); +} + +#security-level-radiogroup .security-level-radio { + margin: 0; } -#securityLevel-radiogroup[disabled] { - opacity: 0.5; +#security-level-radiogroup .radio-label-box { + /* .security-level-current-badge already has a margin. */ + margin: 0; } -/* Overwrite the rule in common-shared.css so we don't get 0.25 opacity overall - * on the radio text. */ -#securityLevel-radiogroup[disabled] radio[disabled] .radio-label-box { - opacity: 1.0; +#security-level-radiogroup .privacy-detailedoption.security-level-radio-container:not(.selected) .security-level-description-extra { + /* .privacy-detailedoption uses visibility: hidden, which does not work with + * our grid display (the margin is still reserved) so we use display: none + * instead. */ + display: none; } ===================================== browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml ===================================== @@ -17,112 +17,19 @@ data-l10n-id="security-level-preferences-learn-more-link" ></html:a> </description> - <hbox - id="securityLevel-customNotification" - class="info-box-container" - flex="1" - > - <hbox class="info-icon-container"> - <image class="info-icon securityLevel-custom-warning-icon"/> - </hbox> - <vbox flex="1"> - <label - id="securityLevel-customHeading" - data-l10n-id="security-level-preferences-custom-heading" - /> - <description - id="securityLevel-customDescription" - data-l10n-id="security-level-summary-custom" - flex="1" - /> - </vbox> - <hbox align="center"> - <button - id="securityLevel-restoreDefaults" - data-l10n-id="security-level-restore-defaults-button" - /> - </hbox> - </hbox> - <radiogroup id="securityLevel-radiogroup"> - <vbox class="securityLevel-radio-option privacy-detailedoption info-box-container"> - <radio - value="standard" - data-l10n-id="security-level-preferences-level-standard" - aria-describedby="securityLevelSummary-standard" - /> - <vbox id="securityLevelSummary-standard" class="indent"> - <label data-l10n-id="security-level-summary-standard" /> - </vbox> - </vbox> - <vbox class="securityLevel-radio-option privacy-detailedoption info-box-container"> -  - <radio - value="safer" - data-l10n-id="security-level-preferences-level-safer" - aria-describedby="securityLevelSummary-safer" - /> - <vbox id="securityLevelSummary-safer" class="indent"> - <label data-l10n-id="security-level-summary-safer" /> - <vbox class="privacy-extra-information"> - <vbox class="indent"> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-https-only-javascript" - /> - </hbox> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-limit-font-and-symbols" - /> - </hbox> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-limit-media" - /> - </hbox> - </vbox> - </vbox> - </vbox> - </vbox> - <vbox class="securityLevel-radio-option privacy-detailedoption info-box-container"> - <radio - value="safest" - data-l10n-id="security-level-preferences-level-safest" - aria-describedby="securityLevelSummary-safest" - /> - <vbox id="securityLevelSummary-safest" class="indent"> - <label data-l10n-id="security-level-summary-safest" /> - <vbox class="privacy-extra-information"> - <vbox class="indent"> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-disabled-javascript" - /> - </hbox> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-limit-font-and-symbols-and-images" - /> - </hbox> - <hbox class="extra-information-label"> - <label - class="content-blocking-label" - data-l10n-id="security-level-preferences-bullet-limit-media" - /> - </hbox> - </vbox> - </vbox> - </vbox> - </vbox> - </radiogroup> + <html:div id="security-level-current" class="security-level-grid"> + <html:img + class="security-level-icon" + alt="" + /> + <html:div + class="security-level-current-badge" + data-l10n-id="security-level-preferences-current-badge" + ></html:div> + <html:button + id="security-level-change" + data-l10n-id="security-level-preferences-change-button" + ></html:button> + </html:div> </vbox> </groupbox> ===================================== browser/components/securitylevel/jar.mn ===================================== @@ -4,3 +4,5 @@ browser.jar: content/browser/securitylevel/securityLevelButton.css (content/securityLevelButton.css) content/browser/securitylevel/securityLevelPreferences.css (content/securityLevelPreferences.css) content/browser/securitylevel/securityLevelIcon.svg (content/securityLevelIcon.svg) + content/browser/securitylevel/securityLevelDialog.xhtml (content/securityLevelDialog.xhtml) + content/browser/securitylevel/securityLevelDialog.js (content/securityLevelDialog.js) ===================================== browser/components/securitylevel/moz.build ===================================== @@ -1 +1,5 @@ JAR_MANIFESTS += ["jar.mn"] + +EXTRA_JS_MODULES += [ + "SecurityLevelUIUtils.sys.mjs", +] ===================================== browser/modules/SecurityLevelRestartNotification.sys.mjs ===================================== @@ -0,0 +1,72 @@ +const lazy = {}; + +ChromeUtils.defineESModuleGetters(lazy, { + BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs", + SecurityLevelPrefs: "resource://gre/modules/SecurityLevel.sys.mjs", +}); + +ChromeUtils.defineLazyGetter(lazy, "NotificationStrings", function () { + return new Localization([ + "branding/brand.ftl", + "toolkit/global/base-browser.ftl", + ]); +}); + +/** + * Interface for showing the security level restart notification on desktop. + */ +export const SecurityLevelRestartNotification = { + /** + * Whether we have already been initialised. + * + * @type {boolean} + */ + _initialized: false, + + /** + * Called when the UI is ready to show a notification. + */ + ready() { + if (this._initialized) { + return; + } + this._initialized = true; + lazy.SecurityLevelPrefs.setRestartNotificationHandler(this); + }, + + /** + * Show the restart notification, and perform the restart if the user agrees. + */ + async tryRestartBrowser() { + const [titleText, bodyText, primaryButtonText, secondaryButtonText] = + await lazy.NotificationStrings.formatValues([ + { id: "security-level-restart-prompt-title" }, + { id: "security-level-restart-prompt-body" }, + { id: "security-level-restart-prompt-button-restart" }, + { id: "security-level-restart-prompt-button-ignore" }, + ]); + const buttonFlags = + Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_0 + + Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_1; + + const propBag = await Services.prompt.asyncConfirmEx( + lazy.BrowserWindowTracker.getTopWindow()?.browsingContext ?? null, + Services.prompt.MODAL_TYPE_INTERNAL_WINDOW, + titleText, + bodyText, + buttonFlags, + primaryButtonText, + secondaryButtonText, + null, + null, + null, + {} + ); + + if (propBag.get("buttonNumClicked") === 0) { + Services.startup.quit( + Services.startup.eAttemptQuit | Services.startup.eRestart + ); + } + }, +}; ===================================== browser/modules/moz.build ===================================== @@ -126,6 +126,7 @@ EXTRA_JS_MODULES += [ "PermissionUI.sys.mjs", "ProcessHangMonitor.sys.mjs", "Sanitizer.sys.mjs", + "SecurityLevelRestartNotification.sys.mjs", "SelectionChangedMenulist.sys.mjs", "SiteDataManager.sys.mjs", "SitePermissions.sys.mjs", ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorAndroidIntegration.java ===================================== @@ -49,6 +49,9 @@ public class TorAndroidIntegration implements BundleEventListener { private static final String EVENT_SETTINGS_CHANGED = "GeckoView:Tor:SettingsChanged"; // Events we emit + // TODO: Integrate the security level API. tor-browser#43820 + private static final String EVENT_SECURITY_LEVEL_GET = "GeckoView:Tor:SecurityLevelGet"; + private static final String EVENT_SECURITY_LEVEL_SET_BEFORE_RESTART = "GeckoView:Tor:SecurityLevelSetBeforeRestart"; private static final String EVENT_SETTINGS_GET = "GeckoView:Tor:SettingsGet"; private static final String EVENT_SETTINGS_SET = "GeckoView:Tor:SettingsSet"; private static final String EVENT_BOOTSTRAP_BEGIN = "GeckoView:Tor:BootstrapBegin"; ===================================== toolkit/components/extensions/ExtensionParent.sys.mjs ===================================== @@ -2345,6 +2345,7 @@ async function torSendExtensionMessage(extensionId, message) { const result = await ProxyMessenger.conduit.castRuntimeMessage("messenger", { extensionId, holder: new StructuredCloneHolder("torSendExtensionMessage", null, message), + query: true, firstResponse: true, sender: { id: extensionId, ===================================== toolkit/components/securitylevel/SecurityLevel.sys.mjs ===================================== @@ -16,6 +16,7 @@ const BrowserTopics = Object.freeze({ // The Security Settings prefs in question. const kSliderPref = "browser.security_level.security_slider"; const kCustomPref = "browser.security_level.security_custom"; +const kNoScriptInitedPref = "browser.security_level.noscript_inited"; // __getPrefValue(prefName)__ // Returns the current value of a preference, regardless of its type. @@ -32,11 +33,11 @@ var getPrefValue = function (prefName) { } }; -// __bindPref(prefName, prefHandler, init)__ +// __bindPref(prefName, prefHandler)__ // Applies prefHandler whenever the value of the pref changes. // If init is true, applies prefHandler to the current value. -// Returns a zero-arg function that unbinds the pref. -var bindPref = function (prefName, prefHandler, init = false) { +// Returns the observer that was added. +var bindPref = function (prefName, prefHandler) { let update = () => { prefHandler(getPrefValue(prefName)); }, @@ -48,21 +49,9 @@ var bindPref = function (prefName, prefHandler, init = false) { }, }; Services.prefs.addObserver(prefName, observer); - if (init) { - update(); - } - return () => { - Services.prefs.removeObserver(prefName, observer); - }; + return observer; }; -// __bindPrefAndInit(prefName, prefHandler)__ -// Applies prefHandler to the current value of pref specified by prefName. -// Re-applies prefHandler whenever the value of the pref changes. -// Returns a zero-arg function that unbinds the pref. -var bindPrefAndInit = (prefName, prefHandler) => - bindPref(prefName, prefHandler, true); - async function waitForExtensionMessage(extensionId, checker = () => {}) { const { torWaitForExtensionMessage } = lazy.ExtensionParent; if (torWaitForExtensionMessage) { @@ -74,7 +63,7 @@ async function waitForExtensionMessage(extensionId, checker = () => {}) { async function sendExtensionMessage(extensionId, message) { const { torSendExtensionMessage } = lazy.ExtensionParent; if (torSendExtensionMessage) { - return torSendExtensionMessage(extensionId, message); + return await torSendExtensionMessage(extensionId, message); } return undefined; } @@ -187,14 +176,8 @@ var initializeNoScriptControl = () => { // `browser.runtime.onMessage.addListener(...)` in NoScript's bg/main.js. // TODO: Is there a better way? - let sendNoScriptSettings = settings => - sendExtensionMessage(noscriptID, settings); - - // __setNoScriptSafetyLevel(safetyLevel)__. - // Set NoScript settings according to a particular safety level - // (security slider level): 0 = Standard, 1 = Safer, 2 = Safest - let setNoScriptSafetyLevel = safetyLevel => - sendNoScriptSettings(noscriptSettings(safetyLevel)); + let sendNoScriptSettings = async settings => + await sendExtensionMessage(noscriptID, settings); // __securitySliderToSafetyLevel(sliderState)__. // Converts the "browser.security_level.security_slider" pref value @@ -204,36 +187,46 @@ var initializeNoScriptControl = () => { // Wait for the first message from NoScript to arrive, and then // bind the security_slider pref to the NoScript settings. - let messageListener = a => { + let messageListener = async a => { try { logger.debug("Message received from NoScript:", a); - let noscriptPersist = Services.prefs.getBoolPref( - "browser.security_level.noscript_persist", - false - ); + const persistPref = "browser.security_level.noscript_persist"; + let noscriptPersist = Services.prefs.getBoolPref(persistPref, false); let noscriptInited = Services.prefs.getBoolPref( - "browser.security_level.noscript_inited", + kNoScriptInitedPref, false ); - // Set the noscript safety level once if we have never run noscript - // before, or if we are not allowing noscript per-site settings to be - // persisted between browser sessions. Otherwise make sure that the - // security slider position, if changed, will rewrite the noscript - // settings. - bindPref( - kSliderPref, - sliderState => - setNoScriptSafetyLevel(securitySliderToSafetyLevel(sliderState)), - !noscriptPersist || !noscriptInited - ); - if (!noscriptInited) { - Services.prefs.setBoolPref( - "browser.security_level.noscript_inited", - true + // Set the noscript safety level once at startup. + // If a user has set noscriptPersist, then we only send this if the + // security level was changed in a previous session. + // NOTE: We do not re-send this when the security_slider preference + // changes mid-session because this should always require a restart. + if (noscriptPersist && noscriptInited) { + logger.warn( + `Not initialising NoScript since the user has set ${persistPref}` ); + return; } + // Read the security level, even if the user has the "custom" + // preference. + const securityIndex = Services.prefs.getIntPref(kSliderPref, 0); + const safetyLevel = securitySliderToSafetyLevel(securityIndex); + // May throw if NoScript fails to apply the settings: + const noscriptResult = await sendNoScriptSettings( + noscriptSettings(safetyLevel) + ); + // Mark the NoScript extension as initialised so we do not reset it + // at the next startup for noscript_persist users. + Services.prefs.setBoolPref(kNoScriptInitedPref, true); + logger.info("NoScript successfully initialised."); + // In the future NoScript may tell us more about how it applied our + // settings, e.g. if user is overriding per-site permissions. + // Up to NoScript 12.6 noscriptResult is undefined. + logger.debug("NoScript response:", noscriptResult); } catch (e) { - logger.exception(e); + logger.error("Could not apply NoScript settings", e); + // Treat as a custom security level for the rest of the session. + Services.prefs.setBoolPref(kCustomPref, true); } }; waitForExtensionMessage(noscriptID, a => a.__meta.name === "started").then( @@ -242,6 +235,8 @@ var initializeNoScriptControl = () => { logger.info("Listening for messages from NoScript."); } catch (e) { logger.exception(e); + // Treat as a custom security level for the rest of the session. + Services.prefs.setBoolPref(kCustomPref, true); } }; @@ -271,16 +266,60 @@ const kSecuritySettings = { // ### Prefs +/** + * Amend the security level index to a standard value. + * + * @param {integer} index - The input index value. + * @returns {integer} - A standard index value. + */ +function fixupIndex(index) { + if (!Number.isInteger(index) || index < 1 || index > 4) { + // Unexpected value out of range, go to the "safest" level as a fallback. + return 1; + } + if (index === 3) { + // Migrate from old medium-low (3) to new medium (2). + return 2; + } + return index; +} + +/** + * A list of preference observers that should be disabled whilst we write our + * preference values. + * + * @type {{ prefName: string, observer: object }[]} + */ +const prefObservers = []; + // __write_setting_to_prefs(settingIndex)__. // Take a given setting index and write the appropriate pref values // to the pref database. var write_setting_to_prefs = function (settingIndex) { - Object.keys(kSecuritySettings).forEach(prefName => - Services.prefs.setBoolPref( - prefName, - kSecuritySettings[prefName][settingIndex] - ) - ); + settingIndex = fixupIndex(settingIndex); + // Don't want to trigger our internal observers when setting ourselves. + for (const { prefName, observer } of prefObservers) { + Services.prefs.removeObserver(prefName, observer); + } + try { + // Make sure noscript is re-initialised at the next startup when the + // security level changes. + Services.prefs.setBoolPref(kNoScriptInitedPref, false); + Services.prefs.setIntPref(kSliderPref, settingIndex); + // NOTE: We do not clear kCustomPref. Instead, we rely on the preference + // being cleared on the next startup. + Object.keys(kSecuritySettings).forEach(prefName => + Services.prefs.setBoolPref( + prefName, + kSecuritySettings[prefName][settingIndex] + ) + ); + } finally { + // Re-add the observers. + for (const { prefName, observer } of prefObservers) { + Services.prefs.addObserver(prefName, observer); + } + } }; // __read_setting_from_prefs()__. @@ -309,24 +348,6 @@ var read_setting_from_prefs = function (prefNames) { return null; }; -// __watch_security_prefs(onSettingChanged)__. -// Whenever a pref bound to the security slider changes, onSettingChanged -// is called with the new security setting value (1,2,3,4 or null). -// Returns a zero-arg function that ends this binding. -var watch_security_prefs = function (onSettingChanged) { - let prefNames = Object.keys(kSecuritySettings); - let unbindFuncs = []; - for (let prefName of prefNames) { - unbindFuncs.push( - bindPrefAndInit(prefName, () => - onSettingChanged(read_setting_from_prefs()) - ) - ); - } - // Call all the unbind functions. - return () => unbindFuncs.forEach(unbind => unbind()); -}; - // __initialized__. // Have we called initialize() yet? var initializedSecPrefs = false; @@ -342,36 +363,82 @@ var initializeSecurityPrefs = function () { } logger.info("Initializing security-prefs.js"); initializedSecPrefs = true; - // When security_custom is set to false, apply security_slider setting - // to the security-sensitive prefs. - bindPrefAndInit(kCustomPref, function (custom) { - if (custom === false) { - write_setting_to_prefs(Services.prefs.getIntPref(kSliderPref)); - } - }); - // If security_slider is given a new value, then security_custom should - // be set to false. - bindPref(kSliderPref, function (prefIndex) { + + const wasCustom = Services.prefs.getBoolPref(kCustomPref, false); + // For new profiles with no user preference, the security level should be "4" + // and it should not be custom. + let desiredIndex = Services.prefs.getIntPref(kSliderPref, 4); + desiredIndex = fixupIndex(desiredIndex); + // Make sure the user has a set preference user value. + Services.prefs.setIntPref(kSliderPref, desiredIndex); + Services.prefs.setBoolPref(kCustomPref, wasCustom); + + // Make sure that the preference values at application startup match the + // expected values for the desired security level. See tor-browser#43783. + + // NOTE: We assume that the controlled preference values that are read prior + // to profile-after-change do not change in value before this method is + // called. I.e. we expect the current preference values to match the + // preference values that were used during the application initialisation. + const effectiveIndex = read_setting_from_prefs(); + + if (wasCustom && effectiveIndex !== null) { + logger.info(`Custom startup values match index ${effectiveIndex}`); + // Do not consider custom any more. + // NOTE: This level needs to be set before it is read elsewhere. In + // particular, for the NoScript addon. Services.prefs.setBoolPref(kCustomPref, false); - write_setting_to_prefs(prefIndex); + Services.prefs.setIntPref(kSliderPref, effectiveIndex); + } else if (!wasCustom && effectiveIndex !== desiredIndex) { + // NOTE: We assume all our controlled preferences require a restart. + // In practice, only a subset of these preferences may actually require a + // restart, so we could switch their values. But we treat them all the same + // for simplicity, consistency and stability in case mozilla changes the + // restart requirements. + logger.info(`Startup values do not match for index ${desiredIndex}`); + SecurityLevelPrefs.requireRestart(); + } + + // Start listening for external changes to the controlled preferences. + prefObservers.push({ + prefName: kCustomPref, + observer: bindPref(kCustomPref, custom => { + // Custom flag was removed mid-session. Requires a restart to apply the + // security level. + if (custom === false) { + logger.info("Custom flag was cleared externally"); + SecurityLevelPrefs.requireRestart(); + } + }), }); - // If a security-sensitive pref changes, then decide if the set of pref values - // constitutes a security_slider setting or a custom value. - watch_security_prefs(settingIndex => { - if (settingIndex === null) { - Services.prefs.setBoolPref(kCustomPref, true); - } else { - Services.prefs.setIntPref(kSliderPref, settingIndex); - Services.prefs.setBoolPref(kCustomPref, false); - } + prefObservers.push({ + prefName: kSliderPref, + observer: bindPref(kSliderPref, () => { + // Security level was changed mid-session. Requires a restart to apply. + logger.info("Security level was changed externally"); + SecurityLevelPrefs.requireRestart(); + }), }); - // Migrate from old medium-low (3) to new medium (2). - if ( - Services.prefs.getBoolPref(kCustomPref) === false && - Services.prefs.getIntPref(kSliderPref) === 3 - ) { - Services.prefs.setIntPref(kSliderPref, 2); - write_setting_to_prefs(2); + + for (const prefName of Object.keys(kSecuritySettings)) { + prefObservers.push({ + prefName, + observer: bindPref(prefName, () => { + logger.warn( + `The controlled preference ${prefName} was changed externally.` + + " Treating as a custom security level." + ); + // Something outside of this module changed the preference value for a + // preference we control. + // Always treat as a custom security level for the rest of this session, + // even if the new preference values match a pre-set security level. We + // do this because some controlled preferences require a restart to be + // properly applied. See tor-browser#43783. + // In the case where it does match a pre-set security level, the custom + // flag will be cleared at the next startup. + Services.prefs.setBoolPref(kCustomPref, true); + }), + }); } logger.info("security-prefs.js initialization complete"); @@ -425,8 +492,9 @@ export class SecurityLevel { init() { migratePreferences(); - initializeNoScriptControl(); + // Fixup our preferences before we pass on the security level to NoScript. initializeSecurityPrefs(); + initializeNoScriptControl(); } observe(aSubject, aTopic) { @@ -436,10 +504,19 @@ export class SecurityLevel { } } +/** + * @typedef {object} SecurityLevelRestartNotificationHandler + * + * An object that can serve the user a restart notification. + * + * @property {Function} tryRestartBrowser - The method that should be called to + * ask the user to restart the browser. + */ + /* Security Level Prefs - Getters and Setters for relevant torbutton prefs + Getters and Setters for relevant security level prefs */ export const SecurityLevelPrefs = { SecurityLevels: Object.freeze({ @@ -450,6 +527,14 @@ export const SecurityLevelPrefs = { security_slider_pref: "browser.security_level.security_slider", security_custom_pref: "browser.security_level.security_custom", + /** + * The current security level preference. + * + * This ignores any custom settings the user may have changed, and just + * gives the underlying security level. + * + * @type {?string} + */ get securityLevel() { // Set the default return value to 0, which won't match anything in // SecurityLevels. @@ -459,18 +544,146 @@ export const SecurityLevelPrefs = { )?.[0]; }, - set securityLevel(level) { - const val = this.SecurityLevels[level]; - if (val !== undefined) { - Services.prefs.setIntPref(this.security_slider_pref, val); - } + /** + * Set the desired security level just before a restart. + * + * The caller must restart the browser after calling this method. + * + * @param {string} level - The name of the new security level to set. + */ + setSecurityLevelBeforeRestart(level) { + write_setting_to_prefs(this.SecurityLevels[level]); }, + /** + * Whether the user has any custom setting values that do not match a pre-set + * security level. + * + * @type {boolean} + */ get securityCustom() { return Services.prefs.getBoolPref(this.security_custom_pref); }, - set securityCustom(val) { - Services.prefs.setBoolPref(this.security_custom_pref, val); + /** + * A summary of the current security level. + * + * If the user has some custom settings, this returns "custom". Otherwise + * returns the name of the security level. + * + * @type {string} + */ + get securityLevelSummary() { + if (this.securityCustom) { + return "custom"; + } + return this.securityLevel ?? "custom"; + }, + + /** + * Whether the browser should be restarted to apply the security level. + * + * @type {boolean} + */ + _needRestart: false, + + /** + * The external handler that can show a notification to the user, if any. + * + * @type {?SecurityLevelRestartNotificationHandler} + */ + _restartNotificationHandler: null, + + /** + * Set the external handler for showing notifications to the user. + * + * This should only be called once per session once the handler is ready to + * show a notification, which may occur immediately during this call. + * + * @param {SecurityLevelRestartNotificationHandler} handler - The new handler + * to use. + */ + setRestartNotificationHandler(handler) { + logger.info("Restart notification handler is set"); + this._restartNotificationHandler = handler; + if (this._needRestart) { + // Show now using the new handler. + this._tryShowRestartNotification(); + } + }, + + /** + * A promise for any ongoing notification prompt task. + * + * @type {Promise} + */ + _restartNotificationPromise: null, + + /** + * Try show a notification to the user. + * + * If no notification handler has been attached yet, this will do nothing. + */ + async _tryShowRestartNotification() { + if (!this._restartNotificationHandler) { + logger.info("Missing a restart notification handler"); + // This may be added later in the session. + return; + } + + const prevPromise = this._restartNotificationPromise; + let resolve; + ({ promise: this._restartNotificationPromise, resolve } = + Promise.withResolvers()); + await prevPromise; + + try { + await this._restartNotificationHandler?.tryRestartBrowser(); + } finally { + // Allow the notification to be shown again. + resolve(); + } + }, + + /** + * Mark the session as requiring a restart to apply a change in security + * level. + * + * The security level will immediately be switched to "custom", and the user + * may be shown a notification to restart the browser. + */ + requireRestart() { + logger.warn("The browser needs to be restarted to set the security level"); + // Treat as a custom security level for the rest of the session. + // At the next startup, the custom flag may be cleared if the settings are + // as expected. + Services.prefs.setBoolPref(kCustomPref, true); + this._needRestart = true; + + // NOTE: We need to change the controlled security level preferences in + // response to the desired change in security level. We could either: + // 1. Only change the controlled preferences after the user confirms a + // restart. Or + // 2. Change the controlled preferences and then try and ask the user to + // restart. + // + // We choose the latter: + // 1. To allow users to manually restart. + // 2. If the user ignores or misses the notification, they will at least be + // in the correct state when the browser starts again. Although they will + // be in a custom/undefined state in the mean time. + // 3. Currently Android relies on triggering the change in security level + // by setting the browser.security_level.security_slider preference + // value. So it currently uses this path. So we need to set the values + // now, before it preforms a restart. + // TODO: Have android use the `setSecurityLevelBeforeRestart` method + // instead of setting the security_slider preference value directly, so that + // it knows exactly when it can restart the browser. tor-browser#43820 + write_setting_to_prefs(Services.prefs.getIntPref(kSliderPref, 0)); + // NOTE: Even though we have written the preferences, the session should + // still be marked as "custom" because: + // 1. Some preferences require a browser restart to be applied. + // 2. NoScript has not been updated with the new settings. + this._tryShowRestartNotification(); }, }; /* Security Level Prefs */ ===================================== toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== @@ -128,10 +128,6 @@ security-level-toolbar-button-custom = # Uses sentence case in English (US). security-level-panel-heading = Security level - -security-level-panel-level-standard = Standard -security-level-panel-level-safer = Safer -security-level-panel-level-safest = Safest security-level-panel-learn-more-link = Learn more # Button to open security level settings. security-level-panel-open-settings-button = Settings… @@ -141,6 +137,19 @@ security-level-panel-open-settings-button = Settings… security-level-preferences-heading = Security Level security-level-preferences-overview = Disable certain web features that can be used to attack your security and anonymity. security-level-preferences-learn-more-link = Learn more +# Text for a badge that labels the currently active security level. +# The text in between '<span>' and '</span>' should contain some kind of bracket, like '(' and ')', or other punctuation used in your language to separate out text from its surrounding context. This will not be visible, but will be use for screen readers to make it clear that the text is not part of the same sentence. For example, in US English this would be read as "(Current level)", and the full line of text would be read as "Safest (Current level)". +security-level-preferences-current-badge = <span>(</span>Current level<span>)</span> +security-level-preferences-change-button = Change… + +## Security level settings dialog. + +security-level-dialog-window = + .title = Change security level + +# '-brand-short-name' is the localized browser name, like "Tor Browser". +security-level-dialog-restart-description = You will need to restart { -brand-short-name } to apply any changes. This will close all windows and tabs. + security-level-preferences-level-standard = .label = Standard security-level-preferences-level-safer = @@ -148,6 +157,16 @@ security-level-preferences-level-safer = security-level-preferences-level-safest = .label = Safest +security-level-dialog-save-restart = + .label = Save and restart + +## Security level names shown in the security panel and settings. + +security-level-panel-level-standard = Standard +security-level-panel-level-safer = Safer +security-level-panel-level-safest = Safest +security-level-panel-level-custom = Custom + ## Security level summaries shown in security panel and settings. security-level-summary-standard = All browser and website features are enabled. @@ -166,13 +185,13 @@ security-level-preferences-bullet-limit-font-and-symbols-and-images = Some fonts ## Custom security level. ## Some custom preferences configuration has placed the user outside one of the standard three levels. -# Shown in the security level panel as an orange badge next to the expected level. -security-level-panel-custom-badge = Custom -# Shown in the security level settings in a warning box. -security-level-preferences-custom-heading = Custom security level configured # Description of custom state and recommended action. # Shown in the security level panel and settings. security-level-summary-custom = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. -# Button to undo custom changes to the security level and place the user in one of the standard security levels. -# Shown in the security level panel and settings. -security-level-restore-defaults-button = Restore defaults + +## Security level restart prompt. + +security-level-restart-prompt-title = Your security level settings require a restart +security-level-restart-prompt-body = You must restart { -brand-short-name } for your security level settings to be applied. This will close all your windows and tabs. +security-level-restart-prompt-button-restart = Restart +security-level-restart-prompt-button-ignore = Ignore ===================================== toolkit/modules/TorAndroidIntegration.sys.mjs ===================================== @@ -11,6 +11,7 @@ ChromeUtils.defineESModuleGetters(lazy, { TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs", TorProviderTopics: "resource://gre/modules/TorProviderBuilder.sys.mjs", TorSettings: "resource://gre/modules/TorSettings.sys.mjs", + SecurityLevelPrefs: "resources://gre/modules/SecurityLevel.sys.mjs", }); const Prefs = Object.freeze({ @@ -34,6 +35,8 @@ const EmittedEvents = Object.freeze({ }); const ListenedEvents = Object.freeze({ + securityLevelGet: "GeckoView:Tor:SecurityLevelGet", + securityLevelSetBeforeRestart: "GeckoView:Tor:SecurityLevelSetBeforeRestart", settingsGet: "GeckoView:Tor:SettingsGet", // The data is passed directly to TorSettings. settingsSet: "GeckoView:Tor:SettingsSet", @@ -171,6 +174,20 @@ class TorAndroidIntegrationImpl { logger.debug(`Received event ${event}`, data); try { switch (event) { + case ListenedEvents.securityLevelGet: + // "standard"/"safer"/"safest" + // TODO: Switch to securityLevelSummary to allow android to handle + // "custom" security level. tor-browser#43819 + callback?.onSuccess(lazy.SecurityLevelPrefs.securityLevel); + break; + case ListenedEvents.securityLevelSetBeforeRestart: + lazy.SecurityLevelPrefs.setSecurityLevelBeforeRestart(data.levelName); + // Let the caller know that the setting is applied and the browser + // should be restarted now. + // NOTE: The caller must wait for this callback before triggering + // the restart. + callback?.onSuccess(); + break; case ListenedEvents.settingsGet: callback?.onSuccess(lazy.TorSettings.getSettings()); return; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e8925f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e8925f… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41444: Fix android artifacts path (2)
by brizental (＠brizental) 03 Jun '25

03 Jun '25

brizental pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 4727bc62 by Nicolas Vigier at 2025-06-02T08:55:42+02:00 Bug 41444: Fix android artifacts path (2) - - - - - 1 changed file: - projects/browser/build.android Changes: ===================================== projects/browser/build.android ===================================== @@ -121,6 +121,6 @@ apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $ [% END -%] [% IF … [View More]

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-140.0a1-15.0-1-build1
by Pier Angelo Vendrame (＠pierov) 28 May '25

28 May '25

Pier Angelo Vendrame pushed new tag base-browser-140.0a1-15.0-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-140.0a1-15.0-1
by Pier Angelo Vendrame (＠pierov) 28 May '25

28 May '25

Pier Angelo Vendrame pushed new branch base-browser-140.0a1-15.0-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-140.0a1-15.0-1-build1
by Pier Angelo Vendrame (＠pierov) 28 May '25

28 May '25

Pier Angelo Vendrame pushed new tag tor-browser-140.0a1-15.0-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.0a1-15.0-1] 250 commits: BB 41454: Move focus after calling openPreferences for a sub-category.
by Pier Angelo Vendrame (＠pierov) 28 May '25

28 May '25

Pier Angelo Vendrame pushed to branch tor-browser-140.0a1-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 1c62dcd0 by Henry Wilkes at 2025-05-26T17:09:46+02:00 BB 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 6234deaa by Henry Wilkes at 2025-05-26T17:09:46+02:00 BB 43072: Add aria label and description to moz-message-bar. Ensures that moz-message-bar, including notifications, are … [View More]announced on Orca. This addresses upstream bugzilla bug 1895857 and should likely be replaced when it is fixed. - - - - - 22871bbd by Henry Wilkes at 2025-05-26T17:09:47+02:00 BB 42739: Use the brand name for profile error messages. Some messages in profileSelection.properties use gAppData->name as variable inputs. However, gAppData->name is still "Firefox" for our base-browser builds, rather than the user-facing browser name. We swap these instances with the displayed brand name instead. - - - - - e0b3463d by Henry Wilkes at 2025-05-26T17:09:47+02:00 BB 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - 514551af by Marco Simonelli at 2025-05-26T17:09:47+02:00 BB 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - db0eb2d7 by Marco Simonelli at 2025-05-26T17:09:48+02:00 BB 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - 0e04f6e2 by Marco Simonelli at 2025-05-26T17:09:48+02:00 BB 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - 57ae2660 by Marco Simonelli at 2025-05-26T17:09:48+02:00 BB 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - cb1c8f2e by Marco Simonelli at 2025-05-26T17:09:49+02:00 BB 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - f270801c by Marco Simonelli at 2025-05-26T17:09:49+02:00 BB 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - 85b745ac by june wilde at 2025-05-26T17:09:49+02:00 BB 42758: Fix WebRTC build errors. - - - - - 6983b3d4 by Pier Angelo Vendrame at 2025-05-26T17:09:50+02:00 fixup! BB 42758: Fix WebRTC build errors. MB 436: Link to pthread on mingw. - - - - - bf7456e3 by hackademix at 2025-05-26T17:09:50+02:00 BB 41854: Allow overriding download spam protection. - - - - - 77d83e7c by hackademix at 2025-05-26T17:09:50+02:00 BB 42832: Download spam prevention exemption for browser extensions. - - - - - c828018a by Pier Angelo Vendrame at 2025-05-26T17:09:51+02:00 BB 42220: Allow for more file types to be forced-inline. Firefox allows to open some files in the browser without any confirmation, but this will result in a disk leak, because the file will be downloaded to the temporary directory first (and not deleted, in some cases). A preference allows PDFs to be opened without being downloaded to disk. So, we introduce a similar one to do the same for all the files that are set to be opened automatically in the browser. - - - - - 7363fb2b by hackademix at 2025-05-26T17:09:51+02:00 BB 42835: Create an actor to filter file data transfers - - - - - 6cd5e7a4 by Beatriz Rizental at 2025-05-26T17:09:51+02:00 BB 42728: Modify ./mach lint to skip unused linters - - - - - 18bb3759 by Gaba at 2025-05-26T17:09:52+02:00 Adding issue and merge request templates - - - - - 4192c445 by Morgan at 2025-05-26T17:09:52+02:00 fixup! Adding issue and merge request templates revert - - - - - 6d00d585 by Morgan at 2025-05-26T17:09:53+02:00 BB 43615: Add Gitlab Issue and Merge Request templates - - - - - 394898ab by Morgan at 2025-05-26T17:09:53+02:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates add new and modify existing shared Tor/Mullvad browser templates - - - - - fa1f6dc5 by Richard Pospesel at 2025-05-26T17:09:53+02:00 BB 42683: Create script to generate issue triage csv file from bugzilla query and git logs - - - - - 2a69ab71 by Henry Wilkes at 2025-05-26T17:09:54+02:00 BB 42305: Add script to combine translation files across versions. - - - - - 2489421e by Beatriz Rizental at 2025-05-26T17:09:54+02:00 BB 43535: Enable tests - - - - - c4ab567d by Beatriz Rizental at 2025-05-28T15:41:31+02:00 Add CI for Base Browser - - - - - 5d0374cb by Beatriz Rizental at 2025-05-28T15:41:44+02:00 fixup! Add CI for Base Browser - - - - - c0675a5c by Beatriz Rizental at 2025-05-28T15:41:44+02:00 fixup! Add CI for Base Browser Timeout `git fetch` if takes longer than 3min. Long fetched are very expensive and due to the amount of parallel jobs our CI can execute at a time too many long fetches can cause significant slowness on our Gitlab instance. - - - - - 27f34247 by Beatriz Rizental at 2025-05-28T15:41:44+02:00 fixup! Add CI for Base Browser - - - - - 0050e300 by Pier Angelo Vendrame at 2025-05-28T15:41:45+02:00 Base Browser's .mozconfigs. Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 21849: Don't allow SSL key logging. Bug 25741 - TBA: Disable features at compile-time Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 29859: Disable HLS support for now Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 41584: Move some configuration options to base-browser level - - - - - 4c25687d by Pier Angelo Vendrame at 2025-05-28T15:41:45+02:00 fixup! Base Browser's .mozconfigs. BB 43772: Do not use official branding for BB/TB/MB. We already pass --with-branding in our builds, no need to also pass this option. However, we should further audit what this option does, and try to recall why we added it at a certain point. - - - - - 2b316362 by Pier Angelo Vendrame at 2025-05-28T15:41:46+02:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - 938f1225 by Beatriz Rizental at 2025-05-28T15:41:46+02:00 fixup! Tweaks to the build system - - - - - a822cf5d by Pier Angelo Vendrame at 2025-05-28T15:41:46+02:00 BB 29320: Replace the gnu target with gnullvm for Rust. - - - - - 08268254 by Pier Angelo Vendrame at 2025-05-28T15:41:47+02:00 BB 42616: Remove VideoCaptureTest.kt. This is a workaround to fix the GeckoView build with WebRTC disabled. We should replace this workaround with a proper solution, that excludes this test when MOZ_WEBRTC is undefined/False. - - - - - 52e5b614 by Pier Angelo Vendrame at 2025-05-28T15:41:47+02:00 BB 41108: Remove privileged macOS installation from 102 - - - - - e4419bb2 by Dan Ballard at 2025-05-28T15:41:47+02:00 BB 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - 900165b8 by Henry Wilkes at 2025-05-28T15:41:48+02:00 BB 43092: Disable wayland by default in Base Browser. - - - - - ea0e01a5 by Matthew Finkel at 2025-05-28T15:41:48+02:00 BB 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - bc45cfff by Matthew Finkel at 2025-05-28T15:41:48+02:00 BB 28125: Prevent non-Necko network connections - - - - - ddde35fe by Mike Perry at 2025-05-28T15:41:49+02:00 BB 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 49a51c04 by cypherpunks1 at 2025-05-28T15:41:49+02:00 BB 40717: Hide Windows SSO in settings - - - - - 9884ff20 by Georg Koppen at 2025-05-28T15:41:49+02:00 BB 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - a82e5f90 by Kathy Brade at 2025-05-28T15:41:50+02:00 BB 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 382bf2ac by Kathy Brade at 2025-05-28T15:41:50+02:00 BB 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - a289e7df by Alex Catarineu at 2025-05-28T15:41:50+02:00 BB 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - e00de157 by Kathy Brade at 2025-05-28T15:41:50+02:00 BB 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. - - - - - 102c83ee by Morgan at 2025-05-28T15:41:51+02:00 BB 42716: Disable unwanted about: pages - - - - - a4f069da by Arthur Edelstein at 2025-05-28T15:41:51+02:00 BB 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - 7b25e93c by Alex Catarineu at 2025-05-28T15:41:51+02:00 BB 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - 0c62a555 by cypherpunks1 at 2025-05-28T15:41:52+02:00 BB 41092: Add a RemoteSettings JSON dump for query-stripping - - - - - 5cbfb77b by cypherpunks1 at 2025-05-28T15:41:52+02:00 BB 42730: Patch RemoteSettings to use only local dumps as a data source - - - - - d7cf14d6 by Pier Angelo Vendrame at 2025-05-28T15:41:52+02:00 BB 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - 4d0ade2f by Georg Koppen at 2025-05-28T15:41:53+02:00 BB 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 5977dd10 by Alex Catarineu at 2025-05-28T15:41:53+02:00 BB 28369: Stop shipping pingsender executable - - - - - d4cd197b by Henry Wilkes at 2025-05-28T15:41:53+02:00 BB 42630: Disable LaterRun module. - - - - - d8994e73 by Pier Angelo Vendrame at 2025-05-28T15:41:54+02:00 BB 41599: Always return an empty string as network ID Firefox computes an internal network ID used to detect network changes and act consequently (e.g., to improve WebSocket UX). However, there are a few ways to get this internal network ID, so we patch them out, to be sure any new code will not be able to use them and possibly link users. We also sent a patch to Mozilla to seed the internal network ID, to prevent any accidental leak in the future. Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756 - - - - - b2221cc1 by Pier Angelo Vendrame at 2025-05-28T15:41:54+02:00 BB 43386: Use Firefox in the UA in RFP-exempt request. XHR requests initiated by extensions are exempt from RFP. Therefore, they report the actual app name, instead of Firefox, and the actual Firefox minor version. This happens whenever the app name has been customized and does not match a hardcoded "Firefox". - - - - - 582fb566 by Richard Pospesel at 2025-05-28T15:41:54+02:00 BB 41327: Disable UrlbarProviderInterventions - - - - - 239cda66 by Richard Pospesel at 2025-05-28T15:41:55+02:00 BB 42037: Disable about:firefoxview page - - - - - 55ebd812 by Mike Perry at 2025-05-28T15:41:55+02:00 Firefox preference overrides. - - - - - 67857bba by Pier Angelo Vendrame at 2025-05-28T15:41:55+02:00 fixup! Firefox preference overrides. BB 43322: Switch from font whitelist to font visibility. - - - - - 784e69d5 by Pier Angelo Vendrame at 2025-05-28T15:41:56+02:00 fixup! Firefox preference overrides. This reverts commit ce4889c9f51d60761ffcbd416eac50ed6490fed9. - - - - - f1d2dce2 by Neel Chauhan at 2025-05-28T15:41:56+02:00 fixup! Firefox preference overrides. - - - - - fc07d241 by hackademix at 2025-05-28T15:41:56+02:00 fixup! Firefox preference overrides. Disable the UITour API. - - - - - a8ae555a by Pier Angelo Vendrame at 2025-05-28T15:41:56+02:00 BB 43140: Tighten up fonts on Linux. We ship a fontconfig configuration to esnure all Linux users have the same defaults and reduce the chances of fingerprinting. We used to add this file in tor-browser-build, but some users might skip it by using the browser executable without the wrapper script. Therefore, we decided to activate the file with the FontConfig API instead of the environment variables. Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). Bug 43141: Hardcode system-ui to Arimo. - - - - - 99057ccc by Pier Angelo Vendrame at 2025-05-28T15:41:57+02:00 BB 41901: Hardcode normalized FontSubstitutes. Windows has a system to set font aliases through the registry. This allows some customization that could be used as a fingerprinting vector. Moreover, this mechanism is used by Windows itself, and different SKUs might have different default FontSubstitutes. - - - - - 1f42eb59 by Pier Angelo Vendrame at 2025-05-28T15:41:57+02:00 BB 43322: Customize the font visibility lists. Customize the lists of fonts to assign base visibility to in base browser and derivatives. Also, rename the files with the upstream lists, to make sure we do not use them by mistake. - - - - - ee1c5ed2 by Alex Catarineu at 2025-05-28T15:41:57+02:00 BB 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - b67fef89 by Pier Angelo Vendrame at 2025-05-28T15:41:58+02:00 BB 42562: Normalized the Accepted Languages on Android. The OS language might be outside the list of actually supported languages and it might leak the user's region. Therefore, we force the locale reported in Accept-Language to match one we support with translations, even when it means using a not exact region tag. - - - - - 1ab699e3 by Alex Catarineu at 2025-05-28T15:41:58+02:00 BB 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - 6c84558c by Alex Catarineu at 2025-05-28T15:41:58+02:00 BB 26345: Hide tracking protection UI - - - - - 9bb2c24e by Henry Wilkes at 2025-05-28T15:41:59+02:00 BB 43109: Hide Firefox Relay from settings. This should remain disabled, see tor-browser#42814. - - - - - 2782538f by Henry Wilkes at 2025-05-28T15:41:59+02:00 BB 42777: Hide Website Privacy Preferences. We hide the Website Privacy Preferences section, which controls the "global privacy control" (GPC) and "do not track" (DNT) settings. - - - - - eb5cb49b by Morgan at 2025-05-28T15:41:59+02:00 BB 42070: Hide "Use smooth scrolling" from settings - - - - - 4141c66b by Arthur Edelstein at 2025-05-28T15:42:00+02:00 BB 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - 179ad128 by Pier Angelo Vendrame at 2025-05-28T15:42:00+02:00 BB 41739: Remove "Website appearance" from about:preferences. It is ignored because of RFP and it is confusing for users. - - - - - f3f33d38 by Henry Wilkes at 2025-05-28T15:42:00+02:00 BB 43117: Hide "Always underline links" from settings. - - - - - a1e00a1d by Pier Angelo Vendrame at 2025-05-28T15:42:01+02:00 BB 42774: Always hide the third-pary certs UI. - - - - - 95c02c14 by Henry Wilkes at 2025-05-28T15:42:01+02:00 BB 43118: Hide feature recommendation (CFR) settings. - - - - - 26edd84d by Pier Angelo Vendrame at 2025-05-28T15:42:01+02:00 BB 9173: Change the default Firefox profile directory to be relative. This commit makes Firefox look for the default profile directory in a directory relative to the binary path. The directory can be specified through the --with-relative-data-dir. This is relative to the same directory as the firefox main binary for Linux and Windows. On macOS, we remove Contents/MacOS from it. Or, in other words, the directory is relative to the application bundle. This behavior can be overriden at runtime, by placing a file called system-install adjacent to the firefox main binary (also on macOS). - - - - - 10d6ffca by Pier Angelo Vendrame at 2025-05-28T15:42:02+02:00 BB 42773: Replace ~ with the original home. In Bug 93141, Mozilla started sending users to their home when they type ~ in the URL bar. On Linux, we change $HOME for various reason, therefore you would be redirected to the spoofed home directory when typing ~. So, we check if the original home directory is known, and use that, instead. - - - - - 0e277fe6 by Alex Catarineu at 2025-05-28T15:42:02+02:00 BB 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 8990bdb1 by Mike Perry at 2025-05-28T15:42:02+02:00 BB 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - e12e6a5c by Pier Angelo Vendrame at 2025-05-28T15:42:03+02:00 BB 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - 3afd4c53 by Matthew Finkel at 2025-05-28T15:42:03+02:00 BB 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - 8d7c6bb8 by Henry Wilkes at 2025-05-28T15:42:03+02:00 BB 29745: Limit remote access to content accessible resources - - - - - 0ec023ac by cypherpunks1 at 2025-05-28T15:42:03+02:00 BB 33955: When copying an image only copy the image contents to the clipboard - - - - - 3d274eec by cypherpunks1 at 2025-05-28T15:42:04+02:00 BB 41791: Omit the source URL when copying page contents to the clipboard - - - - - 43b9263d by Pier Angelo Vendrame at 2025-05-28T15:42:04+02:00 BB 43196: Remove the vendor name from media notifications on Linux. Firefox shows "vendor remoteName" as a title of the "... is playing media" notification on Linux. However, for our browser the remote name is enough, and prepending the vendor to it creates a string users usually never see. - - - - - c9deac83 by Pier Angelo Vendrame at 2025-05-28T15:42:32+02:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - 084670ab by hackademix at 2025-05-28T15:42:41+02:00 fixup! Base Browser strings BB 41919: Letterboxing, add temporarily visible web content-size indicator on window resizing. - - - - - f07715ed by Henry Wilkes at 2025-05-28T15:42:41+02:00 fixup! Base Browser strings TB 43624: Tweak the string letterboxing-size-status. NOTE: The string has not yet reached translators, so we do not need to change the ID. - - - - - c5b08aae by Henry Wilkes at 2025-05-28T15:42:42+02:00 BB 42583: Modify moz-support-link for Base Browser. - - - - - 046a368e by Pier Angelo Vendrame at 2025-05-28T15:42:42+02:00 BB 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - 8db86712 by p13dz at 2025-05-28T15:42:43+02:00 BB 40283: Workaround for the file upload bug - - - - - 0d944072 by hackademix at 2025-05-28T15:42:43+02:00 BB 42019: Empty browser's clipboard on browser shutdown - - - - - 3934dcf8 by hackademix at 2025-05-28T15:42:43+02:00 BB 42084: Ensure English spoofing works even if preferences are set out of order. - - - - - 8c03211d by Pier Angelo Vendrame at 2025-05-28T15:42:44+02:00 BB 41930: Remove the UI to customize accept_languages. - - - - - 12d9184c by hackademix at 2025-05-28T15:42:44+02:00 BB 32308: Use direct browser sizing for letterboxing. Bug 30556: align letterboxing with 200x100 new win width stepping - - - - - 95f4101c by hackademix at 2025-05-28T15:42:44+02:00 BB 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - e449f16d by Pier Angelo Vendrame at 2025-05-28T15:42:45+02:00 fixup! BB 41631: Prevent weird initial window dimensions caused by subpixel computations BB 43672: Compensate window.resizeTo truncating by ceiling newwin sizes. - - - - - 69e20cdf by hackademix at 2025-05-28T15:42:45+02:00 BB 41918: Option to reuse last window size when letterboxing is enabled. - - - - - 4882e432 by hackademix at 2025-05-28T15:42:45+02:00 BB 41916: Letterboxing preferences UI - - - - - 9785f054 by Beatriz Rizental at 2025-05-28T15:42:46+02:00 fixup! BB 41916: Letterboxing preferences UI - - - - - fa273e5b by hackademix at 2025-05-28T15:42:46+02:00 BB 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 38df892c by hackademix at 2025-05-28T15:42:46+02:00 BB 42443: Shrink window to match letterboxing size when the emtpy area is clicked. - - - - - fb56f0fd by hackademix at 2025-05-28T15:42:46+02:00 BB 41919: Letterboxing, add temporarily visible web content-size indicator on window resizing. - - - - - 542a541d by hackademix at 2025-05-28T15:42:47+02:00 fixup! BB 41919: Letterboxing, add temporarily visible web content-size indicator on window resizing. BB 43632: Letterboxing, always show the correct size for the active tab on resizing. BB 43642: New tab shows letterboxing size indicator. - - - - - ea3b8776 by Henry Wilkes at 2025-05-28T15:42:47+02:00 BB 42528: Don't leak system scrollbar size on windows. - - - - - 0dcb94e1 by Henry Wilkes at 2025-05-28T15:42:47+02:00 BB 31575: Disable Firefox Home (Activity Stream) Treat about:blank as the default home page and new tab page. Avoid loading AboutNewTab in BrowserGlue.sys.mjs in order to avoid several network requests that we do not need. Bug 41624: Disable about:pocket-* pages. Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - bddb558b by Kathy Brade at 2025-05-28T15:42:48+02:00 BB 4234: Use the Firefox Update Process for Base Browser. Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix bug 27221: purge the startup cache if the Base Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Base Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Base Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - 152c980c by Pier Angelo Vendrame at 2025-05-28T15:42:48+02:00 BB 42061: Create an alpha update channel. - - - - - 25fe6882 by Nicolas Vigier at 2025-05-28T15:42:48+02:00 BB 41682: Add base-browser nightly mar signing key - - - - - 295fba39 by Pier Angelo Vendrame at 2025-05-28T15:42:49+02:00 BB 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - 2db64d4e by Pier Angelo Vendrame at 2025-05-28T15:42:49+02:00 BB 42438: Tweaks to the migration wizard. Remove the items not compatible with our features (such as history) from the migration wizard. On Linux, allow to specify an alternative home directory, since we usually change $HOME in our startup script. - - - - - 7fd30f3c by Alex Catarineu at 2025-05-28T15:42:49+02:00 BB 40069: Add helpers for message passing with extensions - - - - - 7419f78d by Matthew Finkel at 2025-05-28T15:42:50+02:00 BB 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 0930d696 by Henry Wilkes at 2025-05-28T15:42:50+02:00 BB 41581: Hide NoScript extension's toolbar button by default. This hides it from both the toolbar and the unified extensions panel. We also hide the unified-extension-button if the panel would be empty: not including the NoScript button when it is hidden. As a result, this will be hidden by default until a user installs another extension (or shows the NoScript button and unpins it). - - - - - 69d2ff3e by hackademix at 2025-05-28T15:42:50+02:00 BB 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons - - - - - 0a681da1 by Pier Angelo Vendrame at 2025-05-28T15:42:51+02:00 BB 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - 28e48f1b by Pier Angelo Vendrame at 2025-05-28T15:42:51+02:00 BB 40926: Implemented the New Identity feature - - - - - a77619cd by Pier Angelo Vendrame at 2025-05-28T15:42:51+02:00 fixup! BB 40926: Implemented the New Identity feature Fixed oncommands - - - - - 0aabef4d by Henry Wilkes at 2025-05-28T15:42:52+02:00 BB 41736: Customize toolbar for base-browser. - - - - - fe2e8642 by Pier Angelo Vendrame at 2025-05-28T15:42:52+02:00 BB 42027: Base Browser migration procedures. This commit implmenents the the Base Browser's version of _migrateUI. - - - - - 6c787fd9 by Henry Wilkes at 2025-05-28T15:42:52+02:00 TB 42308: Create README for tor-browser. We drop the README.txt that comes from Mozilla Firefox and add README.md for tor-browser. - - - - - f1ba33fb by Richard Pospesel at 2025-05-28T15:42:53+02:00 TB 41649: Create rebase and security backport gitlab issue templates - - - - - 58cbfcb3 by Henry Wilkes at 2025-05-28T15:42:53+02:00 fixup! TB 41649: Create rebase and security backport gitlab issue templates TB 43594: Add bugzilla audit issue template. - - - - - 503530cd by Morgan at 2025-05-28T15:42:53+02:00 fixup! TB 41649: Create rebase and security backport gitlab issue templates revert - - - - - 023647fa by Morgan at 2025-05-28T15:42:54+02:00 TB 43616: Customize Gitlab Issue and Merge Request templates - - - - - a91e4c4f by Morgan at 2025-05-28T15:42:54+02:00 fixup! TB 43616: Customize Gitlab Issue and Merge Request templates Tor Browser specific updates - - - - - 63e24fb9 by Beatriz Rizental at 2025-05-28T15:42:54+02:00 Add CI for Tor Browser - - - - - 594cfdbd by Richard Pospesel at 2025-05-28T15:42:55+02:00 TB 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - 19c4154b by Pier Angelo Vendrame at 2025-05-28T15:42:55+02:00 fixup! TB 41089: Add tor-browser build scripts + Makefile to tor-browser TB 43799: Updated the path where APKs are located. - - - - - a61bd581 by Henry Wilkes at 2025-05-28T15:42:55+02:00 TB 41803: Add some developer tools for working on tor-browser. - - - - - 8f6c5717 by Alex Catarineu at 2025-05-28T15:42:55+02:00 Add TorStrings module for localization - - - - - 596bf660 by Henry Wilkes at 2025-05-28T15:42:56+02:00 Tor Browser strings This commit adds all the strings needed for Tor Browser patches. - - - - - 9c64773f by Henry Wilkes at 2025-05-28T15:42:56+02:00 Tor Browser localization migration scripts. - - - - - d72c0e5d by Mike Perry at 2025-05-28T15:42:56+02:00 TB 2176: Rebrand Firefox to TorBrowser See also Bugs #5194, #7187, #8115, #8219. This patch does some basic renaming of Firefox to TorBrowser. The rest of the branding is done by images and icons. Also fix bug 27905. Bug 25702: Update Tor Browser icon to follow design guidelines - Updated all of the branding in /browser/branding/official with new 'stable' icon series. - Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and add the source svg in the same directory - Copied /browser/branding/official over /browser/branding/nightly and the new /browser/branding/alpha directories. Replaced content with 'nightly' and 'alpha' icon series. Updated VisualElements_70.png and VisualElements_150.png with updated icons in each branding directory (fixes #22654) - Updated firefox.VisualElementsManfiest.xml with updated colors in each branding directory - Added firefox.svg to each branding directory from which all the other icons are derived (apart from document.icns and document.ico) - Added default256.png and default512.png icons - Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed original icon - Use the Tor Browser icon within devtools/client/themes/images/. Bug 30631: Blurry Tor Browser icon on macOS app switcher It would seem the png2icns tool does not generate correct icns files and so on macOS the larger icons were missing resulting in blurry icons in the OS chrome. Regenerated the padded icons in a macOS VM using iconutil. Bug 28196: preparations for using torbutton tor-browser-brand.ftl A small change to Fluent FileSource class is required so that we can register a new source without its supported locales being counted as available locales for the browser. Bug 31803: Replaced about:debugging logo with flat version Bug 21724: Make Firefox and Tor Browser distinct macOS apps When macOS opens a document or selects a default browser, it sometimes uses the CFBundleSignature. Changing from the Firefox MOZB signature to a different signature TORB allows macOS to distinguish between Firefox and Tor Browser. Bug 32092: Fix Tor Browser Support link in preferences For bug 40562, we moved onionPattern* from bug 27476 to here, as about:tor needs these files but it is included earlier. Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one Bug 42088: New application icons (used in-app and on linux). Bug 42087: New application icons (windows). - - - - - 5de13b56 by Pier Angelo Vendrame at 2025-05-28T15:42:57+02:00 fixup! TB 2176: Rebrand Firefox to TorBrowser TB 43776: Mark branding files for l10n merge. - - - - - 2d3d397c by Henry Wilkes at 2025-05-28T15:42:57+02:00 Customize moz-toggle for tor-browser. - - - - - 59fd27a5 by Henry Wilkes at 2025-05-28T15:42:57+02:00 TB 43087: Add onion-pattern to be used on Tor pages. - - - - - 7d3002c8 by hackademix at 2025-05-28T15:42:58+02:00 TB 41917: Tor brand-specific styles. - - - - - e49b16da by Henry Wilkes at 2025-05-28T15:42:58+02:00 TB 41817: tor-browser semantic colors. - - - - - c6689731 by Henry Wilkes at 2025-05-28T15:42:58+02:00 TB 42110: Add TorUIUtils module for common tor component methods. - - - - - 6dcabe60 by Henry Wilkes at 2025-05-28T15:42:59+02:00 Add purple tor version of the loading APNG. - - - - - df6624a8 by Henry Wilkes at 2025-05-28T15:42:59+02:00 TB 42583: Modify moz-support-link for Tor Browser. - - - - - d01be18b by sanketh at 2025-05-28T15:42:59+02:00 TB 40209: Implement Basic Crypto Safety Adds a CryptoSafety actor which detects when you've copied a crypto address from a HTTP webpage and shows a warning. Closes #40209. Bug 40428: Fix string attribute names - - - - - a5e0fb06 by Mike Perry at 2025-05-28T15:43:00+02:00 TB3: Tor Browser's official .mozconfigs. Also: Add an --enable-tor-browser-data-outside-app-dir configure option Add --with-tor-browser-version configure option Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. Bug 31935: Disable profile downgrade protection. Since Tor Browser does not support more than one profile, disable the prompt and associated code that offers to create one when a version downgrade situation is detected. Add --enable-tor-browser-update build option Bug 40793: moved Tor configuration options from old-configure.in to moz.configure Bug 41584: Move some configuration options to base-browser level - - - - - 292535dd by Henry Wilkes at 2025-05-28T15:43:00+02:00 TB 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. - - - - - b5f3ac9c by Pier Angelo Vendrame at 2025-05-28T15:43:00+02:00 TB 40562: Added Tor Browser preferences to 000-tor-browser.js Before reordering patches, we used to keep the Tor-related patches (torbutton and tor-launcher) at the beginning. After that issue, we decided to move them towards the end. In addition to that, we have decided to move Tor Browser-only preferences there, too, to make Base Browser-only fixups easier to apply. - - - - - 3a407f20 by Pier Angelo Vendrame at 2025-05-28T15:43:01+02:00 fixup! TB 40562: Added Tor Browser preferences to 000-tor-browser.js TB 43653: Remove spoofOsInUserAgentHeader from 000-tor-browser.js. This pref does not do anything, as its code has been removed for tor-browser#43189. - - - - - 27e95cf8 by Pier Angelo Vendrame at 2025-05-28T15:43:01+02:00 TB 13252: Customize profile management on macOS On macOS we allow both portable mode and system installation. However, in the latter case, we customize Firefox's directories to match the hierarchy we use for the portable mode. Also, display an informative error message if the TorBrowser-Data directory cannot be created due to an "access denied" or a "read only volume" error. - - - - - 309c44c9 by Pier Angelo Vendrame at 2025-05-28T15:43:01+02:00 TB 40933: Add tor-launcher functionality Bug 41926: Reimplement the control port - - - - - cb7ba22c by Cecylia Bocovich at 2025-05-28T15:43:02+02:00 Lox integration - - - - - 1b815495 by Beatriz Rizental at 2025-05-28T15:43:02+02:00 fixup! Lox integration - - - - - ce9b935e by Richard Pospesel at 2025-05-28T15:43:02+02:00 TB 40597: Implement TorSettings module - migrated in-page settings read/write implementation from about:preferences#tor to the TorSettings module - TorSettings initially loads settings from the tor daemon, and saves them to firefox prefs - TorSettings notifies observers when a setting has changed; currently only QuickStart notification is implemented for parity with previous preference notify logic in about:torconnect and about:preferences#tor - about:preferences#tor, and about:torconnect now read and write settings thorugh the TorSettings module - all tor settings live in the torbrowser.settings.* preference branch - removed unused pref modify permission for about:torconnect content page from AsyncPrefs.jsm Bug 40645: Migrate Moat APIs to Moat.jsm module - - - - - 10d546d5 by Pier Angelo Vendrame at 2025-05-28T15:43:02+02:00 fixup! TB 40597: Implement TorSettings module Sync pt_config.json after tor-browser-build#41425. - - - - - 7dd1049f by Caspar Schutijser at 2025-05-28T15:43:03+02:00 fixup! TB 40597: Implement TorSettings module TB 43628: TorConnect: handle unavailability of NetworkLinkService API Fixes TorConnect on e.g. OpenBSD. - - - - - a1481d3a by Arthur Edelstein at 2025-05-28T15:43:03+02:00 TB 3455: Add DomainIsolator, for isolating circuit by domain. Add an XPCOM component that registers a ProtocolProxyChannelFilter which sets the username/password for each web request according to url bar domain. Bug 9442: Add New Circuit button Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ. Bug 19206: Include a 128 bit random tag as part of the domain isolator nonce. Bug 19206: Clear out the domain isolator state on `New Identity`. Bug 21201.2: Isolate by firstPartyDomain from OriginAttributes Bug 21745: Fix handling of catch-all circuit Bug 41741: Refactor the domain isolator and new circuit - - - - - b0f66c2f by Pier Angelo Vendrame at 2025-05-28T15:43:03+02:00 fixup! TB 3455: Add DomainIsolator, for isolating circuit by domain. Fixed oncommand - - - - - 87e5846c by Pier Angelo Vendrame at 2025-05-28T15:43:04+02:00 fixup! TB 3455: Add DomainIsolator, for isolating circuit by domain. TB 43604: fix DomainIsolator.#clearKnownCircuits on Android. Window type "navigator:browser" does not match GeckoView sessions. So, in addition to that, we iterate on "navigator:geckoview" windows. - - - - - 7f6c11f4 by Henry Wilkes at 2025-05-28T15:43:04+02:00 TB 41600: Add a tor circuit display panel. - - - - - 7df90033 by Pier Angelo Vendrame at 2025-05-28T15:43:04+02:00 TB 42247: Android helpers for the TorProvider GeckoView is missing some API we use on desktop for the integration with the tor daemon, such as subprocess. Therefore, we need to implement them in Java and plumb the data back and forth between JS and Java. - - - - - 4d8b3566 by clairehurst at 2025-05-28T15:43:05+02:00 fixup! TB 42247: Android helpers for the TorProvider Bug 43576: Connection Assist on Android Fast Follows (Bug 41188) Rename to regions - - - - - 8170ea00 by hackademix at 2025-05-28T15:43:05+02:00 TB 8324: Prevent DNS proxy bypasses caused by Drag&Drop Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs - - - - - d114ef8c by Matthew Finkel at 2025-05-28T15:43:05+02:00 TB 25741: TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. - - - - - 659baa84 by Pier Angelo Vendrame at 2025-05-28T15:43:06+02:00 TB 40807: Added QRCode.js to toolkit/modules - - - - - 69a603cf by Richard Pospesel at 2025-05-28T15:43:06+02:00 TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection This patch adds a new about:preferences#connection page which allows modifying bridge, proxy, and firewall settings from within Tor Browser. All of the functionality present in tor-launcher's Network Configuration panel is present: - Setting built-in bridges - Requesting bridges from BridgeDB via moat - Using user-provided bridges - Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies - Setting firewall ports - Viewing and Copying Tor's logs - The Networking Settings in General preferences has been removed Bug 40774: Update about:preferences page to match new UI designs - - - - - 37ff4d91 by Beatriz Rizental at 2025-05-28T15:43:06+02:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection - - - - - 63d1429a by Richard Pospesel at 2025-05-28T15:43:07+02:00 TB 27476: Implement about:torconnect captive portal within Tor Browser - implements new about:torconnect page as tor-launcher replacement - adds new torconnect component to browser - tor process management functionality remains implemented in tor-launcher through the TorProtocolService module - adds warning/error box to about:preferences#tor when not connected to tor Bug 40773: Update the about:torconnect frontend page to match additional UI flows. Bug 41608: Add a toolbar status button and a urlbar "Connect" button. - - - - - 9f4c8957 by Beatriz Rizental at 2025-05-28T15:43:07+02:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser - - - - - a0a2e68c by Pier Angelo Vendrame at 2025-05-28T15:43:07+02:00 Temporary changes to about:torconnect for Android. We are planning of tempoorarily using about:torconnect on Android, until the native UX is ready. - - - - - 665464e7 by Henry Wilkes at 2025-05-28T15:43:08+02:00 TB 43405: Show a prompt whenever we fail to apply Tor settings. - - - - - 1d39bc12 by Henry Wilkes at 2025-05-28T15:43:08+02:00 TB 7494: Create local home page for TBB. Bug 41333: Update about:tor to new design. Including: + make the favicon match the branding icon. + make the location bar show a search icon. - - - - - b098ded4 by Henry Wilkes at 2025-05-28T15:43:08+02:00 fixup! TB 7494: Create local home page for TBB. TB 43567: Use the same update URL in about:tor as the about dialog. - - - - - 87ac8341 by Pier Angelo Vendrame at 2025-05-28T15:43:09+02:00 fixup! TB 7494: Create local home page for TBB. TB 43647: Dynamically update the survey language. We observe the lang attribute of the document element (which normally is set by Fluent) and we update the survey language whenever it changes. - - - - - e25bfa8b by Henry Wilkes at 2025-05-28T15:43:09+02:00 fixup! TB 7494: Create local home page for TBB. This reverts commit 2780d106d85ca2fa6d41ef08106d02293f21af2a. - - - - - 1f642e0a by Henry Wilkes at 2025-05-28T15:43:09+02:00 fixup! TB 7494: Create local home page for TBB. TB 43647: Use the app locale directly from the parent actor for setting the survey banner's language. - - - - - a1da6715 by Beatriz Rizental at 2025-05-28T15:43:09+02:00 fixup! TB 7494: Create local home page for TBB. - - - - - 67c77a39 by Pier Angelo Vendrame at 2025-05-28T15:43:10+02:00 TB 41668: Tweaks to the Base Browser updater for Tor Browser This commit was once part of "Bug 4234: Use the Firefox Update Process for Tor Browser.". However, some parts of it were not needed for Base Browser and some derivative browsers. Therefore, we extracted from that commit the parts for Tor Browser legacy, and we add them back to the patch set with this commit. - - - - - 00bf0b05 by Henry Wilkes at 2025-05-28T15:43:10+02:00 fixup! TB 41668: Tweaks to the Base Browser updater for Tor Browser TB 43567: Drop torbrowser.post_update.url. Also, no longer require an override page to be set to open about:tor after an update. - - - - - 649d7222 by Kathy Brade at 2025-05-28T15:43:10+02:00 TB 12647: Support symlinks in the updater. - - - - - 98e4ef5e by Georg Koppen at 2025-05-28T15:43:11+02:00 TB 32658: Create a new MAR signing key It's time for our rotation again: Move the backup key in the front position and add a new backup key. Bug 33803: Move our primary nightly MAR signing key to tor-browser Bug 33803: Add a secondary nightly MAR signing key - - - - - c7c61910 by Pier Angelo Vendrame at 2025-05-28T15:43:11+02:00 TB 42891: Set the bundled search engine for Tor Browser. After upstream changes between Firefox 115 and 128, we had to completely rework the way in which we define our search engines. This commit replaces the old "Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing". With that commit, we customized a list of addons IDs to ship as built-in search engines, but then upsteam moved to using only RemoteSettings. The configuration has many more fields, and it would be quite long to include it in the source code. Therefore, we use some local JSON files and load the settings from them. - - - - - 49c1d841 by Beatriz Rizental at 2025-05-28T15:43:11+02:00 fixup! TB 42891: Set the bundled search engine for Tor Browser. - - - - - 402c500c by Henry Wilkes at 2025-05-28T15:43:12+02:00 TB 41906: Hide DNS over HTTPS preferences. - - - - - 76a43a3b by Richard Pospesel at 2025-05-28T15:43:12+02:00 TB 23247: Communicating security expectations for .onion Encrypting pages hosted on Onion Services with SSL/TLS is redundant (in terms of hiding content) as all traffic within the Tor network is already fully encrypted. Therefore, serving HTTP pages from an Onion Service is more or less fine. Prior to this patch, Tor Browser would mostly treat pages delivered via Onion Services as well as pages delivered in the ordinary fashion over the internet in the same way. This created some inconsistencies in behaviour and misinformation presented to the user relating to the security of pages delivered via Onion Services: - HTTP Onion Service pages did not have any 'lock' icon indicating the site was secure - HTTP Onion Service pages would be marked as unencrypted in the Page Info screen - Mixed-mode content restrictions did not apply to HTTP Onion Service pages embedding Non-Onion HTTP content This patch fixes the above issues, and also adds several new 'Onion' icons to the mix to indicate all of the various permutations of Onion Services hosted HTTP or HTTPS pages with HTTP or HTTPS content. Strings for Onion Service Page Info page are pulled from Torbutton's localization strings. - - - - - f29cbd1c by Kathy Brade at 2025-05-28T15:43:12+02:00 TB 30237: Add v3 onion services client authentication prompt When Tor informs the browser that client authentication is needed, temporarily load about:blank instead of about:neterror and prompt for the user's key. If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD control port command to add the key (via Torbutton's control port module) and reload the page. If the user cancels the prompt, display the standard about:neterror "Unable to connect" page. This requires a small change to browser/actors/NetErrorChild.jsm to account for the fact that the docShell no longer has the failedChannel information. The failedChannel is used to extract TLS-related error info, which is not applicable in the case of a canceled .onion authentication prompt. Add a leaveOpen option to PopupNotifications.show so we can display error messages within the popup notification doorhanger without closing the prompt. Add support for onion services strings to the TorStrings module. Add support for Tor extended SOCKS errors (Tor proposal 304) to the socket transport and SOCKS layers. Improved display of all of these errors will be implemented as part of bug 30025. Also fixes bug 19757: Add a "Remember this key" checkbox to the client auth prompt. Add an "Onion Services Authentication" section within the about:preferences "Privacy & Security section" to allow viewing and removal of v3 onion client auth keys that have been stored on disk. Also fixes bug 19251: use enhanced error pages for onion service errors. - - - - - b966c025 by Alex Catarineu at 2025-05-28T15:43:13+02:00 TB 21952: Implement Onion-Location Whenever a valid Onion-Location HTTP header (or corresponding HTML <meta> http-equiv attribute) is found in a document load, we either redirect to it (if the user opted-in via preference) or notify the presence of an onionsite alternative with a badge in the urlbar. - - - - - b005248b by Pier Angelo Vendrame at 2025-05-28T15:43:13+02:00 fixup! TB 21952: Implement Onion-Location No more inline event handlers - - - - - acab9006 by Pier Angelo Vendrame at 2025-05-28T15:43:13+02:00 TB 40458: Implement .tor.onion aliases We have enabled HTTPS-Only mode, therefore we do not need HTTPS-Everywhere anymore. However, we want to keep supporting .tor.onion aliases (especially for securedrop). Therefore, in this patch we implemented the parsing of HTTPS-Everywhere rulesets, and the redirect of .tor.onion domains. Actually, Tor Browser believes they are actual domains. We change them on the fly on the SOCKS proxy requests to resolve the domain, and on the code that verifies HTTPS certificates. - - - - - 8e30ac8b by Beatriz Rizental at 2025-05-28T15:43:14+02:00 fixup! TB 40458: Implement .tor.onion aliases - - - - - 0fdf8196 by Pier Angelo Vendrame at 2025-05-28T15:43:14+02:00 TB 11698: Incorporate Tor Browser Manual pages into Tor Browser This patch associates the about:manual page to a translated page that must be injected to browser/omni.ja after the build. The content must be placed in chrome/browser/content/browser/manual/, so that is then available at chrome://browser/content/manual/. We preferred giving absolute freedom to the web team, rather than having to change the patch in case of changes on the documentation. - - - - - 86329827 by Pier Angelo Vendrame at 2025-05-28T15:43:14+02:00 fixup! TB 11698: Incorporate Tor Browser Manual pages into Tor Browser Fix oncommands - - - - - 36c02400 by Pier Angelo Vendrame at 2025-05-28T15:43:15+02:00 TB 41435: Add a Tor Browser migration function For now this function only deletes old language packs for which we are already packaging the strings with the application. - - - - - 12929c3d by Henry Wilkes at 2025-05-28T15:43:15+02:00 fixup! TB 41435: Add a Tor Browser migration function TB 43567: Clear torbrowser.post_update.url. - - - - - db6e0c13 by Dan Ballard at 2025-05-28T15:43:15+02:00 TB 40701: Add security warning when downloading a file Shown in the downloads panel, about:downloads and places.xhtml. - - - - - 22e238bb by Henry Wilkes at 2025-05-28T15:43:16+02:00 TB 41736: Customize toolbar for tor-browser. - - - - - a9454912 by hackademix at 2025-05-28T15:43:16+02:00 TB 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key - - - - - 7746d2ef by Richard Pospesel at 2025-05-28T15:43:16+02:00 TB 41822: Unconditionally disable default browser UX in about:preferences - - - - - a749d336 by Cecylia Bocovich at 2025-05-28T15:43:16+02:00 Temporary commit: manually place generated wasm files These files are built reproducibly using tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_re… We're manually adding them here while working on the interface, but eventually these should be placed in the right location using tor-browser-build. - - - - - 20951f51 by Pier Angelo Vendrame at 2025-05-28T15:43:17+02:00 [android] TBA strings - - - - - 7ef3e5a5 by Dan Ballard at 2025-05-28T15:43:17+02:00 TB 42660: Disable ProxySelector.openConnectionWithProxy and NOPify CrashReporter.sendCrashReport - - - - - 858a7828 by Dan Ballard at 2025-05-28T15:43:17+02:00 TB 43006: Disable RFP for Font Visibility on Android - - - - - 02cf432a by Matthew Finkel at 2025-05-28T15:43:18+02:00 TB 40005: [android] Modify Default toolbar menu Originally android-components#40005. - - - - - ce989cab by Alex Catarineu at 2025-05-28T15:43:18+02:00 TB 34378: [android] Port external helper app prompting Together with the corresponding fenix patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. Originally, android-components#40007 and fenix#34378. - - - - - 61b45025 by Alex Catarineu at 2025-05-28T15:43:18+02:00 TB 40002: [android] Ensure system download manager is not used Originally, android-components#40002. android-components#40075: Support scoped storage to enable downloads on API < 29 - in android-components!7, we blocked all usage of Scoped Storage in an attempt to block usage of Android's DownloadManager, which is known to cause proxy bypasses - as of Android API 29, downloads will not work without Scoped Storage, causing all downlaods to fail (see: fenix##40192) - here, we enable usage of scoped storage for API >= 29, but block calls to DownloadManager on API < 29 - - - - - 1f90164d by Alex Catarineu at 2025-05-28T15:43:19+02:00 TB 40009: [android] Change the default search engines Originally, android-components#40009. This matches the search engines from desktop, that is: DDG as the default, then YouTube, Google, DDGOnion, Startpage, Twitter, Wikipedia and Yahoo. android-components#40062: Update DuckDuckGo onion search plugin - - - - - 8553668b by hackademix at 2025-05-28T15:43:19+02:00 TB 42191: [android] Temporary StrictMode relaxation to clear the thumbnail cache. - - - - - b2a5bfce by hackademix at 2025-05-28T15:43:19+02:00 [android] Modify add-on support Bug 41160: One-time ultimate switch Tor Browser Android to HTTPS-Only. Bug 41159: Remove HTTPS-Everywhere extension from Tor Browser Android. Bug 41094: Enable HTTPS-Only Mode by default in Tor Browser Android. Turn shouldUseHttpsOnly's default to true. Bug 40225: Bundled extensions don't get updated with Android Tor Browser updates. Bug 40030: Install NoScript addon on startup. Also 40070: Consider storing the list of recommended addons This implements our own AddonsProvider, which loads the list of available addons from assets instead of fetching it from an endpoint. Also, we hide the uninstall button for builtin addons. Bug 40058: Hide option for disallowing addon in private mode - - - - - a4f1fa1a by Alex Catarineu at 2025-05-28T15:43:20+02:00 [android] Modify Addon support android-components#40011: Hide option for disallowing addons in private mode android-components#40016: Allow inheriting from AddonCollectionProvider This will allow implementing our own AddonsProvider in fenix. - - - - - 335a1109 by Alex Catarineu at 2025-05-28T15:43:20+02:00 TB 40015: [android] Port padlock states for .onion services Originally, android-components#40015. - - - - - 3e08d99a by Matthew Finkel at 2025-05-28T15:43:20+02:00 [android] Modify Tracking Protection configuration android-components#40020: Disable third-party cookies android-components#40024: Disable tracking protection by default - - - - - 91aa53c3 by Matthew Finkel at 2025-05-28T15:43:21+02:00 TB 40023: [android] Stop PrivateNotificationService Originally, android-components#40023. - - - - - ce1d3359 by Alex Catarineu at 2025-05-28T15:43:21+02:00 TB 34439 [android]: Isolate Icon loader on Android. Originally, android-components#34439. - - - - - cb14651e by Matthew Finkel at 2025-05-28T15:43:21+02:00 [android] Disable features and functionality Bug 33594: Disable data collection by default (Glean) Bug 40019: Adjust is disabled on Release when data collection is disabled Bug 34338: Disable the crash reporter Bug 40014: Neuter Google Advertising ID Bug 40018: Disable Push service Bug 40034: Disable PWA onboading Bug 40072: Disable Tracking Protection Bug 40061: Do not show "Send to device" in sharing menu Bug 40109: Reduce requested permissions Exclude LOCATION and NETWORK_STATE - - - - - cb5da90c by Beatriz Rizental at 2025-05-28T15:43:22+02:00 fixup! [android] Disable features and functionality - - - - - 26bb3093 by Matthew Finkel at 2025-05-28T15:43:22+02:00 TB 40032 [android]: Set usesCleartextTraffic as false Originally, fenix#40032. - - - - - 55ec7331 by Matthew Finkel at 2025-05-28T15:43:22+02:00 [android] Rename as Tor Browser Bug 40020: Change applicationId Bug 40020: Change app name Bug 40020: Change deeplink scheme Bug 40020: Change App icons Bug 40073: Use correct branding on About page Bug 40088: Use Tor Browser logo in migration screen - - - - - f0a80a21 by Georg Koppen at 2025-05-28T15:43:23+02:00 [android] Modify build system Bug 40083: Make locale ordering in BuildConfig deterministic Bug 40042: Add option do overwrite timestamp in extension version Bug 40059: Use MOZ_BUILD_DATE for versionCode At the same time we adapt MOZ_BUILD_DATE to our needs where it is actually used and not in tor-browser-build. This gives us more flexibility. See: tor-browser-build#40084. Bug 40067: Fix reproducibility issue in classes2.dex We make sure our MOZ_BUILD_DATE gets used as a source for showing date related information on the Fenix about page. Bug 40071: Show only supported locales Bug 40064: Use Gecko Beta for Nightly and Debug variants Bug 40123: Allow building the instrumented tests apks for variants other than debug This allows to specify the variant of the instrumented tests via a `testBuildType` gradle argument. It also applies a workaround for a R8 issue from https://issuetracker.google.com/issues/140851070. Bug 40143: Use deterministic date in Test apk The build config was using Date() when generating the Test apk's versionName. - - - - - 87693e04 by Dan Ballard at 2025-05-28T15:43:23+02:00 fixup! [android] Modify build system Always set gradle pref for nimbusFml as tbb's env var NIMBUS_FML supercedes it - - - - - a124af0d by Pier Angelo Vendrame at 2025-05-28T15:43:23+02:00 fixup! [android] Modify build system TB 43799: Update the path where apks are. - - - - - c98c78c5 by Matthew Finkel at 2025-05-28T15:43:23+02:00 TB 40185: [android] Use NimbusDisabled Originally, fenix#40185. - - - - - 2a1a49e8 by Alex Catarineu at 2025-05-28T15:43:24+02:00 TB 40087 [android]: Implement a switch for spoof English. Originally, fenix#40087 and android-components#40019. - - - - - f333d9db by Matthew Finkel at 2025-05-28T15:43:24+02:00 TB 34403 [android]: Disable Normal mode by default. Originally, fenix#34403. - - - - - a45c1e50 by Pier Angelo Vendrame at 2025-05-28T15:43:24+02:00 fixup! TB 34403 [android]: Disable Normal mode by default. Import LocalContext, which has been removed upstream. - - - - - 05dec2a8 by Matthew Finkel at 2025-05-28T15:43:25+02:00 TB 40016 [android]: Don't install WebCompat webext. Originally, fenix#40016. - - - - - 137a8e93 by Matthew Finkel at 2025-05-28T15:43:25+02:00 [android] Modify UI/UX Bug 40015: Modify Home menu Bug 40016: Hide unwanted Settings Bug 40016: Modify Default toolbar menu Bug 40016: Add Donate settings button Bug 40016: Move Allow Screenshots under Advanced Bug 40016: Don't install WebCompat webext Bug 40016: Don't onboard Search Suggestions Bug 40094: Do not use MasterPasswordTipProvider in HomeFragment Bug 40095: Hide "Sign in to sync" in bookmarks Bug 40031: Hide Mozilla-specific items on About page Bug 40063: Do not sort search engines alphabetically Bug 40141: Hide EME site permission Bug 40166: Hide "Normal" tab (again) and Sync tab in TabTray Bug 40167: Hide "Save to Collection" in menu Bug 40172: Find the Quit button Bug 40186: Hide Credit Cards in Settings Bug 40198: Spoof English toggle now overlaps with locale list - - - - - 6cc2f67a by Matthew Finkel at 2025-05-28T15:43:25+02:00 TB 40026 [android]: Implement Security Level settings on Android. Originally, fenix#40026. - - - - - 47c42970 by Dan Ballard at 2025-05-28T15:43:26+02:00 TB 41972: [android] Disable Mozilla onboarding - - - - - 4c5c7294 by Dan Ballard at 2025-05-28T15:43:26+02:00 TB 41878: [android] Add standalone Tor Bootstrap - - - - - f44f0a87 by Pier Angelo Vendrame at 2025-05-28T15:43:26+02:00 fixup! TB 41878: [android] Add standalone Tor Bootstrap TB 43611: Move Snowflake to a group of PTs on its own. - - - - - daf6a695 by Matthew Finkel at 2025-05-28T15:43:27+02:00 TB 40041 [android]: Implement Tor Network Settings Originally, fenix#40041. - - - - - 088af13c by clairehurst at 2025-05-28T15:43:27+02:00 [android] Implement Android-native Connection Assist UI - - - - - 1cf391b7 by clairehurst at 2025-05-28T15:43:27+02:00 fixup! [android] Implement Android-native Connection Assist UI Bug 43576: Connection Assist on Android Fast Follows (Bug 41188) cleanup use of _torConnectScreen.value: !1426 (comment 3176147) - - - - - 0c97e79f by clairehurst at 2025-05-28T15:43:28+02:00 fixup! [android] Implement Android-native Connection Assist UI Bug 43565: The quit button on Android doesn't actually exit - - - - - 893f45d5 by clairehurst at 2025-05-28T15:43:28+02:00 fixup! [android] Implement Android-native Connection Assist UI Bug 43576: Connection Assist on Android Fast Follows (Bug 41188) Rename to regions (Bug 43593) - - - - - 63d38ec8 by clairehurst at 2025-05-28T15:43:28+02:00 fixup! [android] Implement Android-native Connection Assist UI - - - - - 0da2fdb5 by clairehurst at 2025-05-28T15:43:29+02:00 fixup! [android] Implement Android-native Connection Assist UI Bug 43576: Connection Assist on Android Fast Follows (Bug 41188) Remove unnecessary locale change listener - - - - - 6ccfca93 by Pier Angelo Vendrame at 2025-05-28T15:43:29+02:00 fixup! [android] Implement Android-native Connection Assist UI TB 43633: Include regionNames.ftl in Android builds. - - - - - 3ad9dffa by Pier Angelo Vendrame at 2025-05-28T15:43:29+02:00 fixup! [android] Implement Android-native Connection Assist UI Fix 139 Android build errors. BrowserToolbarView.view has been removed, so comment it for now. - - - - - 6fad2fea by clairehurst at 2025-05-28T15:43:29+02:00 TB 42655 [android]: Implement "New circuit for this site" on Android - - - - - 1ec37a3f by clairehurst at 2025-05-28T15:43:30+02:00 TB 42089: [android] Remove ability to submit site support requests - - - - - 96e944da by clairehurst at 2025-05-28T15:43:30+02:00 [android] Delete unused media - - - - - be7e1995 by Pier Angelo Vendrame at 2025-05-28T15:43:31+02:00 fixup! [android] Delete unused media Replace another ic_firefox with a file we do not delete. - - - - - d49392c6 by Beatriz Rizental at 2025-05-28T15:43:31+02:00 TB 43243: [android] Implement Android launch test Also remove exit call from terminate function. It causes all espresso tests to crash on exit and otherwise doesn't do anything. - - - - - ef1a460a by Beatriz Rizental at 2025-05-28T15:43:31+02:00 TB 42669: [android] Use custom no-op app-services Fetch the custom built no-op application services library from tor-browser-build when building for Android. - - - - - 5173f924 by Beatriz Rizental at 2025-05-28T15:43:31+02:00 fixup! TB 42669: [android] Use custom no-op app-services - - - - - 23794225 by Beatriz Rizental at 2025-05-28T15:43:32+02:00 Various Android workarounds - - - - - 2eabe5e1 by Pier Angelo Vendrame at 2025-05-28T15:43:32+02:00 fixup! TB 40185: [android] Use NimbusDisabled Flip pref_key_show_top_sites to false. - - - - - 1819 changed files: - .gitignore - + .gitlab-ci.yml - + .gitlab/ci/containers/base/Containerfile - + .gitlab/ci/jobs/lint/helpers.py - + .gitlab/ci/jobs/lint/lint.yml - + .gitlab/ci/jobs/startup-test/startup-test-android.py - + .gitlab/ci/jobs/startup-test/startup-test.py - + .gitlab/ci/jobs/startup-test/startup-test.yml - + .gitlab/ci/jobs/update-containers.yml - + .gitlab/ci/jobs/update-translations.yml - + .gitlab/ci/mixins.yml - + .gitlab/issue_templates/000 Bug Report.md - + .gitlab/issue_templates/010 Proposal.md - + .gitlab/issue_templates/020 Web Compatibility.md - + .gitlab/issue_templates/030 Test.md - + .gitlab/issue_templates/040 Feature.md - + .gitlab/issue_templates/050 Backport.md - + .gitlab/issue_templates/060 Rebase - Alpha.md - + .gitlab/issue_templates/061 Rebase - Stable.md - + .gitlab/issue_templates/062 Rebase - Legacy.md - + .gitlab/issue_templates/063 Rebase - Rapid.md - + .gitlab/issue_templates/070 Uplift.md - + .gitlab/issue_templates/080 Security Backports.md - + .gitlab/issue_templates/090 Emergency Security Issue.md - + .gitlab/issue_templates/100 Release QA - Desktop.md - + .gitlab/issue_templates/101 Release QA - Android.md - + .gitlab/issue_templates/110 Bugzilla Triage.md - + .gitlab/issue_templates/120 Bugzilla Audit.md - + .gitlab/issue_templates/Default.md - + .gitlab/merge_request_templates/Default.md - .prettierignore - README.md - + browser/actors/CryptoSafetyChild.sys.mjs - + browser/actors/CryptoSafetyParent.sys.mjs - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/moz.build - browser/app/permissions - + browser/app/profile/000-tor-browser.js - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/aboutDialog.xhtml - + browser/base/content/aboutDialogTor.css - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-addons.js - browser/base/content/browser-context.js - browser/base/content/browser-init.js - browser/base/content/browser-main.js - browser/base/content/browser-menubar.inc - browser/base/content/browser-menubar.js - browser/base/content/browser-places.js - browser/base/content/browser-safebrowsing.js - browser/base/content/browser-sets.inc - browser/base/content/browser-sets.js - browser/base/content/browser-siteIdentity.js - browser/base/content/browser.js - browser/base/content/browser.js.globals - browser/base/content/browser.xhtml - browser/base/content/default-bookmarks.html - + browser/base/content/languageNotification.js - browser/base/content/main-popupset.inc.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/base/content/navigator-toolbox.js - browser/base/content/pageinfo/pageInfo.xhtml - browser/base/content/pageinfo/security.js - browser/base/content/popup-notifications.inc.xhtml - browser/base/content/utilityOverlay.js - browser/base/jar.mn - browser/base/moz.build - browser/branding/branding-common.mozbuild - + browser/branding/tb-alpha/VisualElements_150.png - + browser/branding/tb-alpha/VisualElements_70.png - + browser/branding/tb-alpha/configure.sh - + browser/branding/tb-alpha/content/about-logo.png - + browser/branding/tb-alpha/content/about-logo.svg - + browser/branding/tb-alpha/content/about-logo(a)2x.png - + browser/branding/tb-alpha/content/about-wordmark.svg - + browser/branding/tb-alpha/content/about.png - + browser/branding/tb-alpha/content/aboutDialog.css - + browser/branding/tb-alpha/content/firefox-wordmark.svg - + browser/branding/tb-alpha/content/jar.mn - + browser/branding/tb-alpha/content/moz.build - + browser/branding/tb-alpha/default128.png - + browser/branding/tb-alpha/default16.png - + browser/branding/tb-alpha/default22.png - + browser/branding/tb-alpha/default24.png - + browser/branding/tb-alpha/default256.png - + browser/branding/tb-alpha/default32.png - + browser/branding/tb-alpha/default48.png - + browser/branding/tb-alpha/default64.png - + browser/branding/tb-alpha/document.icns - + browser/branding/tb-alpha/document.ico - + browser/branding/tb-alpha/document_pdf.ico - + browser/branding/tb-alpha/firefox.VisualElementsManifest.xml - + browser/branding/tb-alpha/firefox.icns - + browser/branding/tb-alpha/firefox.ico - + browser/branding/tb-alpha/locales/en-US/brand.ftl - + browser/branding/tb-alpha/locales/en-US/brand.properties - + browser/branding/tb-alpha/locales/jar.mn - + browser/branding/tb-alpha/locales/moz.build - + browser/branding/tb-alpha/moz.build - + browser/branding/tb-alpha/newtab.ico - + browser/branding/tb-alpha/newwindow.ico - + browser/branding/tb-alpha/pbmode.ico - + browser/branding/tb-alpha/pref/firefox-branding.js - + browser/branding/tb-nightly/VisualElements_150.png - + browser/branding/tb-nightly/VisualElements_70.png - + browser/branding/tb-nightly/configure.sh - + browser/branding/tb-nightly/content/about-logo.png - + browser/branding/tb-nightly/content/about-logo.svg - + browser/branding/tb-nightly/content/about-logo(a)2x.png - + browser/branding/tb-nightly/content/about-wordmark.svg - + browser/branding/tb-nightly/content/about.png - + browser/branding/tb-nightly/content/aboutDialog.css - + browser/branding/tb-nightly/content/firefox-wordmark.svg - + browser/branding/tb-nightly/content/jar.mn - + browser/branding/tb-nightly/content/moz.build - + browser/branding/tb-nightly/default128.png - + browser/branding/tb-nightly/default16.png - + browser/branding/tb-nightly/default22.png - + browser/branding/tb-nightly/default24.png - + browser/branding/tb-nightly/default256.png - + browser/branding/tb-nightly/default32.png - + browser/branding/tb-nightly/default48.png - + browser/branding/tb-nightly/default64.png - + browser/branding/tb-nightly/document.icns - + browser/branding/tb-nightly/document.ico - + browser/branding/tb-nightly/document_pdf.ico - + browser/branding/tb-nightly/firefox.VisualElementsManifest.xml - + browser/branding/tb-nightly/firefox.icns - + browser/branding/tb-nightly/firefox.ico - + browser/branding/tb-nightly/locales/en-US/brand.ftl - + browser/branding/tb-nightly/locales/en-US/brand.properties - + browser/branding/tb-nightly/locales/jar.mn - + browser/branding/tb-nightly/locales/moz.build - + browser/branding/tb-nightly/moz.build - + browser/branding/tb-nightly/newtab.ico - + browser/branding/tb-nightly/newwindow.ico - + browser/branding/tb-nightly/pbmode.ico - + browser/branding/tb-nightly/pref/firefox-branding.js - + browser/branding/tb-release/VisualElements_150.png - + browser/branding/tb-release/VisualElements_70.png - + browser/branding/tb-release/configure.sh - + browser/branding/tb-release/content/about-logo.png - + browser/branding/tb-release/content/about-logo.svg - + browser/branding/tb-release/content/about-logo(a)2x.png - + browser/branding/tb-release/content/about-wordmark.svg - + browser/branding/tb-release/content/about.png - + browser/branding/tb-release/content/aboutDialog.css - + browser/branding/tb-release/content/firefox-wordmark.svg - + browser/branding/tb-release/content/jar.mn - + browser/branding/tb-release/content/moz.build - + browser/branding/tb-release/default128.png - + browser/branding/tb-release/default16.png - + browser/branding/tb-release/default22.png - + browser/branding/tb-release/default24.png - + browser/branding/tb-release/default256.png - + browser/branding/tb-release/default32.png - + browser/branding/tb-release/default48.png - + browser/branding/tb-release/default64.png - + browser/branding/tb-release/document.icns - + browser/branding/tb-release/document.ico - + browser/branding/tb-release/document_pdf.ico - + browser/branding/tb-release/firefox.VisualElementsManifest.xml - + browser/branding/tb-release/firefox.icns - + browser/branding/tb-release/firefox.ico - + browser/branding/tb-release/locales/en-US/brand.ftl - + browser/branding/tb-release/locales/en-US/brand.properties - + browser/branding/tb-release/locales/jar.mn - + browser/branding/tb-release/locales/moz.build - + browser/branding/tb-release/moz.build - + browser/branding/tb-release/newtab.ico - + browser/branding/tb-release/newwindow.ico - + browser/branding/tb-release/pbmode.ico - + browser/branding/tb-release/pref/firefox-branding.js - browser/components/BrowserComponents.manifest - browser/components/BrowserContentHandler.sys.mjs - browser/components/BrowserGlue.sys.mjs - browser/components/DesktopActorRegistry.sys.mjs - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/aboutlogins/AboutLoginsParent.sys.mjs - browser/components/aboutlogins/content/aboutLogins.css - browser/components/aboutlogins/content/aboutLogins.mjs - browser/components/aboutlogins/content/components/fxaccounts-button.css - + browser/components/abouttor/AboutTorChild.sys.mjs - + browser/components/abouttor/AboutTorMessage.sys.mjs - + browser/components/abouttor/AboutTorParent.sys.mjs - + browser/components/abouttor/HomepageOverride.sys.mjs - + browser/components/abouttor/content/1f44b-waving-hand.svg - + browser/components/abouttor/content/1f4e3-megaphone.svg - + browser/components/abouttor/content/26a1-high-voltage.svg - + browser/components/abouttor/content/2728-sparkles.svg - + browser/components/abouttor/content/2764-red-heart.svg - + browser/components/abouttor/content/aboutTor.css - + browser/components/abouttor/content/aboutTor.html - + browser/components/abouttor/content/aboutTor.js - + browser/components/abouttor/content/dax-logo.svg - + browser/components/abouttor/jar.mn - + browser/components/abouttor/moz.build - browser/components/customizableui/CustomizableUI.sys.mjs - browser/components/customizableui/content/panelUI.inc.xhtml - browser/components/customizableui/content/panelUI.js - browser/components/downloads/DownloadSpamProtection.sys.mjs - + browser/components/downloads/DownloadsTorWarning.sys.mjs - browser/components/downloads/content/contentAreaDownloadsView.js - browser/components/downloads/content/contentAreaDownloadsView.xhtml - browser/components/downloads/content/downloads.css - browser/components/downloads/content/downloads.js - browser/components/downloads/content/downloadsPanel.inc.xhtml - browser/components/downloads/moz.build - browser/components/extensions/parent/ext-browserAction.js - browser/components/extensions/schemas/chrome_settings_overrides.json - browser/components/migration/ChromeMigrationUtils.sys.mjs - browser/components/migration/content/migration-wizard.mjs - browser/components/moz.build - + browser/components/newidentity/content/newIdentityDialog.css - + browser/components/newidentity/content/newIdentityDialog.js - + browser/components/newidentity/content/newIdentityDialog.xhtml - + browser/components/newidentity/content/newidentity.js - + browser/components/newidentity/jar.mn - + browser/components/newidentity/moz.build - browser/components/newtab/AboutHomeStartupCache.sys.mjs - browser/components/newtab/AboutNewTabRedirector.sys.mjs - + browser/components/onionservices/OnionAliasStore.sys.mjs - + browser/components/onionservices/OnionLocationChild.sys.mjs - + browser/components/onionservices/OnionLocationParent.sys.mjs - + browser/components/onionservices/TorRequestWatch.sys.mjs - + browser/components/onionservices/content/authNotificationIcon.inc.xhtml - + browser/components/onionservices/content/authPopup.inc.xhtml - + browser/components/onionservices/content/authPreferences.css - + browser/components/onionservices/content/authPreferences.inc.xhtml - + browser/components/onionservices/content/authPreferences.js - + browser/components/onionservices/content/authPrompt.js - + browser/components/onionservices/content/onionlocation-urlbar.inc.xhtml - + browser/components/onionservices/content/onionlocation.css - + browser/components/onionservices/content/onionservices.css - + browser/components/onionservices/content/savedKeysDialog.js - + browser/components/onionservices/content/savedKeysDialog.xhtml - + browser/components/onionservices/jar.mn - + browser/components/onionservices/moz.build - browser/components/places/PlacesUIUtils.sys.mjs - browser/components/places/content/controller.js - browser/components/places/content/places.css - browser/components/places/content/places.js - browser/components/places/content/places.xhtml - browser/components/preferences/home.inc.xhtml - browser/components/preferences/home.js - browser/components/preferences/jar.mn - + browser/components/preferences/letterboxing-middle-dark.svg - + browser/components/preferences/letterboxing-middle-light.svg - + browser/components/preferences/letterboxing-top-dark.svg - + browser/components/preferences/letterboxing-top-light.svg - + browser/components/preferences/letterboxing.css - + browser/components/preferences/letterboxing.inc.xhtml - + browser/components/preferences/letterboxing.js - browser/components/preferences/main.inc.xhtml - browser/components/preferences/main.js - browser/components/preferences/preferences.js - browser/components/preferences/preferences.xhtml - browser/components/preferences/privacy.inc.xhtml - browser/components/preferences/privacy.js - + browser/components/rulesets/RulesetsChild.sys.mjs - + browser/components/rulesets/RulesetsParent.sys.mjs - + browser/components/rulesets/content/aboutRulesets.css - + browser/components/rulesets/content/aboutRulesets.html - + browser/components/rulesets/content/aboutRulesets.js - + browser/components/rulesets/content/securedrop.svg - + browser/components/rulesets/jar.mn - + browser/components/rulesets/moz.build - browser/components/search/SERPCategorization.sys.mjs - browser/components/search/SearchSERPTelemetry.sys.mjs - + browser/components/search/extensions/ddg-onion/favicon.ico - + browser/components/search/extensions/ddg-onion/manifest.json - browser/components/search/extensions/ddg/manifest.json - + browser/components/search/extensions/startpage-onion/favicon.png - + browser/components/search/extensions/startpage-onion/manifest.json - + browser/components/search/extensions/startpage/favicon.png - + browser/components/search/extensions/startpage/manifest.json - + browser/components/securitylevel/content/securityLevel.js - + browser/components/securitylevel/content/securityLevelButton.css - + browser/components/securitylevel/content/securityLevelButton.inc.xhtml - + browser/components/securitylevel/content/securityLevelIcon.svg - + browser/components/securitylevel/content/securityLevelPanel.css - + browser/components/securitylevel/content/securityLevelPanel.inc.xhtml - + browser/components/securitylevel/content/securityLevelPreferences.css - + browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml - + browser/components/securitylevel/jar.mn - + browser/components/securitylevel/moz.build - browser/components/tabbrowser/content/tabbrowser.js - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1fd.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1e7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ef.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1fd.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1ef.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1ef.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1e7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ef-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ef-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ef-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ef-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1e7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1fd.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f4-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f6-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f7-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f7-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f7-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f7-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f7-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1e7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ef.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1fd.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1ef.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fc-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fc-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fd-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fe-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fe-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ff-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ff-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ff-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/README.txt - + browser/components/torcircuit/content/tor-circuit-icon-mask.svg - + browser/components/torcircuit/content/tor-circuit-node-end.svg - + browser/components/torcircuit/content/tor-circuit-node-middle.svg - + browser/components/torcircuit/content/tor-circuit-node-relays.svg - + browser/components/torcircuit/content/tor-circuit-node-start.svg - + browser/components/torcircuit/content/tor-circuit-redirect.svg - + browser/components/torcircuit/content/torCircuitPanel.css - + browser/components/torcircuit/content/torCircuitPanel.inc.xhtml - + browser/components/torcircuit/content/torCircuitPanel.js - + browser/components/torcircuit/jar.mn - + browser/components/torcircuit/moz.build - + browser/components/torpreferences/content/bridge-bot.svg - + browser/components/torpreferences/content/bridge-qr.svg - + browser/components/torpreferences/content/bridge.svg - + browser/components/torpreferences/content/bridgeQrDialog.js - + browser/components/torpreferences/content/bridgeQrDialog.xhtml - + browser/components/torpreferences/content/bridgemoji/BridgeEmoji.js - + browser/components/torpreferences/content/bridgemoji/annotations.json - + browser/components/torpreferences/content/bridgemoji/bridge-emojis.json - + browser/components/torpreferences/content/bridgemoji/svgs/1f300.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f308.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f30a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f30b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f319.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f31f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f321.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f32d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f32e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f332.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f333.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f334.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f335.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f336.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f337.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f339.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f33a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f33b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f33d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f33f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f341.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f344.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f345.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f346.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f347.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f348.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f349.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f34a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f34b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f34c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f34d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f34f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f350.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f351.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f352.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f353.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f354.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f355.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f368.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f369.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f36a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f36b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f36c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f36d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f37f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f380.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f381.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f382.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f383.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f388.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f389.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f38f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f392.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f399.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f39f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3a0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3a1.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3a2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3a8.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3ac.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3af.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3b2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3b6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3b7.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3b8.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3ba.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3bb.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3be.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3c0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3c6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3c8.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3d3.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3d4.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3d5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3dd.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3e1.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3ee.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3f7.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3f8.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3f9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f40a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f40c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f40d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f417.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f418.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f419.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f41a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f41b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f41d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f41e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f41f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f420.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f422.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f425.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f426.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f428.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f42a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f42c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f42d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f42e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f42f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f430.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f431.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f432.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f433.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f434.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f435.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f436.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f437.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f43a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f43b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f43f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f441.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f451.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f455.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f457.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f45f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f47d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f484.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f488.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f48d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f48e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f490.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4a1.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4a7.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4b3.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4bf.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4cc.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4ce.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4d5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4e1.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4e2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4fb.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f50b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f511.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f525.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f526.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f52c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f52d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f52e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f54a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f58c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f58d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f5ff.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f680.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f681.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f686.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f68b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f68d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f695.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f697.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f69a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f69c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6a0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6a2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6a4.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f4.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f8.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6fa.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6fc.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f916.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f93f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f941.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f94c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f94f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f950.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f951.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f955.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f956.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f95c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f95d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f95e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f965.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f966.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f968.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f96c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f96d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f96f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f980.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f981.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f984.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f986.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f987.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f988.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f989.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f98a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f98b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f98c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f98e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f98f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f992.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f993.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f994.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f995.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f998.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f999.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f99a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f99c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f99d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f99e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a3.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a4.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a7.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9ad.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9c1.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9c3.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9c5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9c7.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9c9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9d9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9da.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9dc.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9e0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9e2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9e6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9e9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9ea.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9ec.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9ed.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9ee.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9f2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9f5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9f9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa73.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa80.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa81.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa83.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa90.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa91.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa95.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa97.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fab6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fad0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fad2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fad6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/23f0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2600.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2602.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2604.svg - + browser/components/torpreferences/content/bridgemoji/svgs/260e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2693.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2696.svg - + browser/components/torpreferences/content/bridgemoji/svgs/26bd.svg - + browser/components/torpreferences/content/bridgemoji/svgs/26f2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/26f5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2708.svg - + browser/components/torpreferences/content/bridgemoji/svgs/270f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2728.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2744.svg - + browser/components/torpreferences/content/bridgemoji/svgs/README.txt - + browser/components/torpreferences/content/builtinBridgeDialog.js - + browser/components/torpreferences/content/builtinBridgeDialog.xhtml - + browser/components/torpreferences/content/connectionCategory.inc.xhtml - + browser/components/torpreferences/content/connectionPane.js - + browser/components/torpreferences/content/connectionPane.xhtml - + browser/components/torpreferences/content/connectionSettingsDialog.js - + browser/components/torpreferences/content/connectionSettingsDialog.xhtml - + browser/components/torpreferences/content/lox-bridge-icon.svg - + browser/components/torpreferences/content/lox-bridge-pass.svg - + browser/components/torpreferences/content/lox-complete-ring.svg - + browser/components/torpreferences/content/lox-invite-icon.svg - + browser/components/torpreferences/content/lox-progress-ring.svg - + browser/components/torpreferences/content/lox-success.svg - + browser/components/torpreferences/content/loxInviteDialog.js - + browser/components/torpreferences/content/loxInviteDialog.xhtml - + browser/components/torpreferences/content/mail.svg - + browser/components/torpreferences/content/network-broken.svg - + browser/components/torpreferences/content/network.svg - + browser/components/torpreferences/content/provideBridgeDialog.js - + browser/components/torpreferences/content/provideBridgeDialog.xhtml - + browser/components/torpreferences/content/requestBridgeDialog.js - + browser/components/torpreferences/content/requestBridgeDialog.xhtml - + browser/components/torpreferences/content/telegram-logo.svg - + browser/components/torpreferences/content/torLogDialog.js - + browser/components/torpreferences/content/torLogDialog.xhtml - + browser/components/torpreferences/content/torPreferences.css - + browser/components/torpreferences/jar.mn - + browser/components/torpreferences/moz.build - browser/components/urlbar/UrlbarProvidersManager.sys.mjs - browser/components/urlbar/UrlbarUtils.sys.mjs - browser/components/urlbar/moz.build - + browser/config/mozconfigs/base-browser - + browser/config/mozconfigs/base-browser-android - + browser/config/mozconfigs/tor-browser - + browser/config/mozconfigs/tor-browser-android - browser/extensions/moz.build - + browser/fonts/fonts.conf - browser/fonts/moz.build - browser/installer/Makefile.in - browser/installer/package-manifest.in - browser/installer/windows/nsis/shared.nsh - − browser/locales/en-US/chrome/overrides/appstrings.properties - browser/locales/jar.mn - browser/locales/l10n.toml - browser/modules/BrowserWindowTracker.sys.mjs - browser/modules/HomePage.sys.mjs - browser/modules/LaterRun.sys.mjs - + browser/modules/TorSettingsNotification.sys.mjs - + browser/modules/TorUIUtils.sys.mjs - browser/modules/URILoadingHelper.sys.mjs - browser/modules/moz.build - browser/moz.build - browser/moz.configure - browser/themes/shared/addons/unified-extensions.css - browser/themes/shared/browser-shared.css - browser/themes/shared/controlcenter/panel.css - browser/themes/shared/downloads/contentAreaDownloadsView.css - + browser/themes/shared/icons/new_circuit.svg - + browser/themes/shared/icons/new_identity.svg - browser/themes/shared/identity-block/identity-block.css - browser/themes/shared/jar.inc.mn - browser/themes/shared/notification-icons.css - browser/themes/shared/preferences/preferences.css - browser/themes/shared/tabbrowser/content-area.css - browser/themes/shared/tabbrowser/tabs.css - browser/themes/shared/toolbarbutton-icons.css - + browser/themes/shared/tor-branding.css - + browser/themes/shared/tor-urlbar-button.css - build.gradle - build/application.ini.in - build/moz.build - build/moz.configure/init.configure - build/moz.configure/rust.configure - build/moz.configure/update-programs.configure - build/moz.configure/windows.configure - build/variables.py - caps/nsScriptSecurityManager.cpp - config/createprecomplete.py - devtools/client/aboutdebugging/src/actions/runtimes.js - devtools/client/netmonitor/src/components/SecurityState.js - devtools/client/themes/images/aboutdebugging-firefox-logo.svg - docshell/base/URIFixup.sys.mjs - docshell/base/nsAboutRedirector.cpp - docshell/base/nsDocShell.cpp - docshell/build/components.conf - dom/base/ContentAreaDropListener.sys.mjs - dom/base/Document.cpp - dom/base/Document.h - dom/base/nsContentUtils.cpp - dom/base/nsContentUtils.h - dom/base/nsCopySupport.cpp - dom/base/nsGlobalWindowOuter.cpp - dom/canvas/ClientWebGLContext.cpp - dom/ipc/BrowserParent.cpp - dom/ipc/BrowserParent.h - dom/ipc/PBrowser.ipdl - dom/ipc/WindowGlobalActor.cpp - dom/ipc/WindowGlobalChild.cpp - dom/media/systemservices/video_engine/desktop_device_info.cc - dom/media/webrtc/libwebrtcglue/VideoConduit.cpp - dom/media/webrtc/sdp/RsdparsaSdpAttributeList.cpp - dom/media/webrtc/transport/nrinterfaceprioritizer.cpp - dom/media/webrtc/transport/sigslot.h - dom/media/webrtc/transport/test/ice_unittest.cpp - dom/media/webrtc/transport/third_party/nICEr/src/net/local_addr.c - dom/media/webrtc/transport/third_party/nICEr/src/net/local_addr.h - dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c - dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-win32.c - dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs.c - dom/media/webrtc/transport/third_party/nrappkit/src/log/r_log.c - dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.c - dom/security/nsContentSecurityUtils.cpp - dom/security/nsMixedContentBlocker.cpp - dom/webidl/Document.webidl - dom/websocket/WebSocket.cpp - eslint-file-globals.config.mjs - eslint-ignores.config.mjs - extensions/auth/nsHttpNegotiateAuth.cpp - gfx/thebes/StandardFonts-linux.inc → gfx/thebes/StandardFonts-linux-upstream.inc - + gfx/thebes/StandardFonts-macos-bb.inc - gfx/thebes/StandardFonts-macos.inc → gfx/thebes/StandardFonts-macos-upstream.inc - + gfx/thebes/StandardFonts-win10-bb.inc - gfx/thebes/StandardFonts-win10.inc → gfx/thebes/StandardFonts-win10-upstream.inc - gfx/thebes/gfxDWriteFontList.cpp - gfx/thebes/gfxDWriteFontList.h - gfx/thebes/gfxFcPlatformFontList.cpp - gfx/thebes/gfxGDIFontList.cpp - gfx/thebes/gfxMacPlatformFontList.mm - gfx/thebes/gfxPlatformFontList.cpp - intl/l10n/Localization.h - intl/locale/LocaleService.cpp - js/xpconnect/src/xpc.msg - layout/base/nsLayoutUtils.cpp - media/libaom/moz.build - mobile/android/android-components/components/browser/engine-gecko/build.gradle - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/cookiebanners/GeckoCookieBannersStorage.kt - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/cookiebanners/ReportSiteDomainsRepository.kt - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/webextension/GeckoWebExtension.kt - mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/cookiebanners/GeckoCookieBannersStorageTest.kt - mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/cookiebanners/ReportSiteDomainsRepositoryTest.kt - mobile/android/android-components/components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt - mobile/android/android-components/components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt - mobile/android/android-components/components/browser/thumbnails/src/main/java/mozilla/components/browser/thumbnails/utils/ThumbnailDiskCache.kt - mobile/android/android-components/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt - mobile/android/android-components/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteInfoIconView.kt - mobile/android/android-components/components/browser/toolbar/src/main/res/drawable/mozac_ic_site_info.xml - mobile/android/android-components/components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml - mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt - mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt - mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/cookiehandling/CookieBannersStorage.kt - mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/webextension/WebExtension.kt - mobile/android/android-components/components/concept/engine/src/test/java/mozilla/components/concept/engine/SettingsTest.kt - mobile/android/android-components/components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt - mobile/android/android-components/components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt - mobile/android/android-components/components/feature/accounts/build.gradle - mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/AddonManager.kt - mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AMOAddonsProvider.kt - mobile/android/android-components/components/feature/app-links/build.gradle - mobile/android/android-components/components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt - mobile/android/android-components/components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt - mobile/android/android-components/components/feature/awesomebar/src/main/java/mozilla/components/feature/awesomebar/provider/SessionAutocompleteProvider.kt - mobile/android/android-components/components/feature/awesomebar/src/main/java/mozilla/components/feature/awesomebar/provider/SessionSuggestionProvider.kt - mobile/android/android-components/components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt - mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt - mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt - mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadsFeatureTest.kt - mobile/android/android-components/components/feature/fxsuggest/build.gradle - mobile/android/android-components/components/feature/privatemode/src/main/java/mozilla/components/feature/privatemode/notification/PrivateNotificationFeature.kt - mobile/android/android-components/components/feature/search/build.gradle - mobile/android/android-components/components/feature/search/src/main/assets/search/list.json - + mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/ddg-onion.xml - mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/ddg.xml - + mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/startpage-onion.xml - + mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/startpage.xml - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/SearchUseCases.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/ext/SearchEngine.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/internal/SearchUrlBuilder.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/storage/SearchEngineReader.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepository.kt - mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/telemetry/BaseSearchTelemetryTest.kt - mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepositoryTest.kt - mobile/android/android-components/components/feature/toolbar/src/main/java/mozilla/components/feature/toolbar/ToolbarPresenter.kt - mobile/android/android-components/components/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/Types.kt - mobile/android/android-components/components/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/sync/WorkManagerSyncManager.kt - mobile/android/android-components/components/service/nimbus/build.gradle - mobile/android/android-components/components/service/nimbus/src/main/java/mozilla/components/service/nimbus/messaging/NimbusMessagingController.kt - mobile/android/android-components/components/service/nimbus/src/main/java/mozilla/components/service/nimbus/messaging/NimbusMessagingStorage.kt - mobile/android/android-components/components/service/sync-logins/src/main/java/mozilla/components/service/sync/logins/SyncableLoginsStorage.kt - mobile/android/android-components/components/support/ktx/src/main/java/mozilla/components/support/ktx/android/content/Context.kt - mobile/android/android-components/components/support/ktx/src/main/java/mozilla/components/support/ktx/kotlin/String.kt - mobile/android/android-components/components/support/remotesettings/src/main/java/mozilla/components/support/remotesettings/RemoteSettingsClient.kt - mobile/android/android-components/components/support/rustlog/src/main/java/mozilla/components/support/rustlog/RustLog.kt - + mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/TorUtils.kt - mobile/android/android-components/components/support/webextensions/src/main/java/mozilla/components/support/webextensions/WebExtensionSupport.kt - + mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_onion.xml - mobile/android/android-components/plugins/config/src/main/java/ConfigPlugin.kt - mobile/android/android-components/samples/browser/src/main/res/layout/activity_installed_add_on_details.xml - + mobile/android/app/000-tor-browser-android.js - mobile/android/app/geckoview-prefs.js - mobile/android/app/moz.build - + mobile/android/basebrowser.configure - + mobile/android/branding/tb-alpha/configure.sh - + mobile/android/branding/tb-alpha/content/favicon32.png - + mobile/android/branding/tb-alpha/content/favicon64.png - + mobile/android/branding/tb-alpha/content/jar.mn - + mobile/android/branding/tb-alpha/content/moz.build - + mobile/android/branding/tb-alpha/locales/en-US/brand.ftl - + mobile/android/branding/tb-alpha/locales/en-US/brand.properties - + mobile/android/branding/tb-alpha/locales/jar.mn - + mobile/android/branding/tb-alpha/locales/moz.build - + mobile/android/branding/tb-alpha/moz.build - + mobile/android/branding/tb-nightly/configure.sh - + mobile/android/branding/tb-nightly/content/favicon32.png - + mobile/android/branding/tb-nightly/content/favicon64.png - + mobile/android/branding/tb-nightly/content/jar.mn - + mobile/android/branding/tb-nightly/content/moz.build - + mobile/android/branding/tb-nightly/locales/en-US/brand.ftl - + mobile/android/branding/tb-nightly/locales/en-US/brand.properties - + mobile/android/branding/tb-nightly/locales/jar.mn - + mobile/android/branding/tb-nightly/locales/moz.build - + mobile/android/branding/tb-nightly/moz.build - + mobile/android/branding/tb-release/configure.sh - + mobile/android/branding/tb-release/content/favicon32.png - + mobile/android/branding/tb-release/content/favicon64.png - + mobile/android/branding/tb-release/content/jar.mn - + mobile/android/branding/tb-release/content/moz.build - + mobile/android/branding/tb-release/locales/en-US/brand.ftl - + mobile/android/branding/tb-release/locales/en-US/brand.properties - + mobile/android/branding/tb-release/locales/jar.mn - + mobile/android/branding/tb-release/locales/moz.build - + mobile/android/branding/tb-release/moz.build - mobile/android/exoplayer2/src/main/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java - mobile/android/fenix/.buildconfig.yml - mobile/android/fenix/app/build.gradle - mobile/android/fenix/app/lint-baseline.xml - mobile/android/fenix/app/onboarding.fml.yaml - mobile/android/fenix/app/proguard-rules.pro - + mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/AppStartupTest.kt - mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt - mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt - mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt - + mobile/android/fenix/app/src/beta/ic_launcher-playstore.png - + mobile/android/fenix/app/src/beta/res/drawable-hdpi/fenix_search_widget.png - − mobile/android/fenix/app/src/beta/res/drawable-hdpi/fenix_search_widget.webp - − mobile/android/fenix/app/src/beta/res/drawable/animated_splash_screen.xml - + mobile/android/fenix/app/src/beta/res/drawable/ic_launcher_background.xml - + mobile/android/fenix/app/src/beta/res/drawable/ic_launcher_monochrome_foreground.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml → mobile/android/fenix/app/src/beta/res/mipmap-anydpi-v26/ic_launcher.xml - + mobile/android/fenix/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_monochrome.xml - + mobile/android/fenix/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_monochrome_round.xml - + mobile/android/fenix/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_round.xml - mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher.webp - + mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher.webp - + mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_round.webp - + mobile/android/fenix/app/src/beta/res/values/ic_launcher_monochrome_background.xml - mobile/android/fenix/app/src/beta/res/values/static_strings.xml - mobile/android/fenix/app/src/beta/res/xml/shortcuts.xml - − mobile/android/fenix/app/src/debug/ic_launcher-web.webp - + mobile/android/fenix/app/src/debug/res/drawable-hdpi/fenix_search_widget.png - − mobile/android/fenix/app/src/debug/res/drawable/animated_splash_screen.xml - + mobile/android/fenix/app/src/debug/res/drawable/ic_launcher_background.xml - + mobile/android/fenix/app/src/debug/res/drawable/ic_launcher_monochrome_foreground.xml - mobile/android/fenix/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml - + mobile/android/fenix/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_monochrome.xml - + mobile/android/fenix/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_monochrome_round.xml - mobile/android/fenix/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml - mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher.webp - mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher.webp - mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher.webp - mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher.webp - mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.webp - mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/debug/res/values/colors.xml - + mobile/android/fenix/app/src/debug/res/values/ic_launcher_monochrome_background.xml - mobile/android/fenix/app/src/debug/res/xml/shortcuts.xml - mobile/android/fenix/app/src/main/AndroidManifest.xml - + mobile/android/fenix/app/src/main/assets/common/torrc-defaults - − mobile/android/fenix/app/src/main/assets/searchplugins/reddit.xml - − mobile/android/fenix/app/src/main/assets/searchplugins/youtube.xml - − mobile/android/fenix/app/src/main/ic_launcher-web.webp - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/BrowserDirection.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Analytics.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/NimbusComponents.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/NotificationManager.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/TorBrowserFeatures.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/UseCases.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/appstate/setup/checklist/ChecklistItem.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/middleware/MenuNavigationMiddleware.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserMenuSignIn.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenter.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/snackbar/Snackbar.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/PoweredByNotification.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/downloads/dialog/DynamicDownloadDialog.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/experiments/view/ResearchSurfaceSurvey.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ext/Activity.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/gecko/GeckoProvider.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenuView.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/intent/HomeDeepLinkIntentProcessor.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/view/RecentSyncedTab.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/PagerIndicator.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSites.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/ui/Homepage.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/microsurvey/ui/MicrosurveyCompleted.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/microsurvey/ui/MicrosurveyHeader.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/microsurvey/ui/MicrosurveyRequestPrompt.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/FenixOnboarding.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/ReEngagementNotificationWorker.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/MarketingDataOnboardingPage.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingScreen.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/TermsOfServiceOnboardingPage.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/UpgradeOnboarding.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/HttpsOnlyFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TabsSettingsFragment.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TorSecurityLevelFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/account/AccountUiView.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/advanced/DefaultLocaleSettingsController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/logins/view/SavedLoginsListView.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/ProtectionsView.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerDetailsController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerDetailsInteractor.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsView.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannersStorageExt.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SiteSettingsFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/share/SaveToPDFMiddleware.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/share/ShareController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/shortcut/PwaOnboardingObserver.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsList.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/ConnectAssistUiState.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/QuickstartViewModel.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/SecurityLevel.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapProgressViewModel.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorBridgeTransports.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLog.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsComposeFragment.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsViewModel.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/UrlQuickLoadViewModel.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/trackingprotection/ProtectionsStore.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/NotificationBase.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt - mobile/android/fenix/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt - + mobile/android/fenix/app/src/main/res/drawable-hdpi/fenix_search_widget.png - − mobile/android/fenix/app/src/main/res/drawable-hdpi/fenix_search_widget.webp - − mobile/android/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/main/res/drawable-mdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/main/res/drawable-mdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/main/res/drawable-night/onboarding_ctd_default_browser.xml - mobile/android/fenix/app/src/main/res/drawable-v23/splash_screen.xml - − mobile/android/fenix/app/src/main/res/drawable-xhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/main/res/drawable-xhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/main/res/drawable/animated_splash_screen.xml - + mobile/android/fenix/app/src/main/res/drawable/browser_location.xml - + mobile/android/fenix/app/src/main/res/drawable/connect.xml - + mobile/android/fenix/app/src/main/res/drawable/connect_broken.xml - + mobile/android/fenix/app/src/main/res/drawable/globe_broken.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_account.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_account_warning.xml - + mobile/android/fenix/app/src/main/res/drawable/ic_favorite.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_firefox.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_fx_accounts_avatar.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_notification_permission.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_onboarding_key_features.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_onboarding_key_features_icons_only.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_onboarding_search_widget.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_onboarding_sync.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_onboarding_welcome.xml - + mobile/android/fenix/app/src/main/res/drawable/ic_onion_pattern.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_pocket.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_scan.xml - + mobile/android/fenix/app/src/main/res/drawable/ic_screenshot.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_sign_in.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_signed_out.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_status_logo.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_sync_disconnected.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_synced_tabs.xml - + mobile/android/fenix/app/src/main/res/drawable/ic_tor_config_bridge.xml - + mobile/android/fenix/app/src/main/res/drawable/ic_tor_network_settings.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_wordmark_logo.webp - − mobile/android/fenix/app/src/main/res/drawable/ic_wordmark_text_normal.webp - − mobile/android/fenix/app/src/main/res/drawable/ic_wordmark_text_private.webp - − mobile/android/fenix/app/src/main/res/drawable/microsurvey_success.xml - + mobile/android/fenix/app/src/main/res/drawable/new_circuit.xml - − mobile/android/fenix/app/src/main/res/drawable/onboarding_ctd_default_browser.xml - − mobile/android/fenix/app/src/main/res/drawable/onboarding_ctd_notification.xml - − mobile/android/fenix/app/src/main/res/drawable/onboarding_ctd_sync.xml - mobile/android/fenix/app/src/main/res/drawable/progress_gradient.xml - mobile/android/fenix/app/src/main/res/drawable/pager_dot.xml → mobile/android/fenix/app/src/main/res/drawable/rounded_corners.xml - + mobile/android/fenix/app/src/main/res/drawable/tor_bootstrap_background_gradient.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi-v26/ic_launcher_private.xml → mobile/android/fenix/app/src/main/res/drawable/tor_onboarding_donate_gradient.xml - mobile/android/fenix/app/src/main/res/drawable-night/ic_logo_wordmark_normal.xml → mobile/android/fenix/app/src/main/res/drawable/tor_onboarding_donate_rounded_corners.xml - mobile/android/fenix/app/src/main/res/layout/component_cookie_banner_details_panel.xml - mobile/android/fenix/app/src/main/res/layout/fragment_about.xml - mobile/android/fenix/app/src/main/res/layout/fragment_create_shortcut.xml - mobile/android/fenix/app/src/main/res/layout/fragment_home.xml - mobile/android/fenix/app/src/main/res/layout/fragment_locale_settings.xml - + mobile/android/fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml - mobile/android/fenix/app/src/main/res/layout/fragment_turn_on_sync.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi-v26/ic_launcher_private_round.xml → mobile/android/fenix/app/src/main/res/layout/preference_quick_start.xml - mobile/android/fenix/app/src/main/res/layout/quicksettings_permissions.xml - mobile/android/fenix/app/src/main/res/layout/quicksettings_protections_panel.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v1.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v2.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_large.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_medium.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_small.xml - mobile/android/fenix/app/src/main/res/layout/sign_in_preference.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi-v26/ic_launcher_alternative.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round_alternative.xml - − mobile/android/fenix/app/src/main/res/mipmap-hdpi/ic_launcher.webp - − mobile/android/fenix/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp - − mobile/android/fenix/app/src/main/res/mipmap-mdpi/ic_launcher.webp - − mobile/android/fenix/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp - − mobile/android/fenix/app/src/main/res/mipmap-xhdpi/ic_launcher.webp - − mobile/android/fenix/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp - − mobile/android/fenix/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp - − mobile/android/fenix/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp - − mobile/android/fenix/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp - − mobile/android/fenix/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/main/res/navigation/nav_graph.xml - mobile/android/fenix/app/src/main/res/values-night-v27/styles.xml - mobile/android/fenix/app/src/main/res/values-night/styles.xml - mobile/android/fenix/app/src/main/res/values-v24/styles.xml - mobile/android/fenix/app/src/main/res/values-v27/styles.xml - mobile/android/fenix/app/src/main/res/values/attrs.xml - mobile/android/fenix/app/src/main/res/values/colors.xml - + mobile/android/fenix/app/src/main/res/values/ic_launcher_monochrome_background.xml - mobile/android/fenix/app/src/main/res/values/preference_keys.xml - mobile/android/fenix/app/src/main/res/values/static_strings.xml - mobile/android/fenix/app/src/main/res/values/styles.xml - + mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml - mobile/android/fenix/app/src/main/res/xml/logins_preferences.xml - mobile/android/fenix/app/src/main/res/xml/preferences.xml - mobile/android/fenix/app/src/main/res/xml/private_browsing_preferences.xml - mobile/android/fenix/app/src/main/res/xml/search_settings_preferences.xml - mobile/android/fenix/app/src/main/res/xml/shortcuts.xml - mobile/android/fenix/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml - mobile/android/fenix/app/src/main/res/xml/site_permissions_preferences.xml - mobile/android/fenix/app/src/main/res/xml/sync_problem.xml - + mobile/android/fenix/app/src/main/res/xml/tor_bridge_config_preferences.xml - + mobile/android/fenix/app/src/main/res/xml/tor_security_level_preferences.xml - + mobile/android/fenix/app/src/nightly/ic_launcher-playstore.png - + mobile/android/fenix/app/src/nightly/res/drawable-hdpi/fenix_search_widget.png - − mobile/android/fenix/app/src/nightly/res/drawable-hdpi/fenix_search_widget.webp - − mobile/android/fenix/app/src/nightly/res/drawable-hdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable-hdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/nightly/res/drawable/animated_splash_screen.xml - + mobile/android/fenix/app/src/nightly/res/drawable/ic_launcher_background.xml - − mobile/android/fenix/app/src/nightly/res/drawable/ic_launcher_foreground.xml - + mobile/android/fenix/app/src/nightly/res/drawable/ic_launcher_monochrome_foreground.xml - − mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_logo.webp - − mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_text_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_text_private.webp - − mobile/android/fenix/app/src/nightly/res/ic_launcher-web.webp - mobile/android/fenix/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml → mobile/android/fenix/app/src/nightly/res/mipmap-anydpi-v26/ic_launcher.xml - + mobile/android/fenix/app/src/nightly/res/mipmap-anydpi-v26/ic_launcher_monochrome.xml - + mobile/android/fenix/app/src/nightly/res/mipmap-anydpi-v26/ic_launcher_monochrome_round.xml - + mobile/android/fenix/app/src/nightly/res/mipmap-anydpi-v26/ic_launcher_round.xml - mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_round.webp - + mobile/android/fenix/app/src/nightly/res/values/ic_launcher_monochrome_background.xml - mobile/android/fenix/app/src/nightly/res/values/static_strings.xml - mobile/android/fenix/app/src/nightly/res/xml/shortcuts.xml - + mobile/android/fenix/app/src/release/ic_launcher-playstore.png - + mobile/android/fenix/app/src/release/res/drawable-hdpi/fenix_search_widget.png - − mobile/android/fenix/app/src/release/res/drawable-hdpi/fenix_search_widget.webp - − mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/release/res/drawable/animated_splash_screen.xml - + mobile/android/fenix/app/src/release/res/drawable/ic_launcher_background.xml - + mobile/android/fenix/app/src/release/res/drawable/ic_launcher_monochrome_foreground.xml - + mobile/android/fenix/app/src/release/res/mipmap-anydpi-v26/ic_launcher.xml - + mobile/android/fenix/app/src/release/res/mipmap-anydpi-v26/ic_launcher_monochrome.xml - + mobile/android/fenix/app/src/release/res/mipmap-anydpi-v26/ic_launcher_monochrome_round.xml - + mobile/android/fenix/app/src/release/res/mipmap-anydpi-v26/ic_launcher_round.xml - mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher.webp - + mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher.webp - + mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_round.webp - + mobile/android/fenix/app/src/release/res/values/ic_launcher_monochrome_background.xml - mobile/android/fenix/app/src/release/res/values/static_strings.xml - mobile/android/fenix/app/src/release/res/xml/shortcuts.xml - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/menu/MenuNavigationMiddlewareTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/metrics/MetricsUtilsTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/ext/ContextTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/HomeMenuViewTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/onboarding/view/OnboardingPageUiDataTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/SupportUtilsTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/ProtectionsViewTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragmentTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsViewTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/DefaultCookieBannerDetailsControllerTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/share/viewholders/AppViewHolderTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/trackingprotection/ProtectionsStoreTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt - mobile/android/fenix/build.gradle - + mobile/android/fenix/tools/tba-fetch-deps.sh - + mobile/android/fenix/tools/tba-sign-devbuilds.sh - mobile/android/geckoview/api.txt - mobile/android/geckoview/build.gradle - − mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/VideoCaptureTest.kt - mobile/android/geckoview/src/main/AndroidManifest.xml - mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java - mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/CrashReporter.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorAndroidIntegration.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorBootstrappingStatus.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorConnectStage.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorConnectStageName.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorSettings.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtensionController.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/androidlegacysettings/Prefs.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/androidlegacysettings/TorLegacyAndroidSettings.java - mobile/android/gradle/with_gecko_binaries.gradle - mobile/android/installer/package-manifest.in - mobile/android/locales/filter.py - mobile/android/locales/jar.mn - mobile/android/locales/l10n.toml - mobile/android/moz.configure - mobile/android/shared-settings.gradle - mobile/locales/filter.py - mobile/shared/chrome/geckoview/geckoview.js - mobile/shared/components/geckoview/GeckoViewStartup.sys.mjs - mobile/shared/modules/geckoview/GeckoViewContent.sys.mjs - mobile/shared/modules/geckoview/GeckoViewProgress.sys.mjs - mobile/shared/modules/geckoview/GeckoViewWebExtension.sys.mjs - modules/libpref/Preferences.cpp - modules/libpref/init/StaticPrefList.yaml - modules/libpref/init/all.js - moz.configure - + mozconfig-android-aarch64 - + mozconfig-android-all - + mozconfig-android-armv7 - + mozconfig-android-x86 - + mozconfig-android-x86_64 - + mozconfig-linux-aarch64 - + mozconfig-linux-aarch64-dev - + mozconfig-linux-arm - + mozconfig-linux-i686 - + mozconfig-linux-x86_64 - + mozconfig-linux-x86_64-asan - + mozconfig-linux-x86_64-dev - + mozconfig-macos - + mozconfig-macos-dev - + mozconfig-windows-i686 - + mozconfig-windows-x86_64 - netwerk/base/nsNetUtil.cpp - netwerk/base/nsSocketTransport2.cpp - netwerk/build/components.conf - netwerk/build/nsNetCID.h - + netwerk/dns/IOnionAliasService.idl - + netwerk/dns/OnionAliasService.cpp - + netwerk/dns/OnionAliasService.h - netwerk/dns/effective_tld_names.dat - netwerk/dns/moz.build - netwerk/protocol/http/HttpBaseChannel.cpp - netwerk/protocol/http/nsHttpHandler.cpp - netwerk/protocol/http/nsHttpNTLMAuth.cpp - netwerk/sctp/src/moz.build - netwerk/sctp/src/netinet/sctp_cc_functions.c - netwerk/sctp/src/netinet/sctp_indata.c - netwerk/sctp/src/netinet/sctp_input.c - netwerk/sctp/src/netinet/sctp_output.c - netwerk/sctp/src/netinet/sctp_usrreq.c - netwerk/sctp/src/netinet/sctputil.c - netwerk/sctp/src/user_mbuf.c - netwerk/sctp/src/user_socket.c - netwerk/socket/nsSOCKSIOLayer.cpp - netwerk/system/android/nsAndroidNetworkLinkService.cpp - netwerk/system/linux/nsNetworkLinkService.cpp - netwerk/system/mac/nsNetworkLinkService.mm - netwerk/system/netlink/NetlinkService.cpp - netwerk/system/win32/nsNotifyAddrListener.cpp - netwerk/url-classifier/UrlClassifierFeatureBase.cpp - netwerk/url-classifier/components.conf - python/mach/mach/telemetry.py - python/mozbuild/mozbuild/artifacts.py - python/mozbuild/mozbuild/mach_commands.py - python/mozlint/mozlint/cli.py - python/sites/mach.txt - security/certverifier/CertVerifier.cpp - security/manager/ssl/NSSSocketControl.cpp - security/manager/ssl/RemoteSecuritySettings.sys.mjs - security/manager/ssl/SSLServerCertVerification.cpp - security/manager/ssl/SSLServerCertVerification.h - security/manager/ssl/StaticHPKPins.h - security/manager/ssl/nsSecureBrowserUI.cpp - security/moz.build - security/nss/lib/certhigh/ocsp.c - security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c - security/nss/lib/mozpkix/include/pkix/Result.h - security/nss/lib/mozpkix/include/pkix/pkixnss.h - security/nss/lib/ssl/Makefile - services/settings/Attachments.sys.mjs - services/settings/IDBHelpers.sys.mjs - services/settings/RemoteSettingsClient.sys.mjs - services/settings/dumps/gen_last_modified.py - services/settings/dumps/main/moz.build - services/settings/remote-settings.sys.mjs - services/settings/servicesSettings.manifest - services/settings/static-dumps/main/moz.build - + services/settings/static-dumps/main/query-stripping.json - services/sync/components.conf - testing/mozbase/mozinstall/mozinstall/mozinstall.py - testing/mozbase/setup_development.py - testing/mozharness/scripts/does_it_crash.py - testing/specialpowers/api.js - third_party/abseil-cpp/absl/base/base_gn/moz.build - third_party/libwebrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h - third_party/libwebrtc/modules/desktop_capture/desktop_capture_types.h - third_party/libwebrtc/modules/desktop_capture/win/desktop_capture_utils.cc - third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc - third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.cc - third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.h - third_party/libwebrtc/modules/video_capture/windows/device_info_ds.h - third_party/libwebrtc/rtc_base/platform_thread_types.cc - third_party/libwebrtc/rtc_base/socket.h - third_party/libwebrtc/rtc_base/system/file_wrapper.cc - third_party/libwebrtc/rtc_base/win/create_direct3d_device.h - third_party/sipcc/cpr_win_types.h - third_party/sipcc/sdp_token.c - toolkit/.eslintrc.mjs - toolkit/actors/AboutHttpsOnlyErrorParent.sys.mjs - + toolkit/actors/FilesFilterChild.sys.mjs - + toolkit/actors/FilesFilterParent.sys.mjs - toolkit/actors/NetErrorParent.sys.mjs - toolkit/actors/moz.build - toolkit/components/antitracking/antitracking.manifest - toolkit/components/antitracking/components.conf - toolkit/components/downloads/DownloadCore.sys.mjs - toolkit/components/downloads/DownloadIntegration.sys.mjs - toolkit/components/extensions/Extension.sys.mjs - toolkit/components/extensions/ExtensionParent.sys.mjs - toolkit/components/httpsonlyerror/content/errorpage.js - + toolkit/components/lox/Lox.sys.mjs - + toolkit/components/lox/content/lox_wasm_bg.wasm - + toolkit/components/lox/jar.mn - + toolkit/components/lox/lox_wasm.jsm - + toolkit/components/lox/moz.build - toolkit/components/moz.build - toolkit/components/places/PlacesUtils.sys.mjs - toolkit/components/remotebrowserutils/RemoteWebNavigation.sys.mjs - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs - toolkit/components/resistfingerprinting/content/letterboxing.css - toolkit/components/search/AppProvidedSearchEngine.sys.mjs - toolkit/components/search/SearchEngine.sys.mjs - toolkit/components/search/SearchService.sys.mjs - + toolkit/components/search/content/duckduckgo.ico - + toolkit/components/search/content/startpage.png - + toolkit/components/search/content/torBrowserSearchEngineIcons.json - + toolkit/components/search/content/torBrowserSearchEngines.json - + toolkit/components/search/content/wikipedia.ico - + toolkit/components/search/jar.mn - toolkit/components/search/moz.build - + toolkit/components/securitylevel/SecurityLevel.manifest - + toolkit/components/securitylevel/SecurityLevel.sys.mjs - + toolkit/components/securitylevel/components.conf - + toolkit/components/securitylevel/moz.build - toolkit/components/telemetry/app/TelemetrySend.sys.mjs - toolkit/components/telemetry/moz.build - + toolkit/components/tor-launcher/TorBootstrapRequest.sys.mjs - + toolkit/components/tor-launcher/TorControlPort.sys.mjs - + toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs - + toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs - + toolkit/components/tor-launcher/TorParsers.sys.mjs - + toolkit/components/tor-launcher/TorProcess.sys.mjs - + toolkit/components/tor-launcher/TorProcessAndroid.sys.mjs - + toolkit/components/tor-launcher/TorProvider.sys.mjs - + toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs - + toolkit/components/tor-launcher/TorStartupService.sys.mjs - + toolkit/components/tor-launcher/components.conf - + toolkit/components/tor-launcher/moz.build - + toolkit/components/tor-launcher/tor-launcher.manifest - + toolkit/components/torconnect/TorConnectChild.sys.mjs - + toolkit/components/torconnect/TorConnectParent.sys.mjs - + toolkit/components/torconnect/content/aboutTorConnect.css - + toolkit/components/torconnect/content/aboutTorConnect.html - + toolkit/components/torconnect/content/aboutTorConnect.js - + toolkit/components/torconnect/content/arrow-right.svg - + toolkit/components/torconnect/content/bridge.svg - + toolkit/components/torconnect/content/connection-failure.svg - + toolkit/components/torconnect/content/connection-location.svg - + toolkit/components/torconnect/content/tor-connect-broken.svg - + toolkit/components/torconnect/content/tor-connect.svg - + toolkit/components/torconnect/content/tor-not-connected-to-connected-animated.svg - + toolkit/components/torconnect/content/torConnectTitlebarStatus.css - + toolkit/components/torconnect/content/torConnectTitlebarStatus.js - + toolkit/components/torconnect/content/torConnectUrlbarButton.js - + toolkit/components/torconnect/jar.mn - + toolkit/components/torconnect/moz.build - toolkit/components/urlformatter/URLFormatter.sys.mjs - toolkit/components/windowwatcher/nsWindowWatcher.cpp - toolkit/content/.eslintrc.mjs - toolkit/content/aboutNetError.html - toolkit/content/aboutNetError.mjs - toolkit/content/aboutSupport.js - toolkit/content/jar.mn - toolkit/content/license.html - + toolkit/content/moat_countries_dev_build.json - + toolkit/content/pt_config.json - toolkit/content/widgets/infobar.css - toolkit/content/widgets/moz-message-bar/moz-message-bar.mjs - toolkit/content/widgets/moz-support-link/moz-support-link.mjs - toolkit/content/widgets/moz-toggle/moz-toggle.mjs - toolkit/content/widgets/notificationbox.js - + toolkit/locales-preview/base-browser-no-translate.ftl - + toolkit/locales-preview/tor-browser-no-translate.ftl - + toolkit/locales/en-US/toolkit/global/base-browser.ftl - + toolkit/locales/en-US/toolkit/global/tor-browser.ftl - toolkit/locales/jar.mn - toolkit/modules/ActorManagerParent.sys.mjs - toolkit/modules/AppConstants.sys.mjs - + toolkit/modules/Bech32Decode.sys.mjs - + toolkit/modules/BridgeDB.sys.mjs - + toolkit/modules/DomainFrontedRequests.sys.mjs - + toolkit/modules/DragDropFilter.sys.mjs - + toolkit/modules/Moat.sys.mjs - toolkit/modules/PopupNotifications.sys.mjs - + toolkit/modules/QRCode.sys.mjs - toolkit/modules/RemotePageAccessManager.sys.mjs - + toolkit/modules/TorAndroidIntegration.sys.mjs - + toolkit/modules/TorConnect.sys.mjs - + toolkit/modules/TorSettings.sys.mjs - + toolkit/modules/TorStrings.sys.mjs - toolkit/modules/UpdateUtils.sys.mjs - toolkit/modules/moz.build - toolkit/moz.build - toolkit/mozapps/extensions/AddonManager.sys.mjs - toolkit/mozapps/extensions/components.conf - toolkit/mozapps/extensions/content/aboutaddons.html - toolkit/mozapps/extensions/content/aboutaddons.js - toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs - toolkit/mozapps/extensions/internal/XPIInstall.sys.mjs - toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs - toolkit/mozapps/extensions/test/browser/head.js - toolkit/mozapps/extensions/test/xpcshell/head_addons.js - toolkit/mozapps/update/UpdateService.sys.mjs - toolkit/mozapps/update/UpdateServiceStub.sys.mjs - toolkit/mozapps/update/common/updatehelper.cpp - toolkit/mozapps/update/updater/launchchild_osx.mm - toolkit/mozapps/update/updater/moz.build - toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der - toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der - toolkit/mozapps/update/updater/release_primary.der - toolkit/mozapps/update/updater/release_secondary.der - toolkit/mozapps/update/updater/updater.cpp - toolkit/themes/shared/aboutNetError.css - toolkit/themes/shared/desktop-jar.inc.mn - + toolkit/themes/shared/icons/onion-site.svg - + toolkit/themes/shared/icons/onion-slash.svg - + toolkit/themes/shared/icons/onion-warning.svg - + toolkit/themes/shared/icons/tor-dark-loading.png - + toolkit/themes/shared/icons/tor-dark-loading(a)2x.png - + toolkit/themes/shared/icons/tor-light-loading.png - + toolkit/themes/shared/icons/tor-light-loading(a)2x.png - + toolkit/themes/shared/icons/torbrowser.png - toolkit/themes/shared/minimal-toolkit.jar.inc.mn - + toolkit/themes/shared/onion-pattern.css - + toolkit/themes/shared/onion-pattern.svg - + toolkit/themes/shared/tor-colors.css - + toolkit/torbutton/chrome/locale/en-US/onionLocation.properties - + toolkit/torbutton/chrome/locale/en-US/settings.properties - + toolkit/torbutton/chrome/locale/en-US/torConnect.properties - + toolkit/torbutton/chrome/locale/en-US/torlauncher.properties - + toolkit/torbutton/jar.mn - + toolkit/torbutton/moz.build - toolkit/xre/LauncherRegistryInfo.cpp - toolkit/xre/MacLaunchHelper.h - toolkit/xre/MacLaunchHelper.mm - toolkit/xre/MacRunFromDmgUtils.mm - toolkit/xre/ProfileReset.cpp - toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp - toolkit/xre/nsAppRunner.cpp - toolkit/xre/nsIXREDirProvider.idl - toolkit/xre/nsUpdateDriver.cpp - toolkit/xre/nsXREDirProvider.cpp - toolkit/xre/nsXREDirProvider.h - + tools/base-browser/git-rebase-fixup-preprocessor - + tools/base-browser/l10n/combine-translation-versions.py - + tools/base-browser/l10n/combine/__init__.py - + tools/base-browser/l10n/combine/combine.py - + tools/base-browser/l10n/combine/tests/README - + tools/base-browser/l10n/combine/tests/__init__.py - + tools/base-browser/l10n/combine/tests/test_android.py - + tools/base-browser/l10n/combine/tests/test_dtd.py - + tools/base-browser/l10n/combine/tests/test_fluent.py - + tools/base-browser/l10n/combine/tests/test_properties.py - + tools/base-browser/tb-dev - + tools/geckoview/.gitignore - + tools/geckoview/Makefile - + tools/geckoview/android-env-linux-template.sh - + tools/geckoview/android-env-macos-template.sh - + tools/geckoview/build-fenix.sh - + tools/geckoview/build-geckoview.sh - + tools/geckoview/clobber.sh - + tools/geckoview/config.sh - + tools/geckoview/install-fenix.sh - + tools/geckoview/jslint.sh - tools/lint/fluent-lint/exclusions.yml - + tools/torbrowser/Makefile - + tools/torbrowser/browser-self-sign-macos.sh - + tools/torbrowser/build.sh - + tools/torbrowser/clobber.sh - + tools/torbrowser/config.sh - + tools/torbrowser/deploy.sh - + tools/torbrowser/fetch.sh - + tools/torbrowser/generate-bugzilla-triage-csv.sh - + tools/torbrowser/generate_tor_loading_png.py - + tools/torbrowser/ide.sh - + tools/torbrowser/jslint.sh - + tools/torbrowser/l10n/migrate.py - + tools/torbrowser/l10n/migrations/__init__.py - + tools/torbrowser/l10n/migrations/bug-41333-new-about-tor.py - + tools/torbrowser/l10n/migrations/bug-41622-neterror.py - + tools/torbrowser/l10n/migrations/bug-41820-moz-message-bar-download-warning.py - + tools/torbrowser/l10n/migrations/bug-42202-crypto-safety.py - + tools/torbrowser/l10n/migrations/bug-42203-about-dialog.py - + tools/torbrowser/l10n/migrations/bug-42206-rulesets.py - + tools/torbrowser/l10n/migrations/bug-42207-settings.py - + tools/torbrowser/l10n/migrations/bug-42209-tor-circuit.py - + tools/torbrowser/l10n/migrations/bug-42210-download-warning.py - + tools/torbrowser/l10n/migrations/bug-42211-new-identity.py - + tools/torbrowser/l10n/migrations/bug-42212-onion-services.py - + tools/torbrowser/l10n/migrations/bug-42214-security-level.py - + tools/torbrowser/l10n/migrations/bug-43531-bridge-dialog-buttons.py - + tools/torbrowser/prepare-tests.sh - + tools/torbrowser/update_emojis.py - tools/update-packaging/common.sh - tools/update-packaging/make_full_update.sh - tools/update-packaging/make_incremental_update.sh - uriloader/base/nsURILoader.cpp - uriloader/exthandler/nsExternalHelperAppService.cpp - widget/ScrollbarDrawingWin.cpp - widget/ScrollbarDrawingWin11.cpp - widget/android/WebExecutorSupport.cpp - widget/gtk/MPRISServiceHandler.cpp - widget/gtk/WidgetUtilsGtk.cpp - widget/windows/WinTaskbar.cpp - widget/windows/nsDataObj.cpp - xpcom/base/ErrorList.py - xpcom/ds/StaticAtoms.py - xpcom/io/CocoaFileUtils.mm - xpcom/io/nsAppFileLocationProvider.cpp - xpfe/appshell/AppWindow.cpp The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f1e32f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f1e32f… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/tor-browser-update-responses][main] 7 commits: release: new version, 14.5.3 (linux-i686)
by ma1 (＠ma1) 27 May '25

27 May '25

ma1 pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 5f6d6545 by hackademix at 2025-05-27T14:37:01+02:00 release: new version, 14.5.3 (linux-i686) - - - - - e49ea5f5 by hackademix at 2025-05-27T14:37:01+02:00 release: new version, 14.5.3 (linux-x86_64) - - - - - f6cc3c2f by hackademix at 2025-05-27T14:37:01+02:00 release: new version, 14.5.3 (macos) - - - - - 22a8b946 by hackademix at 2025-05-27T14:37:01+02:00 release: new version, 14.5.3 (… [View More]windows-i686) - - - - - 545fb926 by hackademix at 2025-05-27T14:37:02+02:00 release: new version, 14.5.3 (windows-x86_64) - - - - - 14046914 by hackademix at 2025-05-27T14:37:02+02:00 release: new version, 14.5.3 (android) - - - - - cb2172c8 by hackademix at 2025-05-27T14:37:02+02:00 release: new version, 14.5.3 - - - - - 72 changed files: - update_3/release/download-android-aarch64.json - update_3/release/download-android-armv7.json - update_3/release/download-android-x86.json - update_3/release/download-android-x86_64.json - update_3/release/download-linux-i686.json - update_3/release/download-linux-x86_64.json - update_3/release/download-macos.json - update_3/release/download-windows-i686.json - update_3/release/download-windows-x86_64.json - update_3/release/downloads.json - update_3/release/linux-i686/.htaccess - − update_3/release/linux-i686/update-14.0.9-14.5.2+13.5.17-linux-i686.xml - − update_3/release/linux-i686/update-14.5-14.5.2+13.5.17-linux-i686.xml - + update_3/release/linux-i686/update-14.5-14.5.3+13.5.18-linux-i686.xml - − update_3/release/linux-i686/update-14.5.1-14.5.2+13.5.17-linux-i686.xml - + update_3/release/linux-i686/update-14.5.1-14.5.3+13.5.18-linux-i686.xml - − update_3/release/linux-i686/update-14.5.2+13.5.17-linux-i686.xml - + update_3/release/linux-i686/update-14.5.2-14.5.3+13.5.18-linux-i686.xml - + update_3/release/linux-i686/update-14.5.3+13.5.18-linux-i686.xml - update_3/release/linux-x86_64/.htaccess - − update_3/release/linux-x86_64/update-14.0.9-14.5.2+13.5.17-linux-x86_64.xml - − update_3/release/linux-x86_64/update-14.5-14.5.2+13.5.17-linux-x86_64.xml - + update_3/release/linux-x86_64/update-14.5-14.5.3+13.5.18-linux-x86_64.xml - − update_3/release/linux-x86_64/update-14.5.1-14.5.2+13.5.17-linux-x86_64.xml - + update_3/release/linux-x86_64/update-14.5.1-14.5.3+13.5.18-linux-x86_64.xml - − update_3/release/linux-x86_64/update-14.5.2+13.5.17-linux-x86_64.xml - + update_3/release/linux-x86_64/update-14.5.2-14.5.3+13.5.18-linux-x86_64.xml - + update_3/release/linux-x86_64/update-14.5.3+13.5.18-linux-x86_64.xml - update_3/release/macos/.htaccess - − update_3/release/macos/update-13.5.15-14.5.2+13.5.17-macos.xml - + update_3/release/macos/update-13.5.15-14.5.3+13.5.18-macos.xml - − update_3/release/macos/update-13.5.16-14.5.2+13.5.17-macos.xml - + update_3/release/macos/update-13.5.16-14.5.3+13.5.18-macos.xml - + update_3/release/macos/update-13.5.17-14.5.3+13.5.18-macos.xml - − update_3/release/macos/update-14.0.9-14.5.2+13.5.17-macos.xml - − update_3/release/macos/update-14.5-14.5.2+13.5.17-macos.xml - + update_3/release/macos/update-14.5-14.5.3+13.5.18-macos.xml - − update_3/release/macos/update-14.5.1-14.5.2+13.5.17-macos.xml - + update_3/release/macos/update-14.5.1-14.5.3+13.5.18-macos.xml - − update_3/release/macos/update-14.5.2+13.5.17-macos.xml - + update_3/release/macos/update-14.5.2-14.5.3+13.5.18-macos.xml - + update_3/release/macos/update-14.5.3+13.5.18-macos.xml - update_3/release/windows-i686/.htaccess - − update_3/release/windows-i686/update-13.5.14-14.5.2+13.5.17-windows-i686.xml - − update_3/release/windows-i686/update-13.5.15-14.5.2+13.5.17-windows-i686.xml - + update_3/release/windows-i686/update-13.5.15-14.5.3+13.5.18-windows-i686.xml - − update_3/release/windows-i686/update-13.5.16-14.5.2+13.5.17-windows-i686.xml - + update_3/release/windows-i686/update-13.5.16-14.5.3+13.5.18-windows-i686.xml - + update_3/release/windows-i686/update-13.5.17-14.5.3+13.5.18-windows-i686.xml - − update_3/release/windows-i686/update-14.0.9-14.5.2+13.5.17-windows-i686.xml - − update_3/release/windows-i686/update-14.5-14.5.2+13.5.17-windows-i686.xml - + update_3/release/windows-i686/update-14.5-14.5.3+13.5.18-windows-i686.xml - − update_3/release/windows-i686/update-14.5.1-14.5.2+13.5.17-windows-i686.xml - + update_3/release/windows-i686/update-14.5.1-14.5.3+13.5.18-windows-i686.xml - − update_3/release/windows-i686/update-14.5.2+13.5.17-windows-i686.xml - + update_3/release/windows-i686/update-14.5.2-14.5.3+13.5.18-windows-i686.xml - + update_3/release/windows-i686/update-14.5.3+13.5.18-windows-i686.xml - update_3/release/windows-x86_64/.htaccess - − update_3/release/windows-x86_64/update-13.5.14-14.5.2+13.5.17-windows-x86_64.xml - − update_3/release/windows-x86_64/update-13.5.15-14.5.2+13.5.17-windows-x86_64.xml - + update_3/release/windows-x86_64/update-13.5.15-14.5.3+13.5.18-windows-x86_64.xml - − update_3/release/windows-x86_64/update-13.5.16-14.5.2+13.5.17-windows-x86_64.xml - + update_3/release/windows-x86_64/update-13.5.16-14.5.3+13.5.18-windows-x86_64.xml - + update_3/release/windows-x86_64/update-13.5.17-14.5.3+13.5.18-windows-x86_64.xml - − update_3/release/windows-x86_64/update-14.0.9-14.5.2+13.5.17-windows-x86_64.xml - − update_3/release/windows-x86_64/update-14.5-14.5.2+13.5.17-windows-x86_64.xml - + update_3/release/windows-x86_64/update-14.5-14.5.3+13.5.18-windows-x86_64.xml - − update_3/release/windows-x86_64/update-14.5.1-14.5.2+13.5.17-windows-x86_64.xml - + update_3/release/windows-x86_64/update-14.5.1-14.5.3+13.5.18-windows-x86_64.xml - − update_3/release/windows-x86_64/update-14.5.2+13.5.17-windows-x86_64.xml - + update_3/release/windows-x86_64/update-14.5.2-14.5.3+13.5.18-windows-x86_64.xml - + update_3/release/windows-x86_64/update-14.5.3+13.5.18-windows-x86_64.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/mullvad-browser-update-responses][main] 4 commits: release: new version, 14.5.3 (linux-x86_64)
by ma1 (＠ma1) 27 May '25

27 May '25

ma1 pushed to branch main at The Tor Project / Applications / mullvad-browser-update-responses Commits: 784d0d56 by hackademix at 2025-05-27T11:59:00+02:00 release: new version, 14.5.3 (linux-x86_64) - - - - - 28796279 by hackademix at 2025-05-27T11:59:00+02:00 release: new version, 14.5.3 (macos) - - - - - b567de98 by hackademix at 2025-05-27T11:59:00+02:00 release: new version, 14.5.3 (windows-x86_64) - - - - - 48ff51c9 by hackademix at 2025-05-27T11:59:00+02:00 release: new version, 14.… [View More]5.3 - - - - - 31 changed files: - update_1/release/download-linux-x86_64.json - update_1/release/download-macos.json - update_1/release/download-windows-x86_64.json - update_1/release/downloads.json - update_1/release/linux-x86_64/.htaccess - − update_1/release/linux-x86_64/update-14.0.9-14.5.2-linux-x86_64.xml - − update_1/release/linux-x86_64/update-14.5-14.5.2-linux-x86_64.xml - + update_1/release/linux-x86_64/update-14.5-14.5.3-linux-x86_64.xml - − update_1/release/linux-x86_64/update-14.5.1-14.5.2-linux-x86_64.xml - + update_1/release/linux-x86_64/update-14.5.1-14.5.3-linux-x86_64.xml - + update_1/release/linux-x86_64/update-14.5.2-14.5.3-linux-x86_64.xml - − update_1/release/linux-x86_64/update-14.5.2-linux-x86_64.xml - + update_1/release/linux-x86_64/update-14.5.3-linux-x86_64.xml - update_1/release/macos/.htaccess - − update_1/release/macos/update-14.0.9-14.5.2-macos.xml - − update_1/release/macos/update-14.5-14.5.2-macos.xml - + update_1/release/macos/update-14.5-14.5.3-macos.xml - − update_1/release/macos/update-14.5.1-14.5.2-macos.xml - + update_1/release/macos/update-14.5.1-14.5.3-macos.xml - + update_1/release/macos/update-14.5.2-14.5.3-macos.xml - − update_1/release/macos/update-14.5.2-macos.xml - + update_1/release/macos/update-14.5.3-macos.xml - update_1/release/windows-x86_64/.htaccess - − update_1/release/windows-x86_64/update-14.0.9-14.5.2-windows-x86_64.xml - − update_1/release/windows-x86_64/update-14.5-14.5.2-windows-x86_64.xml - + update_1/release/windows-x86_64/update-14.5-14.5.3-windows-x86_64.xml - − update_1/release/windows-x86_64/update-14.5.1-14.5.2-windows-x86_64.xml - + update_1/release/windows-x86_64/update-14.5.1-14.5.3-windows-x86_64.xml - + update_1/release/windows-x86_64/update-14.5.2-14.5.3-windows-x86_64.xml - − update_1/release/windows-x86_64/update-14.5.2-windows-x86_64.xml - + update_1/release/windows-x86_64/update-14.5.3-windows-x86_64.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0