Skip to content

Commit 5afb956

Browse files
jshajsha
committed
Merge branch 'master' into android-gbrowser-fix2
Conflicts: src/components/ssl-observatory.js
2 parents 8cf8ee2 + 7c08ffb commit 5afb956

File tree

98 files changed

+2123
-401
lines changed

Some content is hidden

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

98 files changed

+2123
-401
lines changed

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!--
2+
Nonfunctional subdomains:
3+
4+
- learn *
5+
6+
* Marketo
7+
8+
-->
9+
<ruleset name="Adallom.com (partial)">
10+
11+
<target host="adallom.com" />
12+
<target host="*.adallom.com" />
13+
14+
15+
<rule from="^http://(console\.|www\.)?adallom\.com/"
16+
to="https://$1adallom.com/" />
17+
18+
<rule from="^http://learn\.adallom\.com/(?=css/|images/|js/|rs/)"
19+
to="https://na-ab01.marketo.com/" />
20+
21+
</ruleset>

‎src/chrome/content/rules/Aftenposten.no-falsemixed.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<!--
2+
For rules not causing false/broken MCB, see Aftenposten.xml.
3+
4+
-->
5+
<ruleset name="Aftenposten.no">
6+
7+
<target host="aftenposten.no" />
8+
<target host="www.aftenposten.no" />
9+
10+
11+
<rule from="^http://(?:www\.)?aftenposten\.no/(?=nyheter(?:$|[?/]))"
12+
to="https://www.aftenposten.no/" />
13+
14+
</ruleset>

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

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
<!--
2+
For rules causing false/broken MCB, see Aftenposten.no-falsemixed.xml.
3+
4+
25
Nonfunctional subdomains:
36
4-
- bedrift *
7+
- bedrift ¹
58
- papp2 *
69
- sport (times out)
710
11+
¹ Dropped
812
* Revoked
913
1014
@@ -16,12 +20,16 @@
1620
- bil *
1721
- godetilbud *
1822
- kundeservice (revoked)
23+
- leserpanel ⁵
1924
- ocacache *
2025
- reise *
2126
- rubrikkcache *
2227
28+
- ap.mnocdn.no *
29+
2330
¹ Mixed css
2431
* Works; mismatched, CN: www.aftenposten.no
32+
⁵ Mismatched, CN: hotellweb1.schibsted-it.no
2533
2634
2735
Partially covered subdomains:
@@ -30,16 +38,34 @@
3038
- kundeservice (→ a)
3139
3240
41+
Fully covered subdomains:
42+
43+
- a
44+
- kundesenter
45+
- kundeweb
46+
- onlinesos
47+
48+
3349
Insecure cookies are set for these domains:
3450
51+
- kundesenter.aftenposten.no
3552
- www.aftenposten.no
3653
3754
3855
Mixed content:
3956
57+
- css on www from $self *
58+
4059
- Images, on:
4160
61+
- leserpanel from $self
62+
- www from $self *
4263
- www from www.bt.no *
64+
- www from ap.mnocdn.no *
65+
66+
- favicon on www from $self *
67+
68+
- Bugs on www from ocacache.medianorge.no
4369
4470
* Secured by us
4571
@@ -51,6 +77,10 @@
5177
Redirects to http:
5278
-->
5379
<!--exclusion pattern="^http://www\.aftenposten\.no/$" /-->
80+
<!--
81+
Exceptions:
82+
-->
83+
<!--exclusion pattern="^http://www\.aftenposten\.no/(?!nyheter($|[?/]))" /-->
5484
<!--
5585
Avoid broken MCB:
5686
-->
@@ -60,15 +90,16 @@
6090

6191
<!-- Not secured by server:
6292
-->
93+
<!--securecookie host="^kundesenter\.aftenposten\.no$" name="^_wp_session$" /-->
6394
<!--securecookie host="^www\.aftenposten\.no$" name="^(VPW_Quota_\d+|VPW_QuotaInfo_\d+)$" /-->
6495

6596
<!--securecookie host="^\.aftenposten\.no$" name="^environment$" /-->
66-
<securecookie host="^(?:a|kundeweb|onlinesos)\.aftenposten\.no$" name=".+" />
97+
<securecookie host="^(?:a|kundesenter|kundeweb|onlinesos)\.aftenposten\.no$" name=".+" />
6798

6899

69100
<rule from="^http://(?:www\.)?aftenposten\.no/" to="https://www.aftenposten.no/"/>
70101

71-
<rule from="^http://(a|kundeweb|onlinesos)\.aftenposten\.no/"
102+
<rule from="^http://(a|kundesenter|kundeweb|onlinesos)\.aftenposten\.no/"
72103
to="https://$1.aftenposten.no/" />
73104

74105
<rule from="^http://kundeservice\.aftenposten\.no/(\?.*)?$"

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<!--
2+
For other Mozilla coverage, see Mozilla.xml.
3+
4+
-->
5+
<ruleset name="Are We Slim Yet.com">
6+
7+
<target host="areweslimyet.com" />
8+
<target host="www.areweslimyet.com" />
9+
10+
11+
<rule from="^http://(www\.)?areweslimyet\.com/"
12+
to="https://$1areweslimyet.com/" />
13+
14+
</ruleset>

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

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,42 @@
11
<!--
2+
Problematic subdomains:
3+
4+
- mail *
5+
6+
* Mismatched, CN: postoffice.arvixe.com
7+
8+
29
Fully covered subdomains:
310
411
- affiliates
512
- support
613
714
15+
Insecure cookies are set for these domains:
16+
17+
- .arvixe.com
18+
19+
820
Mixed content:
921
1022
- Images on affiliates from www *
1123
1224
* Secured by us
1325
1426
-->
15-
<ruleset name="Arvixe">
27+
<ruleset name="Arvixe.com">
1628

1729
<target host="arvixe.com" />
1830
<target host="*.arvixe.com" />
1931

2032

21-
<securecookie host="^(.*\.)?arvixe\.com$" name=".*" />
33+
<securecookie host="^(?:.*\.)?arvixe\.com$" name=".+" />
34+
2235

36+
<rule from="^http://mail\.arvixe\.com/"
37+
to="https://postoffice.arvixe.com/" />
2338

2439
<rule from="^http://((?:affiliates|postoffice|support|www)\.)?arvixe\.com/"
2540
to="https://$1arvixe.com/" />
2641

27-
<!-- Cert : postoffice.arvixe.com -->
28-
<rule from="^https?://mail\.arvixe\.com/"
29-
to="https://postoffice.arvixe.com/" />
30-
3142
</ruleset>

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,22 @@
22
For other Stack Exchange coverage, see Stack-Exchange.xml.
33
44
5+
Problematic subdomains:
6+
7+
- www *
8+
9+
* Doesn't work; mismatched, CN: askubuntu.com
10+
11+
512
Fully covered subdomains:
613
7-
- (http://)
14+
- (www.)? (www → ^)
815
- meta
916
10-
Problematic subdomains:
11-
- (www.) (doesn't work; mismatched, CN: https://askubuntu.com)
17+
18+
Insecure cookies are set for these domains:
19+
20+
- .askubuntu.com
1221
1322
1423
Mixed content:
@@ -32,10 +41,7 @@
3241

3342
<securecookie host="^\.(?:meta\.)?askubuntu\.com$" name=".+" />
3443

35-
<rule from="^http://(?:www\.)?askubuntu\.com/"
36-
to="https://askubuntu.com/" />
37-
38-
<rule from="^http://meta\.askubuntu\.com/"
39-
to="https://meta.askubuntu.com/" />
44+
<rule from="^http://(?:(meta\.)?|www\.)?askubuntu\.com/"
45+
to="https://$1askubuntu.com/" />
4046

4147
</ruleset>

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

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<!--
2+
The Attachmate Group
3+
24
Other Attachmate Group rulesets:
35
46
- Attachmate.xml
@@ -10,16 +12,30 @@
1012
1113
Nonfunctional domains:
1214
13-
- attachmategroup.com (no https)
14-
- www.attachmategroup.com (times out)
15+
- attachmategroup.com ¹
16+
- www.attachmategroup.com ²
17+
18+
¹ Refused
19+
² Dropped
20+
21+
22+
Insecure cookies are set for these domains:
23+
24+
- .attachmategroup.com
25+
- esp.attachmategroup.com
26+
- login.attachmategroup.com
1527
1628
-->
17-
<ruleset name="The Attachmate Group (partial)">
29+
<ruleset name="Attachmate Group.com (partial)">
1830

1931
<target host="*.attachmategroup.com" />
2032

2133

34+
<!-- Not secured by server:
35+
-->
2236
<!--securecookie host="^\.attachmategroup\.com$" name="IPCZQX\w{10}$" /-->
37+
<!--securecookie host="^(esp|login)\.attachmategroup\.com$" name="^(UrnNovellNidpClusterMemberId|lb_esp|urn:novell:nidp:cluster:member:id)$" /-->
38+
2339
<securecookie host="^(?:esp|login)\.attachmategroup\.com$" name=".+" />
2440

2541

‎src/chrome/content/rules/BT.no-falsemixed.xml‎

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

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
<ruleset name="Bellingcat">
2-
<target host="bellingcat.com" />
3-
<target host="www.bellingcat.com" />
4-
5-
<rule from="^https?://bellingcat\.com/"
6-
to="https://www.bellingcat.com/" />
7-
<rule from="^http://([^/:@]+)\.bellingcat\.com/"
8-
to="https://$1.bellingcat.com/" />
1+
<ruleset name="Bellingcat.com">
2+
3+
<target host="bellingcat.com" />
4+
<target host="www.bellingcat.com" />
5+
6+
7+
<rule from="^http://(www\.)?bellingcat\.com/"
8+
to="https://$1bellingcat.com/" />
9+
910
</ruleset>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<!--
22
Bergens Tidende
33
4+
For rules causing false/broken MCB, see BT.no-falsemixed.xml.
5+
46
57
Nonfunctional subdomains:
68
@@ -53,7 +55,7 @@
5355
5456
-->
5557
<ruleset name="BT.no (partial)">
56-
<target host="www.bt.no" />
58+
<target host="*.bt.no" />
5759
<target host="bt.no" />
5860
<!--
5961
Redirects to http:

0 commit comments

Comments
 (0)