Skip to content

Commit 2db290c

Browse files
author
MB
committed
Merge remote-tracking branch 'efforg/master'
2 parents d2b7ca2 + 2a717ae commit 2db290c

File tree

11 files changed

+121
-74
lines changed

11 files changed

+121
-74
lines changed

‎src/chrome/content/rules/Greenpeace-Energy.de.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<ruleset name= "Greenpeace-Energy.de">
2+
<target host= "greenpeace-energy.de" />
3+
<target host="www.greenpeace-energy.de" />
4+
5+
<securecookie host="\.?www\.greenpeace-energy\.de$" name=".*" />
6+
7+
<rule from="^https?://greenpeace-energy\.de/"
8+
to="https://www.greenpeace-energy.de/" />
9+
<rule from="^http:"
10+
to="https:" />
11+
</ruleset>

‎src/chrome/content/rules/Greenpeace-magazin.de.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<ruleset name= "Greenpeace-Magazin.de">
2+
<target host= "greenpeace-magazin.de" />
3+
<target host="www.greenpeace-magazin.de" />
4+
5+
<securecookie host="^(.*\.)?greenpeace-magazin\.de$" name=".*" />
6+
7+
<rule from="^http:"
8+
to="https:" />
9+
</ruleset>

‎src/chrome/content/rules/Greenpeace.de.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<ruleset name="Greenpeace.de">
2+
<target host="greenpeace.de" />
3+
<target host="www.greenpeace.de" />
4+
5+
<rule from="^https?://greenpeace\.de/"
6+
to="https://www.greenpeace.de/" />
7+
<rule from="^http:"
8+
to="https:" />
9+
</ruleset>

‎src/chrome/content/rules/Hitbox.tv.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
<ruleset name="hitbox.tv">
1+
<!--
2+
Disabled per https://github.com/EFForg/https-everywhere/issues/1616
3+
Site doesn't load properly, just keeps reloading/redirecting
4+
-->
5+
<ruleset name="hitbox.tv" default_off="broken">
26
<target host="www.hitbox.tv" />
37

48
<rule from="^http:"

‎src/chrome/content/rules/Lookback.io.xml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://www.lookback.io/ => https://www.lookback.io/: (7, 'Failed to connect to www.lookback.io port 443: No route to host')
4-
-->
5-
<ruleset name="Lookback.io" default_off='failed ruleset test'>
6-
1+
<ruleset name="Lookback.io">
72
<target host="lookback.io" />
83
<target host="www.lookback.io" />
94

10-
11-
<rule from="^http://(www\.)?lookback\.io/"
12-
to="https://$1lookback.io/" />
13-
5+
<rule from="^http:"
6+
to="https:" />
147
</ruleset>

‎src/chrome/content/rules/Mythic-Beasts.xml‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,31 @@
11
<!--
2-
Nonfunctional subdomains:
2+
Mythic Beasts
33
4-
- blog ¹
5-
- status (shows wiki)
4+
Nonfunctional subdomains:
5+
- blog ¹
6+
¹ Redirects to www
67
7-
¹ Redirects to www
8-
9-
10-
Fully covered subdomains:
11-
12-
- (www.)
13-
- ctrlpanel
14-
- secure
15-
- static
16-
- wiki
8+
Fully covered subdomains:
179
10+
- (www.)
11+
- ctrlpanel
12+
- secure
13+
- static
14+
- wiki
1815
-->
19-
<ruleset name="Mythic Beasts (partial)">
20-
21-
<target host="mythic-beasts.com" />
22-
<target host="*.mythic-beasts.com" />
23-
24-
25-
<!-- Not secured by server:
26-
-->
27-
<!--securecookie host="^\.mythic-beasts\.com$" name="^(acct|id)$" /-->
28-
29-
<securecookie host="^\w+\.mythic-beasts\.com$" name=".*" />
16+
<ruleset name="Mythic Beasts">
17+
<target host="mythic-beasts.com" />
18+
<target host="www.mythic-beasts.com" />
19+
<target host="ctrlpanel.mythic-beasts.com" />
20+
<target host="secure.mythic-beasts.com" />
21+
<target host="static.mythic-beasts.com" />
22+
<target host="status.mythic-beasts.com" />
23+
<target host="wiki.mythic-beasts.com" />
3024

25+
<!-- Not secured by server: -->
26+
<!--securecookie host="^\.mythic-beasts\.com$" name="^(acct|id)$" /-->
27+
<securecookie host="^\w+\.mythic-beasts\.com$" name=".*" />
3128

32-
<rule from="^http://((?:ctrlpanel|secure|static|wiki|www)\.)?mythic-beasts\.com/"
33-
to="https://$1mythic-beasts.com/$1" />
3429

30+
<rule from="^http:" to="https:" />
3531
</ruleset>

‎src/chrome/content/rules/Streamfarm.net.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<ruleset name="Streamfarm.net">
2+
<target host="*.core.cdn.streamfarm.net" />
3+
4+
<test url="http://c1000305-o.p.core.cdn.streamfarm.net/" />
5+
<test url="http://c13009-l.l.core.cdn.streamfarm.net/" />
6+
<test url="http://c17001-o.l.core.cdn.streamfarm.net/" />
7+
<test url="http://c20004-o.l.core.cdn.streamfarm.net/" />
8+
<test url="http://c22033-o.p.core.cdn.streamfarm.net/" />
9+
<test url="http://c31001-o.l.core.cdn.streamfarm.net/" />
10+
11+
<rule from="^http:" to="https:" />
12+
</ruleset>

‎src/chrome/content/rules/TV1.eu.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<ruleset name="TV1.eu">
2+
<target host="player.cdn.tv1.eu" />
3+
<test url="http://player.cdn.tv1.eu/player/macros/brtv/tksplayer.js" />
4+
<rule from="^http:" to="https:" />
5+
</ruleset>

‎src/chrome/content/rules/UU.se.xml‎

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,70 @@
11
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://uu.se/ => https://www.uu.se/: (6, 'Could not resolve host: uu.se')
42
Uppsala university
53
64
75
Nonfunctional subdomains:
86
9-
- (www.)astro *
10-
- user.it *
7+
- www.astro ⁴
8+
- user.it ¹
9+
- www.listserv ³
10+
- www.math ³
11+
- static ³
1112
- www.uaf ²
13+
- www.uuinnovation ³
1214
13-
* Dropped
15+
¹ Dropped
1416
² Handshake fails
17+
³ Mismatched
18+
⁴ No local issuer cert provided
19+
20+
21+
Other domains not covered:
22+
23+
- boxer.bmc ¹
24+
- filer.student ¹
25+
26+
¹ Does not respond on port 80 (but does on 443)
1527
1628
1729
Fully covered subdomains:
1830
19-
- (www.) (^ → www)
31+
- ^
32+
- www
2033
- filer.anst
21-
- www.anst
22-
- boxer.bmc
23-
- it.bmc
2434
- dropbox
25-
- helpdesk
2635
- www.it
27-
- www.listserv
28-
- filer.student
29-
- home.student
30-
- mail.teknik
31-
- tor.uadm
36+
- lists
37+
- mail
38+
- www.physics
39+
- uadm
3240
- www.uppmax
33-
- www.uuinnovation
3441
- webmail
3542
- www-hotel
3643
3744
3845
Insecure cookies are set for these domains:
3946
4047
- www.it
41-
42-
43-
Not all subdomains suports ssl, here are those that do.
44-
45-
-->
46-
<ruleset name="UU.se" platform="mixedcontent" default_off='failed ruleset test'>
48+
-->
49+
<ruleset name="UU.se">
4750

4851
<target host="uu.se" />
49-
<target host="*.uu.se" />
50-
51-
52-
<!-- Not secured by server:
53-
-->
54-
<!--securecookie host="^www\.it\.uu\.se$" name="^PHPSESSID$" /-->
52+
<target host="www.uu.se" />
53+
<target host="filer.anst.uu.se" />
54+
<target host="dropbox.uu.se" />
55+
<target host="www.it.uu.se" />
56+
<target host="lists.uu.se" />
57+
<target host="mail.uu.se" />
58+
<target host="www.physics.uu.se" />
59+
<target host="uadm.uu.se" />
60+
<target host="www.uppmax.uu.se" />
61+
<target host="webmail.uu.se" />
62+
<target host="www-hotel.uu.se" />
5563

5664
<securecookie host="^www\.it\.uu\.se$" name=".+" />
5765

58-
59-
<rule from="^http://(?:www\.)?uu\.se/"
60-
to="https://www.uu.se/" />
61-
62-
<rule from="^http://((?:filer|www)\.anst|(?:boxer|it)\.bmc|dropbox|filer|helpdesk|www\.it|www\.listserv|(?:filer|home)\.student|mail\.teknik|tor\.uadm|www\.uppmax|www\.uuinnovation|webmail|www-hotel)\.uu\.se/"
63-
to="https://$1.uu.se/" />
66+
<rule from="^http:"
67+
to="https:" />
6468

6569
</ruleset>
6670

‎src/chrome/content/rules/YourBittorrent.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,22 @@
99
1010
Problematic subdomains:
1111
12+
- www (certificate name mismatch)
1213
- i (404)
1314
1415
-->
1516
<ruleset name="YourBittorrent">
1617

1718
<target host="yourbittorrent.com" />
18-
<target host="*.yourbittorrent.com" />
19+
<target host="i.yourbittorrent.com" />
20+
<target host="www.yourbittorrent.com" />
1921

2022

2123
<securecookie host="^\.yourbittorrent\.com$" name=".+" />
2224

2325

2426
<rule from="^http://(www\.)?yourbittorrent\.com/"
25-
to="https://$1yourbittorrent.com/" />
27+
to="https://yourbittorrent.com/" />
2628

2729
<rule from="^http://i\.yourbittorrent\.com/"
2830
to="https://yourbittorrent.com/images/" />

0 commit comments

Comments
 (0)