Batch trivialize rulesets with static securecookies (EFForg#16378)

ccfb3ee765a58cae · Sep 6, 2018 · 435944a · 435944a
1 parent 83714d7
commit 435944a
Show file tree

Hide file tree

Showing 306 changed files with 1,327 additions and 1,588 deletions.
diff --git a/src/chrome/content/rules/365_Tickets_Global.com.xml b/src/chrome/content/rules/365_Tickets_Global.com.xml
diff --git a/src/chrome/content/rules/4D.com.xml b/src/chrome/content/rules/4D.com.xml
@@ -6,13 +6,12 @@
 -->
 <ruleset name="4D.com (partial)">
 
-	<target host="*.4d.com" />
+	<target host="store.4d.com" />
 
 
 	<securecookie host="^\.store\.4d\.com$" name=".+" />
 
 
-	<rule from="^http://store\.4d\.com/"
-		to="https://store.4d.com/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/888173.net-falsemixed.xml b/src/chrome/content/rules/888173.net-falsemixed.xml
@@ -4,13 +4,10 @@
 -->
 <ruleset name="888173.net (false MCB)" platform="mixedcontent">
 
-	<target host="*.888173.net" />
+	<target host="www.888173.net" />
 
 
-	<securecookie host="^\.888173\.net$" name=".+" />
 
-
-	<rule from="^http://www\.888173\.net/"
-		to="https://www.888173.net/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/AA.net.uk.xml b/src/chrome/content/rules/AA.net.uk.xml
@@ -29,13 +29,15 @@
 -->
 <ruleset name="AA.net.uk (partial)">
 
-	<target host="*.aa.net.uk" />
+	<target host="accounts.aa.net.uk" />
+	<target host="clueless.aa.net.uk" />
+	<target host="order.aa.net.uk" />
+	<target host="status.aa.net.uk" />
 
 
 	<securecookie host="^(?:accounts|clueless|status)\.aa\.net\.uk$" name=".+" />
 
 
-	<rule from="^http://(accounts|clueless|order|status)\.aa\.net\.uk/"
-		to="https://$1.aa.net.uk/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/ATG_Web_Commerce.xml b/src/chrome/content/rules/ATG_Web_Commerce.xml
@@ -4,13 +4,13 @@
 -->
 <ruleset name="ATG Web Commerce">
 
-	<target host="*.instantservice.com" />
+	<target host="gs.instantservice.com" />
+	<target host="rs.instantservice.com" />
 
 
 	<securecookie host="^[gr]s\.instantservice\.com$" name=".+" />
 
 
-	<rule from="^http://(g|r)s\.instantservice\.com/"
-		to="https://$1s.instantservice.com/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Adelaide.edu.au.xml b/src/chrome/content/rules/Adelaide.edu.au.xml
@@ -61,7 +61,20 @@
 <ruleset name="Adelaide.edu.au (partial)">
 
 	<target host="adelaide.edu.au" />
-	<target host="*.adelaide.edu.au" />
+	<target host="apps.adelaide.edu.au" />
+	<target host="auth.adelaide.edu.au" />
+	<target host="cas-prd.auth.adelaide.edu.au" />
+	<target host="blogs.adelaide.edu.au" />
+	<target host="global.adelaide.edu.au" />
+	<target host="international.adelaide.edu.au" />
+	<target host="login.adelaide.edu.au" />
+	<target host="m.adelaide.edu.au" />
+	<target host="myuni.adelaide.edu.au" />
+	<target host="orbit.adelaide.edu.au" />
+	<target host="password.adelaide.edu.au" />
+	<target host="shop.adelaide.edu.au" />
+	<target host="unified.adelaide.edu.au" />
+	<target host="www.adelaide.edu.au" />
 		<!--exclusion pattern="http://(www\.)?alumni\.adelaide\.edu\.au/" /-->
 
 
@@ -81,7 +94,6 @@
 	<securecookie host="^(?:apps|blogs|myuni|orbit|shop)\.adelaide\.edu\.au$" name=".+" />
 
 
-	<rule from="^http://((?:apps|auth|cas-prd\.auth|blogs|global|international|login|m|myuni|orbit|password|shop|unified|www)\.)?adelaide\.edu\.au/"
-		to="https://$1adelaide.edu.au/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Adk2.xml b/src/chrome/content/rules/Adk2.xml
@@ -24,18 +24,19 @@ Fetch error: http://adk2.com/ => https://adk2.com/: (60, 'SSL certificate proble
 <ruleset name="adk2 (partial)" default_off='failed ruleset test'>
 
 	<target host="adk2.com" />
-	<target host="*.adk2.com" />
+	<target host="ads.adk2.com" />
+	<target host="adstract.adk2.com" />
+	<target host="cpmrocket.adk2.com" />
+	<target host="cdn.adk2.com" />
 
 
 	<securecookie host="^\.?ads\.adk2\.com$" name=".+" />
 
 
-	<rule from="^http://((?:ads|adstract|cpmrocket)\.)?adk2\.com/"
-		to="https://$1adk2.com/" />
+	<rule from="^http:" to="https:" />
 
 	<!--	Included on 3rd-party websites.
 						-->
-	<rule from="^http://cdn\.adk2\.com/"
-		to="https://cdn.adk2.com/" />
+
 
 </ruleset>
diff --git a/src/chrome/content/rules/Adknowledge.xml b/src/chrome/content/rules/Adknowledge.xml
@@ -12,19 +12,15 @@
 -->
 <ruleset name="Adknowledge (partial)">
 
-	<target host="advertiser.adknowledge.com" />
 	<target host="bidsystem.com" />
-	<target host="*.bidsystem.com" />
+	<target host="tracker.bidsystem.com" />
+	<target host="www.bidsystem.com" />
 
 
 	<securecookie host="^advertiser\.adknowledge\.com$" name=".+" />
 	<securecookie host="^(?:www\.)?bidsystem\.com$" name=".+" />
 
 
-	<rule from="^http://advertiser\.adknowledge\.com/"
-		to="https://advertiser.adknowledge.com/" />
-
-	<rule from="^http://(tracker\.|www\.)?bidsystem\.com/"
-		to="https://$1bidsystem.com/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Adkontekst.pl.xml b/src/chrome/content/rules/Adkontekst.pl.xml
@@ -15,13 +15,14 @@
 -->
 <ruleset name="Adkontekst.pl (partial)">
 
-	<target host="*.adkontekst.pl" />
+	<target host="adsearch.adkontekst.pl" />
+	<target host="www.adsearch.adkontekst.pl" />
+	<target host="wydawcy.panel.adkontekst.pl" />
 
 
 	<securecookie host="^wydawcy\.panel\.adkontekst\.pl$" name=".+" />
 
 
-	<rule from="^http://((?:www\.)?adsearch|wydawcy\.panel)\.adkontekst\.pl/"
-		to="https://$1.adkontekst.pl/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Adpay.com.xml b/src/chrome/content/rules/Adpay.com.xml
@@ -12,16 +12,14 @@
 -->
 <ruleset name="Adpay.com (partial)">
 
-	<target host="*.adpay.com" />
+	<target host="secure.adpay.com" />
+	<target host="staging.adpay.com" />
 		<!--exclusion pattern="^http://secure\.adpay\.com/(default\.aspx|/searchresults\.aspx)" /-->
 		<exclusion pattern="^http://secure\.adpay\.com/(?!ajaxpro/|[bB]randing/|favicon\.ico|[iI]mages/|Includes/|RadControls/|WebResource\.axd)" />
 		<exclusion pattern="^http://staging\.adpay\.com//searchresults\.aspx" />
 
 
-	<securecookie host="^\.adpay\.com$" name="^adpay$" />
 
-
-	<rule from="^http://s(ecure|taging)\.adpay\.com/"
-		to="https://s$1.adpay.com/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Adserver01.de.xml b/src/chrome/content/rules/Adserver01.de.xml
@@ -1,12 +1,11 @@
 <ruleset name="adserver01.de">
 
-	<target host="*.adserver01.de" />
+	<target host="ad2.adserver01.de" />
 
 
 	<securecookie host="^ad2\.adserver01\.de$" name=".+" />
 
 
-	<rule from="^http://(ad|r)2\.adserver01\.de/"
-		to="https://$12.adserver01.de/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Adtraxx.de.xml b/src/chrome/content/rules/Adtraxx.de.xml
@@ -4,13 +4,10 @@
 -->
 <ruleset name="adtraxx.de">
 
-	<target host="*.adtraxx.de" />
+	<target host="view.adtraxx.de" />
 
 
-	<securecookie host="^\.adtraxx\.de$" name=".+" />
 
-
-	<rule from="^http://view\.adtraxx\.de/"
-		to="https://view.adtraxx.de/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Advert_Stream.xml b/src/chrome/content/rules/Advert_Stream.xml
@@ -16,13 +16,14 @@
 -->
 <ruleset name="Advert Stream (partial)">
 
-	<target host="*.advertstream.com" />
+	<target host="d.advertstream.com" />
+	<target host="ad.advertstream.com" />
+	<target host="adaccess.advertstream.com" />
 
 
 	<securecookie host="^\.adaccess\.advertstream\.com$" name=".+" />
 
 
-	<rule from="^http://(a?d|adaccess)\.advertstream\.com/"
-		to="https://$1.advertstream.com/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Advocates_for_Youth.xml b/src/chrome/content/rules/Advocates_for_Youth.xml
@@ -11,13 +11,13 @@
 -->
 <ruleset name="Advocates for Youth (partial)">
 
-	<target host="*.advocatesforyouth.org" />
+	<target host="secure.advocatesforyouth.org" />
+	<target host="shop.advocatesforyouth.org" />
 
 
 	<securecookie host="^\.?s(?:ecure|hop)\.advocatesforyouth\.org$" name=".+" />
 
 
-	<rule from="^http://s(ecure|hop)\.advocatesforyouth\.org/"
-		to="https://s$1.advocatesforyouth.org/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Advolution.de.xml b/src/chrome/content/rules/Advolution.de.xml
@@ -1,12 +1,9 @@
 <ruleset name="advolution.de">
 
-	<target host="*.advolution.de" />
+	<target host="asn.advolution.de" />
 
 
-	<securecookie host="^\.advolution\.de$" name=".+" />
 
-
-	<rule from="^http://asn\.advolution\.de/"
-		to="https://asn.advolution.de/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Ahm.com.au.xml b/src/chrome/content/rules/Ahm.com.au.xml
@@ -1,7 +1,9 @@
 <ruleset name="ahm.com.au (partial)">
 
 	<target host="ahm.com.au" />
-	<target host="*.ahm.com.au" />
+	<target host="members.ahm.com.au" />
+	<target host="providers.ahm.com.au" />
+	<target host="www.ahm.com.au" />
 		<!--
 			Redirect to http:
 						-->
@@ -19,7 +21,6 @@
 	<securecookie host="^members\.ahm\.com\.au$" name=".+" />
 
 
-	<rule from="^http://((?:members|providers|www)\.)?ahm\.com\.au/"
-		to="https://$1ahm.com.au/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/AkademiskaHus.se.xml b/src/chrome/content/rules/AkademiskaHus.se.xml
@@ -6,13 +6,13 @@
 -->
 <ruleset name="AkademiskaHus.se (partial)">
 
-	<target host="*.akademiskahus.se" />
+	<target host="portal.akademiskahus.se" />
+	<target host="vpn.akademiskahus.se" />
 
 
 	<securecookie host="^(?:portal|vpn)\.akademiskahus\.se$" name=".+" />
 
 
-	<rule from="^http://(portal|vpn)\.akademiskahus\.se/"
-		to="https://$1.akademiskahus.se/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/AllSeen_Alliance.org.xml b/src/chrome/content/rules/AllSeen_Alliance.org.xml
@@ -5,7 +5,12 @@
 <ruleset name="AllSeen Alliance.org">
 
 	<target host="allseenalliance.org" />
-	<target host="*.allseenalliance.org" />
+	<target host="ask.allseenalliance.org" />
+	<target host="git.allseenalliance.org" />
+	<target host="jira.allseenalliance.org" />
+	<target host="lists.allseenalliance.org" />
+	<target host="wiki.allseenalliance.org" />
+	<target host="www.allseenalliance.org" />
 
 
 	<!--	Not secured by server:
@@ -17,7 +22,6 @@
 	<securecookie host="^(?:ask|jira|wiki)\.allseenalliance\.org$" name=".+" />
 
 
-	<rule from="^http://((?:ask|git|jira|lists|wiki|www)\.)?allseenalliance\.org/"
-		to="https://$1allseenalliance.org/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/AllianceBernstein.xml b/src/chrome/content/rules/AllianceBernstein.xml
@@ -20,7 +20,6 @@
 	<securecookie host="^(?:www\.)?alliancebernstein\.com$" name=".+" />
 
 
-	<rule from="^http://(www\.)?(alliance)?bernstein\.com/"
-		to="https://$1$2bernstein.com/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Allied_Media.org.xml b/src/chrome/content/rules/Allied_Media.org.xml
@@ -22,7 +22,10 @@ Fetch error: http://alliedmedia.org/ => https://alliedmedia.org/: (60, 'SSL cert
 <ruleset name="Allied Media.org">
 
 	<target host="alliedmedia.org" />
-	<target host="*.alliedmedia.org" />
+	<!--target host="amc.alliedmedia.org" /-->
+	<target host="store.alliedmedia.org" />
+	<!--target host="talk.alliedmedia.org" /-->
+	<target host="www.alliedmedia.org" />
 
 
 	<!--	Not secured by server:
@@ -33,7 +36,6 @@ Fetch error: http://alliedmedia.org/ => https://alliedmedia.org/: (60, 'SSL cert
 	<securecookie host="^\.(?:store|talk)\.alliedmedia\.org$" name=".+" />
 
 
-	<rule from="^http://((?:amc|store|talk|www)\.)?alliedmedia\.org/"
-		to="https://$1alliedmedia.org/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>