[HTTPS-E Rulesets] Even more to Google

Osama Khalid osamak at gnu.org
Thu May 19 14:54:41 PDT 2011


Thanks for the quick commit!

Now this patch changes the following:
* Moves www.google.com/codesearch ruleset from GoogleServices.xml to
  Google.xml and adds codesearch.google.com.
* Adds rulesets to cover www.google.com/(intl|js|css|tools)/ and
  pagead2.googlesyndication.com.
* Removes two duplicated rulesets which are covered by the two general
  rulesets: www.google.com/cse and www.google.com/intl.
* Extend www.google.com/cse, www.google.com/support/,
  www.google.com/logos/, www.google.com/trends to include
  international editions since they're already identical.

--Osama Khalid
-------------- next part --------------
diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
index e07f17c..1c10891 100644
--- a/src/chrome/content/rules/Google.xml
+++ b/src/chrome/content/rules/Google.xml
@@ -61,6 +61,12 @@
   <rule from="^http://(www\.)?google\.com/squared"
           to="https://www.google.com/squared"/>
 
+  <rule from="^http://codesearch\.google\.com/"
+          to="https://codesearch.google.com/"/>
+
+  <rule from="^http://(www\.)?google\.com/codesearch"
+          to="https://www.google.com/codesearch"/>
+
   <rule from="^http://(www\.)?google\.com/#"
           to="https://encrypted.google.com/#"/>
 
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index dcdf84c..23a54d0 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -18,6 +18,7 @@
   <target host="news.google.*" />
   <target host="appspot.com" />
   <target host="*.appspot.com" />
+  <target host="pagead2.googlesyndication.com" />
 
   <rule from="^http://spreadsheets\.google\.com/"
           to="https://spreadsheets.google.com/"/>
@@ -37,8 +38,6 @@
           to="https://www.google.com/webfonts"/>
   <rule from="^http://code\.google\.com/"
           to="https://code.google.com/"/>
-  <rule from="^http://(www\.)?google\.com/codesearch"
-          to="https://www.google.com/codesearch"/>
   <rule from="^http://sites\.google\.com/"
           to="https://sites.google.com/"/>
 
@@ -71,14 +70,9 @@
 
   <rule from="^http://trends\.google\.com/"
           to="https://www.google.com/trends"/>
-  <rule from="^http://(www\.)?google\.com/trends"
+  <rule from="^http://(www\.)?google((\.com?)?(\.[^/@:][^/@:])?)/trends"
           to="https://www.google.com/trends"/>
 
-  <rule from="^http://www\.google\.com/cse/intl/([^/:@][^/:@])/images/google_custom_search_watermark\.gif$"
-          to="https://www.google.com/cse/intl/$1/images/google_custom_search_watermark.gif" />
-  <rule from="^http://www\.google\.com/intl/([^/:@][^/:@])/images/logos/custom_search_logo_sm\.gif"
-          to="https://www.google.com/intl/$1/images/logos/custom_search_logo_sm.gif" />
-
   <rule from="^http://(www\.)?google\.com/finance"
           to="https://www.google.com/finance"/>
   <rule from="^http://(www\.)?google\.co\.uk/finance"
@@ -95,6 +89,8 @@
 	to="https://appengine.google.com/"/>
   <rule from="^http://([^@:\./]+\.)?appspot\.com/"
         to="https://$1appspot.com/"/>
+  <rule from="^http://pagead2\.googlesyndication\.com/"
+	  to="https://pagead2.googlesyndication.com/"/>
 
   <rule from="^http://(www\.)?google\.com/contacts"
           to="https://www.google.com/contacts"/>
@@ -103,26 +99,27 @@
   <rule from="^http://(www\.)?google\.co\.in/contacts"
           to="https://www.google.co.in/contacts"/>
 
-  <rule from="^http://(www\.)?google\.com/(cse|custom)"
-		  to="https://www.google.com/cse" />
-  <rule from="^http://(www\.)?google\.com/moderator/"
-          to="https://www.google.com/moderator/"/>
-  <rule from="^http://(www\.)?google\.com/dictionary"
+  <rule from="^http://(www\.)?google(\.com?)?(\.[^/@:][^/@:])?/(css|intl|js|logos|tools)/"
+	  to="https://www.google.com/$4/"/>
+  <rule from="^http://(www\.)?google(\.com?)?(\.[^/@:][^/@:])?/(cse|custom)"
+	  to="https://www.google.com/cse" />
+  <rule from="^http://(www\.)?google(\.com?)?(\.[^/@:][^/@:])?/dictionary"
           to="https://www.google.com/dictionary"/>
-  <rule from="^http://(www\.)?google\.com/newproducts/"
-          to="https://www.google.com/newproducts/"/>
-  <rule from="^http://(www\.)?google\.com/support/"
+  <rule from="^http://(www\.)?google(\.com?)?(\.[^/@:][^/@:])?/support/"
           to="https://www.google.com/support/"/>
   <!-- But not the forums, bizarrely. -->
-  <exclusion pattern="^http://www\.google\.com/support/forum([\?/].*)?$"/>
+  <exclusion pattern="^http://(www\.)?google(\.com?)?(\.[^/@:][^/@:])?/support/forum([\?/].*)?$"/>
+
+  <rule from="^http://(www\.)?google\.com/newproducts/"
+          to="https://www.google.com/newproducts/"/>
+  <rule from="^http://(www\.)?google\.com/moderator/"
+          to="https://www.google.com/moderator/"/>
 
   <!-- Note: This rule is NOT for the Google Images service, which is
        available via a redirect from http://www.google.com/images
        (with no slash), but rather for images used internally by
        Google, within http://www.google.com/images/ (with a slash).
        This fixes the mixed content warning on Google Dictionary. -->
-  <rule from="^http://(www\.)?google\.com/images/"
+  <rule from="^http://(www\.)?google(\.com?)?(\.[^/@:][^/@:])?/images/"
           to="https://www.google.com/images/"/>
-  <rule from="^http://(www\.)?google\.com/logos/"
-          to="https://www.google.com/logos/"/>
 </ruleset>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.eff.org/pipermail/https-everywhere-rules/attachments/20110520/5375520e/attachment.sig>


More information about the HTTPS-Everywhere-Rules mailing list