Skip to content

Commit d925096

Browse files
jshajsha
committed
Merge pull request EFForg#1954 from mnordhoff/disable-rulesets-june-2015-a
Fix half a dozen rulesets
2 parents 081c601 + cb5765c commit d925096

Some content is hidden

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

41 files changed

+241
-374
lines changed

‎src/chrome/content/rules/Ansible.com-problematic.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@
44
-->
55
<ruleset name="Ansible.com (mismatched)" default_off="mismatched">
66

7+
<target host="ansible.com" />
78
<target host="www.ansible.com" />
89

910

10-
<rule from="^http://www\.ansible\.com/"
11+
<rule from="^http://ansible\.com/"
1112
to="https://www.ansible.com/" />
1213

14+
<rule from="^http:"
15+
to="https:" />
16+
1317
</ruleset>

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
21
<!--
3-
Disabled by https-everywhere-checker because:
4-
Fetch error: http://ansible.com/ => https://ansible.com/: (28, 'Connection timed out after 10000 milliseconds')
5-
62
For problematic rules, see Ansible.com-problematic.xml.
73
84
@@ -20,10 +16,9 @@ Fetch error: http://ansible.com/ => https://ansible.com/: (28, 'Connection timed
2016
2117
Nonfunctional subdomains:
2218
23-
- docs *
24-
- releases *
19+
- ^ *
2520
26-
* 503, valid cert
21+
* times out
2722
2823
2924
www: works, akamai
@@ -38,17 +33,19 @@ Fetch error: http://ansible.com/ => https://ansible.com/: (28, 'Connection timed
3833
3934
- Images, on:
4035
36+
- docs from www
4137
- www from $self ¹
4238
- www from cdn2.hubspot.net ²
4339
4440
¹ Rule disabled by default <= mismatched
4541
² Secured by us
4642
4743
-->
48-
<ruleset name="Ansible.com (partial)" default_off='failed ruleset test'>
44+
<ruleset name="Ansible.com (partial)">
4945

50-
<target host="ansible.com" />
51-
<target host="*.ansible.com" />
46+
<target host="docs.ansible.com" />
47+
<target host="galaxy.ansible.com" />
48+
<target host="releases.ansible.com" />
5249

5350

5451
<securecookie host="^\.ansible\.com$" name="^__cfduid$" />
@@ -58,7 +55,7 @@ Fetch error: http://ansible.com/ => https://ansible.com/: (28, 'Connection timed
5855
<securecookie host="^galaxy\.ansible\.com$" name=".+" />
5956

6057

61-
<rule from="^http://(galaxy\.)?ansible\.com/"
62-
to="https://$1ansible.com/" />
58+
<rule from="^http:"
59+
to="https:" />
6360

6461
</ruleset>

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
1-
21
<!--
3-
Disabled by https-everywhere-checker because:
4-
Fetch error: http://cdn.cakecentral.com/ => https://d2r287735ijf1o.cloudfront.net/: (6, 'Could not resolve host: d2r287735ijf1o.cloudfront.net')
5-
62
CDN buckets:
73
8-
- d2r287735ijf1o.cloudfront.net
4+
- cdn.cakecentral.com.s3.amazonaws.com
95
106
- cdn
117
128
13-
(www.): redirects to http, valid cert
9+
(www.): connection refused
1410
1511
-->
16-
<ruleset name="Cake Central.com (partial)" default_off='failed ruleset test'>
12+
<ruleset name="Cake Central.com (partial)">
1713

1814
<target host="cdn.cakecentral.com" />
1915

2016

2117
<rule from="^http://cdn\.cakecentral\.com/"
22-
to="https://d2r287735ijf1o.cloudfront.net/" />
18+
to="https://s3.amazonaws.com/cdn.cakecentral.com/" />
2319

2420
</ruleset>

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
21
<!--
3-
Disabled by https-everywhere-checker because:
4-
Fetch error: http://developer.chromium.org/ => https://developer.chromium.org/: (6, 'Could not resolve host: developer.chromium.org')
5-
62
For other Google coverage, see GoogleServices.xml.
73
84
@@ -23,7 +19,6 @@ Fetch error: http://developer.chromium.org/ => https://developer.chromium.org/:
2319
- codesearch
2420
- cs
2521
- dev
26-
- developer
2722
- gerrit
2823
- git
2924
- planet
@@ -37,7 +32,7 @@ Fetch error: http://developer.chromium.org/ => https://developer.chromium.org/:
3732
* Secured by us
3833
3934
-->
40-
<ruleset name="Chromium.org" default_off='failed ruleset test'>
35+
<ruleset name="Chromium.org">
4136

4237
<!-- Direct rewrites:
4338
-->
@@ -48,7 +43,6 @@ Fetch error: http://developer.chromium.org/ => https://developer.chromium.org/:
4843
<target host="codesearch.chromium.org" />
4944
<target host="cs.chromium.org" />
5045
<target host="dev.chromium.org" />
51-
<target host="developer.chromium.org" />
5246
<target host="gerrit.chromium.org" />
5347
<target host="git.chromium.org" />
5448
<target host="planet.chromium.org" />

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
21
<!--
3-
Disabled by https-everywhere-checker because:
4-
Fetch error: http://cfdnscheck.cloudflare.com/ => https://cfdnscheck.cloudflare.com/: (6, 'Could not resolve host: cfdnscheck.cloudflare.com')
5-
62
Other CloudFlare rulesets:
73
84
- Cdnjs.xml
@@ -19,7 +15,7 @@ Fetch error: http://cfdnscheck.cloudflare.com/ => https://cfdnscheck.cloudflare.
1915
wildcard cookies for every client domain.
2016
2117
-->
22-
<ruleset name="CloudFlare.com" default_off='failed ruleset test'>
18+
<ruleset name="CloudFlare.com">
2319

2420
<!-- Direct rewrites:
2521
-->
@@ -29,7 +25,6 @@ Fetch error: http://cfdnscheck.cloudflare.com/ => https://cfdnscheck.cloudflare.
2925
<target host="blog.cloudflare.com" />
3026
<target host="cdnjs.cloudflare.com" />
3127
<target host="cdn-static.cloudflare.com" />
32-
<target host="cfdnscheck.cloudflare.com" />
3328
<target host="cn.cloudflare.com" />
3429
<target host="de.cloudflare.com" />
3530
<target host="developers.cloudflare.com" />

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
21
<!--
3-
Disabled by https-everywhere-checker because:
4-
Non-2xx HTTP code: http://cdn.derkeiler.com/ (200) => https://dk.cachefly.net/ (404)
5-
62
Nonfunctional subdomains:
73
84
- (www.) *
@@ -14,12 +10,12 @@ Non-2xx HTTP code: http://cdn.derkeiler.com/ (200) => https://dk.cachefly.net/ (
1410
* Refused
1511
1612
-->
17-
<ruleset name="Der Keiler.com (partial)" default_off='failed ruleset test'>
13+
<ruleset name="Der Keiler.com (partial)">
1814

1915
<target host="cdn.derkeiler.com" />
2016

2117

2218
<rule from="^http://cdn\.derkeiler\.com/"
23-
to="https://dk.cachefly.net/" />
19+
to="https://d30uw9rfekksi5.cloudfront.net/" />
2420

2521
</ruleset>

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
2-
<!--
3-
Disabled by https-everywhere-checker because:
4-
Fetch error: http://www.diasp.de/ => https://www.diasp.de/: (51, "SSL: no alternative certificate subject name matches target host name 'www.diasp.de'")
5-
6-
-->
7-
<ruleset name="Diasp.de" default_off='failed ruleset test'>
1+
<ruleset name="Diasp.de">
82

93
<!-- Direct rewrites:
104
-->
115
<target host="diasp.de" />
126
<target host="www.diasp.de" />
137

8+
<rule from="^http://www\.diasp\.de/" to="https://diasp.de/" />
9+
1410
<rule from="^http:" to="https:" />
1511
</ruleset>

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

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
21
<!--
3-
Disabled by https-everywhere-checker because:
4-
Fetch error: http://cdn.dice.com/ => https://d1i4601q19kpjz.cloudfront.net/: (28, 'Operation timed out after 15001 milliseconds with 0 bytes received')
5-
62
For rules causing false/broken MCB, see Dice-problematic.xml.
73
84
@@ -13,13 +9,6 @@ Fetch error: http://cdn.dice.com/ => https://d1i4601q19kpjz.cloudfront.net/: (28
139
- Slashdot_Media.xml
1410
1511
16-
CDN buckets:
17-
18-
- d1i4601q19kpjz.cloudfront.net
19-
20-
- cdn
21-
22-
2312
Nonfunctional subdomains:
2413
2514
- marketing ¹
@@ -86,7 +75,7 @@ Fetch error: http://cdn.dice.com/ => https://d1i4601q19kpjz.cloudfront.net/: (28
8675
* Secured by us
8776
8877
-->
89-
<ruleset name="Dice.com (partial)" default_off='failed ruleset test'>
78+
<ruleset name="Dice.com (partial)">
9079

9180
<target host="assets.dice.com" />
9281
<target host="employer.dice.com" />
@@ -97,7 +86,6 @@ Fetch error: http://cdn.dice.com/ => https://d1i4601q19kpjz.cloudfront.net/: (28
9786
<!-- Complications:
9887
-->
9988
<target host="dice.com" />
100-
<target host="cdn.dice.com" />
10189

10290
<!-- Redirects to http:
10391
-->
@@ -137,9 +125,6 @@ Fetch error: http://cdn.dice.com/ => https://d1i4601q19kpjz.cloudfront.net/: (28
137125
<rule from="^http://dice\.com/"
138126
to="https://www.dice.com/" />
139127

140-
<rule from="^http://cdn\.dice\.com/"
141-
to="https://d1i4601q19kpjz.cloudfront.net/" />
142-
143128
<rule from="^http:"
144129
to="https:" />
145130

‎src/chrome/content/rules/Disconnect.me.xml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
21
<!--
3-
Disabled by https-everywhere-checker because:
4-
Fetch error: http://forum.disconnect.me/ => https://forum.disconnect.me/: (7, 'Failed to connect to forum.disconnect.me port 443: Connection refused')
5-
62
CDN buckets:
73
84
- s3.amazonaws.com/disconnectblogimages/
@@ -17,7 +13,7 @@ Fetch error: http://forum.disconnect.me/ => https://forum.disconnect.me/: (7, 'F
1713
- search
1814
1915
-->
20-
<ruleset name="Disconnect.me" default_off='failed ruleset test'>
16+
<ruleset name="Disconnect.me">
2117

2218
<target host="disconnect.me" />
2319
<target host="blog.disconnect.me" />
@@ -30,6 +26,9 @@ Fetch error: http://forum.disconnect.me/ => https://forum.disconnect.me/: (7, 'F
3026
<securecookie host="^blog\.disconnect\.me$" name=".+" />
3127

3228

29+
<rule from="^https?://forum\.disconnect\.me/"
30+
to="https://disconnect.me/forum/" />
31+
3332
<rule from="^http:"
3433
to="https:" />
3534

‎src/chrome/content/rules/Federal-Bureau-of-Investigation.xml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
21
<!--
3-
Disabled by https-everywhere-checker because:
4-
Fetch error: http://foia.fbi.gov/ => https://foia.fbi.gov/: (28, 'Connection timed out after 10001 milliseconds')
5-
62
Federal Bureau of Investigation
73
84
For other US government coverage, see US-government.xml.
@@ -13,24 +9,20 @@ Fetch error: http://foia.fbi.gov/ => https://foia.fbi.gov/: (28, 'Connection tim
139
- .fbi.gov
1410
1511
-->
16-
<ruleset name="FBI.gov (partial)" default_off='failed ruleset test'>
12+
<ruleset name="FBI.gov">
1713

1814
<!-- Direct rewrites:
1915
-->
2016
<target host="foia.fbi.gov" />
2117
<target host="forms.fbi.gov" />
2218
<target host="tips.fbi.gov" />
2319
<target host="vault.fbi.gov" />
24-
<!--target host="www.fbi.gov" /-->
20+
<target host="www.fbi.gov" />
2521

2622
<!-- Complications:
2723
-->
2824
<target host="fbi.gov" />
2925

30-
<!-- Redirects to http:
31-
-->
32-
<!--exclusion pattern="^http://www\.fbi\.gov/$" /-->
33-
3426

3527
<!-- CloudFlare cookies:
3628
-->
@@ -42,6 +34,9 @@ Fetch error: http://foia.fbi.gov/ => https://foia.fbi.gov/: (28, 'Connection tim
4234
<rule from="^http://fbi\.gov/"
4335
to="https://www.fbi.gov/" />
4436

37+
<rule from="^http://foia\.fbi\.gov/"
38+
to="https://www.fbi.gov/foia/" />
39+
4540
<rule from="^http:"
4641
to="https:" />
4742

0 commit comments

Comments
 (0)