From 1470bc4bc89f0beea2f6f15eb8ca790f38409e4f Mon Sep 17 00:00:00 2001 From: Ian Carrico Date: Fri, 28 Apr 2017 16:40:28 -0500 Subject: [PATCH 1/8] First pass to ensure that Vox Media properties are enabled on HTTPS Everywhere --- src/chrome/content/rules/Curbed.com.xml | 2 +- src/chrome/content/rules/Eater.xml | 2 +- src/chrome/content/rules/Racked.com.xml | 2 +- src/chrome/content/rules/Vox.com.xml | 2 +- src/chrome/content/rules/Vox_Media.com.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/rules/Curbed.com.xml b/src/chrome/content/rules/Curbed.com.xml index e8092064b84a..e9638fa8ce6d 100644 --- a/src/chrome/content/rules/Curbed.com.xml +++ b/src/chrome/content/rules/Curbed.com.xml @@ -50,7 +50,7 @@ ˢ Secured by us --> - + diff --git a/src/chrome/content/rules/Eater.xml b/src/chrome/content/rules/Eater.xml index 8caf3e152eb8..2804dd95fec4 100644 --- a/src/chrome/content/rules/Eater.xml +++ b/src/chrome/content/rules/Eater.xml @@ -24,7 +24,7 @@ - Fonts on www from fonts.voxmedia.com --> - + diff --git a/src/chrome/content/rules/Racked.com.xml b/src/chrome/content/rules/Racked.com.xml index 98afde200e07..c3c02851c434 100644 --- a/src/chrome/content/rules/Racked.com.xml +++ b/src/chrome/content/rules/Racked.com.xml @@ -7,7 +7,7 @@ * CORS issues, https://github.com/EFForg/https-everywhere/issues/7381 --> - + diff --git a/src/chrome/content/rules/Vox.com.xml b/src/chrome/content/rules/Vox.com.xml index 5a4179c8501a..839e9192f466 100644 --- a/src/chrome/content/rules/Vox.com.xml +++ b/src/chrome/content/rules/Vox.com.xml @@ -23,7 +23,7 @@ ^vox.com: Refused --> - + diff --git a/src/chrome/content/rules/Vox_Media.com.xml b/src/chrome/content/rules/Vox_Media.com.xml index e6e34bad33ab..c5f73a003480 100644 --- a/src/chrome/content/rules/Vox_Media.com.xml +++ b/src/chrome/content/rules/Vox_Media.com.xml @@ -51,7 +51,7 @@ ᶜ See https://owasp.org/index.php/SecureFlag --> - + From 76088f838bd8616d06ecec0d74c6221ef0becb03 Mon Sep 17 00:00:00 2001 From: Ian Carrico Date: Fri, 28 Apr 2017 16:43:59 -0500 Subject: [PATCH 2/8] I forgot to add in Recode as well --- src/chrome/content/rules/Recode.net.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Recode.net.xml b/src/chrome/content/rules/Recode.net.xml index d84f5352f4b8..81d123317ad5 100644 --- a/src/chrome/content/rules/Recode.net.xml +++ b/src/chrome/content/rules/Recode.net.xml @@ -9,7 +9,7 @@ ᶜ See https://owasp.org/index.php/SecureFlag --> - + From ffecfa9fef3e8ad845619cba877d56fece347992 Mon Sep 17 00:00:00 2001 From: Ian Carrico Date: Fri, 28 Apr 2017 16:54:46 -0500 Subject: [PATCH 3/8] Removing a lot of the complications, all sites support HTTPS now --- src/chrome/content/rules/Curbed.com.xml | 36 +---- src/chrome/content/rules/Eater.xml | 4 +- src/chrome/content/rules/Polygon.com.xml | 47 +----- src/chrome/content/rules/Recode.net.xml | 129 --------------- src/chrome/content/rules/Vox.com.xml | 13 -- src/chrome/content/rules/Vox_Media.com.xml | 179 --------------------- 6 files changed, 4 insertions(+), 404 deletions(-) diff --git a/src/chrome/content/rules/Curbed.com.xml b/src/chrome/content/rules/Curbed.com.xml index e9638fa8ce6d..462db09cfc5c 100644 --- a/src/chrome/content/rules/Curbed.com.xml +++ b/src/chrome/content/rules/Curbed.com.xml @@ -54,48 +54,16 @@ + - - - - - - - - - - - - - - - - - - - - - - - + - - - - - diff --git a/src/chrome/content/rules/Eater.xml b/src/chrome/content/rules/Eater.xml index 2804dd95fec4..cda27d8334d9 100644 --- a/src/chrome/content/rules/Eater.xml +++ b/src/chrome/content/rules/Eater.xml @@ -29,10 +29,8 @@ - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Recode.net.xml b/src/chrome/content/rules/Recode.net.xml index 81d123317ad5..37b14b379ea7 100644 --- a/src/chrome/content/rules/Recode.net.xml +++ b/src/chrome/content/rules/Recode.net.xml @@ -14,135 +14,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Vox.com.xml b/src/chrome/content/rules/Vox.com.xml index 839e9192f466..bd4bc8fd5548 100644 --- a/src/chrome/content/rules/Vox.com.xml +++ b/src/chrome/content/rules/Vox.com.xml @@ -29,19 +29,6 @@ --> - - - - - - - - - - diff --git a/src/chrome/content/rules/Vox_Media.com.xml b/src/chrome/content/rules/Vox_Media.com.xml index c5f73a003480..e858e591dd7c 100644 --- a/src/chrome/content/rules/Vox_Media.com.xml +++ b/src/chrome/content/rules/Vox_Media.com.xml @@ -66,185 +66,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 4c42236e41172c99e073139258b9f39ef4a8700f Mon Sep 17 00:00:00 2001 From: Ian Carrico Date: Mon, 1 May 2017 16:04:31 -0500 Subject: [PATCH 4/8] Add in some tests --- src/chrome/content/rules/Curbed.com.xml | 9 ++++++--- src/chrome/content/rules/The-Verge.xml | 2 ++ src/chrome/content/rules/Vox.com.xml | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/rules/Curbed.com.xml b/src/chrome/content/rules/Curbed.com.xml index 462db09cfc5c..0efabdb96b1b 100644 --- a/src/chrome/content/rules/Curbed.com.xml +++ b/src/chrome/content/rules/Curbed.com.xml @@ -55,11 +55,14 @@ - - - + + + + + + diff --git a/src/chrome/content/rules/The-Verge.xml b/src/chrome/content/rules/The-Verge.xml index 982feff2bc17..a875a9baa8f5 100644 --- a/src/chrome/content/rules/The-Verge.xml +++ b/src/chrome/content/rules/The-Verge.xml @@ -13,6 +13,8 @@ Timeout: + + diff --git a/src/chrome/content/rules/Vox.com.xml b/src/chrome/content/rules/Vox.com.xml index bd4bc8fd5548..7f533b7763fe 100644 --- a/src/chrome/content/rules/Vox.com.xml +++ b/src/chrome/content/rules/Vox.com.xml @@ -34,6 +34,9 @@ + + + From 515c7ea6887908c67e886c68c8c42b997cf5ea35 Mon Sep 17 00:00:00 2001 From: Ian Carrico Date: Mon, 1 May 2017 16:26:47 -0500 Subject: [PATCH 5/8] I cannot test locally, trying on Travis --- src/chrome/content/rules/Vox.com.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Vox.com.xml b/src/chrome/content/rules/Vox.com.xml index 7f533b7763fe..68001ccc2938 100644 --- a/src/chrome/content/rules/Vox.com.xml +++ b/src/chrome/content/rules/Vox.com.xml @@ -28,6 +28,7 @@ + @@ -35,7 +36,7 @@ - + From 3838c65685f695d4ce8b290fe2cecc070bd65d37 Mon Sep 17 00:00:00 2001 From: Ian Carrico Date: Mon, 5 Jun 2017 16:19:38 -0400 Subject: [PATCH 6/8] Add in more tests for Eater as well as all comments --- src/chrome/content/rules/Eater.xml | 38 ++++++++---------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/src/chrome/content/rules/Eater.xml b/src/chrome/content/rules/Eater.xml index cda27d8334d9..a850f29cab1c 100644 --- a/src/chrome/content/rules/Eater.xml +++ b/src/chrome/content/rules/Eater.xml @@ -1,40 +1,22 @@ - - - + + + + + + + + + From f7bac3bcbcf8cbc908e1076993632889d32b1a74 Mon Sep 17 00:00:00 2001 From: Ian Carrico Date: Mon, 5 Jun 2017 16:21:55 -0400 Subject: [PATCH 7/8] Tests should be all HTTP --- src/chrome/content/rules/Eater.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/rules/Eater.xml b/src/chrome/content/rules/Eater.xml index a850f29cab1c..2a5c8b28736a 100644 --- a/src/chrome/content/rules/Eater.xml +++ b/src/chrome/content/rules/Eater.xml @@ -9,14 +9,14 @@ - - - - - - - - + + + + + + + + From bd2326342599d6f4fe832ae818dff001c705e269 Mon Sep 17 00:00:00 2001 From: Ian Carrico Date: Wed, 5 Jul 2017 10:43:55 -0400 Subject: [PATCH 8/8] More small updates --- src/chrome/content/rules/Vox.com.xml | 39 ++-------- src/chrome/content/rules/Vox_Media.com.xml | 73 ++++--------------- .../content/rules/voxmedia.com-resources.xml | 5 -- 3 files changed, 21 insertions(+), 96 deletions(-) diff --git a/src/chrome/content/rules/Vox.com.xml b/src/chrome/content/rules/Vox.com.xml index 68001ccc2938..b5b250b16316 100644 --- a/src/chrome/content/rules/Vox.com.xml +++ b/src/chrome/content/rules/Vox.com.xml @@ -1,45 +1,22 @@ - - - - + + + + + - - + + diff --git a/src/chrome/content/rules/Vox_Media.com.xml b/src/chrome/content/rules/Vox_Media.com.xml index e858e591dd7c..1d2684ca16db 100644 --- a/src/chrome/content/rules/Vox_Media.com.xml +++ b/src/chrome/content/rules/Vox_Media.com.xml @@ -2,68 +2,27 @@ For rules covering resources which do not secure mixed content, see voxmedia.com-resources.xml. - For other Vox Media coverage, see Vox.com.xml. - - - CDN buckets: - - - d3jpjf0yeaswad.cloudfront.net ← cdn.hymnal - - d8wuu9msfgurd.cloudfront.net ← ea-cdn - - - Nonfunctional hosts in *voxmedia.com: - - - blog * - - pixelpunch ² - - ʰ Redirects to http - * Tumblr - ² 500 - ¹ Refused - - - Problematic hosts in *voxmedia.com: - - - ^ ¹ - - cdn.hymnal ² - - jobs ¹ - - status ³ - - ¹ Refused, preemptable redirect - ² Fastly / mismatched - ³ StatusPage / mismatched - - - Partially covered hosts in *voxmedia.com: - - - marketing ʰ - - product ʰ - - ʰ Some pages redirect to http - - - Insecure cookies are set for these hosts: ᶜ - - - marketing.voxmedia.com - - product.voxmedia.com - - www.voxmedia.com - - ᶜ See https://owasp.org/index.php/SecureFlag - + Other Vox rulesets: + + - Cstatic.net.xml + - Curbed.cc.xml + - Curbed.com.xml + - Eater.xml + - Polygon.xml + - Racked.com.xml + - Recode.net.xml + - The-Verge.xml + - Vox-CDN.com.xml + - Vox.com.xml --> - - - - - - - - - - + diff --git a/src/chrome/content/rules/voxmedia.com-resources.xml b/src/chrome/content/rules/voxmedia.com-resources.xml index acfaab85da29..f86ad0772573 100644 --- a/src/chrome/content/rules/voxmedia.com-resources.xml +++ b/src/chrome/content/rules/voxmedia.com-resources.xml @@ -8,15 +8,10 @@ --> - - - - -