Batch trivialize unnecessary cloudfront.net rewrites (#15998)

EFForg · Jul 17, 2018 · 812d5bb · 812d5bb
1 parent 9014359
commit 812d5bb
Show file tree

Hide file tree

Showing 70 changed files with 952 additions and 216 deletions.
diff --git a/src/chrome/content/rules/Adk2.xml b/src/chrome/content/rules/Adk2.xml
@@ -36,6 +36,6 @@ Fetch error: http://adk2.com/ => https://adk2.com/: (60, 'SSL certificate proble
 	<!--	Included on 3rd-party websites.
 						-->
 	<rule from="^http://cdn\.adk2\.com/"
-		to="https://d38cp5x90nxyo0.cloudfront.net/" />
+		to="https://cdn.adk2.com/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Adspdbl.com.xml b/src/chrome/content/rules/Adspdbl.com.xml
@@ -17,7 +17,6 @@
 	<target host="files.adspdbl.com" />
 
 
-	<rule from="^http://files\.adspdbl\.com/"
-		to="https://d3ijm230svej28.cloudfront.net/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Altex.ro.xml b/src/chrome/content/rules/Altex.ro.xml
@@ -55,10 +55,6 @@ Fetch error: http://cdn.altex.ro/ => https://d2qpxedcu5ji30.cloudfront.net/: (28
 	<securecookie host="^\w" name=".+" />
 
 
-	<rule from="^http://cdn\.altex\.ro/"
-		to="https://d2qpxedcu5ji30.cloudfront.net/" />
-
-	<rule from="^http:"
-		to="https:" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/CKSource.com.xml b/src/chrome/content/rules/CKSource.com.xml
@@ -53,10 +53,6 @@
 	<target host="c.cksource.com" />
 	<target host="www.cksource.com" />
 
-
-	<rule from="^http://c\.cksource\.com/"
-		to="https://d2xc7e2akbvihw.cloudfront.net/" />
-
 	<rule from="^http://www\.cksource\.com/"
 		to="https://cksource.com/" />
 

diff --git a/src/chrome/content/rules/Circle_of_Moms.xml b/src/chrome/content/rules/Circle_of_Moms.xml
@@ -30,9 +30,9 @@ Fetch error: http://circleofmoms.com/ => https://www.circleofmoms.com/: Cycle de
 		to="https://www.circleofmoms.com/" />
 
 	<rule from="^http://imagelib4\.circleofmoms\.com/"
-		to="https://dx7naiqi3v8zr.cloudfront.net/" />
+		to="https://imagelib4.circleofmoms.com/" />
 
 	<rule from="^http://images3\.circleofmoms\.com/"
-		to="https://d2sshc984jwlg9.cloudfront.net/" />
+		to="https://images3.circleofmoms.com/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/CmCDN.net.xml b/src/chrome/content/rules/CmCDN.net.xml
@@ -33,7 +33,7 @@ Fetch error: http://s.cmcdn.net/ => https://d1gyuuidj3lauh.cloudfront.net/: (6,
 
 
 	<rule from="^http://media\.cmcdn\.net/"
-		to="https://d2tbi97h020xxe.cloudfront.net/" />
+		to="https://media.cmcdn.net/" />
 
 	<rule from="^http://s\.cmcdn\.net/"
 		to="https://d1gyuuidj3lauh.cloudfront.net/" />

diff --git a/src/chrome/content/rules/ComiXology.com.xml b/src/chrome/content/rules/ComiXology.com.xml
@@ -86,9 +86,6 @@
 	<rule from="^http://comixology\.com/"
 		to="https://www.comixology.com/" />
 
-	<rule from="^http://support\.comixology\.com/"
-		to="https://d3jyn100am7dxp.cloudfront.net/" />
-
 	<rule from="^http:"
 		to="https:" />
 

diff --git a/src/chrome/content/rules/Conde_Nast.co.uk.xml b/src/chrome/content/rules/Conde_Nast.co.uk.xml
@@ -11,29 +11,17 @@
 
 			- cnda.condenast.co.uk
 
-		- dvcpqzrjfwvhx.cloudfront.net
-
-			- cdni.condenast.co.uk
-
-
 	Problematic subdomains:
 
-		- cdni.condenast.co.uk		(mismatched, 403 when rewritten to dvcpqzrjfwvhx.cloudfront.net)
 		- cnda.condenast.co.uk		(mismatched, CN: *.cloudfront.net)
 
 -->
 <ruleset name="Conde Nast.co.uk (partial)">
 
 	<!--	Complications:
 				-->
-	<target host="cdni.condenast.co.uk" />
 	<target host="cnda.condenast.co.uk" />
 
-
-	<rule from="^http://cdni\.condenast\.co\.uk/"
-		to="https://s3-eu-west-1.amazonaws.com/img.condenast.co.uk/" />
-
-	<rule from="^http://cnda\.condenast\.co\.uk/"
-		to="https://dg9g3lm9lsog5.cloudfront.net/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Customersaas.com.xml b/src/chrome/content/rules/Customersaas.com.xml
@@ -14,13 +14,10 @@
 -->
 <ruleset name="customersaas.com">
 
-	<target host="*.customersaas.com" />
+	<target host="imageservice.customersaas.com" />
+	<target host="static1.customersaas.com" />
 
 
-	<rule from="^http://imageservice\.customersaas\.com/"
-		to="https://d35v9wsdymy32b.cloudfront.net/" />
-
-	<rule from="^http://static1\.customersaas\.com/"
-		to="https://d1wawgqwk8hdm1.cloudfront.net/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Cxt.ms.xml b/src/chrome/content/rules/Cxt.ms.xml
@@ -8,13 +8,10 @@
 -->
 <ruleset name="Cxt.ms">
 
-	<target host="*.cxt.ms" />
+	<target host="s.cxt.ms" />
+	<target host="t.cxt.ms" />
 
 
-	<rule from="^http://s\.cxt\.ms/"
-		to="https://d3j09g9h9lgmkt.cloudfront.net/" />
-
-	<rule from="^http://t\.cxt\.ms/"
-		to="https://t.cxt.ms/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/DealerRater.com.xml b/src/chrome/content/rules/DealerRater.com.xml
@@ -1,36 +1,15 @@
 <!--
-	CDN buckets:
-
-		- d17jk93jbxi6p4.cloudfront.net
-
-			- cdn-user
-
-		- d3go5n7g2hd1g0.cloudfront.net
-
-			- cdn-static
-
-
-	Some pages redirect to http.
-
+	Non-functional hosts:
+		Server misconfig:
+		- cdn-static.dealerrater.com (https ver 301 redirect to self)
 -->
-<ruleset name="DealerRater.com (partial)">
+<ruleset name="DealerRater.com">
 
 	<target host="dealerrater.com" />
 	<target host="www.dealerrater.com" />
-		<!--
-			$ redirects to http:
-						-->
-		<exclusion pattern="^http://(?:www\.)?dealerrater\.com/+(?:$|\?)" />
-		<!--exclusion pattern="^http://(www\.)?dealerrater\.com/(?!(dealer|login|password)\.aspx|favicon\.ico|os/icon/)" /-->
-
-
-	<rule from="^http://(www\.)?dealerrater\.com/"
-		to="https://$1dealerrater.com/" />
-
-	<rule from="^http://cdn-static\.dealerrater\.com/"
-		to="https://d3go5n7g2hd1g0.cloudfront.net/" />
+	<!-- target host="cdn-static.dealerrater.com" / -->
+	<target host="cdn-user.dealerrater.com" />
 
-	<rule from="^http://cdn-user\.dealerrater\.com/"
-		to="https://d17jk93jbxi6p4.cloudfront.net/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Desk.com.xml b/src/chrome/content/rules/Desk.com.xml
@@ -73,7 +73,7 @@ Fetch error: http://assistly.com/ => https://assistly.com/: (51, "SSL: no altern
 		to="https://d218iqt4mo6adh.cloudfront.net/" />
 
 	<rule from="^http://webassets\.desk\.com/"
-		to="https://d3e6ejlgd1t9v1.cloudfront.net/" />
+		to="https://webassets.desk.com/" />
 
 	<!--	1st-party domains:
 

diff --git a/src/chrome/content/rules/Direct_Mail_Mac.com.xml b/src/chrome/content/rules/Direct_Mail_Mac.com.xml
@@ -27,7 +27,6 @@
 		<test url="http://four.cdn.directmailmac.com/images/[email protected]" />
 
 
-	<rule from="^http://four\.cdn\.directmailmac\.com/"
-		to="https://d39okwd0art5yj.cloudfront.net/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Divshot.xml b/src/chrome/content/rules/Divshot.xml
@@ -19,6 +19,6 @@
 		to="https://$1divshot.com/" />
 
 	<rule from="^http://a1\.divshot\.com/"
-		to="https://djyhxgczejc94.cloudfront.net/" />
+		to="https://a1.divshot.com/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/EFinancialCareers.xml b/src/chrome/content/rules/EFinancialCareers.xml
@@ -84,10 +84,6 @@ Fetch error: http://news-cdn.efinancialcareers.com/ => https://d2p98mys7gexzy.cl
 	<securecookie host="^\." name="^__utm" />
 
 
-	<rule from="^http://news-cdn\.efinancialcareers\.com/"
-		to="https://d2p98mys7gexzy.cloudfront.net/" />
-
-	<rule from="^http:"
-		to="https:" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Filemobile.xml b/src/chrome/content/rules/Filemobile.xml
@@ -43,9 +43,6 @@
 	<rule from="^http://(assets|storage)\.filemobile\.com/"
 		to="https://s3.amazonaws.com/$1.filemobile.com/" />
 
-	<rule from="^http://cimg\.filemobile\.com/"
-		to="https://d2ksawk1637r8x.cloudfront.net/" />
-
 	<rule from="^http:"
 		to="https:" />
 

diff --git a/src/chrome/content/rules/Full_Signal.xml b/src/chrome/content/rules/Full_Signal.xml
@@ -16,7 +16,6 @@
 	<target host="static.thefullsignal.com" />
 
 
-	<rule from="^http://static\.thefullsignal\.com/"
-		to="https://d1jy4z176wg3x.cloudfront.net/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/GCaptain.com.xml b/src/chrome/content/rules/GCaptain.com.xml
@@ -69,9 +69,6 @@ Non-2xx HTTP code: http://cfs1.gcaptain.com/ (200) => https://d2m8pnbf2v4ae2.clo
 	<rule from="^http://cf\.gcaptain\.com/"
 		to="https://d38ecmhxsvwui3.cloudfront.net/" />
 
-	<rule from="^http://cfs1\.gcaptain\.com/"
-		to="https://d2m8pnbf2v4ae2.cloudfront.net/" />
-
 	<rule from="^http:"
 		to="https:" />
 

diff --git a/src/chrome/content/rules/GumGum.xml b/src/chrome/content/rules/GumGum.xml
@@ -31,6 +31,6 @@
 		to="https://$1.gumgum.com/" />
 
 	<rule from="^http://c\.gumgum\.com/"
-		to="https://d1u2cbczpt82kt.cloudfront.net/" />
+		to="https://c.gumgum.com/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/IDG.com.au.xml b/src/chrome/content/rules/IDG.com.au.xml
@@ -36,7 +36,7 @@ Fetch error: http://computerworld.com.au/ => https://computerworld.com.au/: (51,
 	<!--	Protocol-relative link from www.computerworld.com.au:
 							-->
 	<rule from="^http://demo\.idg\.com\.au/"
-		to="https://d1i47h7pyjy1h0.cloudfront.net/" />
+		to="https://demo.idg.com.au/" />
 
 	<rule from="^http://cdn\.idg\.com\.au/"
 		to="https://dfwp37e65law8.cloudfront.net/" />

diff --git a/src/chrome/content/rules/IT_Toolbox.com.xml b/src/chrome/content/rules/IT_Toolbox.com.xml
@@ -21,18 +21,15 @@
 -->
 <ruleset name="IT Toolbox.com (partial)">
 
-	<target host="*.ittoolbox.com" />
+	<target host="images.ittoolbox.com" />
+	<target host="userimages.ittoolbox.com" />
 
 
 	<!--	Could we secure this safely?
 						-->
 	<!--securecookie host="^\.ittoolbox\.com$" name="^iNa$" /-->
 
 
-	<rule from="^http://images\.ittoolbox\.com/"
-		to="https://images.ittoolbox.com/" />
-
-	<rule from="^http://userimages\.ittoolbox\.com/"
-		to="https://deh50at6yod5w.cloudfront.net/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/IndiaMART.xml b/src/chrome/content/rules/IndiaMART.xml
@@ -33,23 +33,13 @@
 -->
 <ruleset name="IndiaMART (partial)">
 
-	<target host="*.imimg.com" />
+	<target host="1.imimg.com" />
+	<target host="2.imimg.com" />
+	<target host="3.imimg.com" />
+	<target host="4.imimg.com" />
 	<target host="im.gifbt.com" />
 
 
-	<rule from="^http://1\.imgimg\.com/"
-		to="https://d2y6cbvg1xh035.cloudfront.net/" />
+	<rule from="^http:" to="https:" />
 
-	<rule from="^http://2\.imimg\.com/"
-		to="https://d1raip7zazff6e.cloudfront.net/" />
-
-	<rule from="^http://3\.imimg\.com/"
-		to="https://dypmusfs8hvdw.cloudfront.net/" />
-
-	<rule from="^http://4\.imimg\.com/"
-		to="https://d3p8pcjf51nlqw.cloudfront.net/" />
-
-	<rule from="^http://im\.gifbt\.com/"
-		to="https://d1wd2icune084.cloudfront.net/" />
-
-</ruleset>
+</ruleset>
diff --git a/src/chrome/content/rules/InkFrog.com.xml b/src/chrome/content/rules/InkFrog.com.xml
@@ -16,7 +16,7 @@
 		- img ¹
 		- imgs ²
 		- thmb ¹
-		- thumbnails ²
+		- thumbnails (expired)
 
 	¹ Works, expired 2013-04-24
 	² Cloudfront
@@ -44,12 +44,7 @@
 
 
 	<rule from="^http://imgs\.inkfrog\.com/"
-		to="https://d29h7ql7qnxkqx.cloudfront.net/" />
-
-	<!--	Protocol relative links exist on img:
-							-->
-	<rule from="^https?://thumbnails\.inkfrog\.com/"
-		to="https://d33oiwhbojapjx.cloudfront.net/" />
+		to="https://imgs.inkfrog.com/" />
 
 	<rule from="^http://(www\.)?inkfrog\.com/"
 		to="https://$1inkfrog.com/" />

diff --git a/src/chrome/content/rules/Internet_Video_Archive.com.xml b/src/chrome/content/rules/Internet_Video_Archive.com.xml
@@ -9,7 +9,6 @@
 	<target host="content.internetvideoarchive.com" />
 
 
-	<rule from="^http://content\.internetvideoarchive\.com/"
-		to="https://d2nebe8lbbiml.cloudfront.net/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Iono.fm.xml b/src/chrome/content/rules/Iono.fm.xml
@@ -42,10 +42,6 @@
 	<securecookie host=".+" name=".+" />
 
 
-	<rule from="^http://static\.iono\.fm/"
-		to="https://d1pbkbr0pcz1zy.cloudfront.net/" />
-
-	<rule from="^http:"
-		to="https:" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Jawbone.com.xml b/src/chrome/content/rules/Jawbone.com.xml
@@ -9,6 +9,10 @@
 
 			- forums
 
+	Non-functional hosts:
+		Timeout:
+		- jawbone.com
+
 
 	Partially covered subdomains:
 
@@ -47,18 +51,17 @@
 -->
 <ruleset name="Jawbone.com (partial)">
 
-	<target host="jawbone.com" />
 	<target host="*.jawbone.com" />
 		<exclusion pattern="^http://store\.jawbone\.com/(?!Admin/|DRHM/)" />
 
 
 	<securecookie host="^(?!store\.).*\.jawbone\.com$" name=".+" />
 
 
-	<rule from="^http://((?:eu|forums|mytalk|store|thoughts|up|www)\.)?jawbone\.com/"
+	<rule from="^http://((?:eu|forums|mytalk|store|thoughts|up|www)\.)jawbone\.com/"
 		to="https://$1jawbone.com/" />
 
 	<rule from="^http://content\.jawbone\.com/"
-		to="https://d3osil7svxrrgt.cloudfront.net/" />
+		to="https://content.jawbone.com/" />
 
-</ruleset>
+</ruleset>