[HTTPS-E Rulesets] More to GoogleServices.xml
Osama Khalid
osamak at gnu.org
Thu May 19 00:27:03 PDT 2011
On Thu, May 19, 2011 at 09:57:41AM +0300, Osama Khalid wrote:
> This patch changes the following:
I just found out that www.google.com/(logos|newproducts)/ support
HTTPS. This is an updated patch which covers that too.
I also moved www.google.com/support/ from Google Search ruleset to
Google Services and added www.google.com/squared to Google Search.
And yes, these are many changes but hopefully these notes will help
track them. :)
--Osama Khalid
-------------- next part --------------
diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
index 4aeb8aa..e07f17c 100644
--- a/src/chrome/content/rules/Google.xml
+++ b/src/chrome/content/rules/Google.xml
@@ -47,13 +47,6 @@
<exclusion pattern="^http://(www\.)?google\.com/search.*tbm=isch.*" />
- <!-- Google's help is now available in HTTPS too. -->
- <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([\?/].*)?$"/>
-
<!-- There are two distinct cases for these firefox searches -->
<rule from="^http://(www\.)?google\.com/firefox/?$"
@@ -65,6 +58,9 @@
<rule from="^http://(www\.)?google\.com/webhp"
to="https://encrypted.google.com/webhp"/>
+ <rule from="^http://(www\.)?google\.com/squared"
+ to="https://www.google.com/squared"/>
+
<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 9ca3eb0..dcdf84c 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"/>
@@ -91,12 +105,16 @@
<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"
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/"
+ to="https://www.google.com/support/"/>
+ <!-- But not the forums, bizarrely. -->
+ <exclusion pattern="^http://www\.google\.com/support/forum([\?/].*)?$"/>
<!-- Note: This rule is NOT for the Google Images service, which is
available via a redirect from http://www.google.com/images
@@ -105,5 +123,6 @@
This fixes the mixed content warning on Google Dictionary. -->
<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/20110519/d7869f51/attachment.sig>
More information about the HTTPS-Everywhere-Rules
mailing list