Skip to content

Commit 79d6ffd

Browse files
author
MB
committed
Merge remote-tracking branch 'EFForg/master'
Note to @jsha: After communicating to something purporting to be 'the home team' about 'some other team' and being DDOSed over impossible routes over Tor (10 minutes later) (how is that even possible) I suggest you *seriously* scrutinize *anything* I submit that's not in rulesets/ I can write C and Haskell but I wouldn't subject anyone to it (probably would do more wrong than right) You shouldn't trust anything from git mail address anyway. It's just one massive stream of spear-fishing attempts and token reset warnings. Also, thanks to @QubesOS and grsecurity for saving my life (maybe). Conflicts: src/chrome/content/rules/Federal-Communications-Commission.xml
2 parents 8afd2b8 + 4bf661a commit 79d6ffd

16 files changed

+106
-19
lines changed

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<!--
2+
Non-functional domain:
3+
- centili.com (cert only matches subdomains)
4+
-->
5+
6+
<ruleset name="Centili">
7+
<target host="api.centili.com" />
8+
<target host="www.centili.com" />
9+
10+
<securecookie host="^(api|www)\.centili\.com$" name=".+" />
11+
12+
<rule from="^http:"
13+
to="https:" />
14+
</ruleset>

‎src/chrome/content/rules/Dash-Player.com.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<ruleset name="bitmovin GmbH">
2+
3+
<target host="www.dash-player.com"/>
4+
5+
<rule from="^http:"
6+
to="https:" />
7+
8+
</ruleset>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<!--
22
For other Embedly coverage, see Embed.ly.xml.
3+
Rule breaks videos on genius.com
34
45
-->
5-
<ruleset name="Embedly.com">
6+
<ruleset name="Embedly.com" default_off="breaks site">
67

78
<!-- Direct rewrites:
89
-->

‎src/chrome/content/rules/Federal-Communications-Commission.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
- ^ (shows transition; mismatched, CN: transition.fcc.gov)
1515
- publicsafety (times out)
1616
- reboot *
17+
- transition (404 on http://transition.fcc.gov/Daily_Releases/Daily_Digest/2015/dd2015.html)
18+
- apps (404, expired)
19+
- fjallfoss (404)
1720
1821
* Times out
1922
@@ -61,6 +64,9 @@
6164
exclusions and tests are left for commentary and potential
6265
future use.
6366
67+
<test url="http://hraunfoss.fcc.gov/edocs_public/attachmatch/DOC-235879A1.txt" />
68+
<test url="http://hraunfoss.fcc.gov/edocs_public/attachmatch/DOC-235879A1.pdf" />
69+
6470
404:
6571
-->
6672
<!--exclusion pattern="^http://apps\.fcc\.gov/ecfs/$" /-->

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!--
2+
CDN bucket:
3+
- dyq29inb4n9ck.cloudfront.net
4+
-->
5+
6+
<ruleset name="Fortumo">
7+
<target host="fortumo.com" />
8+
<target host="blog.fortumo.com" />
9+
<target host="developers.fortumo.com" />
10+
<target host="www.fortumo.com" />
11+
12+
<securecookie host="^.*\.fortumo\.com$" name=".+" />
13+
14+
<rule from="^http:"
15+
to="https:" />
16+
</ruleset>

‎src/chrome/content/rules/Gannett-cdn.com.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- www.gannett-cdn.com.edgesuite.net
88
99
-->
10-
<ruleset name="gannett-cdn.com (partial)">
10+
<ruleset name="gannett-cdn.com (partial)" default_off="breaks site">
1111

1212
<target host="www.gannett-cdn.com" />
1313
<!--

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<target host="www.grr.la" />
88

99
<securecookie host="^www\.guerrillamail\.com$" name=".+" />
10+
<securecookie host="^grr\.la$" name=".+" />
1011

1112
<rule from="^http:"
1213
to="https:" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Secured by us
1919
2020
-->
21-
<ruleset name="UPI.com (partial)">
21+
<ruleset name="UPI.com (partial)" default_off="expired">
2222

2323
<target host="upi.com" />
2424
<target host="*.upi.com" />

‎src/chrome/content/rules/Wal.co.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
<!-- Direct rewrites:
88
-->
9+
<target host="a14.wal.co" />
910
<target host="ll-us-i5.wal.co" />
1011

1112

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@
125125
<target host="es.corporate.walmart.com" />
126126

127127
<target host="corporativo.walmart.com" />
128+
<target host="fonts.walmart.com" />
128129
<target host="foundation.walmart.com" />
129130
<target host="es.foundation.walmart.com" />
130131
<target host="fundacion.walmart.com" />

0 commit comments

Comments
 (0)