Skip to content

Commit 91a8ec3

Browse files
author
Chan Chak Shing
authored
Update Ars Technica related rulesets (EFForg#18990)
* Update Conde Nast related rulesets * Update ArsTechnica.com.xml * Update ArsTechnica.com.xml * Whitelist ArsTechnica.com.xml from fetch-test * Update Vanity-Fair.xml
1 parent 9509a27 commit 91a8ec3

8 files changed

Lines changed: 103 additions & 164 deletions

File tree

‎src/chrome/content/rules/Ars-Technica.xml‎

Lines changed: 0 additions & 108 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!--
2+
For other Condé Nast coverage, see Conde-Nast.xml.
3+
-->
4+
<ruleset name="ArsTechnica.co.uk (partial)">
5+
<target host="arstechnica.co.uk" />
6+
<target host="www.arstechnica.co.uk" />
7+
8+
<securecookie host=".+" name=".+" />
9+
10+
<rule from="^http:" to="https:" />
11+
</ruleset>
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<!--
2+
For other Condé Nast coverage, see Conde-Nast.xml.
3+
4+
Non-functional hosts
5+
Couldn't connect to server:
6+
- irc.arstechnica.com
7+
- irc-nyc.arstechnica.com
8+
- irc-sfo.arstechnica.com
9+
- staging.arstechnica.com
10+
11+
Timeout was reached:
12+
- origin.cdn.arstechnica.com
13+
- live.arstechnica.com
14+
- uk.live.arstechnica.com
15+
- util.arstechnica.com
16+
17+
SSL connect error:
18+
- feeds.arstechnica.com
19+
20+
SSL peer certificate was not OK:
21+
- www.coins.arstechnica.com
22+
- www.irc.arstechnica.com
23+
24+
Mixed content blocking (MCB) triggered:
25+
- archive.arstechnica.com
26+
-->
27+
<ruleset name="ArsTechnica.com (partial)">
28+
<target host="arstechnica.com" />
29+
<target host="www.arstechnica.com" />
30+
<target host="apps.arstechnica.com" />
31+
<target host="cardboard.arstechnica.com" />
32+
<target host="civis.arstechnica.com" />
33+
<target host="cms.arstechnica.com" />
34+
<target host="coins.arstechnica.com" />
35+
<target host="dev.arstechnica.com" />
36+
<target host="episteme.arstechnica.com" />
37+
<target host="hq.arstechnica.com" />
38+
<target host="jobs.arstechnica.com" />
39+
<target host="link.arstechnica.com" />
40+
<target host="m.arstechnica.com" />
41+
<target host="media.arstechnica.com" />
42+
<target host="origin.arstechnica.com" />
43+
<target host="sstats.arstechnica.com" />
44+
<target host="static.arstechnica.com" />
45+
<test url="http://static.arstechnica.com/staff-directory/" />
46+
<test url="http://static.arstechnica.com/store/" />
47+
<target host="stats.arstechnica.com" />
48+
<target host="stats2.arstechnica.com" />
49+
<target host="store.arstechnica.com" />
50+
<target host="video.arstechnica.com" />
51+
<test url="http://video.arstechnica.com/genres/technology" />
52+
<test url="http://video.arstechnica.com/watch/a-celebration-of-cassini/" />
53+
<target host="write.arstechnica.com" />
54+
55+
<securecookie host=".+" name=".+" />
56+
57+
<rule from="^http:" to="https:" />
58+
</ruleset>
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<!--
2+
For other Condé Nast coverage, see Conde-Nast.xml.
3+
4+
Non-functional hosts
5+
SSL peer certificate was not OK:
6+
- static.arstechnica.net
7+
-->
8+
<ruleset name="ArsTechnica.net (partial)">
9+
<target host="cdn.arstechnica.net" />
10+
11+
<securecookie host=".+" name=".+" />
12+
13+
<rule from="^http:" to="https:" />
14+
</ruleset>

‎src/chrome/content/rules/Conde-Nast-mismatches.xml‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
-->
55
<ruleset name="Condé Nast (mismatches)" default_off="expired, mismatch, self-signed">
66

7-
<target host="jobs.arstechnica.com" />
87
<target host="thumbnailer.thestudio.condenast.com" />
98
<!--
109
Expired.
@@ -14,18 +13,12 @@
1413
<target host="blog.details.com" />
1514
<target host="golfdigestschool.com" />
1615
<target host="www.golfdigestschool.com" />
17-
<target host="vanityfair.com" />
18-
<target host="www.vanityfair.com" />
1916
<target host="vf.com" />
2017
<target host="www.vf.com" />
2118

2219

2320
<securecookie host="^designcentersearch\.com$" name=".+" />
2421

25-
26-
<rule from="^http://jobs\.arstechnica\.com/"
27-
to="https://jobs.arstechnica.com/" />
28-
2922
<!-- Akamai.
3023
-->
3124
<rule from="^http://thumbnailer\.thestudio\.condenast\.com/"
@@ -40,14 +33,6 @@
4033
<rule from="^http://(?:www\.)?golfdigestschool\.com/"
4134
to="https://www.golfdigestschool.com/" />
4235

43-
<!-- Condé Nast cert matches www.vanityfair.com
44-
and stag.vanityfair.com, so presumably
45-
support is forthcoming.
46-
-->
47-
<rule from="^http://(?:www\.)?v(?:anityfair|f)\.com/"
48-
to="https://www.vanityfair.com/" />
49-
50-
<rule from="^http://stag\.vanityfair\.com/"
51-
to="https://stag.vanityfair.com/" />
36+
<rule from="^http:" to="https:" />
5237

5338
</ruleset>

‎src/chrome/content/rules/Conde-Nast.xml‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
1-
21
<!--
3-
Disabled by https-everywhere-checker because:
4-
Fetch error: http://www.condenast.com/ => https://www.condenast.com/: Too many redirects while fetching 'https://www.condenast.com/'
5-
Fetch error: http://condenast.com/ => https://www.condenast.com/: Too many redirects while fetching 'https://www.condenast.com/'
6-
72
For problematic rules, see Conde-Nast-mismatches.xml.
83
94
105
Other Condé Nast rulesets:
116
12-
- Ars-Technica.xml
7+
- ArsTechnica.co.uk.xml
8+
- ArsTechnica.com.xml
9+
- ArsTechnica.net.xml
1310
- Conde_Nast.co.uk.xml
1411
- Conde_Nast_Digital.com.xml
1512
- Conde_Nast_Traveler.xml
1613
- Conde_Nast_store.com.xml
1714
- Condenet.com.xml
1815
- Details.xml
19-
- Golf_Digest.xml
20-
- GQ.xml
2116
- GQ-magazine.co.uk.xml
17+
- GQ.xml
18+
- Golf_Digest.xml
2219
- Style.com.xml
2320
- The-New-Yorker.xml
2421
- Vanity-Fair.xml
@@ -49,22 +46,14 @@ Fetch error: http://condenast.com/ => https://www.condenast.com/: Too many redir
4946
- www.webmonkey.com (Akamai; 503)
5047
5148
-->
52-
<ruleset name="Conde Nast.com (partial)" default_off="failed ruleset test">
49+
<ruleset name="Conde Nast.com (partial)">
5350

54-
<!-- Direct rewrites:
55-
-->
56-
<target host="fonts.condenast.com" />
57-
<target host="www.condenast.com" />
58-
59-
<!-- Complications:
60-
-->
6151
<target host="condenast.com" />
52+
<target host="www.condenast.com" />
53+
<target host="fonts.condenast.com" />
6254

55+
<securecookie host=".+" name=".+" />
6356

64-
<rule from="^http://condenast\.com/"
65-
to="https://www.condenast.com/" />
66-
67-
<rule from="^http:"
68-
to="https:" />
57+
<rule from="^http:" to="https:" />
6958

7059
</ruleset>
Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,20 @@
11
<!--
22
For other Conde Nast coverage, see Conde-Nast.xml.
33
4+
Non-functional host:
5+
Timeout:
6+
- stats.vanityfair.com
47
5-
CDN buckets:
6-
7-
- stag.vanityfair.com.edgesuite.net
8-
- www.vanityfair.com.edgesuite.net
9-
10-
11-
Nonfunctional domains:
12-
13-
- promotions.vf.com
14-
8+
Mismatched:
9+
- stats2.vanityfair.com
1510
-->
1611
<ruleset name="Vanity Fair (partial)">
1712

18-
<target host="secure.vanityfair.com" />
19-
<target host="stats2.vanityfair.com" />
20-
13+
<target host="vanityfair.com" />
14+
<target host="www.vanityfair.com" />
15+
<target host="stag.vanityfair.com" />
2116

2217
<securecookie host=".+" name=".+"/>
2318

24-
25-
26-
<rule from="^http://stats2\.vanityfair\.com/"
27-
to="https://vanityfair-com.122.2o7.net/" />
28-
2919
<rule from="^http:" to="https:" />
3020
</ruleset>

‎utils/ruleset-whitelist.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2558,4 +2558,4 @@ e5702add6d485cbf6b018ea01bbd171656a5cb624d2ac685d7e189a373ab8812,1,1,Yourhosting
25582558
618c143055176140e5517088535d1ca18e01aa1132adc3f546cf5f28d4f1f655,1,0,Zoho.xml
25592559
298d6a10c5dd2b45a9b73221ad69566c8110e36acbca3a7ce0404433e7f4a636,1,0,ZONZA.tv.xml
25602560
5e6c30a2931bd2bf241ebcbe957a2b200f6d4526b26321e77bc41c405d90c59a,0,1,Zopa.xml
2561-
54f30ba3843ce2be5355b1259c28f6ffe7b3c9feddcbe0de95025bc506e913cf,1,0,Zulius.com.xml
2561+
54f30ba3843ce2be5355b1259c28f6ffe7b3c9feddcbe0de95025bc506e913cf,1,0,Zulius.com.xml

0 commit comments

Comments
 (0)