Fix filewriting bug.

pde · pde · commit cad783c9afb4 · 2014-04-26T16:42:33.000-07:00
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -266,13 +266,13 @@ const RuleWriter = {
   write: function(file, data) {
     //if (!file.exists())
     //  return null;
-    this.log(WARN, "Opening " + file.path + "for writing");
-    var data = "";
+    this.log(WARN, "Opening " + file.path + " for writing");
     var fstream = CC["@mozilla.org/network/file-output-stream;1"]
         .createInstance(CI.nsIFileOutputStream);
     fstream.init(file, -1, -1, 0);
 
-    fstream.write(data, data.length);
+    var retval = fstream.write(data, data.length);
+    this.log(WARN, "Got retval " + retval);
     fstream.close();
     return data;
   },
diff --git a/src/components/ssl-observatory.js b/src/components/ssl-observatory.js
@@ -149,6 +149,7 @@ function SSLObservatory() {
 
   //this.updateCertWhitelist();
   this.loadCertWhitelist();
+  this.saveCertWhitelist();
 
   this.log(DBUG, "Loaded observatory component!");
 }
@@ -545,7 +546,10 @@ SSLObservatory.prototype = {
     var file =
       CC["@mozilla.org/file/local;1"]
       .createInstance(CI.nsILocalFile);
-    file.initWithPath(this.HTTPSEverywhere.rw.chromeToPath(loc));
+    var path = this.HTTPSEverywhere.rw.chromeToPath(loc);
+    this.log(WARN,"SAVING cert whitelist to " + path);
+    file.initWithPath(path);
+    this.log(WARN,"got " + file);
     var data = this.HTTPSEverywhere.rw.write(file, JSON.stringify(this.whitelist));
   },
 
@@ -580,7 +584,7 @@ SSLObservatory.prototype = {
         that.log(4, "Replacing chain whitelist...");
         that.whitelist = whitelist;
         that.log(5, "Got valid whitelist..." + JSON.stringify(whitelist));
-        that.saveCertWhitelist();
+        that.updateCertWhitelist();
       } else {
         that.log(4, "Unexpected response status " + req.status + " fetching chain whitelist");
         return false;
