Skip to content

Commit b7098f8

Browse files
author
MB
committed
Merge remote-tracking branch 'efforg/master'
2 parents 9582201 + 25bb7f5 commit b7098f8

Some content is hidden

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

58 files changed

+173
-86
lines changed

‎README.md‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ HTTPS Everywhere consists of a large number of rules for switching sites from HT
8282

8383
If you want to create new rules to submit to us, we expect them to be in the src/chrome/content/rules directory. That directory also contains a useful script, make-trivial-rule, to create a simple rule for a specified domain. There is also a script called trivial-validate.py, to check all the pending rules for several common errors and oversights. For example, if you wanted to make a rule for the example.com domain, you could run
8484

85-
sh ./make-trivial-rule example.com
85+
bash ./make-trivial-rule example.com
8686

8787
inside the rules directory. This would create Example.com.xml, which you could then take a look at and edit based on your knowledge of any specific URLs at example.com that do or don't work in HTTPS. You should then run
8888

@@ -113,9 +113,11 @@ Please help write more unittests and integration tests!
113113

114114
There are also ruleset tests, which aim to find broken rulesets by actually
115115
loading URLs in a browser and watching for Mixed Content Blocking to fire.
116-
You can run ruleset tests by opening [about:config](about:config) and changing
117-
`extensions.https_everywhere.show_ruleset_tests` to true. Now when you open
118-
the HTTPS Everywhere context menu there will be a "Run HTTPS Everywhere Ruleset Tests"
119-
menu item.
116+
The easiest way to run ruleset tests is to load a standalone Firefox instance
117+
with the tests enabled:
120118

121-
When you run the tests, be prepared to let your computer run them for a really long time.
119+
bash test.sh --justrun
120+
121+
Then click the HTTPS Everywhere icon on the toolbar, and click "Run HTTPS
122+
Everywhere Ruleset Tests." When you run the tests, be prepared to let your
123+
computer run them for a really long time.

‎src/chrome/content/about.xul‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
onmouseover="event.target.style.cursor='pointer'"
6161
onmouseout="event.target.style.cursor='default'"
6262
onclick="window_opener('https://www.torproject.org/donate/donate.html.en')"/>
63-
or
63+
&https-everywhere.about.or;
6464
<label id="donate link2"
6565
value="&https-everywhere.about.donate_eff;"
6666
style="color: blue; cursor:hand; text-decoration:underline; font-style:bold"

src/chrome/content/rules/Centrum.sk_cz.xml renamed to src/chrome/content/rules/Centrum_Holdings.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<!--
2+
Centrum Holdings, a.s.
23
centrum.sk, centrum.cz webmail
4+
atlas.sk webmail
35
46
Nonfunctional subdomains:
57
www
@@ -9,13 +11,18 @@
911
lite.mail.centrum.sk
1012
mail.centrum.sk
1113
-->
12-
<ruleset name="Centrum.sk_cz (partial)">
14+
<ruleset name="Centrum Holdings (partial)">
1315
<target host="*.centrum.sk" />
1416
<target host="*.centrum.cz" />
1517

18+
<target host="*.atlas.sk" />
19+
20+
<rule from="^http://(mail|reg|user|heslo)\.atlas\.sk/"
21+
to="https://$1.atlas.sk/" />
22+
1623
<rule from="^http://(reg|user|heslo)\.centrum\.(cz|sk)/"
1724
to="https://$1.centrum.$2/" />
1825

19-
<rule from="^http://mail\.centrum\.cz/"
20-
to="https://mail.centrum.cz/" />
26+
<rule from="^http://(areg|auser|mail)\.centrum\.cz/"
27+
to="https://$1.centrum.cz/" />
2128
</ruleset>

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
1-
<!--
2-
Mixed content:
1+
<ruleset name="Forocoches">
32

4-
- Images on www.forocoches.com/ and forocoches.com/ from img.infocoches.com *
5-
- Images on www.forocoches.com/ and forocoches.com/ from www.forocoches.com *
6-
7-
* Secured by us
8-
9-
-->
10-
11-
<ruleset name="Forocoches" platform="mixedcontent">
12-
<target host="forocoches.com" />
13-
<target host="*.forocoches.com" />
3+
<target host="forocoches.com" />
4+
<target host="*.forocoches.com" />
145

156
<rule from="^http://forocoches\.com/" to="https://forocoches.com/"/>
167
<rule from="^http://([^/:@]*)\.forocoches\.com/" to="https://$1.forocoches.com/"/>
8+
179
</ruleset>

‎src/chrome/content/rules/GnuPG.org-cacert.xml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<!--
2-
For domains using cacert, see GnuPG.org-cacert.xml.
3-
42
For problematic rules, see GnuPG.org-problematic.xml.
53
64
For other Free Software Foundation coverage, see FSF.xml.
@@ -11,32 +9,30 @@
119
- blog ¹
1210
- ftp *
1311
14-
¹ Works; mismatched, CN: gunpg.org
12+
¹ Works; mismatched, CN: gnupg.org
1513
* Refused
1614
1715
1816
Problematic subdomains:
1917
2018
- bugs (works; mismatched, CN: kerckhoffs.g10code.com)
21-
- lists ²
22-
- wiki ³
19+
- wiki ²
2320
24-
² cacert
25-
³ self-signed
21+
² self-signed
2622
2723
2824
Fully covered subdomains:
2925
3026
- (www.)
31-
27+
- lists
3228
-->
3329
<ruleset name="GnuPG.org (partial)">
3430

3531
<target host="gnupg.org" />
3632
<target host="www.gnupg.org" />
33+
<target host="lists.gnupg.org" />
3734

38-
39-
<rule from="^http://(www\.)?gnupg\.org/"
35+
<rule from="^http://((?:www|lists)\.)?gnupg\.org/"
4036
to="https://$1gnupg.org/" />
4137

4238
</ruleset>

‎src/chrome/content/rules/Poliisi.fi.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ruleset name="Poliisi.fi">
1+
<ruleset name="Poliisi.fi" platform="mixedcontent">
22
<target host="poliisi.fi" />
33
<target host="www.poliisi.fi" />
44

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<ruleset name="WaniKani">
2+
<target host="www.wanikani.com" />
3+
<target host="wanikani.com" />
4+
5+
<rule from="^http://(www\.)?wanikani\.com/" to="https://www.wanikani.com/"/>
6+
</ruleset>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
(www.)?: Dropped
33
44
-->
5-
<ruleset name="WeeklyPlus.com (partial)" deafault_off="connection dropped">
5+
<ruleset name="WeeklyPlus.com (partial)" default_off="connection dropped">
66

77
<target host="weeklyplus.com" />
88
<target host="www.weeklyplus.com" />

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

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

0 commit comments

Comments
 (0)