Run node utils/trivialize-rules/trivialize-cookie-rules.js

src/chrome/content/rules/AIA-Surety.xml

@@ -1,18 +1,15 @@
 <ruleset name="AIA Surety">
 
 	<target host="aiasurety.com" />
-	<target host="*.aiasurety.com" />
+	<target host="becomeanagent.aiasurety.com" />
+	<target host="www.aiasurety.com" />
 	<target host="expertbail.com" />
 	<target host="www.expertbail.com" />
 
 
-	<securecookie host="^(?:.*\.)?(?:aiasurety|expertbail)\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
-	<rule from="^http://((?:becomeanagent|www)\.)?aiasurety\.com/"
-		to="https://$1aiasurety.com/" />
-
-	<rule from="^http://(www\.)?expertbail\.com/"
-		to="https://$1expertbail.com/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>

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

@@ -8,7 +8,7 @@
 	<target host="*.arpnetworks.com" />
 
 
-	<securecookie host="^(?:.*\.)?arpnetworks\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<rule from="^http://(portal\.|www\.)?arpnetworks\.com/"

src/chrome/content/rules/Acenet.xml

@@ -9,10 +9,8 @@
 	<target host="acenet-inc.net"/>
 	<target host="*.acenet-inc.net"/>
 	<!--	for cross-domain cookie	-->
-
-	<securecookie host="^(?:.*\.)?ace-host\.net$" name=".+" />
 	<!--	no cookies needed for excluded pages	-->
-	<securecookie host="^(?:.*\.)?acenet-inc\.net$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 	<rule from="^http://(\w+\.)?ace-host\.net/"
 		to="https://$1ace-host.net/"/>

src/chrome/content/rules/Addison_Lee.xml

@@ -8,7 +8,7 @@ Fetch error: http://addisonlee.com/ => https://www.addisonlee.com/: Too many red
     <target host="addisonlee.com" />
     <target host="*.addisonlee.com" />
 
-    <securecookie host="^(?:.*\.)?addisonlee\.com$" name=".+" />
+    <securecookie host=".+" name=".+"/>
 
     <rule from="^http://addisonlee\.com/"
         to="https://www.addisonlee.com/"/>

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

@@ -49,7 +49,7 @@
 
 
 	<!--securecookie host="^\.adtechus\.com$" name="^(CfP|JEB2)" /-->
-	<securecookie host=".*\.adtechus\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<rule from="^http://aka-cdn-ns\.adtechus\.com/"

src/chrome/content/rules/AlliedMods.xml

@@ -2,7 +2,7 @@
 	<target host="alliedmods.net" />
 	<target host="*.alliedmods.net" />
 
-	<securecookie host="^(?:.*\.)?alliedmods\.net$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 	<rule from="^http://([^/@:\.]+)\.alliedmods\.net/"
 		to="https://$1.alliedmods.net/" />

src/chrome/content/rules/Arvixe.xml

@@ -30,7 +30,7 @@
 	<target host="*.arvixe.com" />
 
 
-	<securecookie host="^(?:.*\.)?arvixe\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<rule from="^http://mail\.arvixe\.com/"

src/chrome/content/rules/Assembla.xml

@@ -36,7 +36,7 @@
 	<target host="*.assembla.com" />
 
 
-	<securecookie host="^(?:.*\.)?assembla\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<rule from="^http://((?:assets\d|nooku|(?:scala-ide-)?portfolio|svn2|trac2?|www)\.)?assembla\.com/"

src/chrome/content/rules/Audible.de.xml

@@ -6,7 +6,7 @@ Fetch error: http://audible.de/ => https://www.audible.de/: Cycle detected - URL
   <target host="audible.de"/>
   <target host="*.audible.de"/>
 
-  <securecookie host="^(?:.*\.)?audible\.de$" name=".+" />
+  <securecookie host=".+" name=".+"/>
 
   <rule from="^http://(?:www\.)?audible\.de/" to="https://www.audible.de/"/>
   <rule from="^http://audible\.de/" to="https://www.audible.de/"/>

src/chrome/content/rules/Banque_CIC.xml

@@ -2,7 +2,7 @@
     <target host="cic.fr" />
     <target host="*.cic.fr" />
 
-    <securecookie host="^(?:.*\.)?cic\.fr$" name=".+" />
+    <securecookie host=".+" name=".+"/>
 
     <rule from="^http://cic\.fr/"
         to="https://www.cic.fr/"/>

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

@@ -21,7 +21,7 @@
 		<exclusion pattern="^http://ed\.benaughty\.com/(?!ext\.php)" />
 
 
-	<securecookie host="^(?:.*\.)?benaughty\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<rule from="^http://(?:www\.)?benaughty\.com/"

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

@@ -361,7 +361,7 @@
 	<target host="womensmidlifehealthjournal.biomedcentral.com" />
 	<target host="zoologicalletters.biomedcentral.com" />
 
-	<securecookie host="^(?:.*\.)?biomedcentral\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 	<rule from="^http://biomedcentral\.com/"
 		to="https://www.biomedcentral.com/" />

src/chrome/content/rules/Brainshark.xml

@@ -11,7 +11,7 @@
 	<target host="brainshark.com"/>
 	<target host="www.brainshark.com"/>
 
-	<securecookie host="^(?:.*\.)?brainshark\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 	<rule from="^http://presentation\.brainshark\.com/company/contact_us\.(?:aspx|php)(?:$|\?.*)"
 		to="https://www.brainshark.com/contact-us" />

src/chrome/content/rules/CERT-Bund.xml

@@ -2,7 +2,7 @@
     <target host="cert-bund.de" />
     <target host="*.cert-bund.de" />
 
-    <securecookie host="^(?:.*\.)?cert-bund\.de$" name=".+" />
+    <securecookie host=".+" name=".+"/>
 
     <rule from="^http://cert-bund\.de/"
         to="https://www.cert-bund.de/" />

src/chrome/content/rules/CERT.at.xml

@@ -2,7 +2,7 @@
     <target host="cert.at" />
     <target host="*.cert.at" />
 
-    <securecookie host="^(?:.*\.)?cert\.at$" name=".+" />
+    <securecookie host=".+" name=".+"/>
 
     <rule from="^http://cert\.at/"
         to="https://www.cert.at/" />

src/chrome/content/rules/Carl_Zeiss.xml

@@ -24,7 +24,7 @@
 	<target host="*.zeiss.com" />
 
 
-	<securecookie host=".+\.zeiss\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<rule from="^http://applications\.zeiss\.com/\??$"

src/chrome/content/rules/Center-for-Responsive-Politics.xml

@@ -3,7 +3,7 @@
 	<target host="opensecrets.org"/>
 	<target host="*.opensecrets.org"/>
 
-	<securecookie host="^(?:.*\.)?opensecrets\.org$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 	<rule from="^http://(?:www\.)?opensecrets\.org/"
 		to="https://www.opensecrets.org/"/>

src/chrome/content/rules/Centre_for_the_Protection_of_National_Infrastructure.xml

@@ -6,7 +6,7 @@ Fetch error: http://cpni.gov.uk/ => https://www.cpni.gov.uk/: (6, 'Could not res
     <target host="cpni.gov.uk" />
     <target host="*.cpni.gov.uk" />
 
-    <securecookie host="^(?:.*\.)?cpni\.gov\.uk$" name=".+" />
+    <securecookie host=".+" name=".+"/>
 
     <rule from="^http://cpni\.gov\.uk/"
         to="https://www.cpni.gov.uk/" />

src/chrome/content/rules/Chitika.xml

@@ -22,16 +22,15 @@
 <ruleset name="Chitika (partial)">
 
 	<target host="chitika.com" />
-	<target host="*.chitika.com" />
+	<target host="www.chitika.com" />
+	<target host="affiliate.chitika.com" />
+	<target host="blog.chitika.com" />
+	<target host="publishers.chitika.com" />
 
 
-	<securecookie host="^(?:.*\.)?chitika\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
-	<rule from="^http://(www\.)?chitika\.com/"
-		to="https://$1chitika.com/" />
-
-	<rule from="^http://(affiliate|blog|publishers)\.chitika\.com/"
-		to="https://$1.chitika.com/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>

src/chrome/content/rules/CloudSigma.xml

@@ -10,7 +10,7 @@ Fetch error: http://cloudsigma.com/ => https://cloudsigma.com/: (60, 'SSL certif
 	<target host="*.cloudsigma.com" />
 
 
-	<securecookie host="^(?:.*\.)?cloudsigma\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<rule from="^http://((?:autodetect|www|zrh|gui\.zrh)\.)?cloudsigma\.com/"

src/chrome/content/rules/Columbia_University-problematic.xml

@@ -21,7 +21,7 @@
 	<target host="www.stv.columbia.edu" />
 
 
-	<securecookie host="^.+\.columbia\.edu$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<rule from="^http://(?:www\.)?(cdrs|stv)\.columbia\.edu/"

src/chrome/content/rules/Comparis.xml

@@ -1,7 +1,7 @@
 <ruleset name="Comparis.ch">
         <target host="comparis.ch" />
         <target host="*.comparis.ch" />
-        <securecookie host="^(?:.*\.)?comparis\.ch$" name=".+" />
+        <securecookie host=".+" name=".+"/>
 
         <rule from="^http://comparis\.ch/"
             to="https://www.comparis.ch/" />

src/chrome/content/rules/Covisint.xml

@@ -10,7 +10,7 @@ Non-2xx HTTP code: http://covisint.com/ (200) => https://covisint.com/ (500)
 	<target host="*.covisint.com" />
 
 
-	<securecookie host="^(?:.*\.)?covisint\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<rule from="^http://(portal\.|www\.)?covisint\.com/"

src/chrome/content/rules/Cyberstreetwise.xml

@@ -6,7 +6,7 @@
     <target host="cyberstreetwise.com" />
     <target host="*.cyberstreetwise.com" />
 
-    <securecookie host="^(?:.*\.)?cyberstreetwise\.com$" name=".+" />
+    <securecookie host=".+" name=".+"/>
 
     <rule from="^http://cyberstreetwise\.com/"
         to="https://www.cyberstreetwise.com/" />

src/chrome/content/rules/Demand-Base.xml

@@ -60,7 +60,7 @@ Fetch error: http://leads.demandbase.com/ => https://leads.demandbase.com/: (6,
 	<!--securecookie host="^auth\.demandbase\.com$" name="^AWSELB$" /-->
 	<!--securecookie host="^www\.demandbase\.com$" name="^PHPSESSID$" /-->
 
-	<securecookie host="^(?:.*\.)?demandbase\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<!--	Redirect keeps forward

src/chrome/content/rules/Deposit-Files.xml

@@ -24,7 +24,7 @@
 	<target host="depositfiles.com"/>
 	<target host="*.depositfiles.com"/>
 
-	<securecookie host="^(?:.*\.)?depositfiles\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 	<rule from="^http://(static\d+\.|www\.)?depositfiles\.com/"
 		to="https://$1depositfiles.com/"/>

src/chrome/content/rules/EPB.xml

@@ -1,18 +1,18 @@
 <ruleset name="EPB">
 
 	<target host="epb.net" />
-	<target host="*.epb.net" />
+	<target host="livehelp.epb.net" />
+	<target host="www.epb.net" />
 	<target host="epbfi.com" />
-	<target host="*.epbfi.com" />
+	<target host="mail.epbfi.com" />
+	<target host="livehelp.epbfi.com" />
+	<target host="phone.epbfi.com" />
+	<target host="www.epbfi.com" />
 
 
-	<securecookie host="^(?:.*\.)?epb(?:\.net|fi\.com)$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
-	<rule from="^http://(livehelp\.|www\.)?epb\.net/"
-		to="https://$1epb.net/" />
-
-	<rule from="^http://((?:mail|livehelp|phone|www)\.)?epbfi\.com/"
-		to="https://$1epbfi.com/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>

src/chrome/content/rules/Eloqua-mismatches.xml

@@ -16,9 +16,7 @@
 				-->
 	<target host="www.useitandsee.com" />
 
-
-	<securecookie host=".*\.eloqua\.com$" name=".+" />
-	<securecookie host="(?:.*\.)?useitandsee\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<rule from="^http://www\.useitandsee\.com/"

src/chrome/content/rules/Elsevier_Health.com.au.xml

@@ -8,7 +8,7 @@
 	<target host="www.elsevierhealth.com.au" />
 
 
-	<securecookie host="(?:.*\.)?elsevierhealth\.com\.au$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<rule from="^http://(?:www\.)?elsevierhealth\.com\.au/"

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

@@ -39,7 +39,7 @@ Fetch error: http://www.elsevierhealth.com/ => https://www.elsevierhealth.com/:
 		<!--exclusion pattern="^http://secure\.jbs\.elsevierhealth\.com/$" /-->
 
 
-	<securecookie host="(?:.*\.)?elsevierhealth\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<rule from="^http:"

src/chrome/content/rules/ExactTarget.xml

@@ -165,7 +165,7 @@
 					-->
 	<!--securecookie host="^3sixty\.exacttarget\.com$" name="^(\.ASPXANONYMOUS|language)$" /-->
 
-	<securecookie host="^(?:.*\.)?exacttarget\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<!--	Cert doesn't match !www.	-->

src/chrome/content/rules/FilmTrack.xml

@@ -9,7 +9,7 @@
 	<target host="*.filmtrackonline.com" />
 
 
-	<securecookie host="^.+\.filmtrackonline\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<rule from="^http://([\w-]+)\.filmtrackonline\.com/"

src/chrome/content/rules/FireHost.xml

@@ -11,7 +11,7 @@ Fetch error: http://firehost.com/ => http://firehost.com/: (60, 'SSL certificate
 	<target host="*.firehost.com"/>
 		<exclusion pattern="^http://www\.firehost\.com/(?:company|compare|customers|details/[\w\-]+\w|secure-hosting(?:/[^/]?/)?|solutions)?$"/>
 
-	<securecookie host="^(?:.*\.)?firehost\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 	<rule from="^http://(www\.)?firehost\.com/(/_CaptchaImage\.axd|assets/|cart|company/contact|partners|protected/|secure-hosting/[\w\-]+/configure)"
 		to="https://$1firehost.com/$1"/>

src/chrome/content/rules/Frys.xml

@@ -7,7 +7,7 @@
 	<target host="*.frys.com" />
 
 
-	<securecookie host="^.*\.frys\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<!--	Guilty of giving ExtremeTech http

src/chrome/content/rules/Hackerschool.xml

@@ -3,7 +3,7 @@
 	<target host="hackerschool.com"/>
 	<target host="*.hackerschool.com"/>
 
-	<securecookie host="^(?:.*\.)?hackerschool\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 	<!--	cert from redirector.zerigo.net	-->
 	<rule from="^http://hackerschool\.com/"

src/chrome/content/rules/Hidemyass.xml

@@ -16,7 +16,7 @@
 			- ^.
 			- ^affiliate
 					-->
-	<securecookie host="^(?:.*\.)?hidemyass\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<!--	cert !valid for !www	-->

src/chrome/content/rules/HootSuite.xml

@@ -81,7 +81,7 @@
 	<!--securecookie host="^hootsuite\.com$" name="^eZSESSID$" /-->
 	<!--securecookie host="^feedback\.hootsuite\.com$" name="^(_rf|_session_id)$" /-->
 
-	<securecookie host="^(?:.*\.)?hootsuite\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<rule from="^http://(?:s7\.)?static\.hootsuite\.com/"

src/chrome/content/rules/HostDime.xml

@@ -58,7 +58,7 @@ Fetch error: http://forum.hostdime.com/ => https://forum.hostdime.com/: (6, 'Cou
 					-->
 	<!--securecookie host="^www\.hostdime\.com$" name="^PHPSESSID$" /-->
 
-	<securecookie host="^(?:.*\.)?hostdime\.com$" name=".+" />
+	<securecookie host=".+" name=".+"/>
 
 
 	<!--	Redirect drops path and forward