From d6c17eeaa181040070dc3e94cbdb1841090c5522 Mon Sep 17 00:00:00 2001
From: cschanaj <cschanaj@users.noreply.github.com>
Date: Fri, 11 Sep 2020 14:44:04 +0200
Subject: [PATCH 01/10] Run node utils/trivialize-cdn-rules/index.js

---
 src/chrome/content/rules/Ecwid.xml                   | 4 ++--
 src/chrome/content/rules/Oculus_VR.xml               | 2 +-
 src/chrome/content/rules/Ow.ly.xml                   | 2 +-
 src/chrome/content/rules/Pragmatic_Marketing.com.xml | 2 +-
 src/chrome/content/rules/Rev2pub.com.xml             | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/chrome/content/rules/Ecwid.xml b/src/chrome/content/rules/Ecwid.xml
index ff77d4eaaa6f..b12e6b2cb172 100644
--- a/src/chrome/content/rules/Ecwid.xml
+++ b/src/chrome/content/rules/Ecwid.xml
@@ -46,7 +46,7 @@
 
 
 	<rule from="^http://images-cdn\.ecwid\.com/"
-		to="https://dpbfm6h358sh7.cloudfront.net/" />
+		to="https://images-cdn.ecwid.com/" />
 
 	<rule from="^http://kb\.ecwid\.com/(f/|theme_image\.php)"
 		to="https://ecwid.pbworks.com/$1" />
@@ -55,6 +55,6 @@
 		to="https://my.ecwid.com/" />
 
 	<rule from="^http://static\.ecwid\.com/"
-		to="https://dj925myfyz5v.cloudfront.net/" />
+		to="https://static.ecwid.com/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Oculus_VR.xml b/src/chrome/content/rules/Oculus_VR.xml
index 54b5500667ce..28c37777538d 100644
--- a/src/chrome/content/rules/Oculus_VR.xml
+++ b/src/chrome/content/rules/Oculus_VR.xml
@@ -53,7 +53,7 @@ Fetch error: http://www.oculusvr.com/ => https://www.oculusvr.com/: (60, 'SSL ce
 		to="https://www.oculus.com/" />
 
 	<rule from="^http://static\.oculusvr\.com/"
-		to="https://d11g5bl75h7gks.cloudfront.net/" />
+		to="https://static.oculusvr.com/" />
 
 	<rule from="^http:"
 		to="https:" />
diff --git a/src/chrome/content/rules/Ow.ly.xml b/src/chrome/content/rules/Ow.ly.xml
index 0999a8cb576d..9d1959999ae4 100644
--- a/src/chrome/content/rules/Ow.ly.xml
+++ b/src/chrome/content/rules/Ow.ly.xml
@@ -18,6 +18,6 @@
 
 
 	<rule from="^http://static\.ow\.ly/"
-		to="https://d2jhuj1whasmze.cloudfront.net/" />
+		to="https://static.ow.ly/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Pragmatic_Marketing.com.xml b/src/chrome/content/rules/Pragmatic_Marketing.com.xml
index db1e7ada32e5..d1bf9748abe2 100644
--- a/src/chrome/content/rules/Pragmatic_Marketing.com.xml
+++ b/src/chrome/content/rules/Pragmatic_Marketing.com.xml
@@ -31,7 +31,7 @@
 
 
 	<rule from="^http://mediafiles\.pragmaticmarketing\.com/"
-		to="https://d1qrnovf1k6d8a.cloudfront.net/" />
+		to="https://mediafiles.pragmaticmarketing.com/" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/Rev2pub.com.xml b/src/chrome/content/rules/Rev2pub.com.xml
index 90abefd86afa..1ce1628d35b4 100644
--- a/src/chrome/content/rules/Rev2pub.com.xml
+++ b/src/chrome/content/rules/Rev2pub.com.xml
@@ -21,6 +21,6 @@ Fetch error: http://creative.rev2pub.com/ => https://d1col0l9yjljr0.cloudfront.n
 
 
 	<rule from="^http://creative\.rev2pub\.com/"
-		to="https://d1col0l9yjljr0.cloudfront.net/" />
+		to="https://creative.rev2pub.com/" />
 
 </ruleset>

From 25283af7a9e4dc638193c5261b175efd7f125a62 Mon Sep 17 00:00:00 2001
From: cschanaj <cschanaj@users.noreply.github.com>
Date: Fri, 11 Sep 2020 14:45:54 +0200
Subject: [PATCH 02/10] Run node utils/trivialize-rules/trivialize-rules.js

---
 src/chrome/content/rules/City-Mail.xml               | 3 +--
 src/chrome/content/rules/EPEAT.xml                   | 3 +--
 src/chrome/content/rules/Ow.ly.xml                   | 3 +--
 src/chrome/content/rules/Pragmatic_Marketing.com.xml | 3 ---
 src/chrome/content/rules/Rev2pub.com.xml             | 3 +--
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/chrome/content/rules/City-Mail.xml b/src/chrome/content/rules/City-Mail.xml
index e8fe8e9f8c02..f8a76f500105 100644
--- a/src/chrome/content/rules/City-Mail.xml
+++ b/src/chrome/content/rules/City-Mail.xml
@@ -11,7 +11,6 @@
 	<securecookie host="^(?:www\.)?cityemail\.com$" name=".+" />
 
 
-	<rule from="^http://(www\.)?cityemail\.com/"
-		to="https://$1cityemail.com/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/EPEAT.xml b/src/chrome/content/rules/EPEAT.xml
index 0f18351672ae..37be148faa84 100644
--- a/src/chrome/content/rules/EPEAT.xml
+++ b/src/chrome/content/rules/EPEAT.xml
@@ -3,7 +3,6 @@
 	<target host="ww2.epeat.net" />
 
 
-	<rule from="^http://ww2\.epeat\.net/"
-		to="https://ww2.epeat.net/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Ow.ly.xml b/src/chrome/content/rules/Ow.ly.xml
index 9d1959999ae4..cb35365e389d 100644
--- a/src/chrome/content/rules/Ow.ly.xml
+++ b/src/chrome/content/rules/Ow.ly.xml
@@ -17,7 +17,6 @@
 	<target host="static.ow.ly" />
 
 
-	<rule from="^http://static\.ow\.ly/"
-		to="https://static.ow.ly/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Pragmatic_Marketing.com.xml b/src/chrome/content/rules/Pragmatic_Marketing.com.xml
index d1bf9748abe2..7f56f9a97d9b 100644
--- a/src/chrome/content/rules/Pragmatic_Marketing.com.xml
+++ b/src/chrome/content/rules/Pragmatic_Marketing.com.xml
@@ -30,8 +30,5 @@
 
 
 
-	<rule from="^http://mediafiles\.pragmaticmarketing\.com/"
-		to="https://mediafiles.pragmaticmarketing.com/" />
-
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/Rev2pub.com.xml b/src/chrome/content/rules/Rev2pub.com.xml
index 1ce1628d35b4..83f88e1a529a 100644
--- a/src/chrome/content/rules/Rev2pub.com.xml
+++ b/src/chrome/content/rules/Rev2pub.com.xml
@@ -20,7 +20,6 @@ Fetch error: http://creative.rev2pub.com/ => https://d1col0l9yjljr0.cloudfront.n
 	<target host="creative.rev2pub.com" />
 
 
-	<rule from="^http://creative\.rev2pub\.com/"
-		to="https://creative.rev2pub.com/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>

From 173eba150b67fa3c50bfe897fd3d2a4453aa9bf5 Mon Sep 17 00:00:00 2001
From: cschanaj <cschanaj@users.noreply.github.com>
Date: Fri, 11 Sep 2020 14:52:12 +0200
Subject: [PATCH 03/10] Re-activate and update Rev2pub.com.xml

---
 src/chrome/content/rules/Rev2pub.com.xml | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/chrome/content/rules/Rev2pub.com.xml b/src/chrome/content/rules/Rev2pub.com.xml
index 83f88e1a529a..acdbbd73e704 100644
--- a/src/chrome/content/rules/Rev2pub.com.xml
+++ b/src/chrome/content/rules/Rev2pub.com.xml
@@ -1,21 +1,4 @@
-
-<!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://creative.rev2pub.com/ => https://d1col0l9yjljr0.cloudfront.net/: (6, 'Could not resolve host: d1col0l9yjljr0.cloudfront.net')
-
-Automatically by https-everywhere-checker because:
-Fetch error: http://creative.rev2pub.com/ => https://d1col0l9yjljr0.cloudfront.net/: (6, 'Could not resolve host: d1col0l9yjljr0.cloudfront.net')
-	For other Matomy coverage, see Matomy-Media.xml.
-
-
-	CDN buckets:
-
-		- d1col0l9yjljr0.cloudfront.net
-
-			- creative
-
--->
-<ruleset name="rev2pub.com" default_off="failed ruleset test">
+<ruleset name="rev2pub.com">
 
 	<target host="creative.rev2pub.com" />
 

From 1bffa59fa08a8dce708c41a2825bd98a994890c3 Mon Sep 17 00:00:00 2001
From: cschanaj <cschanaj@users.noreply.github.com>
Date: Fri, 11 Sep 2020 14:56:30 +0200
Subject: [PATCH 04/10] Update Pragmatic_Marketing.com.xml

---
 .../content/rules/Pragmatic_Marketing.com.xml | 27 +++----------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/src/chrome/content/rules/Pragmatic_Marketing.com.xml b/src/chrome/content/rules/Pragmatic_Marketing.com.xml
index 7f56f9a97d9b..88f78fff41d1 100644
--- a/src/chrome/content/rules/Pragmatic_Marketing.com.xml
+++ b/src/chrome/content/rules/Pragmatic_Marketing.com.xml
@@ -1,34 +1,13 @@
 <!--
-	CDN buckets:
-
-		- pragmatic-marketing-469ad240.s3.amazonaws.com
-
-		- d1qrnovf1k6d8a.cloudfront.net
-
-			- mediafiles
-
-
-	Partially covered subdomains:
-
-		- (www.)	(some pages redirect to http)
-
-
-	Fully covered subdomains:
-
-		- buy
-		- mediafiles	(→ d1qrnovf1k6d8a.cloudfront.net)
-
+	Non-functional hosts:
+		Timeout:
+		- buy.pragmaticmarketing.com
 -->
 <ruleset name="Pragmatic Marketing.com (partial)">
 
 	<target host="pragmaticmarketing.com" />
-	<target host="buy.pragmaticmarketing.com" />
 	<target host="www.pragmaticmarketing.com" />
 	<target host="mediafiles.pragmaticmarketing.com" />
-		<!--exclusion pattern="^http://(www\.)?pragmaticmarketing\.com/+($|\?|favicon\.ico|my-account/|resources/[\w-]+$)" /-->
-		<exclusion pattern="^http://(?:www\.)?pragmaticmarketing\.com/(?![cC]ontent/|Scripts/)" />
-
-
 
 	<rule from="^http:" to="https:" />
 </ruleset>

From 561f7db545474245a6744edb934c3e72b6fcac93 Mon Sep 17 00:00:00 2001
From: cschanaj <cschanaj@users.noreply.github.com>
Date: Fri, 11 Sep 2020 15:00:45 +0200
Subject: [PATCH 05/10] Rename and update OculusVR.com.xml

---
 src/chrome/content/rules/OculusVR.com.xml | 16 ++++++
 src/chrome/content/rules/Oculus_VR.xml    | 61 -----------------------
 2 files changed, 16 insertions(+), 61 deletions(-)
 create mode 100644 src/chrome/content/rules/OculusVR.com.xml
 delete mode 100644 src/chrome/content/rules/Oculus_VR.xml

diff --git a/src/chrome/content/rules/OculusVR.com.xml b/src/chrome/content/rules/OculusVR.com.xml
new file mode 100644
index 000000000000..d4142f58650f
--- /dev/null
+++ b/src/chrome/content/rules/OculusVR.com.xml
@@ -0,0 +1,16 @@
+<ruleset name="OculusVR.com">
+	<target host="oculusvr.com" />
+	<target host="www.oculusvr.com" />
+	<target host="answers.oculusvr.com" />
+	<target host="careers.oculusvr.com" />
+	<target host="developer.oculusvr.com" />
+	<target host="forums.oculusvr.com" />
+	<target host="share.oculusvr.com" />
+	<target host="static.oculusvr.com" />
+	<target host="storystudio.oculusvr.com" />
+	<target host="www1.oculusvr.com" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Oculus_VR.xml b/src/chrome/content/rules/Oculus_VR.xml
deleted file mode 100644
index 28c37777538d..000000000000
--- a/src/chrome/content/rules/Oculus_VR.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-<!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://oculusvr.com/ => https://oculusvr.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
-Fetch error: http://careers.oculusvr.com/ => https://careers.oculusvr.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
-Fetch error: http://share.oculusvr.com/ => https://share.oculusvr.com/: (6, 'Could not resolve host: share.oculusvr.com')
-Fetch error: http://www.oculusvr.com/ => https://www.oculusvr.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
-
-	CDN buckets:
-
-		- s3.amazonaws.com/static.oculus.com/
-		- d11g5bl75h7gks.cloudfront.net
-
-
-	Problematic hosts in *oculusvr.com:
-
-		- answers ¹
-		- forums ¹
-		- static ²
-		- storystudio ¹
-		- www1 ¹
-
-	¹ Shows www1.oculus.com
-	² Cloudfront/mismatched
-
--->
-<ruleset name="Oculus VR" default_off="failed ruleset test">
-
-	<!--	Direct rewrites:
-				-->
-	<target host="oculusvr.com" />
-	<target host="careers.oculusvr.com" />
-	<target host="developer.oculusvr.com" />
-	<target host="share.oculusvr.com" />
-	<target host="www.oculusvr.com" />
-
-	<!--	Complications:
-				-->
-	<target host="answers.oculusvr.com" />
-	<target host="forums.oculusvr.com" />
-	<target host="static.oculusvr.com" />
-	<target host="storystudio.oculusvr.com" />
-	<target host="www1.oculusvr.com" />
-
-
-	<securecookie host="^\w" name=".+" />
-
-
-	<!--	Redirect keeps path and args,
-		but not forward slash:
-					-->
-	<rule from="^http://(?:answers|forums|storystudio|www1)\.oculusvr\.com/+"
-		to="https://www.oculus.com/" />
-
-	<rule from="^http://static\.oculusvr\.com/"
-		to="https://static.oculusvr.com/" />
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>

From ae246942cc79ceef36d93923c91dfc59d8c76d6b Mon Sep 17 00:00:00 2001
From: cschanaj <cschanaj@users.noreply.github.com>
Date: Fri, 11 Sep 2020 15:01:43 +0200
Subject: [PATCH 06/10] Update City-Mail.xml

---
 src/chrome/content/rules/City-Mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/City-Mail.xml b/src/chrome/content/rules/City-Mail.xml
index f8a76f500105..7934b0246084 100644
--- a/src/chrome/content/rules/City-Mail.xml
+++ b/src/chrome/content/rules/City-Mail.xml
@@ -8,7 +8,7 @@
 	<target host="www.cityemail.com" />
 
 
-	<securecookie host="^(?:www\.)?cityemail\.com$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
 	<rule from="^http:" to="https:" />

From 5037ea1e39bf3636d6ae188050ab37a4f7daa1b6 Mon Sep 17 00:00:00 2001
From: cschanaj <cschanaj@users.noreply.github.com>
Date: Fri, 11 Sep 2020 15:17:39 +0200
Subject: [PATCH 07/10] Update Ecwid.xml

---
 src/chrome/content/rules/Ecwid.xml | 55 +++---------------------------
 1 file changed, 5 insertions(+), 50 deletions(-)

diff --git a/src/chrome/content/rules/Ecwid.xml b/src/chrome/content/rules/Ecwid.xml
index b12e6b2cb172..b57d8e36ed25 100644
--- a/src/chrome/content/rules/Ecwid.xml
+++ b/src/chrome/content/rules/Ecwid.xml
@@ -1,60 +1,15 @@
-<!--
-	CDN buckets:
-
-		- dj925myfyz5v.cloudfront.net
-
-			- static.ecwid.com
-
-		- dpbfm6h358sh7.cloudfront.net
-
-			- images-cdn.ecwid.com
-
-		- ecwid.desk.com
-
-			- help.ecwid.com
-
-		- ecwid.pbworks.com
-
-			- kb.ecwid.com
-
-		- ecwid.uservoice.com
-
-			- ideas.ecwid.com
-
-
-	Nonfunctional subdomains:
-
-		- (www.)	(redirects to http)
-		- help		(redirects to http; mismatched, CN: *.assistly.com)
-		- kb		(redirects to http; mismatched, CN: *.pbworks.com)
-
-
-	Problematic subdomains:
-
-		- ideas		(works; mismatched, CN: *.uservoice.com)
-
--->
 <ruleset name="Ecwid (partial)">
 
+	<target host="ecwid.com" />
+	<target host="www.ecwid.com" />
+	<target host="ideas.ecwid.com" />
 	<target host="images-cdn.ecwid.com" />
 	<target host="kb.ecwid.com" />
 	<target host="my.ecwid.com" />
 	<target host="static.ecwid.com" />
 
+	<securecookie host=".+" name=".+" />
 
-	<securecookie host="^my\.ecwid\.com$" name=".+" />
-
-
-	<rule from="^http://images-cdn\.ecwid\.com/"
-		to="https://images-cdn.ecwid.com/" />
-
-	<rule from="^http://kb\.ecwid\.com/(f/|theme_image\.php)"
-		to="https://ecwid.pbworks.com/$1" />
-
-	<rule from="^http://my\.ecwid\.com/"
-		to="https://my.ecwid.com/" />
-
-	<rule from="^http://static\.ecwid\.com/"
-		to="https://static.ecwid.com/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>

From 6efbe01e2fed095a83157932ac8543bc4f437d41 Mon Sep 17 00:00:00 2001
From: cschanaj <cschanaj@users.noreply.github.com>
Date: Fri, 11 Sep 2020 15:19:24 +0200
Subject: [PATCH 08/10] Rename and update Ecwid.com.xml

---
 src/chrome/content/rules/{Ecwid.xml => Ecwid.com.xml} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename src/chrome/content/rules/{Ecwid.xml => Ecwid.com.xml} (81%)

diff --git a/src/chrome/content/rules/Ecwid.xml b/src/chrome/content/rules/Ecwid.com.xml
similarity index 81%
rename from src/chrome/content/rules/Ecwid.xml
rename to src/chrome/content/rules/Ecwid.com.xml
index b57d8e36ed25..3b7497e24a67 100644
--- a/src/chrome/content/rules/Ecwid.xml
+++ b/src/chrome/content/rules/Ecwid.com.xml
@@ -1,4 +1,4 @@
-<ruleset name="Ecwid (partial)">
+<ruleset name="Ecwid.com (partial)">
 
 	<target host="ecwid.com" />
 	<target host="www.ecwid.com" />
@@ -7,6 +7,7 @@
 	<target host="kb.ecwid.com" />
 	<target host="my.ecwid.com" />
 	<target host="static.ecwid.com" />
+	<target host="support.ecwid.com" />
 
 	<securecookie host=".+" name=".+" />
 

From 2e4b1d0f5e17ab20e83040e2bc45362d67569f91 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing <cschanaj@users.noreply.github.com>
Date: Fri, 11 Sep 2020 15:28:20 +0200
Subject: [PATCH 09/10] Update Ecwid.com.xml

---
 src/chrome/content/rules/Ecwid.com.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/Ecwid.com.xml b/src/chrome/content/rules/Ecwid.com.xml
index 3b7497e24a67..072d9119294e 100644
--- a/src/chrome/content/rules/Ecwid.com.xml
+++ b/src/chrome/content/rules/Ecwid.com.xml
@@ -1,8 +1,12 @@
+<!--
+	Non-functional hosts:
+		Incomplete certificate chain error:
+		- ideas.ecwid.com
+-->
 <ruleset name="Ecwid.com (partial)">
 
 	<target host="ecwid.com" />
 	<target host="www.ecwid.com" />
-	<target host="ideas.ecwid.com" />
 	<target host="images-cdn.ecwid.com" />
 	<target host="kb.ecwid.com" />
 	<target host="my.ecwid.com" />

From 2666262dbfefb847cade4e2916662b74cb95ae05 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing <cschanaj@users.noreply.github.com>
Date: Sun, 13 Sep 2020 10:41:00 +0200
Subject: [PATCH 10/10] Delete EPEAT.xml

---
 src/chrome/content/rules/EPEAT.xml | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 src/chrome/content/rules/EPEAT.xml

diff --git a/src/chrome/content/rules/EPEAT.xml b/src/chrome/content/rules/EPEAT.xml
deleted file mode 100644
index 37be148faa84..000000000000
--- a/src/chrome/content/rules/EPEAT.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<ruleset name="EPEAT (partial)">
-
-	<target host="ww2.epeat.net" />
-
-
-	<rule from="^http:" to="https:" />
-
-</ruleset>