This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-102.3.0esr-12.0-1 in repository tor-browser.
commit 4be4528b0945f6dedfa4a2c7c5b5d2b3b54e88f9 Author: Dan Ballard dan@mindstab.net AuthorDate: Tue Sep 6 11:34:24 2022 -0700
Bug 41125: stop proxy bypass in ServiceRequest.fetch by gating with checking MOZ_PROXY_BYPASS_PROTECTION and network.proxy.allow_bypass --- services/settings/Utils.jsm | 3 +++ toolkit/modules/AppConstants.jsm | 7 +++++++ 2 files changed, 10 insertions(+)
diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm index 31ad77d28678..bab0e078ea14 100644 --- a/services/settings/Utils.jsm +++ b/services/settings/Utils.jsm @@ -220,6 +220,9 @@ var Utils = { function fallbackOrReject(err) { if ( // At most one recursive Utils.fetch call (bypassProxy=false to true). + // if allowed by network.proxy.allow_bypass + AppConstants.MOZ_PROXY_BYPASS_PROTECTION || + !Services.prefs.getBoolPref("network.proxy.allow_bypass", false) || bypassProxy || Services.startup.shuttingDown || Utils.isOffline || diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm index 5799b78178aa..e19078ee31c9 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm @@ -460,6 +460,13 @@ this.AppConstants = Object.freeze({ false, #endif
+ MOZ_PROXY_BYPASS_PROTECTION: +#ifdef MOZ_PROXY_BYPASS_PROTECTION + true, +#else + false, +#endif + // Returns true for CN region build when distibution id set as 'MozillaOnline' isChinaRepack() { return (