Skip to content

Commit 1f17e67

Browse files
jshajsha
committed
Merge branch 'master' into disable-rulesets-june-2015-a
2 parents f50bcb9 + 6785e83 commit 1f17e67

File tree

9 files changed

+73
-78
lines changed

9 files changed

+73
-78
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@ Non-2xx HTTP code: http://ec2.images-amazon.com/ (200) => https://images-na.ssl-
125125
Breaks soundsjustlike.com audio:
126126
-->
127127
<exclusion pattern="^http://badracket-website\.s3\.amazonaws\.com/swf/soundmanager\d_flash\d\.swf" />
128+
<!--
129+
Breaks premiumbeat.com preview player
130+
-->
131+
<exclusion pattern="^http://s3\.amazonaws\.com/pb_(sfx_)?previews/" />
132+
128133
<!--
129134
https://trac.torproject.org/projects/tor/ticket/7857
130135
@@ -324,6 +329,7 @@ Non-2xx HTTP code: http://ec2.images-amazon.com/ (200) => https://images-na.ssl-
324329
<test url="http://darkskysatellitemaps.s3.amazonaws.com/" />
325330
<test url="http://ecx.images-amazon.com/" />
326331
<test url="http://amazon-zg.s3.amazonaws.com/" />
327-
332+
<test url="http://s3.amazonaws.com/pb_previews/" />
333+
<test url="http://s3.amazonaws.com/pb_sfx_previews/" />
328334

329335
</ruleset>

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,23 @@ Non-2xx HTTP code: http://appspot.com/ (200) => https://appspot.com/ (404)
1414
Redirects to http for some reason.
1515
-->
1616
<exclusion pattern="^http://photomunchers\.appspot\.com/" />
17+
<test url="http://photomunchers.appspot.com/" />
18+
<!--
19+
Starbucks captive portals use this name internally,
20+
but don't have a local key / cert for it (which is a
21+
good thing). If we rewrite to HTTPS, we break access
22+
to the captive portal, making it impossible to get
23+
access to the Internet.
24+
https://github.com/EFForg/https-everywhere/issues/1958#issuecomment-113695158
25+
-->
26+
<exclusion pattern="^http://sbux-portal\.appspot\.com/" />
27+
<test url="http://sbux-portal.appspot.com/" />
1728

1829

1930
<securecookie host="^.+\.appspot\.com$" name=".+" />
2031

2132

22-
<rule from="^http://([^@:\./]+\.)?appspot\.com/"
23-
to="https://$1appspot.com/" />
33+
<rule from="^http:"
34+
to="https:" />
2435

25-
</ruleset>
36+
</ruleset>

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

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@
3131
3232
- euw ¹
3333
- na ¹
34+
- forums.(na|euw) ¹
3435
- community.na ²
3536
- competitive.na ³
3637
37-
¹ Redirects to http, valid cert
38+
¹ 500
3839
² Refused
3940
³ 503, akamai
4041
@@ -45,14 +46,16 @@
4546
- gameinfo.euw ¹
4647
- gameinfo.na ¹
4748
- prized.na ²
49+
- metrics ³
50+
- status ³
4851
4952
¹ cloudfront
5053
² Works; mismatched, CN: *.gotpantheon.com
54+
³ mismatch
5155
5256
5357
Partially covered subdomains:
5458
55-
- forums.na *
5659
- signup *
5760
5861
* Some pages redirect to http
@@ -65,6 +68,8 @@
6568
- pbesignup.euw
6669
- pbesignup.na
6770
- support
71+
- account
72+
- ddragon
6873
6974
* → dx0wf1fepagqw.cloudfront.net
7075
@@ -91,28 +96,24 @@
9196
<ruleset name="League of Legends.com (partial)">
9297

9398
<target host="leagueoflegends.com" />
94-
<target host="*.leagueoflegends.com" />
95-
<!--
96-
Redirect to http:
97-
-->
98-
<!--exclusion pattern="^http://forums\.na\.leagueoflegends\.com/board/($|\?)" /-->
99-
<!--exclusion pattern="^http://signup\.leagueoflegends\.com/+((en/home/index|en/signup/redownload|en/signup/redownload)($|\?))" /-->
100-
<!--
101-
Exceptions:
102-
-->
103-
<exclusion pattern="^http://forums\.na\.leagueoflegends\.com/board/riot-assets/" />
104-
<exclusion pattern="^http://signup\.leagueoflegends\.com/+(?!en/signup(?:$|\?|/captcha/)|favicon\.ico|theme/)" />
99+
<target host="signup.leagueoflegends.com" />
100+
<target host="support.leagueoflegends.com" />
101+
<target host="www.leagueoflegends.com" />
102+
<target host="pbesignup.na.leagueoflegends.com" />
103+
<target host="pbesignup.euw.leagueoflegends.com" />
104+
<target host="account.leagueoflegends.com" />
105+
<target host="ddragon.leagueoflegends.com" />
106+
<target host="cdn.leagueoflegends.com" />
105107

106108

107109
<!-- Server sets Secure for:
108110
-->
109111
<!--securecookie host="^support\.leagueoflegends\.com$" name=".+" /-->
110112

111-
112-
<rule from="^http://((?:pbesignup\.(?:euw|na)|forums\.na|signup|support|www)\.)?leagueoflegends\.com/"
113-
to="https://$1leagueoflegends.com/" />
114-
115113
<rule from="^http://cdn\.leagueoflegends\.com/"
116114
to="https://dx0wf1fepagqw.cloudfront.net/" />
115+
116+
<rule from="^http:"
117+
to="https:" />
117118

118119
</ruleset>

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

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
- forum
1818
- tvprogramm
1919
- wetter (cert: plesk; shows default Parallels Plesk page)
20+
- shop
21+
- wissen
2022
2123
-->
2224
<ruleset name="Spiegel (partial)">
@@ -35,10 +37,26 @@
3537
<rule from="^http://(?:cdn\d?\.)?spiegel\.de/"
3638
to="https://www.spiegel.de/" />
3739

38-
<rule from="^http://www\.spiegel\.de/(images/|img/|layout/|static/|staticgen/)"
40+
<rule from="^http://www\.spiegel\.de/(images/|pics/|layout/|static/|staticgen/)"
3941
to="https://www.spiegel.de/$1" />
4042

41-
<rule from="^http://(abo|count|magazin|shop|wissen)\.spiegel\.de/"
43+
<!-- exclude static/flash from rule above to make videos work properly -->
44+
45+
<exclusion pattern="^http://www\.spiegel\.de/static/flash/" />
46+
47+
<rule from="^http://(abo|count|magazin)\.spiegel\.de/"
4248
to="https://$1.spiegel.de/" />
49+
50+
<test url="http://www.spiegel.de/images/image-429070-thumbsmall-mmtp.png" />
51+
<test url="http://www.spiegel.de/pics/43/0,1020,308043,00.jpg" />
52+
<test url="http://www.spiegel.de/layout/jscfg/http/global-V6-7.js" />
53+
<test url="http://www.spiegel.de/static/sys/dimensionspixel.gif" />
54+
<test url="http://www.spiegel.de/staticgen/fussballticker/heatmaps/BUNDESLIGA/201213/18/spiegel_heatmap_138361_35099_440_330.jpg" />
55+
<test url="http://abo.spiegel.de/" />
56+
<test url="http://abo.spiegel.de/" />
57+
<test url="http://count.spiegel.de/" />
58+
<test url="http://magazin.spiegel.de/" />
59+
<test url="http://www.spiegel.de/static/flash/flashvideo/homadconfig.json" />
60+
4361

4462
</ruleset>

‎src/chrome/content/rules/Stack-Exchange.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,6 @@
7070
<!-- Stackoverflow -->
7171
<target host="chat.stackoverflow.com" />
7272
<target host="careers.stackoverflow.com" />
73-
<!-- These two have mixed active content over https - there is also a downgrade rule below -->
74-
<exclusion pattern="^http://careers\.stackoverflow\.com/(cities|employer)"/>
75-
<test url="http://careers.stackoverflow.com/cities/san-francisco/" />
76-
<test url="http://careers.stackoverflow.com/employer/" />
77-
<test url="https://careers.stackoverflow.com/cities/san-francisco/" />
78-
<test url="https://careers.stackoverflow.com/employer/" />
7973
<target host="ja.stackoverflow.com" />
8074
<target host="meta.stackoverflow.com" />
8175
<target host="pt.stackoverflow.com" />
@@ -141,9 +135,6 @@
141135
<!-- Rules -->
142136

143137
<!-- https links from other pages to these will cause MCB for important elements, hence the downgrades -->
144-
<rule from="^https://careers\.stackoverflow\.com/(cities|employer)"
145-
to="http://careers.stackoverflow.com/$1" downgrade="1" />
146-
147138
<rule from="^https://([\w.-]+)\.([\w-]+)\.stackexchange\.com/"
148139
to="http://$1.$2.stackexchange.com/" downgrade="1" />
149140

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ Fetch error: http://auth.startssl.com/ => https://auth.startssl.com/: (35, 'erro
1515
<target host="*.startssl.eu" />
1616
<target host="startssl.us" />
1717
<target host="*.startssl.us" />
18-
<!-- host startcom.org responds neither on 80 nor on 443 -->
18+
<!-- host startcom.org responds neither on 80 nor on 443,
19+
but should be protected from MitM and redirected to https://www.startcom.org -->
20+
<target host="startcom.org" />
1921
<target host="*.startcom.org" />
2022

2123
<!-- since these resources are required for establishing HTTPS connections,
@@ -55,6 +57,11 @@ Fetch error: http://auth.startssl.com/ => https://auth.startssl.com/: (35, 'erro
5557
<test url="http://www.startssl.org/" />
5658
<test url="http://www.startssl.eu/" />
5759
<test url="http://www.startssl.us/" />
60+
61+
<test url="http://startcom.org/" />
5862

63+
<!-- host startcom.org responds neither on 80 nor on 443,
64+
but should be protected from MitM and redirected to https://www.startcom.org -->
65+
<rule from="^http://startcom\.org/" to="https://www.startcom.org/" />
5966
<rule from="^http:" to="https:" />
6067
</ruleset>

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

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,4 @@
11
<!--
2-
NB: Tor users cannot view* this website due to CloudFlare settings.
3-
4-
See:
5-
6-
- https://blog.torproject.org/blog/call-arms-helping-internet-services-accept-anonymous-users
7-
- https://support.cloudflare.com/hc/en-us/articles/203306930-Does-CloudFlare-block-Tor-
8-
- https://support.cloudflare.com/hc/en-us/articles/200170206-How-do-I-turn-I-m-Under-Attack-mode-on-
9-
10-
* without enabling javascript, for security and privacy implications see e.g.:
11-
12-
- https://www.mozilla.org/security/known-vulnerabilities/firefox.html
13-
- https://trac.torproject.org/projects/tor/query?status=!closed&keywords=~tbb-fingerprinting
14-
- https://panopticlick.eff.org
15-
162
173
Fully covered domains:
184
@@ -28,7 +14,6 @@
2814
2915
* Per-account domains
3016
31-
3217
Insecure cookies are set for these domains:
3318
3419
- .tilt.com
@@ -39,18 +24,13 @@
3924
<target host="tilt.com" />
4025
<target host="*.tilt.com" />
4126

42-
<test url="http://blog.tilt.com/" />
43-
<test url="http://open.tilt.com/" />
44-
<test url="http://questions.tilt.com/" />
45-
<test url="http://www.tilt.com/" />
46-
47-
48-
<!-- CloudFlare cookies:
49-
-->
50-
<!--securecookie host="^\.tilt\.com$" name="^(__cfduid|cf_clearance)$" /-->
51-
52-
<securecookie host="^\.tilt\.com$" name="^(?:__cfduid|cf_clearance)$" />
27+
<exclusion pattern="^http://stories\.tilt\.com" />
28+
<exclusion pattern="^http://engineering\.tilt\.com" />
5329

30+
<test url="http://blog.tilt.com/" />
31+
<test url="http://open.tilt.com/" />
32+
<test url="http://questions.tilt.com/" />
33+
<test url="http://www.tilt.com/" />
5434

5535
<rule from="^http://([\w-]+\.)?tilt\.com/"
5636
to="https://$1tilt.com/" />

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ Fetch error: http://ganglia.wmflabs.org/ => https://ganglia.wmflabs.org/: (6, 'C
114114

115115
<!-- Wikimedia Tool Labs -->
116116
<target host="tools.wmflabs.org" />
117-
<target host="icinga.wmflabs.org" />
118-
<target host="ganglia.wmflabs.org" />
119117
<target host="accounts.wmflabs.org" />
120118
<target host="reportcard.wmflabs.org" />
121119

0 commit comments

Comments
 (0)