Skip to content

Commit 6af3081

Browse files
pipboy96J0WI
authored andcommitted
Update 20min.ch.xml (EFForg#17443)
* Update 20min.ch.xml * Delete 20min.ch-mixedcontent.xml * Update ruleset-whitelist.csv * Update 20min.ch.xml * Update 20min.ch.xml * Update 20min.ch.xml
1 parent 72053ca commit 6af3081

File tree

3 files changed

+9
-53
lines changed

3 files changed

+9
-53
lines changed

src/chrome/content/rules/20min.ch-mixedcontent.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,24 @@
11
<!--
22
Other 20min rulesets:
33
- 20min-tv.ch.xml
4-
- 20min.ch-mixedcontent.xml
54
- 20minuti.ch.xml
65
7-
Nonfunctional hosts in *.20min.ch:
8-
- 20min.ch (h)
9-
- www.20min.ch (some pages redirect to http;
10-
works with "?httpsredirect" parameter, but has mixed content issues then)
11-
- deal.20min.ch (m)
12-
- m.20min.ch (some pages have mixed content issues)
13-
- secretescapes.20min.ch (e)
14-
- static01.20min.ch (r)
15-
- tilllate.20min.ch (m)
6+
20min.ch has both a wildcard DNS record and a wildcard certificate, so enumerating all subdomains is impossible.
167
17-
The host has various subdomains as shortlinks to articles.
18-
Those subdomains redirect to http and their www prefixed alias mismatches the cert.
19-
20-
e: certificate expired
21-
h: http redirect
22-
m: certificate mismatch
23-
r: connection refused
24-
s: self-signed certificate
25-
t: timeout on https
26-
27-
HTTP redirect to 20min.ch on all *.20minuten.ch hosts.
8+
Mismatched, different cert from rest of domains:
9+
- secretescapes
10+
- tilllate
2811
-->
2912
<ruleset name="20min.ch (partial)">
13+
<target host="20min.ch" />
3014
<target host="www.20min.ch" />
3115
<target host="api.20min.ch" />
16+
<target host="deal.20min.ch" />
3217
<target host="m.20min.ch" />
3318
<target host="mediadaten.20min.ch" />
3419
<target host="mediakit.20min.ch" />
3520

36-
<exclusion pattern="^http://www\.20min\.ch/$" />
37-
<exclusion pattern="^http://m\.20min\.ch/$" />
38-
39-
<test url="http://www.20min.ch/2010/img/navigation/20min_logo.png" />
40-
<test url="http://m.20min.ch/webapp/img/de/logo.png" />
41-
<test url="http://www.20min.ch/printpdf/" />
42-
<test url="http://m.20min.ch/printpdf/" />
43-
44-
<rule from="^http://www\.20min\.ch/2010/" to="https://www.20min.ch/2010/" />
45-
<rule from="^http://m\.20min\.ch/webapp/" to="https://m.20min.ch/webapp/" />
46-
<rule from="^http://www\.20min\.ch/printpdf/" to="https://www.20min.ch/printpdf/" />
47-
<rule from="^http://m\.20min\.ch/printpdf/" to="https://m.20min.ch/printpdf/" />
21+
<securecookie host=".+" name=".+" />
4822

49-
<rule from="^http://(api|mediadaten|mediakit)\.20min\.ch/"
50-
to="https://$1.20min.ch/" />
23+
<rule from="^http:" to="https:" />
5124
</ruleset>

utils/ruleset-whitelist.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ b6bdbab95a01ef36c81f06cc64afc02bdaeb2e3eda1a7bb5d08e75723b18d58c,1,1,1c-bitrix.r
88
41003b900cf58a494e7fd80ce52ad63458c5d7b1ca7ef00ca013345bc3897dfb,0,1,1nsk.ru-problematic.xml
99
4d7ea51ecce8ef52d7f14fe3d2196e7647c347ae491a8c51ff84555426f4c05b,0,1,1phads.com.xml
1010
55b1ea082e1da07a13ef7bca833f779a23335658d345294a35e4944b90c5c136,0,1,1TW.org.xml
11+
90eb41e8d88050aa97ca1c11ab44213dfee2fe281b5054421cd25c42144c344a,0,1,20min.ch.xml
1112
d5e0185eea0bec011afe6fbe1b9db732939209a70d73a6bbe38e6b12311282cc,0,1,24-7_Customer.xml
1213
4209813635498e7b1f9c944d648173507b41e0e3260e16b3fdb6f3f945ffc28a,1,1,24-7-Media.xml
1314
a17a8a5bd129ea9a79f7c6d799d48fdd65cd41a3d68f588851130e5dab380c89,1,1,2GIS.ru.xml

0 commit comments

Comments
 (0)