Merge remote-tracking branch 'mikep/bug10298-3.0' into 3.0

pde · pde · commit 32ccb14b53b2 · 2013-12-06T19:45:20.000-08:00
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -16,21 +16,6 @@ function CookieRule(host, cookiename) {
   this.name_c = new RegExp(cookiename);
 }
 
-// Firefox 23+ blocks mixed content by default, so rulesets that create
-// mixed content situations should be disabled there
-
-try {
-  var appPrefs = CC["@mozilla.org/preferences-service;1"].getService(CI.nsIPrefBranch);
-  var blockMixedContent = appPrefs.getBoolPref("security.mixed_content.block_active_content");
-  if(blockMixedContent) {
-    localPlatformRegexp = new RegExp("firefox");
-  } else {
-    localPlatformRegexp = new RegExp("(firefox|mixedcontent)");
-  }
-} catch(e) {
-  localPlatformRegexp = new RegExp("(firefox|mixedcontent)");
-}
-
 ruleset_counter = 0;
 function RuleSet(name, xmlName, match_rule, default_off, platform) {
   if(xmlName == "WordPress.xml" || xmlName == "Github.xml") {
@@ -54,7 +39,7 @@ function RuleSet(name, xmlName, match_rule, default_off, platform) {
     this.on_by_default = false;
   }
   if (platform)
-    if (platform.search(localPlatformRegexp) == -1) {
+    if (platform.search(HTTPSRules.localPlatformRegexp) == -1) {
       this.on_by_default = false;
       this.notes = "Only for " + platform;
     }
@@ -398,6 +383,7 @@ const HTTPSRules = {
       this.rulesetsByID = {};
       this.rulesetsByName = {};
       var t1 = new Date().getTime();
+      this.checkMixedContentHandling();
       var rulefiles = RuleWriter.enumerate(RuleWriter.getCustomRuleDir());
       this.scanRulefiles(rulefiles);
       rulefiles = RuleWriter.enumerate(RuleWriter.getRuleDir());
@@ -428,6 +414,30 @@ const HTTPSRules = {
     return;
   },
 
+  checkMixedContentHandling: function() {
+    // Firefox 23+ blocks mixed content by default, so rulesets that create
+    // mixed content situations should be disabled there
+    var appInfo = CC["@mozilla.org/xre/app-info;1"].getService(CI.nsIXULAppInfo);
+    var platformVer = appInfo.platformVersion;
+    var versionChecker = CC["@mozilla.org/xpcom/version-comparator;1"]
+                          .getService(CI.nsIVersionComparator);
+    var prefs = Components.classes["@mozilla.org/preferences-service;1"]
+                        .getService(Components.interfaces.nsIPrefService).getBranch("");
+
+
+    // If mixed content is present and enabled, and the user hasn't opted to enable
+    // mixed content triggering rules, leave them out. Otherwise add them in.
+    if(versionChecker.compare(appInfo.version, "23.0a1") >= 0
+            && prefs.getBoolPref("security.mixed_content.block_active_content")
+            && !prefs.getBoolPref("extensions.https_everywhere.enable_mixed_rulesets")) {
+      this.log(INFO, "Not loading rules that trigger mixed content errors.");
+      this.localPlatformRegexp = new RegExp("firefox");
+    } else {
+      this.log(INFO, "Loading rules that would normally trigger mixed content");
+      this.localPlatformRegexp = new RegExp("(firefox|mixedcontent)");
+    }
+  },
+
   scanRulefiles: function(rulefiles) {
     var i = 0;
     var r = null;
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -199,7 +199,16 @@ function HTTPSEverywhere() {
     this.obsService.addObserver(this, "profile-after-change", false);
     this.obsService.addObserver(this, "sessionstore-windows-restored", false);
   }
-  
+
+  var pref_service = Components.classes["@mozilla.org/preferences-service;1"]
+      .getService(Components.interfaces.nsIPrefBranchInternal);
+  var branch = pref_service.QueryInterface(Components.interfaces.nsIPrefBranchInternal);
+
+  branch.addObserver("extensions.https_everywhere.enable_mixed_rulesets",
+                         this, false);
+  branch.addObserver("security.mixed_content.block_active_content",
+                         this, false);
+
   return;
 }
 
@@ -511,6 +520,13 @@ HTTPSEverywhere.prototype = {
     } else if (topic == "sessionstore-windows-restored") {
       this.log(DBUG,"Got sessionstore-windows-restored");
       this.maybeShowObservatoryPopup();
+    } else if (topic == "nsPref:changed") {
+        switch (data) {
+            case "security.mixed_content.block_active_content":
+            case "extensions.https_everywhere.enable_mixed_rulesets":
+                HTTPSRules.init();
+                break;
+        }
     }
     return;
   },
@@ -724,6 +740,7 @@ HTTPSEverywhere.prototype = {
             
             this.log(INFO,"ChannelReplacement.supported = "+ChannelReplacement.supported);
 
+            // XXX: Why is this called twice?
             HTTPSRules.init();
 
             if(!Thread.hostRunning)
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
@@ -4,6 +4,9 @@ pref("extensions.https_everywhere.globalEnabled",true);
 // this is the HTTPS Everywhere preferences version (for migrations)
 pref("extensions.https_everywhere.prefs_version", 0);
 
+// enable rulesets that trigger mixed content blocking
+pref("extensions.https_everywhere.enable_mixed_rulesets", false);
+
 // SSl Observatory preferences
 pref("extensions.https_everywhere._observatory.enabled",false);
 
