This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser.

commit 6aac3873c280c0840eb9ae17220dc90e99943105 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Thu Nov 17 18:30:07 2022 +0100

fixup! Bug 40597: Implement TorSettings module

Bug 41460: Removed references to the meek helper --- browser/modules/Moat.jsm | 6 ------ 1 file changed, 6 deletions(-)

diff --git a/browser/modules/Moat.jsm b/browser/modules/Moat.jsm index 28f177e27b3b..2527e0db5551 100644 --- a/browser/modules/Moat.jsm +++ b/browser/modules/Moat.jsm @@ -137,19 +137,13 @@ class MeekTransport {

// Setup env and start meek process let ptStateDir = TorLauncherUtil.getTorFile("tordatadir", false); - let meekHelperProfileDir = TorLauncherUtil.getTorFile( - "pt-profiles-dir", - true - ); ptStateDir.append("pt_state"); // Match what tor uses. - meekHelperProfileDir.appendRelativePath("profile.moat-http-helper");

let envAdditions = { TOR_PT_MANAGED_TRANSPORT_VER: "1", TOR_PT_STATE_LOCATION: ptStateDir.path, TOR_PT_EXIT_ON_STDIN_CLOSE: "1", TOR_PT_CLIENT_TRANSPORTS: meekTransport, - TOR_BROWSER_MEEK_PROFILE: meekHelperProfileDir.path, }; if (TorSettings.proxy.enabled) { envAdditions.TOR_PT_PROXY = TorSettings.proxy.uri;

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser.

commit 6e7b1c47758ef21e3c5f0882100b078853b405ee Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Thu Nov 17 18:28:54 2022 +0100

fixup! Bug 40925: Implemented the Security Level component

Bug 41460: Renamed preferences --- .../securitylevel/content/securityLevel.js | 10 +-- .../mozilla/geckoview/GeckoRuntimeSettings.java | 12 ++-- toolkit/components/securitylevel/SecurityLevel.jsm | 71 +++++++++++++++------- 3 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/browser/components/securitylevel/content/securityLevel.js b/browser/components/securitylevel/content/securityLevel.js index 4b27ddbde592..2ef7fc1648df 100644 --- a/browser/components/securitylevel/content/securityLevel.js +++ b/browser/components/securitylevel/content/securityLevel.js @@ -76,8 +76,8 @@ XPCOMUtils.defineLazyGetter(this, "SecurityLevelStrings", () => { Getters and Setters for relevant torbutton prefs */ const SecurityLevelPrefs = { - security_slider_pref: "extensions.torbutton.security_slider", - security_custom_pref: "extensions.torbutton.security_custom", + security_slider_pref: "browser.security_level.security_slider", + security_custom_pref: "browser.security_level.security_custom",

get securitySlider() { try { @@ -182,7 +182,7 @@ const SecurityLevelButton = { this._configUIFromPrefs();

this._securityPrefsBranch = Services.prefs.getBranch( - "extensions.torbutton." + "browser.security_level." ); this._securityPrefsBranch.addObserver("", this);

@@ -340,7 +340,7 @@ const SecurityLevelPanel = {

init() { this._securityPrefsBranch = Services.prefs.getBranch( - "extensions.torbutton." + "browser.security_level." ); this._securityPrefsBranch.addObserver("", this); }, @@ -545,7 +545,7 @@ const SecurityLevelPreferences = {

// register for pref chagnes this._securityPrefsBranch = Services.prefs.getBranch( - "extensions.torbutton." + "browser.security_level." ); this._securityPrefsBranch.addObserver("", this); }, diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java index a35294bfc6f0..90df323d667d 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java @@ -472,7 +472,7 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { * @return This Builder instance. */ public @NonNull Builder torSecurityLevel(final int level) { - getSettings().mTorSecurityLevel.set(level); + getSettings().mSecurityLevel.set(level); return this; }

@@ -535,8 +535,8 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { new Pref<Boolean>("dom.security.https_only_mode_pbm", false); /* package */ final Pref<Integer> mProcessCount = new Pref<>("dom.ipc.processCount", 2); /* package */ final Pref<Integer> mSpoofEnglish = new Pref<>("privacy.spoof_english", 0); - /* package */ final Pref<Integer> mTorSecurityLevel = - new Pref<>("extensions.torbutton.security_slider", 4); + /* package */ final Pref<Integer> mSecurityLevel = + new Pref<>("browser.security_level.security_slider", 4); /* package */ final Pref<Boolean> mPrioritizeOnions = new Pref<>("privacy.prioritizeonions.enabled", false);

@@ -1309,17 +1309,17 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { * @return current security protection level */ public int getTorSecurityLevel() { - return mTorSecurityLevel.get(); + return mSecurityLevel.get(); }

/** - * Sets the Tor Security Level. + * Sets the Security Level. * * @param level security protection level * @return This GeckoRuntimeSettings instance. */ public @NonNull GeckoRuntimeSettings setTorSecurityLevel(final int level) { - mTorSecurityLevel.commit(level); + mSecurityLevel.commit(level); return this; }

diff --git a/toolkit/components/securitylevel/SecurityLevel.jsm b/toolkit/components/securitylevel/SecurityLevel.jsm index 60e95d777192..f9b6d5971360 100644 --- a/toolkit/components/securitylevel/SecurityLevel.jsm +++ b/toolkit/components/securitylevel/SecurityLevel.jsm @@ -29,9 +29,8 @@ XPCOMUtils.defineLazyGetter(this, "logger", () => { });

// The Security Settings prefs in question. -const kSliderPref = "extensions.torbutton.security_slider"; -const kCustomPref = "extensions.torbutton.security_custom"; -const kSliderMigration = "extensions.torbutton.security_slider_migration"; +const kSliderPref = "browser.security_level.security_slider"; +const kCustomPref = "browser.security_level.security_custom";

// __getPrefValue(prefName)__ // Returns the current value of a preference, regardless of its type. @@ -213,7 +212,7 @@ var initializeNoScriptControl = () => { sendNoScriptSettings(noscriptSettings(safetyLevel));

// __securitySliderToSafetyLevel(sliderState)__. - // Converts the "extensions.torbutton.security_slider" pref value + // Converts the "browser.security_level.security_slider" pref value // to a "safety level" value: 0 = Standard, 1 = Safer, 2 = Safest let securitySliderToSafetyLevel = sliderState => [undefined, 2, 1, 1, 0][sliderState]; @@ -224,11 +223,11 @@ var initializeNoScriptControl = () => { try { logger.debug("Message received from NoScript:", a); let noscriptPersist = Services.prefs.getBoolPref( - "extensions.torbutton.noscript_persist", + "browser.security_level.noscript_persist", false ); let noscriptInited = Services.prefs.getBoolPref( - "extensions.torbutton.noscript_inited", + "browser.security_level.noscript_inited", false ); // Set the noscript safety level once if we have never run noscript @@ -244,7 +243,7 @@ var initializeNoScriptControl = () => { ); if (!noscriptInited) { Services.prefs.setBoolPref( - "extensions.torbutton.noscript_inited", + "browser.security_level.noscript_inited", true ); } @@ -267,7 +266,7 @@ var initializeNoScriptControl = () => { // A table of all prefs bound to the security slider, and the value // for each security setting. Note that 2-m and 3-m are identical, // corresponding to the old 2-medium-high setting. We also separately -// bind NoScript settings to the extensions.torbutton.security_slider +// bind NoScript settings to the browser.security_level.security_slider // (see noscript-control.js). /* eslint-disable */ const kSecuritySettings = { @@ -348,8 +347,8 @@ var watch_security_prefs = function(onSettingChanged) { var initializedSecPrefs = false;

// __initialize()__. -// Defines the behavior of "extensions.torbutton.security_custom", -// "extensions.torbutton.security_slider", and the security-sensitive +// Defines the behavior of "browser.security_level.security_custom", +// "browser.security_level.security_slider", and the security-sensitive // prefs declared in kSecuritySettings. var initializeSecurityPrefs = function() { // Only run once. @@ -390,25 +389,55 @@ var initializeSecurityPrefs = function() { write_setting_to_prefs(2); }

- // Revert #33613 fix - if (Services.prefs.getIntPref(kSliderMigration, 0) < 2) { - // We can't differentiate between users having flipped `javascript.enabled` - // to `false` before it got governed by the security settings vs. those who - // had it flipped due to #33613. Reset the preference for everyone. - if (Services.prefs.getIntPref(kSliderPref) === 1) { - Services.prefs.setBoolPref("javascript.enabled", true); - } - Services.prefs.clearUserPref("media.webaudio.enabled"); - Services.prefs.setIntPref(kSliderMigration, 2); - } logger.info("security-prefs.js initialization complete"); };

+// tor-browser#41460: we changed preference names in 12.0. +// 11.5.8 is an obligated step for desktop users, so this code is helpful only +// to alpha users, and we could remove it quite soon. +function migratePreferences() { + const kPrefCheck = "extensions.torbutton.noscript_inited"; + // For 12.0, check for extensions.torbutton.noscript_inited, which was set + // as a user preference for sure, if someone used security level in previous + // versions. + if(!Services.prefs.prefHasUserValue(kPrefCheck)) { + return; + } + const migrate = (oldName, newName, getter, setter) => { + oldName = `extensions.torbutton.${oldName}`; + newName = `browser.${newName}`; + if (Services.prefs.prefHasUserValue(oldName)) { + setter(newName, getter(oldName)); + Services.prefs.clearUserPref(oldName); + } + }; + const prefs = { + security_custom: "security_level.security_custom", + noscript_persist: "security_level.noscript_persist", + noscript_inited: "security_level.noscript_inited", + } + for (const [oldName, newName] of Object.entries(prefs)) { + migrate( + oldName, + newName, + Services.prefs.getBoolPref.bind(Services.prefs), + Services.prefs.setBoolPref.bind(Services.prefs) + ); + } + migrate( + "security_slider", + "security_level.security_slider", + Services.prefs.getIntPref.bind(Services.prefs), + Services.prefs.setIntPref.bind(Services.prefs) + ); +} + // This class is used to initialize the security level stuff at the startup class SecurityLevel { QueryInterface = ChromeUtils.generateQI(["nsIObserver"]);

init() { + migratePreferences(); initializeNoScriptControl(); initializeSecurityPrefs(); }

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser.

commit ceb40dd8151b0c8323a41fbea721e8dbd941d936 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Thu Nov 17 18:35:02 2022 +0100

fixup! Bug 10760: Integrate TorButton to TorBrowser core

Bug 41460: Updated security level preferences --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 004b629b21c8..60dc0713f2bf 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 004b629b21c83133d7c90e0a3656f90d44562746 +Subproject commit 60dc0713f2bf6e4397c51e798643ca65784d234d