Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/chrome/content/rules/Adsurve.com.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,17 @@

- www01 (refused)


Expired 2013-11-20

-->
<ruleset name="adsurve.com (partial)" default_off="expired">
<ruleset name="Adsurve.com (partial)">

<target host="adsurve.com" />
<target host="www.adsurve.com" />


<securecookie host="^adsurve\.com$" name=".+" />
<securecookie host=".+" name=".+" />


<rule from="^http://(?:www\.)?adsurve\.com/"
to="https://adsurve.com/" />
<rule from="^http:"
to="https:" />

</ruleset>
2 changes: 1 addition & 1 deletion src/chrome/content/rules/Amnistia.cl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
ˢ Secured by us

-->
<ruleset name="Amnistia.cl" default_off="expired">
<ruleset name="Amnistia.cl" platform="mixedcontent">

<target host="amnistia.cl" />
<target host="www.amnistia.cl" />
Expand Down
10 changes: 3 additions & 7 deletions src/chrome/content/rules/Boost.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,15 @@
Nonfunctional subdomains:

- (www.) (redirects to http)
- lists ²

² Redirects to www2

-->
<ruleset name="boost.org (partial)" default_off="expired">
<ruleset name="Boost.org (partial)">

<!-- Direct rewrites:
-->
<target host="lists.boost.org" />
<target host="svn.boost.org" />


<securecookie host="^svn\.boost\.org$" name=".+" />
<securecookie host=".+" name=".+" />


<rule from="^http:"
Expand Down
21 changes: 1 addition & 20 deletions src/chrome/content/rules/BrightContext.com.xml
Original file line number Diff line number Diff line change
@@ -1,23 +1,4 @@
<!--
CDN buckets:

- s3.amazonaws.com/static.brightcontext.com/
- d21tvy0y59wl26.cloudfront.net


Problematic subdomains:

- (www.)? *

* Expired


Fully covered subdomains:

- (www.)?

-->
<ruleset name="BrightContext.com" default_off="expired">
<ruleset name="BrightContext.com">

<target host="brightcontext.com" />
<target host="www.brightcontext.com" />
Expand Down
5 changes: 1 addition & 4 deletions src/chrome/content/rules/Bufferbloat.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@

- snapon.lab (refused)


Expired 2014.

-->
<ruleset name="Bufferbloat.net" default_off="expired">
<ruleset name="Bufferbloat.net">

<target host="bufferbloat.net" />
<target host="lists.bufferbloat.net" />
Expand Down
4 changes: 1 addition & 3 deletions src/chrome/content/rules/Cloudmining.guru.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<ruleset name="cloudmining.guru" default_off="expired">
<ruleset name="Cloudmining.guru">

<!-- Direct rewrites:
-->
<target host="cloudmining.guru" />
<target host="www.cloudmining.guru" />

Expand Down
22 changes: 17 additions & 5 deletions src/chrome/content/rules/CodingTeam.net.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
<ruleset name="CodingTeam.net" default_off="expired">
<target host="codingteam.net"/>
<target host="www.codingteam.net"/>
<!--

Problematic hosts in *codingteam.net:

- www (mismatched)

-->
<ruleset name="CodingTeam.net">

<target host="codingteam.net" />
<target host="www.codingteam.net" />

<rule from="^http://www\.codingteam\.net/"
to="https://codingteam.net/" />

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

<rule from="^http://(?:www\.)?codingteam\.net/"
to="https://codingteam.net/"/>
</ruleset>

12 changes: 4 additions & 8 deletions src/chrome/content/rules/Com-Sys.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<!--
Expired 2013-06-15

-->
<ruleset name="Com-Sys" default_off="expired">
<ruleset name="Com-Sys">

<target host="com-sys.de" />
<target host="www.com-sys.de" />
Expand All @@ -11,7 +7,7 @@
<securecookie host="^com-sys\.de$" name=".+" />


<rule from="^http://(?:www\.)?com-sys\.de/"
to="https://com-sys.de/" />
<rule from="^http:"
to="https:" />

</ruleset>
</ruleset>
14 changes: 4 additions & 10 deletions src/chrome/content/rules/ConnectiCon.org.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<!--
Expired 2013-07-12

-->
<ruleset name="ConnectiCon.org" default_off="expired">
<ruleset name="ConnectiCon.org">

<target host="connecticon.org" />
<target host="www.connecticon.org" />
Expand All @@ -11,9 +7,7 @@
<securecookie host="^connecticon\.org$" name=".+" />


<!-- www redirects to ^ over http, so copy that:
-->
<rule from="^http://(?:www\.)?connecticon\.org/"
to="https://connecticon.org/" />
<rule from="^http:"
to="https:" />

</ruleset>
</ruleset>
6 changes: 1 addition & 5 deletions src/chrome/content/rules/Crafty_Syntax.com.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<!--
Expired 2012

-->
<ruleset name="Crafty Syntax.com" default_off="expired">
<ruleset name="Crafty Syntax.com" default_off="timeout">

<target host="craftysyntax.com" />
<target host="www.craftysyntax.com" />
Expand Down
4 changes: 2 additions & 2 deletions src/chrome/content/rules/Craphound.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<ruleset name="Craphound" default_off="expired">
<ruleset name="Craphound">

<target host="craphound.com" />
<target host="www.craphound.com" />


<securecookie host="^(?:www\.)?craphound\.com$" name=".+" />
<securecookie host=".+" name=".+" />


<rule from="^http:"
Expand Down
7 changes: 3 additions & 4 deletions src/chrome/content/rules/CrazyBump.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<ruleset name="CrazyBump" default_off="expired">
<ruleset name="CrazyBump">

<target host="crazybump.com" />
<target host="www.crazybump.com" />


<rule from="^http://(?:www\.)?crazybump\.com/"
to="https://crazybump.com/" />
<rule from="^http:"
to="https:" />

</ruleset>
35 changes: 3 additions & 32 deletions src/chrome/content/rules/Digital_News_Agency.com.xml
Original file line number Diff line number Diff line change
@@ -1,41 +1,12 @@
<!--
CDN buckets:
<ruleset name="Digital News Agency.com">

- dna-bucket-dna.cf.rawcdn.com <=> df7r7v78mcbtc.cloudfront.net


^digitalnewsagency.com: Cert only matches www


Mixed content:

- Images from dna-bucket-dna.cf.rawcdn.com *

* Secured by us

-->
<ruleset name="Digital News Agency.com" default_off="expired">

<!-- Direct rewrites:
-->
<target host="www.digitalnewsagency.com" />

<!-- Complications:
-->
<target host="digitalnewsagency.com" />
<target host="www.digitalnewsagency.com" />
<target host="dna-bucket-dna.cf.rawcdn.com" />


<!-- Not secured by server:
-->
<!--securecookie host="^\.digitalnewsagency\.com$" name="^_dna_session$" /-->
<test url="http://dna-bucket-dna.cf.rawcdn.com/client/logos/10/original/Vodafone_DNA.jpg" />

<securecookie host="^\.digitalnewsagency\.com$" name=".+" />


<rule from="^http://digitalnewsagency\.com/"
to="https://www.digitalnewsagency.com/" />

<rule from="^http://dna-bucket-dna\.cf\.rawcdn\.com/"
to="https://df7r7v78mcbtc.cloudfront.net/" />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That looks a bit dangerous. Can you provide a test url for it? Otherwise you should remove this target.

@ghost ghost Oct 24, 2017 •

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@J0WI

> nslookup dna-bucket-dna.cf.rawcdn.com
Server:  UnKnown
Address:  192.168.0.1

Non-authoritative answer:
Name:    df7r7v78mcbtc.cloudfront.net
Addresses:  13.33.23.17
          13.33.23.146
          13.33.23.85
          13.33.23.82
          13.33.23.240
          13.33.23.121
          13.33.23.71
          13.33.23.35
Aliases:  dna-bucket-dna.cf.rawcdn.com

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@J0WI yeah, I'd actually initially removed it, but I added it back because I realised it's valid and it's a little beyond the scope of this PR to mess with individual rulesets too much. I've added a test URL, and I don't think there are any issues with this rewrite (possibly it's for third-parties, as I haven't seen any mixedcontent issues causing a need for the rewrite on the main site).


Expand Down
13 changes: 7 additions & 6 deletions src/chrome/content/rules/Ferroh.com.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<!--
status: Pingdom
www: certo nly matches ^ferroh.com

Problematic hosts in *ferroh.com:

- status (refused)

-->
<ruleset name="Ferroh.com (partial)" default_off="expired">
<ruleset name="Ferroh.com (partial)">

<target host="ferroh.com" />
<target host="www.ferroh.com" />


<rule from="^http://(?:www\.)?ferroh\.com/"
to="https://ferroh.com/" />
<rule from="^http:"
to="https:" />

</ruleset>
17 changes: 8 additions & 9 deletions src/chrome/content/rules/FileTrip.net.xml
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
<!--
Nonfunctional subdomains:

- s4 (refused)
Problematic hosts in *filetrip.net:


- Expired 2013-07-10
- Cert only matches ^filetrip.net
- www (mismatched)

-->
<ruleset name="FileTrip.net (partial)" default_off="expired">
<ruleset name="FileTrip.net (partial)">

<target host="filetrip.net" />
<target host="www.filetrip.net" />

<target host="s4.filetrip.net" />

<securecookie host="^filetrip\.net$" name=".+" />


<rule from="^http://(?:www\.)?filetrip\.net/"
<rule from="^http://www\.filetrip\.net/"
to="https://filetrip.net/" />

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

</ruleset>
15 changes: 3 additions & 12 deletions src/chrome/content/rules/Grupo_Avante.org.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
<!--
Problematic subdomains:

- ^ (cert only matches www)


Expired 2013-09-27

-->
<ruleset name="Grupo Avante.org" default_off="expired">
<ruleset name="Grupo Avante.org">

<target host="grupoavante.org" />
<target host="www.grupoavante.org" />
Expand All @@ -16,7 +7,7 @@
<securecookie host="^www\.grupoavante\.org$" name=".+" />


<rule from="^http://(?:www\.)?grupoavante\.org/"
to="https://www.grupoavante.org/" />
<rule from="^http:"
to="https:" />

</ruleset>
9 changes: 9 additions & 0 deletions src/chrome/content/rules/Guillaume-Dargaud.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<ruleset name="Guillaume Dargaud">

<target host="gdargaud.net" />
<target host="www.gdargaud.net" />

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

</ruleset>
14 changes: 0 additions & 14 deletions src/chrome/content/rules/Guillaume_Dargauds_website.xml

This file was deleted.

6 changes: 2 additions & 4 deletions src/chrome/content/rules/Healthfuze.com.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<ruleset name="Healthfuze.com" default_off="expired">
<ruleset name="Healthfuze.com">

<!-- Direct rewrites:
-->
<target host="healthfuze.com" />
<target host="www.healthfuze.com" />


<securecookie host="^(?:.*\.)?healthfuze\.com$" name=".+" />
<securecookie host=".+" name=".+" />


<rule from="^http:"
Expand Down
2 changes: 1 addition & 1 deletion src/chrome/content/rules/Hotel_Managaby.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ruleset name="Hotel Mangaby.com" default_off="expired">
<ruleset name="Hotel Mangaby.com">

<target host="hotelmangaby.com" />
<target host="www.hotelmangaby.com" />
Expand Down
Loading