Skip to content

Commit e3b5fb5

Browse files
pdepde
committed
Merge remote-tracking branch 'negres/master'
2 parents eb74658 + 1099c41 commit e3b5fb5

73 files changed

Lines changed: 1753 additions & 243 deletions

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/123Count.com.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!--
2+
Problematic subdomains:
3+
4+
- ^ (mismatched, CN: www.web-stat.com)
5+
6+
-->
7+
<ruleset name="123Count.com">
8+
9+
<target host="123count.com" />
10+
<target host="*.123count.com" />
11+
12+
13+
<securecookie host="^\.123count\.com$" name=".+" />
14+
15+
16+
<rule from="^http://(?:www\.)?123count\.com/"
17+
to="https://www.123count.com/" />
18+
19+
</ruleset>

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

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,39 @@
1111
1212
CDN buckets:
1313
14+
- d320ze5h7gg57a.cloudfront.net
1415
- d3h9au4afozpag.cloudfront.net
1516
1617
17-
Partially covered domains:
18+
Problematic subdomains:
1819
19-
- (www.)aclu.org (most pages started redirecting to http)
20+
- ^ (works, cert only matches www)
2021
2122
22-
Fully covered domains:
23+
Fully covered subdomains:
2324
24-
- secure.aclu.org
25+
- (www.) (^ → www)
26+
- secure
2527
2628
-->
27-
<ruleset name="ACLU (partial)">
29+
<ruleset name="ACLU">
2830

2931
<target host="aclu.org" />
3032
<target host="*.aclu.org" />
31-
<!--exclusion pattern="^http://(?:www\.)?aclu\.org/(?!donate)(?:blog/|multimedia/|national-security/|prisoners-rights/)?[^/\.]*$" /-->
32-
<exclusion pattern="^http://(?:www\.)?aclu\.org/(?!donate(?:$|\?|/)|files/|secure/|sites/)" />
33+
<!--
34+
Not only does blanket https use work again, but appears to be forced, too.
35+
-->
36+
<!--exclusion pattern="^http://(www\.)?aclu\.org/(?!donate)(blog/|multimedia/|national-security/|prisoners-rights/)?[^/.]*$" /-->
37+
<!--exclusion pattern="^http://(www\.)?aclu\.org/(?!donate($|[?/])|files/|secure/|sites/)" /-->
3338

3439

3540
<securecookie host="^secure\.aclu\.org$" name=".+" />
3641

3742

38-
<rule from="^http://aclu\.org/"
43+
<rule from="^http://(?:www\.)?aclu\.org/"
3944
to="https://www.aclu.org/" />
4045

41-
<rule from="^http://(secure|www)\.aclu\.org/"
42-
to="https://$1.aclu.org/" />
46+
<rule from="^http://secure\.aclu\.org/"
47+
to="https://secure.aclu.org/" />
4348

4449
</ruleset>

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<!--
2+
CDN buckets:
3+
4+
- d3vg9hiogk70qz.cloudfront.net
5+
6+
7+
Problematic domains:
8+
9+
- ads (mismatched, CN: ads.adk2.com)
10+
- cdn (cloudfront)
11+
12+
13+
Fully covered subdomains:
14+
15+
- ads (→ ads.adk2.com)
16+
- cdn (→ d3vg9hiogk70qz.cloudfront.net)
17+
18+
-->
19+
<ruleset name="adsrvmedia.com">
20+
21+
<target host="*.adsrvmedia.com" />
22+
23+
24+
<rule from="^http://ads\.adsrvmedia\.com/"
25+
to="https://ads.adk2.com/" />
26+
27+
<rule from="^http://cdn\.adsrvmedia\.com/"
28+
to="https://d3vg9hiogk70qz.cloudfront.net/" />
29+
30+
</ruleset>

‎src/chrome/content/rules/Assayassured.co.uk.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<!--
2+
Serves widgets on 3rd-party websites.
3+
4+
-->
5+
<ruleset name="Assay Assured.co.uk (partial)">
6+
7+
<target host="assayassured.co.uk" />
8+
<target host="www.assayassured.co.uk" />
9+
<!--
10+
Pages redirect to http:
11+
-->
12+
<!--exclusion pattern="^http://(www\.)?assayassured\.co\.uk/+($|\?|index\.php|site/*($|[?/]))" /-->
13+
14+
15+
<rule from="^http://(www\.)?assayassured\.co\.uk/(?!$|\?|index\.php|site/*(?:$|[?/]))"
16+
to="https://$1assayassured.co.uk/" />
17+
18+
</ruleset>

‎src/chrome/content/rules/Avast.com-falsemixed.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!--
2+
For rules not causing false/broken MCB, see Avast.com.xml.
3+
4+
-->
5+
<ruleset name="Avast.com (false MCB)" platform="mixedcontent">
6+
7+
<target host="forum.avast.com" />
8+
9+
10+
<rule from="^http://forum\.avast\.com/"
11+
to="https://forum.avast.com/" />
12+
13+
</ruleset>

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,60 @@
11
<!--
2+
For rules causing false/broken MCB, see Avast.com-falsemixed.xml.
3+
4+
25
CDN buckets:
36
47
- avast.com.edgesuite.net
58
69
- a1639.g1.akamai.net
710
- sf0.iavs.net
811
12+
- avast.co.jp.ldc.d3.sc.omtrdc.net
13+
14+
- an.avast.com
15+
16+
17+
Nonfunctional subdomains:
18+
19+
- ^ (403, valid cert)
20+
- www (redirects to http, valid cert)
21+
922
1023
Problematic domains:
1124
1225
- sf0.iavs.net (works, akamai)
1326
27+
28+
Fully covered domains:
29+
30+
- avast.com subdomains:
31+
32+
- an (→ avast-co-jp-ldc.d3.sc.omtrdc.net)
33+
- ans
34+
- blog
35+
- id
36+
- my
37+
- static
38+
- support
39+
40+
- sf0.iavs.net (→ akamai)
41+
42+
43+
Mixed content:
44+
45+
- css on forum from sf0.iavs.net *
46+
- Images on forum from sf0.iavs.net *
47+
- Web bug on forum from an *
48+
49+
* Secured by us
50+
51+
52+
forum is in a separate falsemixed ruleset
53+
due to css from sf0.iavs.net.
54+
55+
NB: We secure all resources, and thus
56+
falsemixed should be merged for Ffx 24.
57+
1458
-->
1559
<ruleset name="Avast (partial)">
1660

@@ -20,6 +64,10 @@
2064
2165
<target host="avast.com" /-->
2266
<target host="*.avast.com" />
67+
<!--
68+
Avoid false/broken MCB:
69+
-->
70+
<exclusion pattern="^http://forum\." />
2371
<target host="sf0.iavs.net" />
2472

2573

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<!--
2+
Nonfunctional subdomains:
3+
4+
- stat (shows api; mismatched, CN: api.remonit.de)
5+
6+
7+
Problematic subdomains:
8+
9+
- www (cert only matches ^bgamed.de)
10+
11+
12+
Mixed content:
13+
14+
- Web bugs, on ^ from:
15+
16+
- stat *
17+
- www.facebook.com **
18+
19+
* Unsecurable
20+
** Secured by us
21+
22+
-->
23+
<ruleset name="bGamed.de (partial)">
24+
25+
<target host="bgamed.de" />
26+
<target host="www.bgamed.de" />
27+
28+
29+
<securecookie host="^bgamed\.de$" name=".+" />
30+
31+
32+
<rule from="^http://(?:www\.)?bgamed\.de/"
33+
to="https://bgamed.de/" />
34+
35+
</ruleset>

‎src/chrome/content/rules/Beaverbrooks.co.uk.xml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<!--
2+
Beaverbrooks the Jewellers Ltd
3+
4+
5+
CDN buckets:
6+
7+
- global.prod.fastly.net
8+
9+
- content
10+
11+
- beaverbrooks.peerius.com
12+
13+
14+
Problematic subdomains:
15+
16+
- ^ (works; mismatched, CN: www.beaverbrooks.co.uk)
17+
18+
19+
Partially covered subdomains:
20+
21+
- (www.) (^ → www)
22+
23+
$ redirects to http, but only *after* loading successfully.
24+
It's a pity that we don't have means to prevent that....
25+
26+
27+
Fully covered subdomains:
28+
29+
- content
30+
31+
32+
Mixed content:
33+
34+
- Image on www from www *
35+
36+
* Secured by us
37+
38+
-->
39+
<ruleset name="Beaverbrooks.co.uk (partial)">
40+
41+
<target host="beaverbrooks.co.uk" />
42+
<target host="*.beaverbrooks.co.uk" />
43+
<!--
44+
Redirects to http:
45+
-->
46+
<!--exclusion pattern="^http://www\.beaverbrooks\.co\.uk/+($|\?)" /-->
47+
<!--exclusion pattern="^http://www\.beaverbrooks\.co\.uk/+(?!_client/|favicon\.ico|images/|myaccount($|[?/])|_uploads/)" /-->
48+
49+
50+
<!-- Tracking cookies:
51+
-->
52+
<securecookie host="^\.beaverbrooks\.co\.uk$" name="^__utm\w$" />
53+
54+
55+
<rule from="^http://(?:www\.)?beaverbrooks\.co\.uk/(?=_client/|favicon\.ico|images/|myaccount(?:$|[?/])|_uploads/)"
56+
to="https://www.beaverbrooks.co.uk/" />
57+
58+
<rule from="^http://content\.beaverbrooks\.co\.uk/"
59+
to="https://content.beaverbrooks.co.uk/" />
60+
61+
</ruleset>

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<!--
2+
CDN buckets:
3+
4+
- beetailer.tenderapp.com
5+
6+
- support
7+
8+
9+
Problematic subdomains:
10+
11+
- support (tenderapp)
12+
13+
14+
Fully covered subdomains:
15+
16+
- (www.)
17+
- support (→ beetailer.tenderapp.com)
18+
19+
20+
Mixed content:
21+
22+
- Image on support from www *
23+
24+
* Secured by us
25+
26+
-->
27+
<ruleset name="Beetailer.com">
28+
29+
<target host="beetailer.com" />
30+
<target host="*.beetailer.com" />
31+
32+
33+
<securecookie host="^www\.beetailer\.com$" name=".+" />
34+
35+
36+
<rule from="^http://(www\.)?beetailer\.com/"
37+
to="https://$1beetailer.com/" />
38+
39+
<rule from="^http://support\.beetailer\.com/"
40+
to="https://beetailer.tenderapp.com/" />
41+
42+
</ruleset>

‎src/chrome/content/rules/Bytemark.co.uk.xml‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,35 @@
1+
<!--
2+
Bytemark Hosting
3+
4+
5+
Nonfunctional subdomains:
6+
7+
- (www.) (dropped)
8+
- blog (redirects to http, valid cert)
9+
10+
11+
Fully covered subdomains:
12+
13+
- forum
14+
- order2009
15+
- panel
16+
17+
18+
Observed cookie domains:
19+
20+
- .forum
21+
- order2009
22+
- panel
23+
- webmail
24+
25+
-->
126
<ruleset name="Bytemark.co.uk (partial)">
227

3-
<target host="forum.bytemark.co.uk" />
4-
<target host="order2009.bytemark.co.uk" />
5-
<target host="panel.bytemark.co.uk" />
28+
<target host="*.bytemark.co.uk" />
29+
<!--exclusion pattern="^http://(blog|www)\." /-->
30+
631

7-
<rule from="^http://([fop]\w+)\.bytemark\.co\.uk/"
32+
<rule from="^http://(forum|order2009|panel)\.bytemark\.co\.uk/"
833
to="https://$1.bytemark.co.uk/" />
934

1035
</ruleset>

0 commit comments

Comments
 (0)