Notify observers about rewrites regardless of which codepath we're on

pde · pde · commit de0a9bd38fc1 · 2012-05-08T16:45:28.000-07:00
https://trac.torproject.org/projects/tor/ticket/5682 Conflicts: src/Changelog
diff --git a/src/Changelog b/src/Changelog
@@ -74,6 +74,15 @@ chrome-2012.3.14
   * Switch non-US google searches to country sites by default
   * Better chrome context UI 
 
+2.0.4                                       (2012-05-08)
+  * Fix for compatibility with some other Firefox extensions:
+    https://trac.torproject.org/projects/tor/ticket/5682
+  * Fixes: Wordpress stylesheets, USENIX, Mozilla
+    https://mail1.eff.org/pipermail/https-everywhere-rules/2012-April/001105.html
+  * Disable broken: Pandora, Miranda IM, Pastebin.ca
+    https://trac.torproject.org/projects/tor/ticket/5804
+    https://trac.torproject.org/projects/tor/ticket/5776
+
 2.0.3                                       (2012-04-26)
 
   * Fix a downgrade attack that might allow attackers to deny HTTPS
diff --git a/src/chrome/content/code/HTTPS.js b/src/chrome/content/code/HTTPS.js
@@ -32,16 +32,11 @@ const HTTPS = {
   
   replaceChannel: function(applicable_list, channel) {
     var blob = HTTPSRules.rewrittenURI(applicable_list, channel.URI);
-    if (null == blob) {
-       //HTTPS.log(INFO,
-       //    "Got replace channel with no applicable rules for URI "
-       //    + channel.URI.spec);
-       return false;
-     }
+    if (null == blob) return false; // no rewrite
     var uri = blob.newuri;
     if (!uri) this.log(WARN, "OH NO BAD ARGH\nARGH");
 
-    var c2=channel.QueryInterface(CI.nsIHttpChannel);
+    var c2 = channel.QueryInterface(CI.nsIHttpChannel);
     this.log(DBUG,"Redirection limit is " + c2.redirectionLimit);
     // XXX This used to be (c2.redirectionLimit == 1), but that's very
     // inefficient in a case (eg amazon) where this may happen A LOT.
@@ -58,6 +53,7 @@ const HTTPS = {
       return false;
     }
     if (ChannelReplacement.supported) {
+      HTTPSEverywhere.instance.notifyObservers(channel.URI, uri.spec);
       HTTPS.log(INFO,"Scheduling channel replacement for "+channel.URI.spec);
       ChannelReplacement.runWhenPending(channel, function() {
         var cr = new ChannelReplacement(channel, uri);
@@ -77,7 +73,6 @@ const HTTPS = {
     // Strategy 1: replace the parts of the old_uri piecewise.  Often this
     // works.  In some cases it doesn't.
     this.log(NOTE,"Rewriting " + old_uri.spec + " -> " + new_uri.spec + "\n");
-    HTTPSEverywhere.instance.notifyObservers(old_uri, new_uri.spec);
 
     old_uri.scheme = new_uri.scheme;
     old_uri.userPass = new_uri.userPass;
@@ -131,6 +126,7 @@ const HTTPS = {
     var newuri = blob.newuri;
 
     try {
+      HTTPSEverywhere.instance.notifyObservers(uri, newuri.spec);
       if (this.rewriteInPlace(uri, newuri)) 
         this.log(INFO,"Forced URI " + uri.spec);
       return true;
