Skip to content

Commit 9d69407

Browse files
pdepde
committed
Merge remote-tracking branch 'negres/master'
2 parents 57821a4 + c873a48 commit 9d69407

File tree

77 files changed

+1445
-264
lines changed

Some content is hidden

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

77 files changed

+1445
-264
lines changed

‎src/chrome/content/rules/918autoloans.com.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<ruleset name="918autoloans.com">
2+
3+
<target host="918autoloans.com" />
4+
<target host="*.918autoloans.com" />
5+
6+
7+
<securecookie host="^\.918autoloans\.com$" name=".+" />
8+
9+
10+
<rule from="^http://(www\.)?918autoloans\.com/"
11+
to="https://$1918autoloans.com/" />
12+
13+
</ruleset>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<!--
2+
Web bugs.
3+
4+
-->
5+
<ruleset name="adentifi.com">
6+
7+
<target host="adentifi.com" />
8+
<target host="www.adentifi.com" />
9+
10+
11+
<securecookie host="^(?:www\.)?adentifi\.com$" name=".+" />
12+
13+
14+
<rule from="^http://(www\.)?adentifi\.com/"
15+
to="https://$1adentifi.com/" />
16+
17+
</ruleset>

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!--
2+
For rules not causing false/broken MCB, see AetherFlyff.com.xml.
3+
4+
-->
5+
<ruleset name="Aether Flyff.com (false MCB)" platform="mixedcontent">
6+
7+
<target host="*.aetherflyff.com" />
8+
<!--
9+
Handled in AetherFlyff.com.xml:
10+
-->
11+
<exclusion pattern="^http://basilisk\.aetherflyff\.com/+(?!forums(?!/favicon\.ico|/index\.php\?app=core&amp;module=task|/public/|/uploads/))" />
12+
<exclusion pattern="^http://support\.aetherflyff\.com/+(?:cron/index\.php\?/Base/|favicon\.ico|index\.php\?/Core/|__swift/)" />
13+
14+
15+
<securecookie host="^(?:\.basilisk|support)?\.aetherflyff\.com$" name=".+" />
16+
17+
18+
<rule from="^http://(basilisk|support)\.aetherflyff\.com/"
19+
to="https://$1.aetherflyff.com/" />
20+
21+
</ruleset>

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<!--
2+
For rules causing false/broken MCB, see AetherFlyff.com-falsemixed.xml.
3+
4+
5+
Mixed content:
6+
7+
- css on basilisk and support from self *
8+
9+
- Images, on:
10+
11+
- basilisk and support from $self *
12+
- basilisk from www.gravatar.com *
13+
14+
* Secured by us
15+
16+
-->
17+
<ruleset name="Aether Flyff.com (partial)">
18+
19+
<target host="aetherflyff.com" />
20+
<target host="basilisk.aetherflyff.com" />
21+
<!--
22+
Avoid false/broken MCB:
23+
-->
24+
<exclusion pattern="^http://basilisk\.aetherflyff\.com/+forums(?!/favicon\.ico|/index\.php\?app=core&amp;module=task|/public/|/uploads/)" />
25+
<target host="support.aetherflyff.com" />
26+
<exclusion pattern="^http://support\.aetherflyff\.com/+(?!cron/index\.php\?/Base/|favicon\.ico|index\.php\?/Core/|__swift/)" />
27+
<target host="www.aetherflyff.com" />
28+
29+
30+
<rule from="^http://((?:basilisk|support|www)\.)?aetherflyff\.com/"
31+
to="https://$1aetherflyff.com/" />
32+
33+
</ruleset>

‎src/chrome/content/rules/AllYou.net.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!--
2+
CDN buckets:
3+
4+
- allyou-live-static.s3-eu-west-1.amazonaws.com
5+
6+
-->
7+
<ruleset name="AllYou.net">
8+
9+
<target host="allyou.net" />
10+
<target host="*.allyou.net" />
11+
12+
13+
<securecookie host="^(?:www)?\.allyou\.net$" name=".+" />
14+
15+
16+
<rule from="^http://(media\.|www\.)?allyou\.net/"
17+
to="https://$1allyou.net/" />
18+
19+
</ruleset>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,11 @@
136136
<target host="*.ssl-images-amazon.com" />
137137

138138

139-
<!-- Forced redirect:
139+
<!-- Forced redirects:
140140
-->
141+
<rule from="^http://dis(\.resized)?\.images\.s3\.amazonaws\.com/"
142+
to="https://s3-eu-west-1.amazonaws.com/dis$1.images/" />
143+
141144
<rule from="^http://cms\.kiva\.org\.s3\.amazonaws\.com/"
142145
to="https://s3-us-west-1.amazonaws.com/cms.kiva.org/" />
143146

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<!--
2+
- Expired 2010-03-12
3+
- Cert only matches www.anders.com
4+
5+
6+
Mixed content:
7+
8+
- Videos from www.youtube.com *
9+
10+
- fonts from fonts.googleapis.com *
11+
12+
- Images from ^ *
13+
14+
* Secured by us
15+
16+
-->
17+
<ruleset name="Anders.com" default_off="expired, self-signed">
18+
19+
<target host="anders.com" />
20+
<target host="www.anders.com" />
21+
22+
23+
<securecookie host="^www\.anders\.com$" name=".+" />
24+
25+
26+
<rule from="^http://(?:www\.)?anders\.com/"
27+
to="https://www.anders.com/" />
28+
29+
</ruleset>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
- certifications
119119
- configuration
120120
- connect
121+
- consultants-locator
121122
- csat
122123
- daw
123124
- developer
@@ -256,6 +257,7 @@
256257
Observed cookie domains:
257258
258259
- .
260+
- consultants-locator
259261
- genius-download.itunes
260262
- genius-upload.itunes
261263
- sitemanager.itunes
@@ -279,6 +281,7 @@
279281
280282
- Images, on:
281283
284+
- consultants-locator from images *
282285
- itunes from images *
283286
- itunes from ax.phobos.apple.com.edgesuite.net *
284287
- itunes from a[1-5].mzstatic.com *
@@ -320,7 +323,7 @@
320323
-->
321324
<securecookie host="^(?!\.?(?:concierg|stor)e\.apple\.com).+\.apple\.com$" name=".+" />
322325

323-
<rule from="^http://((?:albert|appleid|application|(?:nc-|nwk-)?as-images|bugreport|buyiphone\d?|certifications|concierge|configuration|connect|csat|daw|developer|devforums|discussions(?:japan)?|ecommerce|service\d?\.ess|expresslane|gsx|gsxapp|help|hrweb|ia?d|idmsa|iforgot|(?:(?:affiliate|api|autolinkmaker|banners|bookkeeper|buy|c|client-api|du|feeds|files|genius(?:-download|-upload)?(?:-2)?|homesharing|init|itunesu|ld-(?:\d|nk11|st11)|linkmaker|my|myapp|p\d+-buy|p100-sandbox|p[12]-u|partiality|pd-nk|pd-st|play|rss|s|sandbox|sc|se|search|sidebar|sitemanager|sp|static|stations|su|tl|tl-activity|upp|userpub|volume|vpp|widgets)\.)?itunes|itunesconnect|jointventure|jobs|prod\.lists|locate|mypage|n(?:c|wk)-(?:buyiphone|unbrick1)|nwk-unbrick2|onetoone|(www\.)?opensource|phobos|portal|register|remoteadvisor|reportingitc|reseller|reserve|salestraining|securemetrics|selfsolve|store|secure\d?\.store|supportprofile|swdlp|uptodate|wdg2|www)\.)?apple\.com/"
326+
<rule from="^http://((?:albert|appleid|application|(?:nc-|nwk-)?as-images|bugreport|buyiphone\d?|certifications|concierge|configuration|connect|consultants-locator|csat|daw|developer|devforums|discussions(?:japan)?|ecommerce|service\d?\.ess|expresslane|gsx|gsxapp|help|hrweb|ia?d|idmsa|iforgot|(?:(?:affiliate|api|autolinkmaker|banners|bookkeeper|buy|c|client-api|du|feeds|files|genius(?:-download|-upload)?(?:-2)?|homesharing|init|itunesu|ld-(?:\d|nk11|st11)|linkmaker|my|myapp|p\d+-buy|p100-sandbox|p[12]-u|partiality|pd-nk|pd-st|play|rss|s|sandbox|sc|se|search|sidebar|sitemanager|sp|static|stations|su|tl|tl-activity|upp|userpub|volume|vpp|widgets)\.)?itunes|itunesconnect|jointventure|jobs|prod\.lists|locate|mypage|n(?:c|wk)-(?:buyiphone|unbrick1)|nwk-unbrick2|onetoone|(www\.)?opensource|phobos|portal|register|remoteadvisor|reportingitc|reseller|reserve|salestraining|securemetrics|selfsolve|store|secure\d?\.store|supportprofile|swdlp|uptodate|wdg2|www)\.)?apple\.com/"
324327
to="https://$1apple.com/" />
325328

326329
<rule from="^http://appldnld\.apple\.com/"

‎src/chrome/content/rules/Ars-Technica.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<rule from="^http://((?:cms|hq|www)\.)?arstechnica\.com/"
6666
to="https://$1arstechnica.com/" />
6767

68-
<rule from="^http://feeds\.arstechnica\.com/(?:\?.*)$"
68+
<rule from="^http://feeds\.arstechnica\.com/(?:\?.*)?$"
6969
to="https://feedburner.google.com/fb/a/home" />
7070

7171
<rule from="^http://stats2\.arstechnica\.com/"

‎src/chrome/content/rules/Atlatszo.hu.xml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<!--
2+
Nonfunctional subdomains:
3+
4+
- services (shows default page; mismatched, CN: *.tyrell.hu)
5+
6+
7+
Cert only matches *.atlatszo.hu
8+
9+
10+
Mixed content:
11+
12+
- Video from player.vimeo.com ¹
13+
14+
- css from fonts.googleapis.com ¹
15+
16+
- Images from ^ ¹
17+
18+
- Ads/web bugs, from;
19+
20+
- services ²
21+
- www.facebook.com ¹
22+
23+
¹ Secured by us
24+
² Unsecurable
25+
26+
-->
27+
<ruleset name="Atlatszo.hu (partial)" default_off="md5, self-signed">
28+
29+
<target host="atlatszo.hu" />
30+
<target host="www.atlatszo.hu" />
31+
32+
33+
<securecookie host="^www\.atlatszo\.hu$" name=".+" />
34+
35+
36+
<rule from="^http://(?:www\.)?atlatszo\.hu/"
37+
to="https://www.atlatszo.hu/" />
38+
39+
</ruleset>

0 commit comments

Comments
 (0)