Author: Seth Schoen <[email protected]> Date: Fri, 29 Oct 2010 16:58:32 -0700 Subject: these five rules were already shipping Commit: ca66c52d91da01fa5e8fe4a1ccdca5f3b6153b43
--- pending-rules/GentooBugzilla.xml | 3 --- pending-rules/Noisebridge.xml | 4 ---- pending-rules/Wikipedia.xml | 25 ------------------------- pending-rules/WordPress.xml | 7 ------- pending-rules/Zoho.xml | 3 --- src/chrome/content/rules/GentooBugzilla.xml | 3 +++ src/chrome/content/rules/Noisebridge.xml | 4 ++++ src/chrome/content/rules/Wikipedia.xml | 25 +++++++++++++++++++++++++ src/chrome/content/rules/WordPress.xml | 7 +++++++ src/chrome/content/rules/Zoho.xml | 3 +++ 10 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 pending-rules/GentooBugzilla.xml delete mode 100644 pending-rules/Noisebridge.xml delete mode 100644 pending-rules/Wikipedia.xml delete mode 100644 pending-rules/WordPress.xml delete mode 100644 pending-rules/Zoho.xml create mode 100644 src/chrome/content/rules/GentooBugzilla.xml create mode 100644 src/chrome/content/rules/Noisebridge.xml create mode 100644 src/chrome/content/rules/Wikipedia.xml create mode 100644 src/chrome/content/rules/WordPress.xml create mode 100644 src/chrome/content/rules/Zoho.xml diff --git a/pending-rules/GentooBugzilla.xml b/pending-rules/GentooBugzilla.xml deleted file mode 100644 index e338767..0000000 --- a/pending-rules/GentooBugzilla.xml +++ /dev/null @@ -1,3 +0,0 @@ -<ruleset name="GentooBugzilla"> - <rule from="^http://bugs\.gentoo\.org/"; to="https://bugs.gentoo.org/"/> -</ruleset> diff --git a/pending-rules/Noisebridge.xml b/pending-rules/Noisebridge.xml deleted file mode 100644 index a5a1063..0000000 --- a/pending-rules/Noisebridge.xml +++ /dev/null @@ -1,4 +0,0 @@ -<ruleset name="Noisebridge"> - <rule from="^http://www\.noisebridge\.net/"; to="https://www.noisebridge.net/"/> - <rule from="^http://noisebridge\.net/"; to="https://www.noisebridge.net/"/> -</ruleset> diff --git a/pending-rules/Wikipedia.xml b/pending-rules/Wikipedia.xml deleted file mode 100644 index 15d86e6..0000000 --- a/pending-rules/Wikipedia.xml +++ /dev/null @@ -1,25 +0,0 @@ -<!-- www.wikisomething.org is generally a valid - domain containing general information on a project and is - simply not available at all in HTTPS. Everything with a /wiki - suffix, however, is a language-specific page that is available in - HTTPS. Hence these rules avoid redirecting www.wikisomething.org, - while redirecting all language-specific subdomains. If you - navigate first to the WWW page, you could be vulnerable to SSL - stripping, but if you succeed in submitting a query from there - in a specific language without interference, you'll subsequently - be protected. --> - -<ruleset name="Wikipedia"> - <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/"/> - <rule from="^http://([^@:/]+)\.wik(ipedia|inews|isource|ibooks|iquote|iversity|tionary)\.org/?$" - to="https://secure.wikimedia.org/wik$2/$1/wiki/"/> - - <rule from="^http://(meta|commons|incubator|species|outreach|strategy|usability|wikimania|test|survey)\.wikimedia\.org/wiki/" - to="https://secure.wikimedia.org/wikipedia/$1/wiki/"/> - - <rule from="^http://([^@:/]+)\.wik(ipedia|inews|isource|ibooks|iquote|iversity|tionary)\.org/w/index.php\?title=" - to="https://secure.wikimedia.org/wik$2/$1/wiki/"/> - -</ruleset> diff --git a/pending-rules/WordPress.xml b/pending-rules/WordPress.xml deleted file mode 100644 index 3fe9c04..0000000 --- a/pending-rules/WordPress.xml +++ /dev/null @@ -1,7 +0,0 @@ -<ruleset name="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/"/> - <rule from="^http://www\.wordpress\.com/"; to="https://www.wordpress.com/"/> - <rule from="^http://([^/:@]*)\.wordpress\.com/" to="https://$1.wordpress.com/"/> -</ruleset> diff --git a/pending-rules/Zoho.xml b/pending-rules/Zoho.xml deleted file mode 100644 index c6f8999..0000000 --- a/pending-rules/Zoho.xml +++ /dev/null @@ -1,3 +0,0 @@ -<ruleset name="Zoho"> - <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> diff --git a/src/chrome/content/rules/GentooBugzilla.xml b/src/chrome/content/rules/GentooBugzilla.xml new file mode 100644 index 0000000..e338767 --- /dev/null +++ b/src/chrome/content/rules/GentooBugzilla.xml @@ -0,0 +1,3 @@ +<ruleset name="GentooBugzilla"> + <rule from="^http://bugs\.gentoo\.org/"; to="https://bugs.gentoo.org/"/> +</ruleset> diff --git a/src/chrome/content/rules/Noisebridge.xml b/src/chrome/content/rules/Noisebridge.xml new file mode 100644 index 0000000..a5a1063 --- /dev/null +++ b/src/chrome/content/rules/Noisebridge.xml @@ -0,0 +1,4 @@ +<ruleset name="Noisebridge"> + <rule from="^http://www\.noisebridge\.net/"; to="https://www.noisebridge.net/"/> + <rule from="^http://noisebridge\.net/"; to="https://www.noisebridge.net/"/> +</ruleset> diff --git a/src/chrome/content/rules/Wikipedia.xml b/src/chrome/content/rules/Wikipedia.xml new file mode 100644 index 0000000..15d86e6 --- /dev/null +++ b/src/chrome/content/rules/Wikipedia.xml @@ -0,0 +1,25 @@ +<!-- www.wikisomething.org is generally a valid + domain containing general information on a project and is + simply not available at all in HTTPS. Everything with a /wiki + suffix, however, is a language-specific page that is available in + HTTPS. Hence these rules avoid redirecting www.wikisomething.org, + while redirecting all language-specific subdomains. If you + navigate first to the WWW page, you could be vulnerable to SSL + stripping, but if you succeed in submitting a query from there + in a specific language without interference, you'll subsequently + be protected. --> + +<ruleset name="Wikipedia"> + <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/"/> + <rule from="^http://([^@:/]+)\.wik(ipedia|inews|isource|ibooks|iquote|iversity|tionary)\.org/?$" + to="https://secure.wikimedia.org/wik$2/$1/wiki/"/> + + <rule from="^http://(meta|commons|incubator|species|outreach|strategy|usability|wikimania|test|survey)\.wikimedia\.org/wiki/" + to="https://secure.wikimedia.org/wikipedia/$1/wiki/"/> + + <rule from="^http://([^@:/]+)\.wik(ipedia|inews|isource|ibooks|iquote|iversity|tionary)\.org/w/index.php\?title=" + to="https://secure.wikimedia.org/wik$2/$1/wiki/"/> + +</ruleset> diff --git a/src/chrome/content/rules/WordPress.xml b/src/chrome/content/rules/WordPress.xml new file mode 100644 index 0000000..3fe9c04 --- /dev/null +++ b/src/chrome/content/rules/WordPress.xml @@ -0,0 +1,7 @@ +<ruleset name="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/"/> + <rule from="^http://www\.wordpress\.com/"; to="https://www.wordpress.com/"/> + <rule from="^http://([^/:@]*)\.wordpress\.com/" to="https://$1.wordpress.com/"/> +</ruleset> diff --git a/src/chrome/content/rules/Zoho.xml b/src/chrome/content/rules/Zoho.xml new file mode 100644 index 0000000..c6f8999 --- /dev/null +++ b/src/chrome/content/rules/Zoho.xml @@ -0,0 +1,3 @@ +<ruleset name="Zoho"> + <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
