Skip to content

Commit 61e557b

Browse files
jshajsha
committed
Merge branch '4.0' of github.com:EFForg/https-everywhere into 4.0
2 parents e79bff4 + efcc078 commit 61e557b

14 files changed

+146
-50
lines changed

‎src/chrome/content/rules/Bet365-Group.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
<!-- !functional:
22
- imstore (banners included on 3rd-party websites)
3+
- members.bet365.com ²
4+
5+
² Blank page
6+
37
-->
48
<ruleset name="bet365 Group (partial)">
59

610
<target host="bet365.com"/>
7-
<target host="*.bet365.com"/>
11+
<target host="www.bet365.com"/>
812
<target host="bet365affiliates.com"/>
913
<target host="www.bet365affiliates.com"/>
1014

@@ -14,9 +18,6 @@
1418
<rule from="^http://(?:www\.)?bet365\.com/"
1519
to="https://www.bet365.com/"/>
1620

17-
<rule from="^http://members\.bet365\.com/"
18-
to="https://members.bet365.com/"/>
19-
2021
<rule from="^http://(?:www\.)?bet365affiliates\.com/"
2122
to="https://www.bet365affiliates.com/"/>
2223

‎src/chrome/content/rules/Blockchain.info.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<!--
2+
blog is handled in WordPress-blogs.xml.
3+
4+
5+
Problematic subdomains:
6+
7+
- blog *
8+
9+
* Wordpress
10+
11+
12+
Observed cookie domains:
13+
14+
- . ¹
15+
- markets ²
16+
17+
¹ Some secured by server, others by us
18+
² Secured by us
19+
20+
-->
21+
<ruleset name="Blockchain.info">
22+
23+
<target host="blockchain.info" />
24+
<target host="*.blockchain.info" />
25+
26+
27+
<!-- Not secured by server:
28+
-->
29+
<!--securecookie host="^markets\.blockchain\.info$" name="^_bitcoinity_session$" /-->
30+
31+
<securecookie host="^(?:markets)?\.blockchain\.info$" name=".+" />
32+
33+
34+
<rule from="^http://((?:markets|static|www)\.)?blockchain\.info/"
35+
to="https://$1blockchain.info/" />
36+
37+
</ruleset>
38+
<!-- Rule generated by HTTPS Finder 0.85 -->

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
<securecookie host="^\.cdt\.org$" name=".*" />
1111

1212

13-
<!-- Cert only matches www. -->
14-
<rule from="^https?://(?:www\.)?cdt\.org/"
15-
to="https://www.cdt.org/" />
13+
<rule from="^http://(www\.)?cdt\.org/"
14+
to="https://$1cdt.org/" />
1615

1716
<rule from="^http://(www\.)?notwithoutawarrant\.com/"
1817
to="https://$1notwithoutawarrant.com/" />

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

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,16 @@
11
<ruleset name="Cloudfront">
2-
<target host="www.cloudfront.net" />
2+
<target host="cloudfront.net" />
33
<target host="*.cloudfront.net" />
44

55
<rule from="^http://([^/:@\.]+)\.cloudfront\.net/" to="https://$1.cloudfront.net/"/>
6-
<!-- Deal with https://trac.torproject.org/projects/tor/ticket/6848 -->
7-
<exclusion pattern="^http://d1b14unh5d6w7g\.cloudfront\.net" />
8-
<!-- https://trac.torproject.org/projects/tor/ticket/7020 -->
9-
<exclusion pattern="^http://d1i6vahw24eb07\.cloudfront\.net" />
10-
<!-- C-SPAN videos: https://trac.torproject.org/projects/tor/ticket/7567 -->
11-
<exclusion pattern="^http://d1k4es7bw1lvxt\.cloudfront\.net" />
12-
<!-- this unbreaks turntable.fm and probably many other things-->
13-
<exclusion pattern="^http://d1bw0qpdrmjlhz\.cloudfront\.net" />
14-
<!--
15-
This breaks padlet.com wall:
166

17-
https://trac.torproject.org/projects/tor/ticket/9146
7+
<!--
8+
and this is a generalised precaution from turntable.fm
189
-->
19-
<exclusion pattern="^http://d2s8n7nv9yizdf\.cloudfront\.net/assets/extras-\w{32}\.js" />
20-
<!-- and this is a generalised precaution from turntable.fm -->
21-
<exclusion pattern="^http://([^/:@\.]+)\.cloudfront\.net/crossdomain\.xml" />
22-
<!-- Spotify https://trac.torproject.org/projects/tor/ticket/7888 -->
23-
<exclusion pattern="^http://dsu0uct5x2puz\.cloudfront\.net" />
24-
<!-- Droplr: https://trac.torproject.org/projects/tor/ticket/8572 -->
25-
<exclusion pattern="^http://d1zjcuqflbd5k\.cloudfront\.net" />
26-
<!-- TuneIn: https://trac.torproject.org/projects/tor/ticket/8704 -->
27-
<exclusion pattern="^http://d3bwsr3zpy54hy\.cloudfront\.net" />
28-
<!-- Amazon mp3: https://trac.torproject.org/projects/tor/ticket/9367
29-
https://trac.torproject.org/projects/tor/ticket/9851 -->
30-
<exclusion pattern="^http://d2q1srilgjznst\.cloudfront\.net" />
31-
<exclusion pattern="^http://d28julafmv4ekl\.cloudfront\.net" />
10+
<exclusion pattern="^http://(?:[^/:@\.]+)\.cloudfront\.net/crossdomain\.xml" />
3211

33-
<!-- Panelsyndicate: https://github.com/EFForg/https-everywhere/issues/650 -->
34-
<exclusion pattern="^http://d2h7a0a3c1074f\.cloudfront\.net" />
12+
<!-- See https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/private-content-creating-signed-url-custom-policy.html
13+
Policies contain the protocol, so a signature for http will not work for https
14+
-->
15+
<exclusion pattern="&amp;Signature=" />
3516
</ruleset>

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
1-
<ruleset name="Eventbrite">
1+
<!--
2+
Nonfunctional domains:
3+
4+
- help.eventbrite.co.uk *
5+
6+
* Refused
7+
8+
-->
9+
<ruleset name="Eventbrite (partial)">
210

311
<target host="eventbrite.com" />
412
<target host="*.eventbrite.com" />
513
<target host="eventbrite.co.uk" />
614
<target host="*.eventbrite.co.uk" />
15+
<exclusion pattern="^http://help\.eventbrite\.co\.uk/" />
716

817
<!--
918
https://trac.torproject.org/projects/tor/ticket/8056

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
favicon picked simply because it is
2727
(or should be) innocuous:
2828
-->
29-
<rule from="^http://www\.fasthosts\.co\.uk/js/track\.js"
29+
<rule from="^https://www\.fasthosts\.co\.uk/js/track\.js"
3030
to="https://www.fasthosts.co.uk/favicon.ico" />
3131

3232
<!-- Cert only matches www. -->

‎src/chrome/content/rules/Hewlett-Packard.xml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@
2020
2121
² http reply
2222
23+
24+
Partially covered domains:
25+
26+
- store.hp.com *
27+
28+
* Some pages redirect to http
29+
30+
2331
-->
2432
<ruleset name="HP (buggy?)" default_off="testing">
2533

@@ -30,7 +38,7 @@
3038
<target host="secure.hp-ww.com" />
3139
<target host="hp.com" />
3240
<target host="*.hp.com" />
33-
<exclusion pattern="^http://h22207\.austin\.hp\.com" />
41+
<exclusion pattern="^http://(?:h(?:22166|22207|30499|30507|50146|71000)\.austin|hpl|reimagine)\.hp\.com" />
3442

3543
<exclusion pattern="^http://m\.hp\.com"/>
3644
<exclusion pattern="^http://welcome\.hp\.com"/>
@@ -41,6 +49,11 @@
4149
<exclusion pattern="^http://h30261\.www3\.hp\.com"/>
4250
<exclusion pattern="^http://h30434\.www3\.hp\.com"/>
4351

52+
<!--
53+
At least some redirects 404:
54+
-->
55+
<exclusion pattern="^http://shopping1\.hp\.com/(?!is-bin/)" />
56+
<exclusion pattern="^http://store\.hp\.com/webapp/wcs/stores/servlet(?:$|[?/])" />
4457
<!--
4558
404 over https:
4659
-->

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
- view.e ³
5050
- graphs ²
5151
- planet ²
52+
- mig ²
5253
- releases ³
5354
- sfx-images ² (banners)
5455
- start ²
@@ -264,7 +265,7 @@
264265
<!--
265266
https://mail1.eff.org/pipermail/https-everywhere-rules/2013-July/001649.html
266267
-->
267-
<exclusion pattern="^http://(?:bonsai|browserquest|trychooser\.pub\.build|dxr|graphs|krakenbenchmark|planet|releases|sfx-images|start|telemetry|w(?:ebsite|ww)-archive)\.mozilla\.org/" />
268+
<exclusion pattern="^http://(?:bonsai|browserquest|trychooser\.pub\.build|dxr|graphs|krakenbenchmark|mig|planet|releases|sfx-images|start|telemetry|w(?:ebsite|ww)-archive)\.mozilla\.org/" />
268269
<!--
269270
Breaks newsletter:
270271

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@
55
- forum
66
- kb
77
8+
9+
Problematic domains:
10+
11+
- parallels.com *
12+
13+
* Mismatched, CN: sp.parallels.com
14+
815
-->
916
<ruleset name="Parallels (partial)">
1017

@@ -15,8 +22,8 @@
1522
<securecookie host="^store\.parallels\.com$" name=".*"/>
1623

1724

18-
<rule from="^http://(www\.)?parallels\.com/(favicon\.ico|file(admin|s)/|r/|typo3(conf|temp)/)"
19-
to="https://$1parallels.com/$2"/>
25+
<rule from="^http://(?:www\.)?parallels\.com/(favicon\.ico|file(admin|s)/|r/|typo3(conf|temp)/)"
26+
to="https://www.parallels.com/$1"/>
2027

2128
<rule from="^http://blogs\.parallels\.com/"
2229
to="https://parallelsblog.squarespace.com/"/>

‎src/chrome/content/rules/Princeton.edu.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ruleset name="Princeton.edu">
1+
<ruleset name="Princeton.edu (buggy)" default_off="buggy">
22

33
<target host="princeton.edu" />
44
<target host="*.princeton.edu" />

0 commit comments

Comments
 (0)