Tentatively, try to consider <securecookie> for applicable rules lists

pde · pde · commit 7557f83803f4 · 2011-06-23T12:33:29.000-07:00
diff --git a/src/chrome/content/code/HTTPS.js b/src/chrome/content/code/HTTPS.js
@@ -97,7 +97,7 @@ const HTTPS = {
         return null;
       }
       domWin = doc.defaultView;
-      this.log(WARN,"Coerced nsIDOMWin from Node: " + domWin);
+      this.log(DBUG,"Coerced nsIDOMWin from Node: " + domWin);
     } else {
       this.log(WARN, "Context for " + uri.spec + 
                      "is some bizarre unexpected thing: " + ctx);
@@ -183,7 +183,10 @@ const HTTPS = {
       this.log(WARN,"No URI inside request " +req);
       return;
     }
-    //this.log(VERB, "Cookie hunting in " + uri.spec);
+    this.log(DBUG, "Cookie hunting in " + uri.spec);
+    var alist = HTTPSEverywhere.instance.getApplicableListForChannel(req);
+    if (!alist)
+      this.log(INFO, "No alist for cookies for "+(req.URI) ? req.URI.spec : "???");
     
     if (uri.schemeIs("https")) {
       var host = uri.host;
@@ -198,7 +201,7 @@ const HTTPS = {
       for each (var cs in cookies.split("\n")) {
         this.log(DBUG, "Examining cookie: ");
         c = new Cookie(cs, host);
-        if (!c.secure && HTTPSRules.shouldSecureCookie(c)) {
+        if (!c.secure && HTTPSRules.shouldSecureCookie(alist, c)) {
           this.log(INFO, "Securing cookie: " + c.domain + " " + c.name);
           c.secure = true;
           req.setResponseHeader("Set-Cookie", c.source + ";Secure", true);
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -95,7 +95,6 @@ RuleSet.prototype = {
 
    for (i = 0; i < this.rules.length; ++i) 
      if (this.rules[i].from_c.test(urispec)) return true;
-   this.log(DBUG, "No, we fell through");
    return false;
  },
 
@@ -402,12 +401,12 @@ const HTTPSRules = {
     return results;
   },
 
-  shouldSecureCookie: function(c) {
+  shouldSecureCookie: function(applicable_list, c) {
     // Check to see if the Cookie object c meets any of our cookierule citeria
     // for being marked as secure
-    //this.log(DBUG, "Testing cookie:");
-    //this.log(DBUG, "  name: " + c.name);
-    //this.log(DBUG, "  host: " + c.host);
+    this.log(DBUG, "Testing cookie:");
+    this.log(DBUG, "  name: " + c.name);
+    this.log(DBUG, "  host: " + c.host);
     //this.log(DBUG, "  domain: " + c.domain);
     //this.log(DBUG, "  rawhost: " + c.rawHost);
     var i,j;
@@ -417,9 +416,16 @@ const HTTPSRules = {
       if (ruleset.active)
         for (j = 0; j < ruleset.cookierules.length; j++) {
           var cr = ruleset.cookierules[j];
-          if (cr.host_c.test(c.host) && cr.name_c.test(c.name))
+          if (cr.host_c.test(c.host) && cr.name_c.test(c.name)) {
+            if (applicable_list) applicable_list.active_rule(ruleset);
+            this.log(INFO,"Active cookie rule " + ruleset.name);
             return true;
+          }
         }
+      else if (ruleset.cookierules.length > 0) {
+        applicable_list.inactive_rule(ruleset);
+        this.log(INFO,"Inactive cookie rule " + ruleset.name);
+      }
     }
     return false;
   }
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -231,10 +231,12 @@ HTTPSEverywhere.prototype = {
   // content is embedded / requested by JavaScript.
   onLocationChange: function(wp, req, uri) {
     if (wp instanceof CI.nsIWebProgress) {
-      this.log(DBUG,"(Probably) Making new alist in onLocationChange");
+      // XXX this should not work like this, and it possibly shouldn't exist
+      // at all
+      //this.log(DBUG,"(Probably) Making new alist in onLocationChange");
       if (!this.getApplicableListForDOMWin(wp.DOMWindow, "onLocChange")) 
         this.log(WARN,"Something went wrong in onLocationChange");
-      this.log(DBUG,"ok");
+      //this.log(DBUG,"ok");
     } else {
       this.log(WARN,"onLocationChange: no nsIWebProgress");
     }
