Small fixes.

jsha · jsha · commit e6cd64ccbf42 · 2014-08-29T18:26:23.000-04:00
Remove spammy log message in ssl-observatory.
Add jsdoc in HTTPS.js.
Add all of pkg/ to gitignore.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,7 @@
 *~
 chromium.pem
 dummy-chromium.pem
-pkg/crx
-pkg/*.crx
-pkg/*.xpi
+pkg/
 src/chrome/content/rules/default.rulesets
 src/defaults/rulesets.sqlite
 *.swp
diff --git a/src/chrome/content/code/HTTPS.js b/src/chrome/content/code/HTTPS.js
@@ -29,7 +29,18 @@ const HTTPS = {
   httpsForced: null,
   httpsForcedExceptions: null,
   httpsRewrite: null,
-  
+
+  /**
+   * Given a channel and a list of potentially applicable rules,
+   * redirect or abort a request if appropriate.
+   *
+   * @param {RuleSet[]} applicable_list A list of potentially applicable rules
+   *   (i.e. those that match on a hostname basis).
+   * @param {nsIChannel} channel The channel to be manipulated.
+   * @param {boolean} httpNowhereEnabled Whether to abort non-https requests.
+   * @returns {boolean} True if the request was redirected; false if it was
+   *   untouched or aborted.
+   */
   replaceChannel: function(applicable_list, channel, httpNowhereEnabled) {
     var blob = HTTPSRules.rewrittenURI(applicable_list, channel.URI.clone());
     if (blob === null) {
diff --git a/src/components/ssl-observatory.js b/src/components/ssl-observatory.js
@@ -533,7 +533,6 @@ SSLObservatory.prototype = {
     file.initWithPath(this.HTTPSEverywhere.rw.chromeToPath(loc));
     var data = this.HTTPSEverywhere.rw.read(file);
     this.whitelist = JSON.parse(data);
-    this.log(DBUG, "yay\n" + data);
   },
 
   saveCertWhitelist: function() {
