[tbb-commits] [tor-browser/tor-browser-60.7.0esr-9.0-1] Bug 30575: Don't allow enterprise policies in Tor Browser

[gk at torproject.org]

commit 9d582e62e32ee8143fd638744f2f5f0f49c28ca3
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jun 7 11:49:06 2019 +0000

    Bug 30575: Don't allow enterprise policies in Tor Browser
---
 .../enterprisepolicies/EnterprisePolicies.js           | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/browser/components/enterprisepolicies/EnterprisePolicies.js b/browser/components/enterprisepolicies/EnterprisePolicies.js
index 20cc33628f2a..4bab7d000ab0 100644
--- a/browser/components/enterprisepolicies/EnterprisePolicies.js
+++ b/browser/components/enterprisepolicies/EnterprisePolicies.js
@@ -78,20 +78,10 @@ EnterprisePoliciesManager.prototype = {
   _xpcom_factory: EnterprisePoliciesFactory,
 
   _initialize() {
-    let provider = this._chooseProvider();
-
-    if (!provider) {
-      this.status = Ci.nsIEnterprisePolicies.INACTIVE;
-      return;
-    }
-
-    if (provider.failed) {
-      this.status = Ci.nsIEnterprisePolicies.FAILED;
-      return;
-    }
-
-    this.status = Ci.nsIEnterprisePolicies.ACTIVE;
-    this._activatePolicies(provider.policies);
+    // We don't want to have any enterprise policies in Tor Browser enabled as
+    // those can affect proxy settings etc. See: e.g. #30575.
+    this.status = Ci.nsIEnterprisePolicies.INACTIVE;
+    return;
   },
 
   _chooseProvider() {