[tbb-commits] [tor-browser/tor-browser-91.6.0esr-11.5-1] Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots

[richard at torproject.org]

commit 8665b764781e1136677c1783330d3170455a6beb
Author: Alex Catarineu <acat at torproject.org>
Date:   Fri Oct 9 12:55:35 2020 +0200

    Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots
---
 browser/components/BrowserGlue.jsm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
index d23d72a1afc8..0b6a4506b80d 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -1352,6 +1352,20 @@ BrowserGlue.prototype = {
     // handle any UI migration
     this._migrateUI();
 
+    // Clear possibly auto enabled enterprise_roots prefs (see bug 40166)
+    if (
+      !Services.prefs.getBoolPref(
+        "security.certerrors.mitm.auto_enable_enterprise_roots"
+      ) &&
+      Services.prefs.getBoolPref(
+        "security.enterprise_roots.auto-enabled",
+        false
+      )
+    ) {
+      Services.prefs.clearUserPref("security.enterprise_roots.enabled");
+      Services.prefs.clearUserPref("security.enterprise_roots.auto-enabled");
+    }
+
     if (!Services.prefs.prefHasUserValue(PREF_PDFJS_ISDEFAULT_CACHE_STATE)) {
       PdfJs.checkIsDefault(this._isNewProfile);
     }