Skip to content

Commit 977756a

Browse files
committed
Merge branch 'master' of github.com:EFForg/https-everywhere
2 parents a63032f + bb3bec3 commit 977756a

336 files changed

Lines changed: 7406 additions & 1221 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/chrome/content/rules/21_Century_Rims.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<ruleset name="2 Ton.com.au">
2+
3+
<!-- Direct rewrites:
4+
-->
5+
<target host="2ton.com.au" />
6+
<target host="www.2ton.com.au" />
7+
8+
9+
<rule from="^http:"
10+
to="https:" />
11+
12+
</ruleset>

src/chrome/content/rules/38degrees.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
- you
55
66
-->
7-
<ruleset name="38degrees">
7+
<ruleset name="38degrees.org.uk">
8+
<target host="secure.38degrees.org.uk" />
89
<target host="you.38degrees.org.uk" />
910

1011
<!-- Not secured by server:
@@ -13,6 +14,6 @@
1314

1415
<securecookie host="^(?:.*\.)?38degrees\.org\.uk$" name=".+" />
1516

16-
<rule from="^http://([^/:@]+)?\.38degrees\.org\.uk/"
17-
to="https://$1.38degrees.org.uk/" />
17+
<rule from="^http:"
18+
to="https:" />
1819
</ruleset>

src/chrome/content/rules/42Floors.com.xml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
* WP Engine
77
88
9-
Fully covered subdomains:
10-
11-
- (www.)?
12-
- cdn
13-
- images
14-
15-
169
Insecure cookes are set for these hosts:
1710
1811
- 42floors.com
@@ -21,9 +14,13 @@
2114
2215
Mixed content:
2316
24-
- Images on (www.)? from cdn *
17+
- Images, on:
2518
26-
* Secured by us
19+
- ^ from blog.42floors.com ¹
20+
- ^ from \d.gravatar.com ²
21+
22+
¹ Unsecurable <= WP Engine
23+
² Secured by us
2724
2825
-->
2926
<ruleset name="42Floors.com (partial)">
@@ -33,10 +30,14 @@
3330
<target host="images.42floors.com" />
3431
<target host="www.42floors.com" />
3532

33+
<!-- Mixed images:
34+
-->
35+
<test url="http://42floors.com/blog/cre/landlords-are-trying-not-to-rent-startups" />
36+
3637

3738
<!-- Not secured by server:
3839
-->
39-
<!--securecookie host="^(www\.)?42floors\.com$" name="^(_spire_session|SERVERID)$" /-->
40+
<!--securecookie host="^(www\.)?42floors\.com$" name="^SERVERID$" /-->
4041

4142
<securecookie host="^(?:www\.)?42floors\.com$" name=".+" />
4243

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<!--
2+
Nonfunctional hosts in *4kdownload.com:
3+
4+
- downloads *
5+
6+
* 404
7+
8+
9+
These altnames don't exist:
10+
11+
- www.static.4kdownload.com
12+
13+
-->
14+
<ruleset name="4K Download.com (partial)">
15+
16+
<!-- Direct rewrites:
17+
-->
18+
<target host="4kdownload.com" />
19+
<target host="static.4kdownload.com" />
20+
<target host="www.4kdownload.com" />
21+
22+
23+
<rule from="^http:"
24+
to="https:" />
25+
26+
</ruleset>

src/chrome/content/rules/A2_Hosting.xml

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,51 @@
44
- community (no https)
55
66
7+
Problematic hosts in *a2hosting.com:
8+
9+
- piwik *
10+
11+
* Untrusted root
12+
13+
14+
Insecure cookies are set for these domains and hosts:
15+
16+
- .a2hosting.com
17+
- my.a2hosting.com
18+
- partners.a2hosting.com
19+
- www.a2hosting.com
20+
21+
722
Mixed content:
823
924
- Image on partners from www *
1025
1126
* Secured by us
1227
1328
-->
14-
<ruleset name="A2 Hosting (partial)">
29+
<ruleset name="A2 Hosting.com (partial)">
1530

31+
<!-- Direct rewrites:
32+
-->
1633
<target host="a2hosting.com" />
17-
<target host="*.a2hosting.com" />
34+
<target host="my.a2hosting.com" />
35+
<target host="partners.a2hosting.com" />
36+
<!--target host="piwik.a2hosting.com" /-->
37+
<target host="www.a2hosting.com" />
38+
1839

40+
<!-- Not secured by server:
41+
-->
42+
<!--securecookie host="\.a2hosting\.com$" name="^(?:__cfduid|cf_clearance)$" /-->
43+
<!--securecookie host="my\.a2hosting\.com$" name="^WHMCS\w+$" /-->
44+
<!--securecookie host="partners\.a2hosting\.com$" name="^_s$" /-->
45+
<!--securecookie host="www\.a2hosting\.com$" name="^(?:PHPSESSID|exp_csrf_token|exp_last_activity|exp_last_visit|exp_tracker)$" /-->
1946

47+
<securecookie host="\.a2hosting\.com$" name="^(?:__cfduid|cf_clearance)$" />
2048
<securecookie host=".+\.a2hosting\.com$" name=".+" />
2149

2250

23-
<rule from="^http://((?:my|partners|www)\.)?a2hosting\.com/"
24-
to="https://$1a2hosting.com/" />
51+
<rule from="^http:"
52+
to="https:" />
2553

2654
</ruleset>
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!--
2+
Insecure cookies are set for these domains and hosts:
3+
4+
- .aei.org
5+
- www.aei.org
6+
7+
-->
8+
<ruleset name="AEI.org">
9+
10+
<!-- Direct rewrites:
11+
-->
12+
<target host="aei.org" />
13+
<target host="www.aei.org" />
14+
15+
16+
<!-- Not secured by server:
17+
-->
18+
<!--securecookie host="^aei\.org$" name="^wfvt_\d+$" /-->
19+
<!--securecookie host="^\.aei\.org$" name="^(?:__cfduid|cf_clearance)$" /-->
20+
21+
<securecookie host="^\.?aei\.org$" name=".+" />
22+
23+
24+
<rule from="^http:"
25+
to="https:" />
26+
27+
</ruleset>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<ruleset name="A Weird Imagination.net">
2+
3+
<!-- Direct rewrites:
4+
-->
5+
<target host="aweirdimagination.net" />
6+
<target host="www.aweirdimagination.net" />
7+
8+
9+
<rule from="^http:"
10+
to="https:" />
11+
12+
</ruleset>
Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
11
<!--
2-
Mixed content:
2+
^aaai.org: Mismatched
33
4-
- Scripts:
5-
6-
- on www from www *
7-
- on www from www.google.com *
8-
9-
- css:
10-
11-
- on www from www *
4+
-->
5+
<ruleset name="AAAI.org">
126

13-
* Secured by us
7+
<!-- Direct rewrites:
8+
-->
9+
<target host="www.aaai.org" />
1410

11+
<!-- Complications:
12+
-->
13+
<target host="aaai.org" />
1514

16-
NB: We secure all resources, and thus
17-
platform should be removed with Ffx 24.
15+
<rule from="^http://aaai\.org/"
16+
to="https://www.aaai.org/" />
1817

19-
-->
20-
<ruleset name="Aaai.org" platform="mixedcontent">
21-
<target host="aaai.org" />
22-
<target host="www.aaai.org" />
18+
<rule from="^http:"
19+
to="https:" />
2320

24-
<rule from="^http://(?:www\.)?aaai\.org/" to="https://www.aaai.org/" />
2521
</ruleset>
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!--
2+
For other Google coverage, see GoogleServices.xml
3+
4+
-->
5+
<ruleset name="abc.xyz">
6+
7+
<!-- Direct rewrites:
8+
-->
9+
<target host="abc.xyz" />
10+
<target host="www.abc.xyz" />
11+
12+
13+
<rule from="^http:"
14+
to="https:" />
15+
16+
</ruleset>

0 commit comments

Comments
 (0)