Skip to content

Commit 7f34606

Browse files
author
MB
committed
Merge github.com/EFForg/https-everywhere
2 parents ecc2ead + 48d0c65 commit 7f34606

Some content is hidden

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

44 files changed

+491
-22
lines changed

‎README.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ Get the packages you need and install a git hook to run tests before push:
88

99
bash install-dev-dependencies.sh
1010

11-
Run the tests for the Firefox version:
11+
Run all the tests:
1212

1313
bash test.sh
1414

1515
Run the latest code and rulesets in a standalone Firefox profile:
1616

17-
bash test.sh --justrun
17+
bash test/firefox.sh --justrun
1818

1919
Run the latest code and rulesets in a standalone Chromium profile:
2020

21-
bash test-chromium.sh --justrun
21+
bash test/chromium.sh --justrun
2222

2323
Build the Firefox extension as a .xpi package:
2424

@@ -56,6 +56,8 @@ Important directories you might want to know about
5656

5757
src/chrome/content/rules The rulesets live here
5858

59+
test/ The tests live here
60+
5961
Hacking on the Source Code
6062
--------------------------
6163

@@ -95,7 +97,7 @@ We have two publicly-archived mailing lists: the https-everywhere list (https://
9597
Tests
9698
-------------
9799

98-
There are some very basic unittests under https-everywhere-tests/. These are run with
100+
There are some very basic unittests under test/. These are run with
99101

100102
bash test.sh
101103

@@ -106,7 +108,7 @@ loading URLs in a browser and watching for Mixed Content Blocking to fire.
106108
The easiest way to run ruleset tests is to load a standalone Firefox instance
107109
with the tests enabled:
108110

109-
bash test.sh --justrun
111+
bash test/firefox.sh --justrun
110112

111113
Then click the HTTPS Everywhere icon on the toolbar, and click "Run HTTPS
112114
Everywhere Ruleset Tests." When you run the tests, be prepared to let your

‎src/chrome/content/rules/Aggemam.dk.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<ruleset name="Aggemam.dk">
2+
<target host="aggemam.dk" />
3+
<target host="www.aggemam.dk" />
4+
5+
<rule from="^http:" to="https:" />
6+
</ruleset>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<ruleset name="Blazeti.me">
2+
<target host="blazeti.me" />
3+
<rule from="^http:"
4+
to="https:" />
5+
</ruleset>

‎src/chrome/content/rules/Blogspot.com_blogs.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<target host="lcamtuf.blogspot.*" />
2828
<target host="lcamtuf.blogspot.co.*" />
2929
<target host="lcamtuf.blogspot.com.*" />
30+
<target host="program-think.blogspot.*" />
31+
<target host="program-think.blogspot.co.*" />
32+
<target host="program-think.blogspot.com.*" />
3033
<target host="w00tsec.blogspot.*" />
3134
<target host="w00tsec.blogspot.co.*" />
3235
<target host="w00tsec.blogspot.com.*" />
@@ -35,6 +38,7 @@
3538
<test url="http://googleblog.blogspot.com/" />
3639
<test url="http://googleonlinesecurity.blogspot.com/" />
3740
<test url="http://lcamtuf.blogspot.com/" />
41+
<test url="http://program-think.blogspot.com/" />
3842
<test url="http://w00tsec.blogspot.com/" />
3943

4044
<!-- All other tlds:

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<!--
2+
3+
Nonfunctional domains:
4+
5+
blog.cambridgesoft.com (mismatched)
6+
insideinformatics.cambridgesoft.com (mismatched)
7+
knowledgebase.cambridgesoft.com (timeout)
8+
media.cambridgesoft.com (mismatched)
9+
sitelicense.cambridgesoft.com (mismatched)
10+
11+
-->
12+
13+
<ruleset name="CambridgeSoft.com (partial)">
14+
15+
<target host="cambridgesoft.com" />
16+
<target host="www.cambridgesoft.com" />
17+
<target host="chembiofinder.cambridgesoft.com" />
18+
<target host="scistore.cambridgesoft.com" />
19+
20+
<rule from="^http:"
21+
to="https:" />
22+
23+
</ruleset>

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

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

4141
<!-- Direct rewrites:
4242
-->
43+
<target host="aurel32.debian.net" />
4344
<target host="binarycontrol.debian.net" />
4445
<target host="bootstrap.debian.net" />
4546
<target host="ca.debian.net" />

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
<target host="bzr.debian.org" />
9393
<target host="contributors.debian.org" />
9494
<target host="cvs.debian.org" />
95+
<target host="d-i.debian.org" />
9596
<target host="darcs.debian.org" />
9697
<target host="db.debian.org" />
9798
<target host="dsa.debian.org" />

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<ruleset name="Decadent.org.uk">
2+
3+
<target host="www.decadent.org.uk" />
4+
<target host="git.decadent.org.uk" />
5+
<target host="soubrette.decadent.org.uk" />
6+
<target host="womble.decadent.org.uk" />
7+
8+
<rule from="^http:"
9+
to="https:" />
10+
11+
</ruleset>

‎src/chrome/content/rules/Emilstahl.dk.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<!--
2+
Note that https://cdn(1)?.emilstahl.dk/ display
3+
mixed content; this should be unproblematic as
4+
those URLs are never encountered in the wild.
5+
-->
6+
<ruleset name="Emilstahl.dk">
7+
8+
<target host="emilstahl.dk" />
9+
<target host="www.emilstahl.dk" />
10+
11+
<target host="cdn.emilstahl.dk" />
12+
<target host="cdn1.emilstahl.dk" />
13+
14+
<rule from="^http:"
15+
to="https:" />
16+
17+
</ruleset>

‎src/chrome/content/rules/FileFormat.info.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<!--
2+
3+
Problematic domains:
4+
5+
fileformat.info (connection refused)
6+
7+
-->
8+
9+
<ruleset name="FileFormat.info (MCB)" platform="mixedcontent">
10+
11+
<target host="fileformat.info" />
12+
<target host="www.fileformat.info" />
13+
14+
<rule from="^http://(www\.)?fileformat\.info/"
15+
to="https://www.fileformat.info/" />
16+
17+
</ruleset>

0 commit comments

Comments
 (0)