Skip to content

Commit 8e27980

Browse files
jshajsha
committed
Merge github.com:jsha/https-everywhere into rewriter
2 parents 0487a4a + e2ae194 commit 8e27980

File tree

85 files changed

+1522
-237
lines changed

Some content is hidden

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

85 files changed

+1522
-237
lines changed

‎src/chrome/content/rules/10gen.xml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
<!--
2+
Other 10gen rulesets:
3+
4+
- MongoDB.com.xml
5+
- MongoDB.org.xml
6+
7+
28
Nonfunctional subdomains:
39
410
- blog
@@ -8,16 +14,9 @@
814

915
<target host="10gen.com" />
1016
<target host="*.10gen.com" />
11-
<target host="jira.mongodb.org" />
12-
13-
14-
<securecookie host="^jira\.mongodb\.org$" name=".*" />
1517

1618

1719
<rule from="^http://(mms\.|www\.)?10gen\.com/"
1820
to="https://$110gen.com/" />
1921

20-
<rule from="^http://jira\.mongodb\.org/"
21-
to="https://jira.mongodb.org/" />
22-
2322
</ruleset>

‎src/chrome/content/rules/4chan.xml‎

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11
<!--
2-
Nonfunctional subdomains:
2+
Nonfunctional domains:
33
4-
- status (Hosted on Blogger, shows Google 404 page)
4+
- status.4chan.org (interrupted - blogger)
55
6-
-->
7-
<ruleset name="4chan (partial)">
86
9-
<target host="4chan.org" />
10-
<target host="*.4chan.org" />
11-
<!--
12-
404
13-
-->
14-
<exclusion pattern="^http://status\." />
15-
<target host="*.boards.4chan.org" />
16-
<target host="*.thumbs.4chan.org" />
17-
<target host="*.4channel.org" />
7+
Fully covered domains:
8+
9+
- 4cdn.org
1810
11+
- *.4cdn.org:
1912
20-
<securecookie host="^.*\.4chan(?:nel)?\.org$" name=".*" />
13+
- s
14+
- t
15+
- www
2116
17+
- 4chan.org
2218
23-
<!-- Observed domains:
19+
- *.4chan.org:
2420
2521
- boards
2622
- content
@@ -32,13 +28,32 @@
3228
- thumbs
3329
- \d.thumbs
3430
- www
35-
-->
36-
<rule from="^http://([\w\.]+\.)?4chan\.org/"
37-
to="https://$14chan.org/" />
3831
39-
<!-- !www doesn't exist.
32+
- (www.)4chan-ads.org
33+
34+
- (www.)4channel.org
35+
36+
-->
37+
<ruleset name="4chan (partial)">
38+
39+
<target host="4cdn.org" />
40+
<target host="*.4cdn.org" />
41+
<target host="4chan.org" />
42+
<target host="*.4chan.org" />
43+
<!--
44+
Blogger:
4045
-->
41-
<rule from="^http://www\.4channel\.org/"
42-
to="https://www.4channel.org/" />
46+
<exclusion pattern="^http://status\." />
47+
<target host="4chan-ads.org" />
48+
<target host="*.4chan-ads.org" />
49+
<target host="4channel.org" />
50+
<target host="*.4channel.org" />
51+
52+
53+
<securecookie host=".*\.4chan(?:-ads|nel)?\.org$" name=".+" />
54+
55+
56+
<rule from="^http://([\w.]+\.)?4c(dn|han|han-ads|hannel)\.org/"
57+
to="https://$14c$2.org/" />
4358

4459
</ruleset>

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<!--
2+
CDN buckets;
3+
4+
- www-cn.avg.com.edgesuite.net
5+
6+
www
7+
8+
9+
Nonfunctional subdomains:
10+
11+
- ^ (dropped)
12+
- www (redirects to http)
13+
14+
15+
Fully covered subdomains:
16+
17+
- inst
18+
19+
- *.inst:
20+
21+
- c04
22+
23+
-->
24+
<ruleset name="AVG.com (partial)">
25+
26+
<target host="*.avg.com" />
27+
28+
29+
<securecookie host="^(?:\w+\.)?inst\.avg\.com$" name=".+" />
30+
31+
32+
<rule from="^http://(\w+\.)?inst\.avg\.com/"
33+
to="https://$1inst.avg.com/" />
34+
35+
</ruleset>

‎src/chrome/content/rules/Akban.org.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!--
2+
CDN buckets:
3+
4+
- c3198132.r32.cf0.rackcdn.com
5+
6+
- images
7+
8+
9+
(www.): dropped
10+
11+
-->
12+
<ruleset name="Akban.org">
13+
14+
<target host="images.akban.org" />
15+
16+
17+
<rule from="^http://images\.akban\.org/"
18+
to="https://c3198132.ssl.cf0.rackcdn.com/" />
19+
20+
</ruleset>

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<ruleset name="Amelia Andersdotter.eu">
2+
3+
<target host="ameliaandersdotter.eu" />
4+
<target host="www.ameliaandersdotter.eu" />
5+
6+
7+
<!-- www redirects to !www over http,
8+
so copy that behavior:
9+
-->
10+
<rule from="^http://(?:www\.)?ameliaandersdotter\.eu/"
11+
to="https://ameliaandersdotter.eu/" />
12+
13+
</ruleset>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
- blog.chaosradio *
77
- dasalte (revoked)
88
- ds (different data)
9+
- static.media (works; mismatched, CN: media.koeln.ccc.de)
910
1011
* Works; mismatched, CN: wiki.chaosradio.ccc.de
1112
@@ -23,4 +24,7 @@
2324
<rule from="^http://([^/:@\.]+)\.ccc\.de/"
2425
to="https://$1.ccc.de/" />
2526

27+
<rule from="^http://static\.media\.ccc\.de/"
28+
to="https://media.ccc.de/" />
29+
2630
</ruleset>

‎src/chrome/content/rules/Clear-Code.org.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<!--
2+
^: cert only matches www
3+
4+
-->
5+
<ruleset name="Clear-Code.org" platform="cacert">
6+
7+
<target host="clear-code.com" />
8+
<target host="www.clear-code.com" />
9+
10+
11+
<rule from="^http://(?:www\.)?clear-code\.com/"
12+
to="https://www.clear-code.com/" />
13+
14+
</ruleset>

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!--
2+
^: mismatched, CN: *.devcloud.acquia-sites.com
3+
data-security: mismatched, CN: *.unbounce.com
4+
5+
-->
6+
<ruleset name="Co3 Sys.com">
7+
8+
<target host="co3sys.com" />
9+
<target host="*.co3sys.com" />
10+
11+
12+
<securecookie host="^app\.co3sys\.com$" name=".+" />
13+
14+
15+
<rule from="^http://(?:www\.)?co3sys\.com/"
16+
to="https://www.co3sys.com/" />
17+
18+
<rule from="^http://app\.co3sys\.com/"
19+
to="https://app.co3sys.com/" />
20+
21+
</ruleset>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
77
Nonfunctional subdomains:
88
9+
- marswatch.astro *
910
- cmsv6.cals *
1011
- hort.cals *
1112
- www.hort *

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<target host="couchbase.com" />
1818
<target host="*.couchbase.com" />
19-
<!--exclusion pattern="^http://(www\.)?couchbase\.com/($|\?|(careers|couchbase-(server-admin-training|services|vs-couchdb)|documentation|downloads(-all)?|leadership|partners|press-releases|white-papers)(?|\?|/)|case-studies/?($|\?))" /-->
19+
<!--exclusion pattern="^http://(www\.)?couchbase\.com/((careers|couchbase-(server-admin-training|services|vs-couchdb)|documentation|downloads(-all)?|leadership|partners|press-releases|white-papers)(?|\?|/)|case-studies/?($|\?))" /-->
2020
<!--exclusion pattern="^http://(www\.)?couchbase\.com/forums/(?!misc/|sites/|user($|\?|/))" /-->
2121

2222

@@ -30,13 +30,13 @@
3030
<rule from="^http://(www\.)?couchbase\.com/develop/?(?:\?.*)?$"
3131
to="https://www.couchbase.com/communities/all-client-libraries" />
3232

33-
<rule from="^http://(www\.)?couchbase\.com/((?:buzz|case-studies/\w+|communities|company|contact|couchbase-(?:open-source-project|server-java-training|server/use-cases|support)|customers|docs|forums/user|learn|presentations|why-nosql/nosql-database)(?:$|\?|/)|(?:forums/)?(?:misc|sites)/)"
34-
to="https://$1couchbase.com/$2" />
33+
<rule from="^http://(www\.)?couchbase\.com/(?=$|\?|(?:buzz|case-studies/\w+|communities|company|contact|couchbase-(?:open-source-project|server-java-training|server/use-cases|support)|customers|docs|forums/user|learn|presentations|why-nosql/nosql-database)(?:$|\?|/)|(?:forums/)?(?:misc|sites)/)"
34+
to="https://$1couchbase.com/" />
3535

36-
<rule from="^http://info\.couchbase\.com/(cs|image|j|r)s/"
37-
to="https://na-a.couchbase.com/$1s/" />
36+
<rule from="^http://info\.couchbase\.com/(?=(?:cs|image|j|r)s/)"
37+
to="https://na-a.marketo.com/" />
3838

3939
<rule from="^http://packages\.couchbase\.com/"
4040
to="https://s3.amazonaws.com/packages.couchbase.com/" />
4141

42-
</ruleset>
42+
</ruleset>

0 commit comments

Comments
 (0)