[or-cvs] [https-everywhere/master 1/2] add target hosts for all currently-shipping rules
schoen at torproject.org
schoen at torproject.org
Thu Nov 4 00:52:37 UTC 2010
Author: Seth Schoen <schoen at eff.org>
Date: Wed, 3 Nov 2010 17:49:36 -0700
Subject: add target hosts for all currently-shipping rules
Commit: 86216662f650d9d8b231fa86da8fe2480c8b6bd5
---
src/chrome/content/rules/Amazon-off-by-default.xml | 7 +
src/chrome/content/rules/Bitly.xml | 7 +
src/chrome/content/rules/CDT.xml | 3 +
src/chrome/content/rules/Cisco.xml | 3 +
src/chrome/content/rules/Dropbox.xml | 3 +
src/chrome/content/rules/DuckDuckGo.xml | 6 +-
src/chrome/content/rules/EFF.xml | 2 +
src/chrome/content/rules/Evernote.xml | 3 +
src/chrome/content/rules/Facebook.xml | 5 +
src/chrome/content/rules/GMX.xml | 6 +
src/chrome/content/rules/Gentoo.xml | 4 +
src/chrome/content/rules/Google.xml | 50 ++++++
src/chrome/content/rules/GoogleAPIs.xml | 9 +
src/chrome/content/rules/GoogleServices.xml | 23 +++
src/chrome/content/rules/Identica.xml | 3 +
src/chrome/content/rules/Ixquick.xml | 4 +
src/chrome/content/rules/Live.xml | 3 +
src/chrome/content/rules/Mail.com.xml | 6 +-
src/chrome/content/rules/Meebo.xml | 6 +-
src/chrome/content/rules/Microsoft.xml | 6 +
src/chrome/content/rules/Mozilla.xml | 10 +
src/chrome/content/rules/NYTimes.xml | 4 +
src/chrome/content/rules/Nederland.xml | 173 +++++++++++++++++++-
src/chrome/content/rules/Noisebridge.xml | 6 +-
src/chrome/content/rules/PayPal.xml | 6 +-
src/chrome/content/rules/Scroogle.xml | 3 +
src/chrome/content/rules/Torproject.xml | 3 +
src/chrome/content/rules/Twitter.xml | 4 +
src/chrome/content/rules/WashingtonPost.xml | 3 +
src/chrome/content/rules/Wikipedia.xml | 9 +
src/chrome/content/rules/WordPress.xml | 3 +
src/chrome/content/rules/Zoho.xml | 2 +
32 files changed, 373 insertions(+), 12 deletions(-)
diff --git a/src/chrome/content/rules/Amazon-off-by-default.xml b/src/chrome/content/rules/Amazon-off-by-default.xml
index 0662c1c..ef70b7d 100644
--- a/src/chrome/content/rules/Amazon-off-by-default.xml
+++ b/src/chrome/content/rules/Amazon-off-by-default.xml
@@ -2,6 +2,13 @@
Amazon site to break; see the mailing list archives for details -->
<ruleset name="Amazon (buggy)" default_off="currently somewhat broken">
+ <target host="www.amazon.*" />
+ <target host="amazon.*" />
+ <target host="www.amazon.co.*" />
+ <target host="amazon.co.*" />
+ <target host="www.amazon.com" />
+ <target host="amazon.com" />
+ <target host="aws.amazon.com" />
<!-- Amazon appears to operate in 7 countries, and does not hold the domains
for some others, like .se or .be. In other cases there is an http-only site
diff --git a/src/chrome/content/rules/Bitly.xml b/src/chrome/content/rules/Bitly.xml
index e3cc6ac..71a415d 100644
--- a/src/chrome/content/rules/Bitly.xml
+++ b/src/chrome/content/rules/Bitly.xml
@@ -1,4 +1,11 @@
<ruleset name="bit.ly">
+ <target host="bit.ly" />
+ <target host="www.bit.ly" />
+ <target host="bit.ly.pro" />
+ <target host="www.bit.ly.pro" />
+ <target host="j.mp" />
+ <target host="www.j.mp" />
+
<rule from="^http://(?:www\.)?bit\.ly/" to="https://bit.ly/"/>
<rule from="^http://(?:www\.)?bit\.ly\.pro/" to="https://bit.ly/pro/"/>
<rule from="^http://(?:www\.)?j\.mp/" to="https://j.mp/"/>
diff --git a/src/chrome/content/rules/CDT.xml b/src/chrome/content/rules/CDT.xml
index e2e01df..276ad54 100644
--- a/src/chrome/content/rules/CDT.xml
+++ b/src/chrome/content/rules/CDT.xml
@@ -1,3 +1,6 @@
<ruleset name="CDT">
+ <target host="www.cdt.org" />
+ <target host="cdt.org" />
+
<rule from="^http://(www\.)?cdt\.org/" to="https://www.cdt.org/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Cisco.xml b/src/chrome/content/rules/Cisco.xml
index 9055ce1..c0d8438 100644
--- a/src/chrome/content/rules/Cisco.xml
+++ b/src/chrome/content/rules/Cisco.xml
@@ -1,3 +1,6 @@
<ruleset name="Cisco">
+ <target host="www.cisco.com" />
+ <target host="cisco.com" />
+
<rule from="^http://(www\.)?cisco\.com/" to="https://www.cisco.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Dropbox.xml b/src/chrome/content/rules/Dropbox.xml
index cd160bd..7df8033 100644
--- a/src/chrome/content/rules/Dropbox.xml
+++ b/src/chrome/content/rules/Dropbox.xml
@@ -1,4 +1,7 @@
<ruleset name="Dropbox">
+ <target host="www.dropbox.com" />
+ <target host="dropbox.com" />
+
<rule from="^http://(www\.)?dropbox\.com/" to="https://www.dropbox.com/"/>
<!-- This breaks blog.dropbox.com and forums.dropbox.com, for example
<rule from="^http://([^/:@]+)\.dropbox\.com/" to="https://$1.dropbox.com/"/>
diff --git a/src/chrome/content/rules/DuckDuckGo.xml b/src/chrome/content/rules/DuckDuckGo.xml
index 9a1b0e2..24ea7af 100644
--- a/src/chrome/content/rules/DuckDuckGo.xml
+++ b/src/chrome/content/rules/DuckDuckGo.xml
@@ -1,6 +1,8 @@
<!-- XXX: Needs more testing -->
<ruleset name="DuckDuckGo">
+ <target host="duckduckgo.com" />
+ <target host="*.duckduckgo.com" />
+
<rule from="^http://duckduckgo\.com/" to="https://duckduckgo.com/"/>
- <rule from="^http://([^/:@]*)\.duckduckgo\.com/"
- to="https://$1.duckduckgo.com/"/>
+ <rule from="^http://([^/:@]*)\.duckduckgo\.com/" to="https://$1.duckduckgo.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/EFF.xml b/src/chrome/content/rules/EFF.xml
index 15f45c9..1251b6f 100644
--- a/src/chrome/content/rules/EFF.xml
+++ b/src/chrome/content/rules/EFF.xml
@@ -1,5 +1,7 @@
<ruleset name="EFF">
<exclusion pattern="^http://action\.eff\.org/"/>
+ <target host="*.eff.org" />
+ <target host="eff.org" />
<rule from="^http://eff\.org/" to="https://eff.org/"/>
diff --git a/src/chrome/content/rules/Evernote.xml b/src/chrome/content/rules/Evernote.xml
index 283de8a..8ef702a 100644
--- a/src/chrome/content/rules/Evernote.xml
+++ b/src/chrome/content/rules/Evernote.xml
@@ -1,3 +1,6 @@
<ruleset name="Evernote">
+ <target host="www.evernote.com" />
+ <target host="evernote.com" />
+
<rule from="^http://(www\.)?evernote\.com/" to="https://www.evernote.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Facebook.xml b/src/chrome/content/rules/Facebook.xml
index e490f0d..8d0ff96 100644
--- a/src/chrome/content/rules/Facebook.xml
+++ b/src/chrome/content/rules/Facebook.xml
@@ -1,4 +1,9 @@
<ruleset name="Facebook">
+ <target host="www.facebook.com" />
+ <target host="facebook.com" />
+ <target host="m.facebook.com" />
+ <target host="www.v6.facebook.com" />
+
<rule from="^http://(www\.)?facebook\.com/" to="https://www.facebook.com/"/>
<rule from="^http://m\.facebook\.com/" to="https://m.facebook.com/"/>
<rule from="^http://www\.v6\.facebook\.com/" to="https://www.v6.facebook.com"/>
diff --git a/src/chrome/content/rules/GMX.xml b/src/chrome/content/rules/GMX.xml
index d759abd..7ac22d6 100644
--- a/src/chrome/content/rules/GMX.xml
+++ b/src/chrome/content/rules/GMX.xml
@@ -1,4 +1,10 @@
<ruleset name="GMX" match_rule="http:.*gmx\.">
+ <target host="www.gmx.*" />
+ <target host="gmx.*" />
+ <target host="www.gmx.co.uk" />
+ <target host="gmx.co.uk" />
+ <target host="service.gmx.com" />
+ <target host="service.gmx.net" />
<!-- in countries like se, it, ca, and ru, www.gmx.cctld redirects
to www.gmx.com; we may as well secure that a bit but it should
diff --git a/src/chrome/content/rules/Gentoo.xml b/src/chrome/content/rules/Gentoo.xml
index b7e3ed5..d935eaa 100644
--- a/src/chrome/content/rules/Gentoo.xml
+++ b/src/chrome/content/rules/Gentoo.xml
@@ -1,4 +1,8 @@
<ruleset name="Gentoo" match_rule="http://.*\.gentoo\.org">
+ <target host="bugs.gentoo.org" />
+ <target host="devmanual.gentoo.org" />
+ <target host="forums.gentoo.org" />
+
<exclusion pattern="^http://www\.gentoo\.org/"/> <!-- https unsupported -->
<exclusion pattern="^http://anoncvs\.gentoo\.org/"/> <!-- https unsupported -->
<exclusion pattern="^http://packages\.gentoo\.org/"/> <!-- redirects to http again -->
diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
index 51f3975..1614577 100644
--- a/src/chrome/content/rules/Google.xml
+++ b/src/chrome/content/rules/Google.xml
@@ -1,4 +1,54 @@
<ruleset name="Google Search" match_rule="http:.*google\.">
+ <target host="encrypted.google.com" />
+ <target host="www.google.com" />
+ <target host="google.com" />
+ <target host="www.google.com.*" />
+ <target host="google.com.*" />
+ <target host="www.google.co.*" />
+ <target host="google.co.*" />
+ <target host="www.google.*" />
+ <target host="google.*" />
+ <target host="suggestqueries.google.com" />
+ <target host="clients0.google.com" />
+ <target host="clients1.google.com" />
+ <target host="clients2.google.com" />
+ <target host="clients3.google.com" />
+ <target host="clients4.google.com" />
+ <target host="clients5.google.com" />
+ <target host="clients6.google.com" />
+ <target host="clients7.google.com" />
+ <target host="clients8.google.com" />
+ <target host="clients9.google.com" />
+ <target host="clients0.google.com.*" />
+ <target host="clients1.google.com.*" />
+ <target host="clients2.google.com.*" />
+ <target host="clients3.google.com.*" />
+ <target host="clients4.google.com.*" />
+ <target host="clients5.google.com.*" />
+ <target host="clients6.google.com.*" />
+ <target host="clients7.google.com.*" />
+ <target host="clients8.google.com.*" />
+ <target host="clients9.google.com.*" />
+ <target host="clients0.google.co.*" />
+ <target host="clients1.google.co.*" />
+ <target host="clients2.google.co.*" />
+ <target host="clients3.google.co.*" />
+ <target host="clients4.google.co.*" />
+ <target host="clients5.google.co.*" />
+ <target host="clients6.google.co.*" />
+ <target host="clients7.google.co.*" />
+ <target host="clients8.google.co.*" />
+ <target host="clients9.google.co.*" />
+ <target host="clients0.google.*" />
+ <target host="clients1.google.*" />
+ <target host="clients2.google.*" />
+ <target host="clients3.google.*" />
+ <target host="clients4.google.*" />
+ <target host="clients5.google.*" />
+ <target host="clients6.google.*" />
+ <target host="clients7.google.*" />
+ <target host="clients8.google.*" />
+ <target host="clients9.google.*" />
<!-- Some Google pages can generate naive links back to the
unencrypted version of encrypted.google.com, which is a
diff --git a/src/chrome/content/rules/GoogleAPIs.xml b/src/chrome/content/rules/GoogleAPIs.xml
index 461a293..4960204 100644
--- a/src/chrome/content/rules/GoogleAPIs.xml
+++ b/src/chrome/content/rules/GoogleAPIs.xml
@@ -1,4 +1,13 @@
<ruleset name="Google APIs">
+ <target host="www.google-analytics.com" />
+ <target host="ssl.google-analytics.com" />
+ <target host="ajax.googleapis.com" />
+ <target host="fonts.googleapis.com" />
+ <target host="themes.googleusercontent.com" />
+ <target host="webcache.googleusercontent.com" />
+ <target host="api.recaptcha.net" />
+ <target host="www.google.com" />
+
<rule from="^http://www\.google-analytics\.com/"
to="https://ssl.google-analytics.com/"/>
<rule from="^http://ajax\.googleapis\.com/"
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 8244a4d..098fe76 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -1,5 +1,28 @@
<!-- XXX: Needs more testing -->
<ruleset name="GoogleServices" match_rule="http:.*google">
+ <target host="spreadsheets.google.com" />
+ <target host="docs.google.com" />
+ <target host="groups.google.com" />
+ <target host="groups.google.de" />
+ <target host="mail.google.com" />
+ <target host="www.google.com" />
+ <target host="google.com" />
+ <target host="www.gmail.com" />
+ <target host="gmail.com" />
+ <target host="code.google.com" />
+ <target host="sites.google.com" />
+ <target host="news.google.com" />
+ <target host="www.googlecode.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="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/"/>
diff --git a/src/chrome/content/rules/Identica.xml b/src/chrome/content/rules/Identica.xml
index d6a56e4..cbed55c 100644
--- a/src/chrome/content/rules/Identica.xml
+++ b/src/chrome/content/rules/Identica.xml
@@ -1,3 +1,6 @@
<ruleset name="Identica">
+ <target host="www.identi.ca" />
+ <target host="identi.ca" />
+
<rule from="^http://(www\.)?identi\.ca/" to="https://identi.ca/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Ixquick.xml b/src/chrome/content/rules/Ixquick.xml
index fdf797b..31de8bd 100644
--- a/src/chrome/content/rules/Ixquick.xml
+++ b/src/chrome/content/rules/Ixquick.xml
@@ -1,4 +1,8 @@
<ruleset name="Ixquick">
+ <target host="ixquick.com" />
+ <target host="*.ixquick.com" />
+ <target host="startpage.com" />
+ <target host="*.startpage.com" />
<rule from="^http://ixquick\.com/" to="https://ixquick.com/"/>
<rule from="^http://([^@/:]*)\.ixquick\.com/" to="https://$1.ixquick.com/"/>
diff --git a/src/chrome/content/rules/Live.xml b/src/chrome/content/rules/Live.xml
index d8cdff1..138428d 100644
--- a/src/chrome/content/rules/Live.xml
+++ b/src/chrome/content/rules/Live.xml
@@ -1,3 +1,6 @@
<ruleset name="Live">
+ <target host="login.live.com" />
+ <target host="onecare.live.com" />
+
<rule from="^http://(login|onecare)\.live\.com/" to="https://$1.live.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Mail.com.xml b/src/chrome/content/rules/Mail.com.xml
index defcc67..3b8b126 100644
--- a/src/chrome/content/rules/Mail.com.xml
+++ b/src/chrome/content/rules/Mail.com.xml
@@ -1,5 +1,7 @@
<ruleset name="Mail.com">
- <rule from="^http://mail\.com/" to="https://www.mail.com/"/>
- <rule from="^http://www\.mail\.com/" to="https://www.mail.com/"/>
+ <target host="www.mail.com" />
+ <target host="mail.com" />
+
+ <rule from="^http://(www\.)?mail\.com/" to="https://www.mail.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Meebo.xml b/src/chrome/content/rules/Meebo.xml
index 58e5462..2d56a3e 100644
--- a/src/chrome/content/rules/Meebo.xml
+++ b/src/chrome/content/rules/Meebo.xml
@@ -1,4 +1,6 @@
<ruleset name="Meebo">
- <rule from="^http://www\.meebo\.com/" to="https://www.meebo.com/"/>
- <rule from="^http://meebo\.com/" to="https://www.meebo.com/"/>
+ <target host="www.meebo.com" />
+ <target host="meebo.com" />
+
+ <rule from="^http://(www\.)?meebo\.com/" to="https://www.meebo.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Microsoft.xml b/src/chrome/content/rules/Microsoft.xml
index d52a6d5..7507a53 100644
--- a/src/chrome/content/rules/Microsoft.xml
+++ b/src/chrome/content/rules/Microsoft.xml
@@ -1,4 +1,10 @@
<ruleset name="Microsoft">
+ <target host="www.microsoft.com" />
+ <target host="microsoft.com" />
+ <target host="office.microsoft.com" />
+ <target host="office2010.microsoft.com" />
+ <target host="store.microsoft.com" />
+
<exclusion pattern="^http://www\.microsoft\.com/security/" />
<rule from="^http://(www\.)?microsoft\.com/" to="https://www.microsoft.com/"/>
<rule from="^http://(office|office2010|store)\.microsoft\.com/" to="https://$1.microsoft.com/"/>
diff --git a/src/chrome/content/rules/Mozilla.xml b/src/chrome/content/rules/Mozilla.xml
index 416c057..6092033 100644
--- a/src/chrome/content/rules/Mozilla.xml
+++ b/src/chrome/content/rules/Mozilla.xml
@@ -2,6 +2,16 @@
HTTP only... -->
<ruleset name="Mozilla">
+ <target host="mozilla.org" />
+ <target host="*.mozilla.org" />
+ <target host="mozilla.com" />
+ <target host="*.mozilla.com" />
+ <target host="mozillalabs.com" />
+ <target host="www.mozillalabs.com" />
+ <target host="mozillamessaging.com" />
+ <target host="www.mozillamessaging.com" />
+ <target host="planet.mozillamessaging.com" />
+
<rule from="^http://mozilla\.org/" to="https://www.mozilla.org/"/>
<rule from="^http://(addons|education|ftp|hacks|hg|labs|mxr|planet|quality|www)\.mozilla\.org/" to="https://$1.mozilla.org/"/>
diff --git a/src/chrome/content/rules/NYTimes.xml b/src/chrome/content/rules/NYTimes.xml
index df7b8a7..7ac589d 100644
--- a/src/chrome/content/rules/NYTimes.xml
+++ b/src/chrome/content/rules/NYTimes.xml
@@ -1,4 +1,8 @@
<ruleset name="NYTimes">
+ <target host="www.nytimes.com" />
+ <target host="nytimes.com" />
+ <target host="global.nytimes.com" />
+
<rule from="^http://(www\.)?nytimes\.com/" to="https://www.nytimes.com/"/>
<rule from="^http://global.nytimes\.com/" to="https://global.nytimes.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Nederland.xml b/src/chrome/content/rules/Nederland.xml
index d57a5ef..acf8d42 100644
--- a/src/chrome/content/rules/Nederland.xml
+++ b/src/chrome/content/rules/Nederland.xml
@@ -1,7 +1,176 @@
<ruleset name="NL Overheid">
+ <target host="digid.nl" />
+ <target host="overheid.nl" />
+ <target host="internetconsultatie.nl" />
+ <target host="politie.nl" />
+ <target host="wodc.nl" />
+ <target host="cjib.nl" />
+ <target host="forensischinstituut.nl" />
+ <target host="werkenbijdeoverheid.nl" />
+ <target host="govcert.nl" />
+ <target host="waarschuwingsdienst.nl" />
+ <target host="minbzk.nl" />
+ <target host="minfin.nl" />
+ <target host="domeinenrz.nl" />
+ <target host="justitie.nl" />
+ <target host="hetlnvloket.nl" />
+ <target host="nationaleombudsman.nl" />
+ <target host="brabant.nl" />
+ <target host="overijssel.nl" />
+ <target host="zeeland.nl" />
+ <target host="aaenhunze.nl" />
+ <target host="amersfoort.nl" />
+ <target host="amstelveen.nl" />
+ <target host="amsterdam.nl" />
+ <target host="bergenopzoom.nl" />
+ <target host="gemeenteberkelland.nl" />
+ <target host="gemeentebest.nl" />
+ <target host="boarnsterhim.nl" />
+ <target host="borne.nl" />
+ <target host="coevorden.nl" />
+ <target host="doesburg.nl" />
+ <target host="duiven.nl" />
+ <target host="elburg.nl" />
+ <target host="geldermalsen.nl" />
+ <target host="haaksbergen.nl" />
+ <target host="haarlemmermeer.nl" />
+ <target host="heerenveen.nl" />
+ <target host="s-hertogenbosch.nl" />
+ <target host="heusden.nl" />
+ <target host="hilversum.nl" />
+ <target host="hoorn.nl" />
+ <target host="horstaandemaas.nl" />
+ <target host="houten.nl" />
+ <target host="huizen.nl" />
+ <target host="lochem.nl" />
+ <target host="maarssen.nl" />
+ <target host="maastricht.nl" />
+ <target host="meerssen.nl" />
+ <target host="middelburg.nl" />
+ <target host="middendrenthe.nl" />
+ <target host="moerdijk.nl" />
+ <target host="gemeentenoordenveld.nl" />
+ <target host="noordwijkerhout.nl" />
+ <target host="oldebroek.nl" />
+ <target host="opsterland.nl" />
+ <target host="oss.nl" />
+ <target host="pijnacker-nootdorp.nl" />
+ <target host="renkum.nl" />
+ <target host="rheden.nl" />
+ <target host="rijswijk.nl" />
+ <target host="schiedam.nl" />
+ <target host="schijndel.nl" />
+ <target host="sittard-geleen.nl" />
+ <target host="smallingerland.nl" />
+ <target host="stedebroec.nl" />
+ <target host="steenwijkerland.nl" />
+ <target host="terneuzen.nl" />
+ <target host="teylingen.nl" />
+ <target host="tubbergen.nl" />
+ <target host="uden.nl" />
+ <target host="utrecht.nl" />
+ <target host="vlagtwedde.nl" />
+ <target host="vlissingen.nl" />
+ <target host="wageningen.nl" />
+ <target host="weert.nl" />
+ <target host="gemeentewesterveld.nl" />
+ <target host="gemeentewestland.nl" />
+ <target host="wierden.nl" />
+ <target host="wijchen.nl" />
+ <target host="winterswijk.nl" />
+ <target host="zaltbommel.nl" />
+ <target host="zandvoort.nl" />
+ <target host="zeist.nl" />
+ <target host="zutphen.nl" />
+ <target host="zwijndrecht.nl" />
+ <target host="government.nl" />
+ <target host="www.digid.nl" />
+ <target host="www.overheid.nl" />
+ <target host="www.internetconsultatie.nl" />
+ <target host="www.politie.nl" />
+ <target host="www.wodc.nl" />
+ <target host="www.cjib.nl" />
+ <target host="www.forensischinstituut.nl" />
+ <target host="www.werkenbijdeoverheid.nl" />
+ <target host="www.govcert.nl" />
+ <target host="www.waarschuwingsdienst.nl" />
+ <target host="www.minbzk.nl" />
+ <target host="www.minfin.nl" />
+ <target host="www.domeinenrz.nl" />
+ <target host="www.justitie.nl" />
+ <target host="www.hetlnvloket.nl" />
+ <target host="www.nationaleombudsman.nl" />
+ <target host="www.brabant.nl" />
+ <target host="www.overijssel.nl" />
+ <target host="www.zeeland.nl" />
+ <target host="www.aaenhunze.nl" />
+ <target host="www.amersfoort.nl" />
+ <target host="www.amstelveen.nl" />
+ <target host="www.amsterdam.nl" />
+ <target host="www.bergenopzoom.nl" />
+ <target host="www.gemeenteberkelland.nl" />
+ <target host="www.gemeentebest.nl" />
+ <target host="www.boarnsterhim.nl" />
+ <target host="www.borne.nl" />
+ <target host="www.coevorden.nl" />
+ <target host="www.doesburg.nl" />
+ <target host="www.duiven.nl" />
+ <target host="www.elburg.nl" />
+ <target host="www.geldermalsen.nl" />
+ <target host="www.haaksbergen.nl" />
+ <target host="www.haarlemmermeer.nl" />
+ <target host="www.heerenveen.nl" />
+ <target host="www.s-hertogenbosch.nl" />
+ <target host="www.heusden.nl" />
+ <target host="www.hilversum.nl" />
+ <target host="www.hoorn.nl" />
+ <target host="www.horstaandemaas.nl" />
+ <target host="www.houten.nl" />
+ <target host="www.huizen.nl" />
+ <target host="www.lochem.nl" />
+ <target host="www.maarssen.nl" />
+ <target host="www.maastricht.nl" />
+ <target host="www.meerssen.nl" />
+ <target host="www.middelburg.nl" />
+ <target host="www.middendrenthe.nl" />
+ <target host="www.moerdijk.nl" />
+ <target host="www.gemeentenoordenveld.nl" />
+ <target host="www.noordwijkerhout.nl" />
+ <target host="www.oldebroek.nl" />
+ <target host="www.opsterland.nl" />
+ <target host="www.oss.nl" />
+ <target host="www.pijnacker-nootdorp.nl" />
+ <target host="www.renkum.nl" />
+ <target host="www.rheden.nl" />
+ <target host="www.rijswijk.nl" />
+ <target host="www.schiedam.nl" />
+ <target host="www.schijndel.nl" />
+ <target host="www.sittard-geleen.nl" />
+ <target host="www.smallingerland.nl" />
+ <target host="www.stedebroec.nl" />
+ <target host="www.steenwijkerland.nl" />
+ <target host="www.terneuzen.nl" />
+ <target host="www.teylingen.nl" />
+ <target host="www.tubbergen.nl" />
+ <target host="www.uden.nl" />
+ <target host="www.utrecht.nl" />
+ <target host="www.vlagtwedde.nl" />
+ <target host="www.vlissingen.nl" />
+ <target host="www.wageningen.nl" />
+ <target host="www.weert.nl" />
+ <target host="www.gemeentewesterveld.nl" />
+ <target host="www.gemeentewestland.nl" />
+ <target host="www.wierden.nl" />
+ <target host="www.wijchen.nl" />
+ <target host="www.winterswijk.nl" />
+ <target host="www.zaltbommel.nl" />
+ <target host="www.zandvoort.nl" />
+ <target host="www.zeist.nl" />
+ <target host="www.zutphen.nl" />
+ <target host="www.zwijndrecht.nl" />
+ <target host="www.government.nl" />
+
<rule
from="^http://(?:www\.)?(digid|overheid|internetconsultatie|politie|wodc|cjib|forensischinstituut|werkenbijdeoverheid|govcert|waarschuwingsdienst|minbzk|minfin|domeinenrz|justitie|hetlnvloket|nationaleombudsman|brabant|overijssel|zeeland|aaenhunze|amersfoort|amstelveen|amsterdam|bergenopzoom|gemeenteberkelland|gemeentebest|boarnsterhim|borne|coevorden|doesburg|duiven|elburg|geldermalsen|haaksbergen|haarlemmermeer|heerenveen|s-hertogenbosch|heusden|hilversum|hoorn|horstaandemaas|houten|huizen|lochem|maarssen|maastricht|meerssen|middelburg|middendrenthe|moerdijk|gemeentenoordenveld|noordwijkerhout|oldebroek|opsterland|oss|pijnacker-nootdorp|renkum|rheden|rijswijk|schiedam|schijndel|sittard-geleen|smallingerland|stedebroec|steenwijkerland|terneuzen|teylingen|tubbergen|uden|utrecht|vlagtwedde|vlissingen|wageningen|weert|gemeentewesterveld|gemeentewestland|wierden|wijchen|winterswijk|zaltbommel|zandvoort|zeist|zutphen|zwijndrecht|government)\.nl/"
to="https://www.$1.nl/" />
</ruleset>
-
-
diff --git a/src/chrome/content/rules/Noisebridge.xml b/src/chrome/content/rules/Noisebridge.xml
index a5a1063..85ebdc1 100644
--- a/src/chrome/content/rules/Noisebridge.xml
+++ b/src/chrome/content/rules/Noisebridge.xml
@@ -1,4 +1,6 @@
<ruleset name="Noisebridge">
- <rule from="^http://www\.noisebridge\.net/" to="https://www.noisebridge.net/"/>
- <rule from="^http://noisebridge\.net/" to="https://www.noisebridge.net/"/>
+ <target host="www.noisebridge.net" />
+ <target host="noisebridge.net" />
+
+ <rule from="^http://(www\.)?noisebridge\.net/" to="https://www.noisebridge.net/"/>
</ruleset>
diff --git a/src/chrome/content/rules/PayPal.xml b/src/chrome/content/rules/PayPal.xml
index 530680e..0693b2d 100644
--- a/src/chrome/content/rules/PayPal.xml
+++ b/src/chrome/content/rules/PayPal.xml
@@ -1,4 +1,6 @@
<ruleset name="PayPal">
- <rule from="^http://www\.paypal\.com/" to="https://www.paypal.com/"/>
- <rule from="^http://paypal\.com/" to="https://www.paypal.com/"/>
+ <target host="www.paypal.com" />
+ <target host="paypal.com" />
+
+ <rule from="^http://(www\.)?paypal\.com/" to="https://www.paypal.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Scroogle.xml b/src/chrome/content/rules/Scroogle.xml
index 62a1fe4..fdf917b 100644
--- a/src/chrome/content/rules/Scroogle.xml
+++ b/src/chrome/content/rules/Scroogle.xml
@@ -1,4 +1,7 @@
<ruleset name="Scroogle">
+ <target host="www.scroogle.org" />
+ <target host="scroogle.org" />
+
<rule from="^http://(www\.)?scroogle\.org/cgi-bin/nbbw\.cgi$" to="https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi"/>
<rule from="^http://(www\.)?scroogle\.org/$" to="https://ssl.scroogle.org/" />
</ruleset>
diff --git a/src/chrome/content/rules/Torproject.xml b/src/chrome/content/rules/Torproject.xml
index a020018..ae78e76 100644
--- a/src/chrome/content/rules/Torproject.xml
+++ b/src/chrome/content/rules/Torproject.xml
@@ -1,4 +1,7 @@
<ruleset name="Torproject">
+ <target host="torproject.org" />
+ <target host="*.torproject.org" />
+
<exclusion pattern="^http://archive\.torproject\.org/"/>
<exclusion pattern="^http://media\.torproject\.org/"/>
<exclusion pattern="^http://deb\.torproject\.org/"/>
diff --git a/src/chrome/content/rules/Twitter.xml b/src/chrome/content/rules/Twitter.xml
index 9f6e62a..7d0cc7c 100644
--- a/src/chrome/content/rules/Twitter.xml
+++ b/src/chrome/content/rules/Twitter.xml
@@ -12,6 +12,10 @@
that it makes the site unusable or particularly broken. -->
<ruleset name="Twitter">
+ <target host="*.twitter.com" />
+ <target host="twitter.com" />
+ <target host="*.twimg.com" />
+
<rule from="^http://(www\.)?twitter\.com/" to="https://twitter.com/"/>
<rule from="^http://(search|static)\.twitter\.com/" to="https://$1.twitter.com/"/>
<rule from="^http://[a-z0-9].?\.twimg\.com/" to="https://s3.amazonaws.com/twitter_production/"/>
diff --git a/src/chrome/content/rules/WashingtonPost.xml b/src/chrome/content/rules/WashingtonPost.xml
index 657be7b..94fa154 100644
--- a/src/chrome/content/rules/WashingtonPost.xml
+++ b/src/chrome/content/rules/WashingtonPost.xml
@@ -1,4 +1,7 @@
<ruleset name="WashingtonPost">
+ <target host="www.washingtonpost.com" />
+ <target host="washingtonpost.com" />
+
<rule from="^http://(www\.)?washingtonpost\.com/"
to="https://www.washingtonpost.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Wikipedia.xml b/src/chrome/content/rules/Wikipedia.xml
index 15d86e6..5d78d64 100644
--- a/src/chrome/content/rules/Wikipedia.xml
+++ b/src/chrome/content/rules/Wikipedia.xml
@@ -10,6 +10,15 @@
be protected. -->
<ruleset name="Wikipedia">
+ <target host="*.wikipedia.org" />
+ <target host="*.wikinews.org" />
+ <target host="*.wikisource.org" />
+ <target host="*.wikibooks.org" />
+ <target host="*.wikiquote.org" />
+ <target host="*.wikiversity.org" />
+ <target host="*.wiktionary.org" />
+ <target host="*.wikimedia.org" />
+
<exclusion pattern="^http://www\.wik(ipedia|inews|isource|ibooks|iquote|iversity|tionary)\.org/"/>
<rule from="^http://([^@:/]+)\.wik(ipedia|inews|isource|ibooks|iquote|iversity|tionary)\.org/(w|wiki)/"
to="https://secure.wikimedia.org/wik$2/$1/$3/"/>
diff --git a/src/chrome/content/rules/WordPress.xml b/src/chrome/content/rules/WordPress.xml
index 3fe9c04..8a60692 100644
--- a/src/chrome/content/rules/WordPress.xml
+++ b/src/chrome/content/rules/WordPress.xml
@@ -1,4 +1,7 @@
<ruleset name="WordPress.com">
+ <target host="wordpress.com" />
+ <target host="*.wordpress.com" />
+
<exclusion pattern="^http://en\.blog\.wordpress\.com/"/>
<exclusion pattern="^http://en\.blog\.files\.wordpress\.com/"/>
<rule from="^http://wordpress\.com/" to="https://wordpress.com/"/>
diff --git a/src/chrome/content/rules/Zoho.xml b/src/chrome/content/rules/Zoho.xml
index c6f8999..783be30 100644
--- a/src/chrome/content/rules/Zoho.xml
+++ b/src/chrome/content/rules/Zoho.xml
@@ -1,3 +1,5 @@
<ruleset name="Zoho">
+ <target host="*.zoho.com" />
+
<rule from="^http://(www|writer|mail|sheet|show|docs|notebook|wiki|share|planner|chat|personal|projects|creator|business|invoice|assist|reports|meeting|recruit|discussions|people|search)\.zoho\.com/" to="https://$1.zoho.com/"/>
</ruleset>
--
1.7.1
More information about the tor-commits
mailing list