Several important changes

pde · pde · commit 39d37b2cd4ef · 2011-07-06T16:27:21.000-07:00
- actually, Firefox's btoa base64 encoder seemed Crazily Broken.
- add a "testing" about:config var, which sends the fingerprints even though
  they aren't strictly necessary
diff --git a/src/components/ssl-observatory.js b/src/components/ssl-observatory.js
@@ -281,15 +281,18 @@ SSLObservatory.prototype = {
     for (var i = 0; i < certArray.length; i++) {
       var len = new Object();
       var derData = certArray[i].getRawDER(len);
-      base64Certs.push(browserWindow.btoa(derData));
-      //this.log(DBUG, "encoding is"+ browserWindow.btoa(derData));
+      //var encoded = browserWindow.btoa(derData);  // seems to not be a real base 64 encoding!
+      base64Certs.push(this.base64_encode(derData, false, false));
     }
 
     // TODO: Server ip??
     var reqParams = [];
     reqParams.push("domain="+domain);
     reqParams.push("server_ip=-1");
-    //reqParams.push("fplist="+this.compatJSON.encode(fps));
+    if (this.prefs.getBoolPref("extensions.https_everywhere._observatory_prefs.testing")) {
+      // The server can compute these, but they're a nice test suite item!
+      reqParams.push("fplist="+this.compatJSON.encode(fps));
+    }
     reqParams.push("certlist="+this.compatJSON.encode(base64Certs));
     // XXX: Should we indicate if this was a wifi-triggered asn fetch vs
     // the less reliable offline/online notification-triggered fetch?
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
@@ -1,6 +1,10 @@
 // SSl Observatory preferences
 pref("extensions.https_everywhere._observatory_prefs.enabled",true);
 
+// "testing" currently means send unecessary fingerprints and other test-suite
+// type stuff
+pref("extensions.https_everywhere._observatory_prefs.testing",false);
+
 pref("extensions.https_everywhere._observatory_prefs.use_tor_proxy",true);
 pref("extensions.https_everywhere._observatory_prefs.submit_during_tor",true);
 pref("extensions.https_everywhere._observatory_prefs.submit_during_nontor",true);
