Merge branch 'master' of https://github.com/EFForg/https-everywhere i…

…nto sqlite

chromium/manifest.json

@@ -6,14 +6,15 @@
         "scripts": [
             "util.js", 
             "URI.js", 
-            "lru.js",
+            "lru.js", 
             "rule_list.js", 
             "rules.js", 
             "background.js"
         ]
     }, 
     "default_locale": "en", 
     "description": "__MSG_about_ext_description__", 
+    "devtools_page": "devtools.html", 
     "homepage_url": "https://www.eff.org/https-everywhere", 
     "icons": {
         "128": "icon128.png", 
@@ -28,7 +29,6 @@
         "default_popup": "popup.html", 
         "default_title": "__MSG_about_ext_name__"
     }, 
-    "devtools_page": "devtools.html",
     "permissions": [
         "webRequest", 
         "webRequestBlocking", 
@@ -37,5 +37,5 @@
         "<all_urls>"
     ], 
     "update_url": "https://www.eff.org/files/https-everywhere-chrome-updates.xml", 
-    "version": "2014.1.3"
-}
+    "version": "2014.1.17"
+}

chromium/rules.js

@@ -76,6 +76,7 @@ RuleSet.prototype = {
 
 function RuleSets() {
   // Load rules into structure
+  var t1 = new Date().getTime();
   this.targets = {};
 
   for(var i = 0; i < rule_list.length; i++) {
@@ -89,6 +90,8 @@ function RuleSets() {
     xhr.send(null);
     this.loadRuleSet(xhr);
   }
+  var t2 =  new Date().getTime();
+  log(NOTE,"Loading rulesets took " + (t2 - t1) / 1000.0 + " seconds");
 }
 
 RuleSets.prototype = {

src/chrome/content/rules/918autoloans.com.xml

@@ -0,0 +1,13 @@
+<ruleset name="918autoloans.com">
+
+	<target host="918autoloans.com" />
+	<target host="*.918autoloans.com" />
+
+
+	<securecookie host="^\.918autoloans\.com$" name=".+" />
+
+
+	<rule from="^http://(www\.)?918autoloans\.com/"
+		to="https://$1918autoloans.com/" />
+
+</ruleset>

src/chrome/content/rules/Adentifi.com.xml

@@ -0,0 +1,17 @@
+<!--
+	Web bugs.
+
+-->
+<ruleset name="adentifi.com">
+
+	<target host="adentifi.com" />
+	<target host="www.adentifi.com" />
+
+
+	<securecookie host="^(?:www\.)?adentifi\.com$" name=".+" />
+
+
+	<rule from="^http://(www\.)?adentifi\.com/"
+		to="https://$1adentifi.com/" />
+
+</ruleset>

src/chrome/content/rules/AetherFlyff.com-falsemixed.xml

@@ -0,0 +1,21 @@
+<!--
+	For rules not causing false/broken MCB, see AetherFlyff.com.xml.
+
+-->
+<ruleset name="Aether Flyff.com (false MCB)" platform="mixedcontent">
+
+	<target host="*.aetherflyff.com" />
+		<!--
+			Handled in AetherFlyff.com.xml:
+							-->
+		<exclusion pattern="^http://basilisk\.aetherflyff\.com/+(?!forums(?!/favicon\.ico|/index\.php\?app=core&amp;module=task|/public/|/uploads/))" />
+		<exclusion pattern="^http://support\.aetherflyff\.com/+(?:cron/index\.php\?/Base/|favicon\.ico|index\.php\?/Core/|__swift/)" />
+
+
+	<securecookie host="^(?:\.basilisk|support)?\.aetherflyff\.com$" name=".+" />
+
+
+	<rule from="^http://(basilisk|support)\.aetherflyff\.com/"
+		to="https://$1.aetherflyff.com/" />
+
+</ruleset>

src/chrome/content/rules/AetherFlyff.com.xml

@@ -0,0 +1,33 @@
+<!--
+	For rules causing false/broken MCB, see AetherFlyff.com-falsemixed.xml.
+
+
+	Mixed content:
+
+		- css on basilisk and support from self *
+
+		- Images, on:
+
+			- basilisk and support from $self *
+			- basilisk from www.gravatar.com *
+
+	* Secured by us
+
+-->
+<ruleset name="Aether Flyff.com (partial)">
+
+	<target host="aetherflyff.com" />
+	<target host="basilisk.aetherflyff.com" />
+		<!--
+			Avoid false/broken MCB:
+						-->
+		<exclusion pattern="^http://basilisk\.aetherflyff\.com/+forums(?!/favicon\.ico|/index\.php\?app=core&amp;module=task|/public/|/uploads/)" />
+	<target host="support.aetherflyff.com" />
+		<exclusion pattern="^http://support\.aetherflyff\.com/+(?!cron/index\.php\?/Base/|favicon\.ico|index\.php\?/Core/|__swift/)" />
+	<target host="www.aetherflyff.com" />
+
+
+	<rule from="^http://((?:basilisk|support|www)\.)?aetherflyff\.com/"
+		to="https://$1aetherflyff.com/" />
+
+</ruleset>

src/chrome/content/rules/AllYou.net.xml

@@ -0,0 +1,19 @@
+<!--
+	CDN buckets:
+
+		- allyou-live-static.s3-eu-west-1.amazonaws.com
+
+-->
+<ruleset name="AllYou.net">
+
+	<target host="allyou.net" />
+	<target host="*.allyou.net" />
+
+
+	<securecookie host="^(?:www)?\.allyou\.net$" name=".+" />
+
+
+	<rule from="^http://(media\.|www\.)?allyou\.net/"
+		to="https://$1allyou.net/" />
+
+</ruleset>

src/chrome/content/rules/AmazonAWS.xml

@@ -136,8 +136,11 @@
 	<target host="*.ssl-images-amazon.com" />
 
 
-	<!--	Forced redirect:
+	<!--	Forced redirects:
 					-->
+	<rule from="^http://dis(\.resized)?\.images\.s3\.amazonaws\.com/"
+		to="https://s3-eu-west-1.amazonaws.com/dis$1.images/" />
+
 	<rule from="^http://cms\.kiva\.org\.s3\.amazonaws\.com/"
 		to="https://s3-us-west-1.amazonaws.com/cms.kiva.org/" />
 

src/chrome/content/rules/Anders.com.xml

@@ -0,0 +1,29 @@
+<!--
+	- Expired 2010-03-12
+	- Cert only matches www.anders.com
+
+
+	Mixed content:
+
+		- Videos from www.youtube.com *
+
+		- fonts from fonts.googleapis.com *
+
+		- Images from ^ *
+
+	* Secured by us
+
+-->
+<ruleset name="Anders.com" default_off="expired, self-signed">
+
+	<target host="anders.com" />
+	<target host="www.anders.com" />
+
+
+	<securecookie host="^www\.anders\.com$" name=".+" />
+
+
+	<rule from="^http://(?:www\.)?anders\.com/"
+		to="https://www.anders.com/" />
+
+</ruleset>

src/chrome/content/rules/Apple.xml

@@ -118,6 +118,7 @@
 			- certifications
 			- configuration
 			- connect
+			- consultants-locator
 			- csat
 			- daw
 			- developer
@@ -256,6 +257,7 @@
 	Observed cookie domains:
 
 		- .
+		- consultants-locator
 		- genius-download.itunes
 		- genius-upload.itunes
 		- sitemanager.itunes
@@ -279,6 +281,7 @@
 
 		- Images, on:
 
+			- consultants-locator from images *
 			- itunes from images *
 			- itunes from ax.phobos.apple.com.edgesuite.net *
 			- itunes from a[1-5].mzstatic.com *
@@ -320,7 +323,7 @@
 							-->
 	<securecookie host="^(?!\.?(?:concierg|stor)e\.apple\.com).+\.apple\.com$" name=".+" />
 
-	<rule from="^http://((?:albert|appleid|application|(?:nc-|nwk-)?as-images|bugreport|buyiphone\d?|certifications|concierge|configuration|connect|csat|daw|developer|devforums|discussions(?:japan)?|ecommerce|service\d?\.ess|expresslane|gsx|gsxapp|help|hrweb|ia?d|idmsa|iforgot|(?:(?:affiliate|api|autolinkmaker|banners|bookkeeper|buy|c|client-api|du|feeds|files|genius(?:-download|-upload)?(?:-2)?|homesharing|init|itunesu|ld-(?:\d|nk11|st11)|linkmaker|my|myapp|p\d+-buy|p100-sandbox|p[12]-u|partiality|pd-nk|pd-st|play|rss|s|sandbox|sc|se|search|sidebar|sitemanager|sp|static|stations|su|tl|tl-activity|upp|userpub|volume|vpp|widgets)\.)?itunes|itunesconnect|jointventure|jobs|prod\.lists|locate|mypage|n(?:c|wk)-(?:buyiphone|unbrick1)|nwk-unbrick2|onetoone|(www\.)?opensource|phobos|portal|register|remoteadvisor|reportingitc|reseller|reserve|salestraining|securemetrics|selfsolve|store|secure\d?\.store|supportprofile|swdlp|uptodate|wdg2|www)\.)?apple\.com/"
+	<rule from="^http://((?:albert|appleid|application|(?:nc-|nwk-)?as-images|bugreport|buyiphone\d?|certifications|concierge|configuration|connect|consultants-locator|csat|daw|developer|devforums|discussions(?:japan)?|ecommerce|service\d?\.ess|expresslane|gsx|gsxapp|help|hrweb|ia?d|idmsa|iforgot|(?:(?:affiliate|api|autolinkmaker|banners|bookkeeper|buy|c|client-api|du|feeds|files|genius(?:-download|-upload)?(?:-2)?|homesharing|init|itunesu|ld-(?:\d|nk11|st11)|linkmaker|my|myapp|p\d+-buy|p100-sandbox|p[12]-u|partiality|pd-nk|pd-st|play|rss|s|sandbox|sc|se|search|sidebar|sitemanager|sp|static|stations|su|tl|tl-activity|upp|userpub|volume|vpp|widgets)\.)?itunes|itunesconnect|jointventure|jobs|prod\.lists|locate|mypage|n(?:c|wk)-(?:buyiphone|unbrick1)|nwk-unbrick2|onetoone|(www\.)?opensource|phobos|portal|register|remoteadvisor|reportingitc|reseller|reserve|salestraining|securemetrics|selfsolve|store|secure\d?\.store|supportprofile|swdlp|uptodate|wdg2|www)\.)?apple\.com/"
 		to="https://$1apple.com/" />
 
 	<rule from="^http://appldnld\.apple\.com/"

src/chrome/content/rules/Ars-Technica.xml

@@ -65,7 +65,7 @@
 	<rule from="^http://((?:cms|hq|www)\.)?arstechnica\.com/"
 		to="https://$1arstechnica.com/" />
 
-	<rule from="^http://feeds\.arstechnica\.com/(?:\?.*)$"
+	<rule from="^http://feeds\.arstechnica\.com/(?:\?.*)?$"
 		to="https://feedburner.google.com/fb/a/home" />
 
 	<rule from="^http://stats2\.arstechnica\.com/"

src/chrome/content/rules/Atlatszo.hu.xml

@@ -0,0 +1,39 @@
+<!--
+	Nonfunctional subdomains:
+
+		- services	(shows default page; mismatched, CN: *.tyrell.hu)
+
+
+	Cert only matches *.atlatszo.hu
+
+
+	Mixed content:
+
+		- Video from player.vimeo.com ¹
+
+		- css from fonts.googleapis.com ¹
+
+		- Images from ^ ¹
+
+		- Ads/web bugs, from;
+
+			- services ²
+			- www.facebook.com ¹
+
+	¹ Secured by us
+	² Unsecurable
+
+-->
+<ruleset name="Atlatszo.hu (partial)" default_off="md5, self-signed">
+
+	<target host="atlatszo.hu" />
+	<target host="www.atlatszo.hu" />
+
+
+	<securecookie host="^www\.atlatszo\.hu$" name=".+" />
+
+
+	<rule from="^http://(?:www\.)?atlatszo\.hu/"
+		to="https://www.atlatszo.hu/" />
+
+</ruleset>

src/chrome/content/rules/Atos.net.xml

@@ -0,0 +1,63 @@
+<!--
+	Fully covered subdomains:
+
+		- (www.)
+		- ae
+		- ap
+		- ar
+		- ascentlookout
+		- at
+		- au
+		- be
+		- bg
+		- br
+		- ch
+		- cms
+		- cn
+		- cz
+		- de
+		- dk
+		- eg
+		- es
+		- fi
+		- fr
+		- hr
+		- in
+		- it
+		- jp
+		- mx
+		- na
+		- nl
+		- nz
+		- ph
+		- pl
+		- prd
+		- pt
+		- ro
+		- rs
+		- ru
+		- se
+		- sk
+		- th
+		- tr
+		- tw
+		- uk
+		- za
+
+
+	Every domain covered thus far sets cookies.
+
+-->
+<ruleset name="Atos.net">
+
+	<target host="atos.net" />
+	<target host="*.atos.net" />
+
+
+	<securecookie host="^(?:\w+\.)?atos\.net$" name=".+" />
+
+
+	<rule from="^http://((?:a[eprtu]|ascentlookout|b[egr]|c[hnz]|cms|de|dk|eg|es|fi|fr|hr|in|it|jp|mx|n[alz]|p[hlt]|prd|r[osu]|se|sk|t[hrw]|uk|www|za)\.)?atos\.net/"
+		to="https://$1atos.net/" />
+
+</ruleset>

src/chrome/content/rules/Blogger.xml

@@ -50,7 +50,7 @@
 	<rule from="^http://(img\d\.|www\.)?blogblog\.com/"
 		to="https://$1blogblog.com/" />
 
-	<rule from="^http://((?:buttons|help|www2?)\.)?blogger\.com/"
+	<rule from="^http://((?:buttons|help|photos1|www2?)\.)?blogger\.com/"
 		to="https://$1blogger.com/" />
 
 	<rule from="^http://(?:\w+\.)?blog(?:ger|spot)\.[\w.]{2,5}/favicon\.ico"

src/chrome/content/rules/CUPS.org.xml

@@ -0,0 +1,10 @@
+<ruleset name="CUPS.org">
+
+	<target host="cups.org" />
+	<target host="www.cups.org" />
+
+
+	<rule from="^http://(www\.)?cups\.org/"
+		to="https://$1cups.org/" />
+
+</ruleset>

src/chrome/content/rules/CentOS.org.xml

@@ -2,6 +2,7 @@
 	Nonfunctional subdomains:
 
 		- bugs			(shows blank tree; expired 2012-05-23, CN: localhost.localdomain)
+		- lists			(refused)
 		- mirror-status		(403; md5 signed, expired 2007-04-05)
 		- wiki			(db connection failure, valid cert)
 

src/chrome/content/rules/Chakas_Mmm.com.xml

@@ -0,0 +1,14 @@
+<!--
+	Some pages redirect to http.
+
+-->
+<ruleset name="Chakas Mmm.com (partial)">
+
+	<target host="chakasmmm.com" />
+	<target host="www.chakasmmm.com" />
+
+
+	<rule from="^http://(www\.)?chakasmmm\.com/(?=favicon\.ico|shop/(?:checkout|login|register|your-account)(?:$|[?/])|wp-content/|wp-includes/)"
+		to="https://$1chakasmmm.com/" />
+
+</ruleset>