Pier Angelo Vendrame pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser

Commits: 7d140e5c by Henry Wilkes at 2024-09-11T09:32:40+02:00 fixup! Bug 18905: Hide unwanted items from help menu

Bug 42647: Hide the switch device menu item.

- - - - - 32c87a46 by Henry Wilkes at 2024-09-11T09:32:49+02:00 fixup! Firefox preference overrides.

Bug 42647: Remove unused preference browser.device-migration.help-menu.hidden.

- - - - - c5fdc06a by Henry Wilkes at 2024-09-11T09:32:58+02:00 Bug 43109: Hide Firefox Relay from settings.

This should remain disabled, see tor-browser#42814.

- - - - - 00bb7583 by Henry Wilkes at 2024-09-11T09:33:07+02:00 fixup! Bug 42027: Base Browser migration procedures.

Bug 42777: Clear user preferences for GPC and DNT.

- - - - - 542ca8e7 by Henry Wilkes at 2024-09-11T09:33:22+02:00 Bug 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.

- - - - - b987575b by Pier Angelo Vendrame at 2024-09-11T09:33:33+02:00 fixup! Bug 40925: Implemented the Security Level component

Bug 42149: Do not change HTTPS-Only settings in the security level anymore.

That preference does not really belong to the security level.

- - - - - eda499b9 by Pier Angelo Vendrame at 2024-09-11T09:33:39+02:00 fixup! Bug 42027: Base Browser migration procedures.

Bug 42149: Clear user values for https_only_mode_send_http_background_request since we do not change it with the security level anymore.

- - - - -

6 changed files:

- browser/app/profile/001-base-profile.js - browser/base/content/browser-menubar.inc - browser/components/BrowserGlue.sys.mjs - browser/components/preferences/privacy.inc.xhtml - browser/components/preferences/privacy.js - toolkit/components/securitylevel/SecurityLevel.sys.mjs

Changes:

===================================== browser/app/profile/001-base-profile.js ===================================== @@ -20,9 +20,6 @@ pref("browser.aboutwelcome.enabled", false); // Disable the Firefox View tab (tor-browser#41876) pref("browser.tabs.firefox-view", false, locked);

-// Disable 'Switching to a new device" help menu item (tor-browser#41774) -pref("browser.device-migration.help-menu.hidden", true); - #if MOZ_UPDATE_CHANNEL == release // tor-browser#42640: Disable Firefox Flame buttond due to unknown interactions with New Identity pref("browser.privatebrowsing.resetPBM.enabled", false, locked);

===================================== browser/base/content/browser-menubar.inc ===================================== @@ -503,6 +503,7 @@ hidden="true"/> <menuitem id="helpSwitchDevice" oncommand="openSwitchingDevicesPage();" + hidden="true" data-l10n-id="menu-help-switch-device" appmenu-data-l10n-id="appmenu-help-switch-device"/> <menuseparator id="aboutSeparator"/>

===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -4701,7 +4701,12 @@ BrowserGlue.prototype = { _migrateUIBB() { // Version 1: 13.0a3. Reset layout.css.prefers-color-scheme.content-override // for tor-browser#41739. - const MIGRATION_VERSION = 1; + // Version 2: 14.0a5:Reset the privacy tracking headers preferences since + // the UI is hidden. tor-browser#42777. + // Also, do not set + // dom.security.https_only_mode_send_http_background_request in + // the security level anymore (tor-browser#42149). + const MIGRATION_VERSION = 2; const MIGRATION_PREF = "basebrowser.migration.version"; // We do not care whether this is a new or old profile, since in version 1 // we just quickly clear a user preference, which should not do anything to @@ -4714,6 +4719,20 @@ BrowserGlue.prototype = { "layout.css.prefers-color-scheme.content-override" ); } + if (currentVersion < 2) { + for (const prefName of [ + "privacy.globalprivacycontrol.enabled", + "privacy.donottrackheader.enabled", + // Telemetry preference for if the user changed the value. + "privacy.globalprivacycontrol.was_ever_enabled", + // The last two preferences have no corresponding UI, but are related. + "privacy.globalprivacycontrol.functionality.enabled", + "privacy.globalprivacycontrol.pbmode.enabled", + "dom.security.https_only_mode_send_http_background_request", + ]) { + Services.prefs.clearUserPref(prefName); + } + } Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); },

===================================== browser/components/preferences/privacy.inc.xhtml ===================================== @@ -358,7 +358,7 @@ </vbox> </vbox> </groupbox> -<groupbox id="nonTechnicalPrivacyGroup" data-category="panePrivacy" data-subcategory="nontechnicalprivacy" hidden="true"> +<groupbox id="nonTechnicalPrivacyGroup" data-category="panePrivacy" data-subcategory="nontechnicalprivacy" data-hidden-from-search="true" hidden="true"> <label id="nonTechnicalPrivacyHeader"><html:h2 data-l10n-id="non-technical-privacy-header"/></label> <vbox id="nonTechnicalPrivacyBox"> <hbox id="globalPrivacyControlBox" flex="1" align="center" hidden="true">

===================================== browser/components/preferences/privacy.js ===================================== @@ -3039,8 +3039,12 @@ var gPrivacyPane = { },

_updateRelayIntegrationUI() { - document.getElementById("relayIntegrationBox").hidden = - !FirefoxRelay.isAvailable; + // In Base Browser, we always hide the integration checkbox since + // FirefoxRelay should remain disabled. + // See tor-browser#43109 and tor-browser#42814. + // NOTE: FirefoxRelay.isAvailable will be true whenever + // FirefoxRelay.isDisabled is true. + document.getElementById("relayIntegrationBox").hidden = true; document.getElementById("relayIntegration").checked = FirefoxRelay.isAvailable && !FirefoxRelay.isDisabled; },

===================================== toolkit/components/securitylevel/SecurityLevel.sys.mjs ===================================== @@ -256,17 +256,16 @@ var initializeNoScriptControl = () => { /* eslint-disable */ // prettier-ignore const kSecuritySettings = { - // Preference name : [0, 1-high 2-m 3-m 4-low] - "javascript.options.ion" : [, false, false, false, true ], - "javascript.options.baselinejit" : [, false, false, false, true ], - "javascript.options.native_regexp" : [, false, false, false, true ], - "mathml.disabled" : [, true, true, true, false], - "gfx.font_rendering.graphite.enabled" : [, false, false, false, true ], - "gfx.font_rendering.opentype_svg.enabled" : [, false, false, false, true ], - "svg.disabled" : [, true, false, false, false], - "javascript.options.asmjs" : [, false, false, false, true ], - "javascript.options.wasm" : [, false, false, false, true ], - "dom.security.https_only_mode_send_http_background_request" : [, false, false, false, true ], + // Preference name: [0, 1-high 2-m 3-m 4-low] + "javascript.options.ion": [, false, false, false, true ], + "javascript.options.baselinejit": [, false, false, false, true ], + "javascript.options.native_regexp": [, false, false, false, true ], + "mathml.disabled": [, true, true, true, false], + "gfx.font_rendering.graphite.enabled": [, false, false, false, true ], + "gfx.font_rendering.opentype_svg.enabled": [, false, false, false, true ], + "svg.disabled": [, true, false, false, false], + "javascript.options.asmjs": [, false, false, false, true ], + "javascript.options.wasm": [, false, false, false, true ], }; /* eslint-enable */

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/69a7c00...