Skip to content

Commit 63de040

Browse files
J0WIJ0WI
authored
Merge pull request EFForg#17179 from cschanaj/vox.com
Re-activate and Update Vox related rulesets
2 parents 2561f1e + 501dc38 commit 63de040

2 files changed

Lines changed: 8 additions & 55 deletions

File tree

‎src/chrome/content/rules/Vox.com.xml‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,38 +18,14 @@
1818
1919
ʳ Refused
2020
21-
22-
^vox.com: Refused
23-
2421
-->
25-
<ruleset name="Vox.com" default_off="redirects to http">
22+
<ruleset name="Vox.com">
2623

27-
<!-- Direct rewrites:
28-
-->
29-
<target host="www.vox.com" />
30-
31-
<!-- Complications:
32-
-->
3324
<target host="vox.com" />
25+
<target host="www.vox.com" />
3426

35-
<!-- Redirects to http:
36-
-->
37-
<exclusion pattern="^http://www\.vox\.com/(?:$|\?|\d{4}/(?:\d\d?/){2}\d+/[\w-]+(?:$|\?))" />
38-
39-
<!-- +ve:
40-
-->
41-
<test url="http://www.vox.com/2016/1/7/10726296/wheres-rey-star-wars-monopoly" />
42-
43-
44-
<!-- Possible trackers (untested):
45-
-->
46-
<securecookie host="^\." name="^__[qu].*" />
47-
48-
49-
<rule from="^http://vox\.com/"
50-
to="https://www.vox.com/" />
27+
<securecookie host=".+" name=".+" />
5128

52-
<rule from="^http:"
53-
to="https:" />
29+
<rule from="^http:" to="https:" />
5430

5531
</ruleset>

‎src/chrome/content/rules/voxmedia.com-resources.xml‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
21
<!--
3-
Disabled by https-everywhere-checker because:
4-
Fetch error: http://providence.voxmedia.com/ => https://providence.voxmedia.com/: (7, 'Failed to connect to providence.voxmedia.com port 443: Connection timed out')
5-
62
For rules covering more than resources, see Vox_Media.com.xml.
73
8-
Note: platform is so as not to increase non-Tor
9-
distinguishability, given that no pages are covered
10-
and no mixed content secured.
11-
4+
Non-functional hosts:
5+
Connection timeout:
6+
- providence.voxmedia.com
127
-->
13-
<ruleset name="Vox Media.com (resources)" platform="mixedcontent" default_off='failed ruleset test'>
8+
<ruleset name="Vox Media.com (resources)">
149

1510
<target host="voxmedia.com" />
1611
<target host="ea-cdn.voxmedia.com" />
@@ -19,31 +14,13 @@ Fetch error: http://providence.voxmedia.com/ => https://providence.voxmedia.com/
1914
<target host="phonograph-static.voxmedia.com" />
2015
<target host="phonograph2.voxmedia.com" />
2116
<target host="product.voxmedia.com" />
22-
<target host="providence.voxmedia.com" />
2317
<target host="www.voxmedia.com" />
2418

2519
<test url="http://ea-cdn.voxmedia.com/production/voxmedia/images/about/chorus-e232d7e7.svg" />
2620
<test url="http://fonts.voxmedia.com/unison/voxmedia/voxmedia.css" />
2721
<test url="http://phonograph2.voxmedia.com/pickup.js" />
2822
<test url="http://phonograph-static.voxmedia.com/beacon-min.js" />
2923

30-
<exclusion pattern="^http://(?:marketing|product|www)\.voxmedia\.com/(?!/*(?:favicon\.ico|styles/))" />
31-
32-
<!-- +ve:
33-
-->
34-
<test url="http://marketing.voxmedia.com/2015/10/14/9531041/vox-in-your-inbox-vox-sentences-gets-personal-with-email-marketing" />
35-
<test url="http://product.voxmedia.com/2012/5/4/5426770/earn-while-working-from-home-keeping-a-close-knit-team-with-far-flung" />
36-
<test url="http://www.voxmedia.com/2015/12/21/10641582/new-york-times-vox-media-adds-re-code-to-its-stable-of-websites" />
37-
38-
<!-- -ve:
39-
-->
40-
<test url="http://marketing.voxmedia.com/favicon.ico" />
41-
<test url="http://product.voxmedia.com/favicon.ico" />
42-
<test url="http://product.voxmedia.com/style/a4599c476fee06f907e34d73f5302974/chorus.css" />
43-
<test url="http://www.voxmedia.com/favicon.ico" />
44-
<test url="http://www.voxmedia.com/style/39ba52252694457a2ece9335b34f6733/chorus.css" />
45-
46-
4724
<rule from="^http:"
4825
to="https:" />
4926

0 commit comments

Comments
 (0)