Merge pull request EFForg#2104 from semenko/reduce-https-listener

jsha · jsha · commit d1192a81f7f9 · 2015-08-12T16:50:12.000-07:00
Cleanups &amp; prep for reducing HTTPS listeners
diff --git a/chromium/background.js b/chromium/background.js
@@ -4,7 +4,7 @@
  *
  * @param url: a relative URL to local XML
  */
-function getRuleXml(url) {
+function loadExtensionFile(url, returnType) {
   var xhr = new XMLHttpRequest();
   // Use blocking XHR to ensure everything is loaded by the time
   // we return.
@@ -14,14 +14,18 @@ function getRuleXml(url) {
   if (xhr.readyState != 4) {
     return;
   }
-  return xhr.responseXML;
+  if (returnType === 'xml') {
+    return xhr.responseXML;
+  }
+  return xhr.responseText;
 }
 
+
 // Rules are loaded here
 var all_rules = new RuleSets(navigator.userAgent, LRUCache, localStorage);
-for (var i = 0; i < rule_list.length; i++) {
-  all_rules.addFromXml(getRuleXml(rule_list[i]));
-}
+var rule_list = 'rules/default.rulesets';
+all_rules.addFromXml(loadExtensionFile(rule_list, 'xml'));
+
 
 var USER_RULE_KEY = 'userRules';
 // Records which tabId's are active in the HTTPS Switch Planner (see
@@ -504,7 +508,14 @@ function onBeforeRedirect(details) {
 }
 
 // Registers the handler for requests
-wr.onBeforeRequest.addListener(onBeforeRequest, {urls: ["https://*/*", "http://*/*"]}, ["blocking"]);
+// We listen to all HTTP hosts, because RequestFilter can't handle tons of url restrictions.
+wr.onBeforeRequest.addListener(onBeforeRequest, {urls: ["http://*/*"]}, ["blocking"]);
+
+// TODO: Listen only to the tiny subset of HTTPS hosts that we rewrite/downgrade.
+var httpsUrlsWeListenTo = ["https://*/*"];
+// See: https://developer.chrome.com/extensions/match_patterns
+wr.onBeforeRequest.addListener(onBeforeRequest, {urls: httpsUrlsWeListenTo}, ["blocking"]);
+
 
 // Try to catch redirect loops on URLs we've redirected to HTTPS.
 wr.onBeforeRedirect.addListener(onBeforeRedirect, {urls: ["https://*/*"]});
diff --git a/chromium/manifest.json b/chromium/manifest.json
@@ -5,7 +5,6 @@
     "background": {
         "scripts": [
             "lru.js", 
-            "rule_list.js", 
             "rules.js", 
             "util.js", 
             "background.js"
diff --git a/chromium/rule_list.js b/chromium/rule_list.js
diff --git a/chromium/util.js b/chromium/util.js
@@ -1,14 +1,16 @@
-VERB=1;
-DBUG=2;
-INFO=3;
-NOTE=4;
-WARN=5;
+"use strict";
+
+var VERB=1;
+var DBUG=2;
+var INFO=3;
+var NOTE=4;
+var WARN=5;
 // FYI: Logging everything is /very/ slow. Chrome will log & buffer
 // these console logs even when the debug tools are closed. :(
 
 // TODO: Add an easy UI to change the log level.
 // (Developers can just type DEFAULT_LOG_LEVEL=1 in the console)
-DEFAULT_LOG_LEVEL=4;
+var DEFAULT_LOG_LEVEL=4;
 console.log("Hey developer! Want to see more verbose logging?");
 console.log("Type this into the console: DEFAULT_LOG_LEVEL=1");
 
