[HTTPS-E Rulesets] More to GoogleServices.xml

[Osama Khalid]

This patch changes the following:
* Adds support for appspot.
* Removes match_rule.
* Covers googlecode.com which'd normally redirect to code.google.com.
* A clearer style by splitting the 'from' and 'to' parameters into two
  different lines.
* Removes the spreadsheets.google.com target since it's already
  covered by *.google.com.
* Sorts target tags in a better relevancy order.

--Osama Khalid
-------------- next part --------------
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 9ca3eb0..d8404d7 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -1,38 +1,46 @@
 <!-- XXX: Needs more testing -->
-<ruleset name="GoogleServices" match_rule="http:.*google">
-  <target host="spreadsheets.google.com" />
+<ruleset name="GoogleServices">
+  <target host="google.*" />
+  <target host="google.com" />
   <target host="*.google.com" />
+  <target host="google.co.*" />
+  <target host="google.com.*" />
+  <target host="www.google.*" />
+  <target host="www.google.co.*" />
+  <target host="www.google.com.*" />
   <target host="groups.google.de" />
-  <target host="google.com" />
-  <target host="www.gmail.com" />
   <target host="gmail.com" />
-  <target host="*.googlecode.com" />
+  <target host="www.gmail.com" />
   <target host="googlecode.com" />
-  <target host="www.google.co.*" />
-  <target host="www.google.com.*" />
-  <target host="google.co.*" />
-  <target host="google.com.*" />
+  <target host="*.googlecode.com" />
   <target host="news.google.co.*" />
   <target host="news.google.com.*" />
-  <target host="google.*" />
-  <target host="www.google.*" />
   <target host="news.google.*" />
-
-  <rule from="^http://spreadsheets\.google\.com/" to="https://spreadsheets.google.com/"/>
-  <rule from="^http://docs\.google\.com/" to="https://docs.google.com/"/>
-  <rule from="^http://groups\.google\.com/" to="https://groups.google.com/"/>
-  <rule from="^http://groups\.google\.de/" to="https://groups.google.de/"/>
-  <rule from="^http://mail\.google\.com/" to="https://mail.google.com/"/>
+  <target host="appspot.com" />
+  <target host="*.appspot.com" />
+
+  <rule from="^http://spreadsheets\.google\.com/"
+          to="https://spreadsheets.google.com/"/>
+  <rule from="^http://docs\.google\.com/"
+          to="https://docs.google.com/"/>
+  <rule from="^http://groups\.google\.com/"
+          to="https://groups.google.com/"/>
+  <rule from="^http://groups\.google\.de/"
+           to="https://groups.google.de/"/>
+  <rule from="^http://mail\.google\.com/"
+           to="https://mail.google.com/"/>
   <rule from="^http://(www\.)?gmail\.com/"
           to="https://mail.google.com/"/>
   <rule from="^http://(www\.)?google\.com/reader/"
           to="https://www.google.com/reader/"/>
   <rule from="^http://(www\.)?google\.com/webfonts"
           to="https://www.google.com/webfonts"/>
-  <rule from="^http://code\.google\.com/" to="https://code.google.com/"/>
+  <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/"/>
+  <rule from="^http://sites\.google\.com/"
+          to="https://sites.google.com/"/>
 
   <rule from="^http://(www\.)?google((\.com?)?(\.[^/@:][^/@:])?)/calendar"
           to="https://www.google$2/calendar" />
@@ -54,7 +62,7 @@
   <rule from="^http://news\.google((\.com?)?(\.[^/@:][^/@:])?)/$"
           to="https://www.google.com/news" />
 
-  <rule from="^http://www\.googlecode\.com/$"
+  <rule from="^http://(www\.)?googlecode\.com/$"
           to="https://code.google.com/" />
   <rule from="^http://([^/:@]*)\.googlecode\.com/$"
           to="https://code.google.com/p/$1/" />
@@ -66,8 +74,10 @@
   <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/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"/>
@@ -81,6 +91,10 @@
           to="https://www.google.com/phone/"/>
   <rule from="^http://feedburner\.google\.com/"
         to="https://feedburner.google.com/"/>
+  <rule from="^http://appengine\.google\.com/"
+	to="https://appengine.google.com/"/>
+  <rule from="^http://([^@:\./]+\.)?appspot\.com/"
+        to="https://$1appspot.com/"/>
 
   <rule from="^http://(www\.)?google\.com/contacts"
           to="https://www.google.com/contacts"/>
-------------- 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/20110519/5a037076/attachment.sig>