Skip to content

Commit e75921d

Browse files
author
MB
committed
[Amnesty International] Enumerate, sort, squish, split, add comments
1 parent 43e815c commit e75921d

File tree

5 files changed

+104
-52
lines changed

5 files changed

+104
-52
lines changed

‎src/chrome/content/rules/Amnesty-International-mismatches.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
<!--
2-
For rules that are on by default, see Amnesty-International.xml.
2+
For rules that are on by default, see Amnesty.org.uk.xml.
33
44
-->
5-
<ruleset name="Amnesty International (mismatches)" default_off="mismatched" platform="mixedcontent">
5+
<ruleset name="Amnesty.org.uk (mismatches)" default_off="mismatched" platform="mixedcontent">
66

7+
<!-- Direct rewrites:
8+
-->
79
<target host="action.amnesty.org.uk" />
810

911

1012
<!-- Cookies are handled in the main ruleset. -->
1113

1214

13-
<rule from="^http://action\.amnesty\.org\.uk/"
14-
to="https://action.amnesty.org.uk/" />
15+
<rule from="^http:"
16+
to="https:" />
1517

1618
</ruleset>

‎src/chrome/content/rules/Amnesty-International.xml‎

Lines changed: 32 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://amnesty.org.uk/ => https://amnesty.org.uk/: Cycle detected - URL already encountered: https://amnesty.org.uk/
4-
For problematic rules, see Amnesty-International-mismatches.xml.
5-
62
For rules subject to JS redirects, see Amnesty_International-nojs.xml.
73
84
95
Other Amnesty International rulesets:
106
7+
- Amnesty.org.uk.xml
118
- Amnesty_International_Norway.xml
129
- Amnesty_USA.org.xml
1310
@@ -17,65 +14,60 @@ Fetch error: http://amnesty.org.uk/ => https://amnesty.org.uk/: Cycle detected -
1714
- d3soxcs9eo85xz.cloudfront.net
1815
1916
20-
Nonfunctional domains:
17+
Nonfunctional hosts in *amnesty.org:
2118
22-
- web.amnesty.org (http reply)
23-
- pthblog.amnesty.org.uk
24-
- tv.amnesty.org.uk
19+
- web (http reply)
2520
2621
27-
Problematic domains:
22+
Problematic hosts in *amnesty.org:
2823
29-
- livewire.amnesty.org (JS redirect to http)
30-
- action.amnesty.org.uk (mismatched, CN: action.amnesty.org.uk)
24+
- livewire (JS redirect to http)
3125
3226
33-
Partially covered domains:
27+
Partially covered hosts in *amnesty.org:
3428
35-
- livewire.amnesty.org (complete coverage in -nojs.xml)
29+
- livewire (complete coverage in -nojs.xml)
3630
3731
38-
Fully covered domains:
32+
Fully covered hosts in *amnesty.org:
3933
40-
- amnesty.org subdomains:
34+
- (www.)
35+
- action
36+
- adam
37+
- files
4138
42-
- (www.)
43-
- adam
44-
- files
4539
46-
- amnesty.org.uk subdomains:
40+
Insecure cookies are set for these domains:
4741
48-
- (www.)
49-
- blogs (→ d3soxcs9eo85xz.cloudfront.net)
50-
- protectthehuman
51-
- www2
42+
- .amnesty.org
43+
- .action.amnesty.org
44+
- .www.amnesty.org
5245
5346
-->
54-
<ruleset name="Amnesty International (partial)" platform="mixedcontent" default_off='failed ruleset test'>
47+
<ruleset name="Amnesty.org (partial)" default_off="Needs ruleset tests">
5548

49+
<!-- Direct rewrites:
50+
-->
5651
<target host="amnesty.org" />
57-
<target host="*.amnesty.org" />
58-
<!--
59-
JS redirect to http:
52+
<target host="action.amnesty.org" />
53+
<target host="adam.amnesty.org" />
54+
<target host="files.amnesty.org" />
55+
<target host="livewire.amnesty.org" />
56+
<target host="www.amnesty.org" />
57+
58+
<!-- JS redirect to http:
6059
-->
6160
<exclusion pattern="^http://livewire\.amnesty\.org/(?:.+/)?(?:\?.*)?$" />
62-
<target host="amnesty.org.uk" />
63-
<target host="*.amnesty.org.uk" />
64-
6561

66-
<securecookie host="^\.amnesty\.org\.uk$" name="^__utm\w$" />
67-
<securecookie host="^(?:.*\.)?amnesty\.org\.uk$" name=".+" />
6862

63+
<!-- Not secured by server:
64+
-->
65+
<!--securecookie host="^\.(action\.|www\.)?amnesty\.org$" name="^ARRAffinity$" /-->
6966

70-
<rule from="^http://((?:adam|files|livewire|www)\.)?amnesty\.org/"
71-
to="https://$1amnesty.org/" />
67+
<securecookie host="^\.(?:action\.|www\.)?amnesty\.org$" name=".+" />
7268

73-
<rule from="^http://(protectthehuman\.|www2?\.)?amnesty\.org\.uk/"
74-
to="https://$1amnesty.org.uk/" />
7569

76-
<!-- blogs has a valid certificate, but pages redirect to http.
77-
-->
78-
<rule from="^http://blogs\.amnesty\.org\.uk/"
79-
to="https://d3soxcs9eo85xz.cloudfront.net/" />
70+
<rule from="^http:"
71+
to="https:" />
8072

8173
</ruleset>

‎src/chrome/content/rules/Amnesty.org.uk.xml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<!--
2+
Disabled by https-everywhere-checker because:
3+
Fetch error: http://amnesty.org.uk/ => https://amnesty.org.uk/: Cycle detected - URL already encountered: https://amnesty.org.uk/
4+
For problematic rules, see Amnesty-International-mismatches.xml.
5+
6+
For other Amnesty International coverage, see Amnesty-International.xml.
7+
8+
9+
CDN buckets:
10+
11+
- d3soxcs9eo85xz.cloudfront.net
12+
13+
14+
Nonfunctional domains:
15+
16+
- pthblog.amnesty.org.uk
17+
- tv.amnesty.org.uk
18+
19+
20+
Problematic domains:
21+
22+
- action.amnesty.org.uk (mismatched, CN: action.amnesty.org.uk)
23+
24+
25+
Fully covered hosts in *amnesty.org.uk:
26+
27+
- (www.)
28+
- blogs (→ d3soxcs9eo85xz.cloudfront.net)
29+
- protectthehuman
30+
- www2
31+
32+
-->
33+
<ruleset name="Amnesty.org.uk (partial)" default_off="redirect loop">
34+
35+
<!-- Direct rewrites:
36+
-->
37+
<target host="amnesty.org.uk" />
38+
<target host="protectthehuman.amnesty.org.uk" />
39+
<target host="www.amnesty.org.uk" />
40+
<target host="www2.amnesty.org.uk" />
41+
42+
<!-- Complications:
43+
-->
44+
<target host="blogs.amnesty.org.uk" />
45+
46+
47+
<securecookie host="^\.amnesty\.org\.uk$" name="^__utm\w$" />
48+
<!--securecookie host="^(?:.*\.)?amnesty\.org\.uk$" name=".+" /-->
49+
50+
51+
<!-- blogs has a valid certificate, but pages redirect to http.
52+
-->
53+
<rule from="^http://blogs\.amnesty\.org\.uk/"
54+
to="https://d3soxcs9eo85xz.cloudfront.net/" />
55+
56+
<rule from="^http:"
57+
to="https:" />
58+
59+
</ruleset>

‎src/chrome/content/rules/Amnesty_International-nojs.xml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,17 @@
55
Hopefully few HTTPSE users enable JS, anyway....
66
77
-->
8-
<ruleset name="Amnesty International (no javascript)" default_off="javascript redirect to http">
8+
<ruleset name="Amnesty.org (no javascript)" default_off="javascript redirect to http">
99

10+
<!-- Direct rewrites:
11+
-->
1012
<target host="livewire.amnesty.org" />
11-
<!--
12-
Handled in Amnesty-International.xml:
13-
-->
14-
<exclusion pattern="^http://livewire\.amnesty\.org/(?!(?:.+/)?(?:\?.*)?$)" />
1513

1614

1715
<securecookie host="^livewire\.amnesty\.org$" name=".+" />
1816

1917

20-
<rule from="^http://livewire\.amnesty\.org/"
21-
to="https://livewire.amnesty.org/" />
18+
<rule from="^http:"
19+
to="https:" />
2220

23-
</ruleset>
21+
</ruleset>

‎utils/duplicate-whitelist.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ adyadvantage.com
66
affair-guide.com
77
afp548.com
88
aftenposten.no
9+
livewire.amnesty.org
910
anunciou.com
1011
arch-stuff.org
1112
articulate.com

0 commit comments

Comments
 (0)