Fix a few more issues, incl bad merge in ssl-observatory.js.

jsha · jsha · commit a4afd1e8b7fe · 2014-12-12T18:17:00.000-08:00
diff --git a/src/chrome/content/code/ApplicableList.js b/src/chrome/content/code/ApplicableList.js
@@ -2,7 +2,7 @@
 // were applied, and which ones weren't but might have been, to the contents
 // of a given page (top level nsIDOMWindow)
 
-serial_number = 0;
+var serial_number = 0;
 
 function ApplicableList(logger, uri) {
   this.log = logger;
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -1,4 +1,3 @@
-const Cc = Components.classes;
 // Compilation of RegExps is now delayed until they are first used...
 
 function Rule(from, to) {
diff --git a/src/chrome/content/code/Root-CAs.js b/src/chrome/content/code/Root-CAs.js
@@ -1,7 +1,7 @@
 // These are concatenated md5 and sha1 fingerprints for the Firefox and
 // Microsoft root CAs as of Aug 2010
 
-root_ca_hashes = {
+var root_ca_hashes = {
   '00531D1D7201D423C820D00B6088C5D143DDB1FFF3B49B73831407F6BC8B975023D07C50' : true,
   '015A99C3D64FA94B3C3BB1A3AB274CBFFC219A76112F76C1C508833C9A2FA2BA84AC087A' : true,
   '019408DE857F8D806CE602CA89522848750251B2C632536F9D917279543C137CD721C6E0' : true,
diff --git a/src/components/ssl-observatory.js b/src/components/ssl-observatory.js
@@ -67,9 +67,12 @@ function SSLObservatory() {
 
   try {
     // Check for torbutton
-    this.tor_logger = CC["@torproject.org/torbutton-logger;1"]
-          .getService(CI.nsISupports).wrappedJSObject;
-    this.torbutton_installed = true;
+    var tor_logger_component = CC["@torproject.org/torbutton-logger;1"];
+    if (tor_logger_component) {
+      this.tor_logger =
+        tor_logger_component.getService(CI.nsISupports).wrappedJSObject;
+      this.torbutton_installed = true;
+    }
   } catch(e) {
     this.torbutton_installed = false;
   }
@@ -380,47 +383,34 @@ SSLObservatory.prototype = {
         this.log(INFO, "Could not get server IP address.");
     }
 
-    if (!this.observatoryActive()) return;
-
-    var host_ip = "-1";
-    var httpchannelinternal = subject.QueryInterface(Ci.nsIHttpChannelInternal);
-    try { 
-      host_ip = httpchannelinternal.remoteAddress;
-    } catch(e) {
-        this.log(INFO, "Could not get server IP address.");
+    channel.QueryInterface(Ci.nsIHttpChannel);
+    var chainEnum = certchain.getChain();
+    var chainArray = [];
+    var chainArrayFpStr = '';
+    var fps = [];
+    for(var i = 0; i < chainEnum.length; i++) {
+      var cert = chainEnum.queryElementAt(i, Ci.nsIX509Cert);
+      chainArray.push(cert);
+      var fp = this.ourFingerprint(cert);
+      fps.push(fp);
+      chainArrayFpStr = chainArrayFpStr + fp;
     }
-    subject.QueryInterface(Ci.nsIHttpChannel);
-    var certchain = this.getSSLCert(subject);
-    if (certchain) {
-      var chainEnum = certchain.getChain();
-      var chainArray = [];
-      var chainArrayFpStr = '';
-      var fps = [];
-      for(var i = 0; i < chainEnum.length; i++) {
-        var cert = chainEnum.queryElementAt(i, Ci.nsIX509Cert);
-        chainArray.push(cert);
-        var fp = this.ourFingerprint(cert);
-        fps.push(fp);
-        chainArrayFpStr = chainArrayFpStr + fp;
-      }
-      var chain_hash = sha256_digest(chainArrayFpStr).toUpperCase();
-      this.log(INFO, "SHA-256 hash of cert chain for "+new String(subject.URI.host)+" is "+ chain_hash);
+    var chain_hash = sha256_digest(chainArrayFpStr).toUpperCase();
+    this.log(INFO, "SHA-256 hash of cert chain for "+new String(channel.URI.host)+" is "+ chain_hash);
 
-      if(!this.myGetBoolPref("use_whitelist")) {
-        this.log(WARN, "Not using whitelist to filter cert chains.");
-      }
-      else if (this.isChainWhitelisted(chain_hash)) {
-        this.log(INFO, "This cert chain is whitelisted. Not submitting.");
-        return;
-      } else {
-        this.log(INFO, "Cert chain is NOT whitelisted. Proceeding with submission.");
-      }
+    if(!this.myGetBoolPref("use_whitelist")) {
+      this.log(WARN, "Not using whitelist to filter cert chains.");
+    } else if (this.isChainWhitelisted(chain_hash)) {
+      this.log(INFO, "This cert chain is whitelisted. Not submitting. ");
+      return;
+    } else {
+      this.log(INFO, "Cert chain is NOT whitelisted. Proceeding with submission");
+    }
 
-      if (channel.URI.port == -1) {
-          this.submitChainArray(chainArray, fps, new String(channel.URI.host), channel, host_ip, warning, false, chain_hash);
-      } else {
-          this.submitChainArray(chainArray, fps, channel.URI.host+":"+channel.URI.port, channel, host_ip, warning, false, chain_hash);
-      }
+    if (channel.URI.port == -1) {
+        this.submitChainArray(chainArray, fps, new String(channel.URI.host), channel, host_ip, warning, false, chain_hash);
+    } else {
+        this.submitChainArray(chainArray, fps, channel.URI.host+":"+channel.URI.port, channel, host_ip, warning, false, chain_hash);
     }
   },
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-const Cc = Components.classes;`
`2`	`1`	`// Compilation of RegExps is now delayed until they are first used...`
`3`	`2`
`4`	`3`	`function Rule(from, to) {`