[or-cvs] [https-everywhere/master 146/291] properly escape all dots in from= rules
schoen at torproject.org
schoen at torproject.org
Sat Oct 30 00:32:39 UTC 2010
Author: Seth Schoen <schoen at eff.org>
Date: Sat, 9 Oct 2010 01:55:21 -0700
Subject: properly escape all dots in from= rules
Commit: ac5920021246a587f3ca91591e732fd71ae6815c
---
src/chrome/content/rules/AmericanExpress.xml | 2 +-
src/chrome/content/rules/Apple.xml | 10 +++++-----
src/chrome/content/rules/BrainBench.xml | 2 +-
src/chrome/content/rules/Bungie.xml | 2 +-
src/chrome/content/rules/Couchsurfing.xml | 2 +-
src/chrome/content/rules/EZTV.xml | 2 +-
src/chrome/content/rules/Egg.xml | 4 ++--
src/chrome/content/rules/Epson.xml | 14 +++++++-------
src/chrome/content/rules/GovernoPortugues.xml | 2 +-
src/chrome/content/rules/PCCaseGear.xml | 2 +-
src/chrome/content/rules/Qualys.xml | 2 +-
src/chrome/content/rules/Scroogle.xml | 2 +-
src/chrome/content/rules/Secunia.xml | 2 +-
src/chrome/content/rules/Symbian.xml | 2 +-
14 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/chrome/content/rules/AmericanExpress.xml b/src/chrome/content/rules/AmericanExpress.xml
index a11eb8a..b844efa 100644
--- a/src/chrome/content/rules/AmericanExpress.xml
+++ b/src/chrome/content/rules/AmericanExpress.xml
@@ -3,5 +3,5 @@
but some don't work properly in HTTPS anyway. This is kind of a mess. -->
<ruleset name="AmericanExpress">
<rule from="^http://(www\.)?americanexpress\.com/" to="https://www.americanexpress.com/"/>
- <rule from="^http://home.americanexpress\.com/" to="https://home.americanexpress.com/"/>
+ <rule from="^http://home\.americanexpress\.com/" to="https://home.americanexpress.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Apple.xml b/src/chrome/content/rules/Apple.xml
index 6818770..72a575f 100644
--- a/src/chrome/content/rules/Apple.xml
+++ b/src/chrome/content/rules/Apple.xml
@@ -1,7 +1,7 @@
<ruleset name="Apple.com (partial)">
- <rule from="^http://(www\.)?apple.com/" to="https://www.apple.com/"/>
- <rule from="^http://developer.apple.com/" to="https://developer.apple.com/"/>
- <rule from="^http://connect.apple.com/" to="https://connect.apple.com/"/>
- <rule from="^http://images.apple.com/" to="https://ssl.apple.com/"/>
- <rule from="^http://jobs.apple.com/" to="https://jobs.apple.com/"/>
+ <rule from="^http://(www\.)?apple\.com/" to="https://www.apple.com/"/>
+ <rule from="^http://developer\.apple\.com/" to="https://developer.apple.com/"/>
+ <rule from="^http://connect\.apple\.com/" to="https://connect.apple.com/"/>
+ <rule from="^http://images\.apple\.com/" to="https://ssl.apple.com/"/>
+ <rule from="^http://jobs\.apple\.com/" to="https://jobs.apple.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/BrainBench.xml b/src/chrome/content/rules/BrainBench.xml
index 851c966..92fe2dc 100644
--- a/src/chrome/content/rules/BrainBench.xml
+++ b/src/chrome/content/rules/BrainBench.xml
@@ -1,4 +1,4 @@
<ruleset name="Brainbench">
- <rule from="^http://(www\.)?brainbench.com/" to="https://www.brainbench.com/"/>
+ <rule from="^http://(www\.)?brainbench\.com/" to="https://www.brainbench.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Bungie.xml b/src/chrome/content/rules/Bungie.xml
index b9d6bd2..c344042 100644
--- a/src/chrome/content/rules/Bungie.xml
+++ b/src/chrome/content/rules/Bungie.xml
@@ -1,4 +1,4 @@
<ruleset name="Bungie">
- <rule from="^http://(www\.)?bungie.net/" to="https://www.bungie.net/"/>
+ <rule from="^http://(www\.)?bungie\.net/" to="https://www.bungie.net/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Couchsurfing.xml b/src/chrome/content/rules/Couchsurfing.xml
index 223df3e..703160c 100644
--- a/src/chrome/content/rules/Couchsurfing.xml
+++ b/src/chrome/content/rules/Couchsurfing.xml
@@ -1,4 +1,4 @@
<ruleset name="Couchsurfing">
- <rule from="^http://www\.couchsurfing\.org/login.html" to="https://www.couchsurfing.org/login.html"/>
+ <rule from="^http://www\.couchsurfing\.org/login\.html$" to="https://www.couchsurfing.org/login.html"/>
</ruleset>
diff --git a/src/chrome/content/rules/EZTV.xml b/src/chrome/content/rules/EZTV.xml
index 5280453..ae6a79a 100644
--- a/src/chrome/content/rules/EZTV.xml
+++ b/src/chrome/content/rules/EZTV.xml
@@ -1,4 +1,4 @@
<ruleset name="EZTV">
- <rule from="^(http|https)://(www\.)?(ezrss.it|eztv.it|zoink.it|ezimages.eu)/" to="https://$3/"/>
+ <rule from="^(http|https)://(www\.)?(ezrss\.it|eztv\.it|zoink\.it|ezimages\.eu)/" to="https://$3/"/>
<rule from="^http://torrent\.zoink\.it/" to="https://torrent.zoink.it/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Egg.xml b/src/chrome/content/rules/Egg.xml
index adb9389..621bf51 100644
--- a/src/chrome/content/rules/Egg.xml
+++ b/src/chrome/content/rules/Egg.xml
@@ -1,4 +1,4 @@
<ruleset name="Egg">
-<rule from="^https://(new|www\.)?egg.com/" to="https://new.egg.com/" />
-<rule from="^https://(your|phonehome\.)egg.com/" to="https://$1.egg.com/" />
+<rule from="^https://(new|www\.)?egg\.com/" to="https://new.egg.com/" />
+<rule from="^https://(your|phonehome\.)egg\.com/" to="https://$1.egg.com/" />
</ruleset>
diff --git a/src/chrome/content/rules/Epson.xml b/src/chrome/content/rules/Epson.xml
index 53282a1..0a24a3c 100644
--- a/src/chrome/content/rules/Epson.xml
+++ b/src/chrome/content/rules/Epson.xml
@@ -1,13 +1,13 @@
<ruleset name="Epson.com (partial)">
- <exclusion pattern="^http://(www\.)?epson.com/cgi-bin/Store/jsp/Product/Photos.do"/>
+ <exclusion pattern="^http://(www\.)?epson\.com/cgi-bin/Store/jsp/Product/Photos.do"/>
<!-- URLs such as http://www.epson.com/snowleopard -->
- <exclusion pattern="^http://(www\.)?epson.com/([a-zA-Z]([a-zA-Z0-9])+){1}$"/>
- <exclusion pattern="^http://(www\.)?epson.com/cgi-bin/Store/consumer/"/>
+ <exclusion pattern="^http://(www\.)?epson\.com/([a-zA-Z]([a-zA-Z0-9])+){1}$"/>
+ <exclusion pattern="^http://(www\.)?epson\.com/cgi-bin/Store/consumer/"/>
- <rule from="^http://(www\.)?epson.com/" to="https://www.epson.com/"/>
- <rule from="^http://was.epson.com/" to="https://was.epson.com/"/>
- <rule from="^http://pos.epson.com/" to="https://pos.epson.com/"/>
- <rule from="^https://(www\.)?epson.com/(([a-zA-Z]([a-zA-Z0-9])+){1})$" to="http://$1epson.com/$2"/>
+ <rule from="^http://(www\.)?epson\.com/" to="https://www.epson.com/"/>
+ <rule from="^http://was\.epson\.com/" to="https://was.epson.com/"/>
+ <rule from="^http://pos\.epson\.com/" to="https://pos.epson.com/"/>
+ <rule from="^https://(www\.)?epson\.com/(([a-zA-Z]([a-zA-Z0-9])+){1})$" to="http://$1epson.com/$2"/>
</ruleset>
diff --git a/src/chrome/content/rules/GovernoPortugues.xml b/src/chrome/content/rules/GovernoPortugues.xml
index 2409e83..a560a82 100644
--- a/src/chrome/content/rules/GovernoPortugues.xml
+++ b/src/chrome/content/rules/GovernoPortugues.xml
@@ -1,5 +1,5 @@
<ruleset name="Governo Português">
- <exclusion pattern="^http://www.portugal\.gov\.pt/PortalMovel/" />
+ <exclusion pattern="^http://www\.portugal\.gov\.pt/PortalMovel/" />
<rule from="^http://portaldocidadao\.pt/" to="https://www.portaldocidadao.pt/"/>
<rule from="^http://www\.portaldocidadao\.pt/" to="https://www.portaldocidadao.pt/"/>
<rule from="^http://portaldaempresa\.pt/" to="https://www.portaldaempresa.pt/"/>
diff --git a/src/chrome/content/rules/PCCaseGear.xml b/src/chrome/content/rules/PCCaseGear.xml
index 988c3b6..481308c 100644
--- a/src/chrome/content/rules/PCCaseGear.xml
+++ b/src/chrome/content/rules/PCCaseGear.xml
@@ -1,3 +1,3 @@
<ruleset name="PCCaseGear">
- <rule from="^(http|https)://(www\.)?pccasegear\.(com|com.au)/" to="https://www.pccasegear.com/"/>
+ <rule from="^(http|https)://(www\.)?pccasegear\.(com|com\.au)/" to="https://www.pccasegear.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Qualys.xml b/src/chrome/content/rules/Qualys.xml
index 4d050de..b14ee8d 100644
--- a/src/chrome/content/rules/Qualys.xml
+++ b/src/chrome/content/rules/Qualys.xml
@@ -1,4 +1,4 @@
<ruleset name="qualys">
<rule from="^http://(www\.)?qualys\.com/" to="https://www.qualys.com/"/>
- <rule from="^http://community.qualys\.com/" to="https://community.qualys.com/"/>
+ <rule from="^http://community\.qualys\.com/" to="https://community.qualys.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Scroogle.xml b/src/chrome/content/rules/Scroogle.xml
index 9abba04..62a1fe4 100644
--- a/src/chrome/content/rules/Scroogle.xml
+++ b/src/chrome/content/rules/Scroogle.xml
@@ -1,4 +1,4 @@
<ruleset name="Scroogle">
- <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/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/Secunia.xml b/src/chrome/content/rules/Secunia.xml
index 1b063ff..d1d3238 100644
--- a/src/chrome/content/rules/Secunia.xml
+++ b/src/chrome/content/rules/Secunia.xml
@@ -1,4 +1,4 @@
<ruleset name="Secunia">
- <rule from="^http://(www\.)?secunia.com/" to="https://secunia.com/"/>
+ <rule from="^http://(www\.)?secunia\.com/" to="https://secunia.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Symbian.xml b/src/chrome/content/rules/Symbian.xml
index 5b805a6..f1bf87f 100644
--- a/src/chrome/content/rules/Symbian.xml
+++ b/src/chrome/content/rules/Symbian.xml
@@ -1,4 +1,4 @@
<ruleset name="Symbian Foundation">
-<rule from="^http://developer.symbian.org/" to="https://developer.symbian.org/" />
+<rule from="^http://developer\.symbian\.org/" to="https://developer.symbian.org/" />
</ruleset>
--
1.7.1
More information about the tor-commits
mailing list