Actually implement BadCertListener2

pde · pde · commit d88fa8e88aee · 2013-06-20T16:41:21.000-07:00
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -438,6 +438,11 @@ HTTPSEverywhere.prototype = {
         return;
       }
       HTTPS.replaceChannel(lst, channel);
+
+      var ssl_observatory = CC["@eff.org/ssl-observatory;1"]
+                      .getService(Components.interfaces.nsISupports)
+                      .wrappedJSObject;
+      if (ssl_observatory.observatoryActive()) channel.notificationCallbacks = ssl_observatory;
     } else if (topic == "http-on-examine-response") {
          this.log(DBUG, "Got http-on-examine-response @ "+ (channel.URI ? channel.URI.spec : '') );
          HTTPS.handleSecureCookies(channel);
diff --git a/src/components/ssl-observatory.js b/src/components/ssl-observatory.js
@@ -130,7 +130,12 @@ SSLObservatory.prototype = {
     [ CI.nsIObserver,
       CI.nsIProtocolProxyFilter,
       //CI.nsIWifiListener,
-      CI.nsIBadCertListener2]),
+      CI.nsIBadCertListener2,
+      CI.nsIInterfaceRequestor]),
+
+  getInterface: function(aIID) {
+    return this.QueryInterface(aIID);
+  },
 
   wrappedJSObject: null,  // Initialized by constructor
 
