Skip to content

Commit 6518ada

Browse files
author
MB
committed
Merge branch 'master' of github.com:EFForg/HTTPS-Everywhere
Conflicts: src/chrome/content/rules/451-Group.xml src/chrome/content/rules/Clicks.lv.xml src/chrome/content/rules/DRM.info.xml src/chrome/content/rules/Medium.xml src/chrome/content/rules/Ozon.ru.xml
2 parents 85152c7 + 0bb9365 commit 6518ada

File tree

273 files changed

+7395
-673
lines changed

Some content is hidden

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

273 files changed

+7395
-673
lines changed

‎.travis.yml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,33 @@
33
language: python
44
python:
55
- "2.7"
6-
cache: pip
6+
cache:
7+
directories:
8+
- $HOME/.cache/pip
9+
- $HOME/virtualenv/python2.7_with_system_site_packages
710
addons:
811
apt:
912
packages:
1013
- libxml2-dev
1114
- python-dev
1215
- libcurl4-openssl-dev
1316
- python-lxml
17+
- python-software-properties
18+
- chromium-browser
1419
firefox: "37.0"
1520
virtualenv:
1621
system_site_packages: true
1722
install:
1823
- pip install -r https-everywhere-checker/requirements.txt
19-
before_script:
20-
- sh -e /etc/init.d/xvfb start
24+
- pip install -r test/chromium/requirements.txt
2125
env:
2226
- DISPLAY=':99.0'
27+
before_script:
28+
- export DISPLAY=:99.0
29+
- sh -e /etc/init.d/xvfb start
30+
- wget https://chromedriver.storage.googleapis.com/2.12/chromedriver_linux64.zip
31+
- unzip chromedriver_linux64.zip
32+
- mv chromedriver test/chromium/chromedriver
2333
script:
2434
- ./test.sh
2535
sudo: false
@@ -33,4 +43,3 @@ notifications:
3343
- "irc.oftc.net#https-everywhere"
3444
on_success: change
3545
on_failure: change
36-

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Run the latest code and rulesets in a standalone Firefox profile:
1818

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

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

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

‎chromium/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@
3939
"<all_urls>"
4040
],
4141
"update_url": "https://www.eff.org/files/https-everywhere-chrome-updates.xml",
42-
"version": "2015.8.13"
42+
"version": "2015.8.25"
4343
}

‎chromium/popup.css‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ section.rules {
2525

2626
/* Favicons */
2727
.rule img {
28+
width: 16px;
29+
height: 16px;
2830
margin-left: 0.6em;
2931
vertical-align: bottom;
3032
}

‎install-dev-dependencies.sh‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,20 @@
44
set -o errexit -o xtrace
55
if type apt-get >/dev/null ; then
66
BROWSERS="firefox chromium-browser"
7+
CHROMEDRIVER="chromium-chromedriver"
78
if [[ "$(lsb_release -is)" == "Debian" ]]; then
89
# Iceweasel is the rebranded Firefox that Debian ships, and Chromium
910
# takes the name of 'chromium' instead of 'chromium-browser' in
1011
# Debian 7 (wheezy) and later.
1112
BROWSERS="iceweasel chromium"
13+
CHROMEDRIVER="chromedriver"
1214
fi
1315
sudo apt-get install libxml2-dev libxml2-utils libxslt1-dev python-dev \
14-
$BROWSERS zip sqlite3 python-pip libcurl4-openssl-dev
16+
$BROWSERS zip sqlite3 python-pip libcurl4-openssl-dev \
17+
libssl-dev $CHROMEDRIVER
1518
elif type brew >/dev/null ; then
1619
brew list python &>/dev/null || brew install python
17-
brew install libxml2 gnu-sed
20+
brew install libxml2 gnu-sed chromedriver
1821
if ! echo $PATH | grep -ql /usr/local/bin ; then
1922
echo '/usr/local/bin not found in $PATH, please add it.'
2023
fi
@@ -31,6 +34,9 @@ pip install --user --no-allow-insecure --no-allow-external -r requirements.txt
3134
cd https-everywhere-checker
3235
pip install --user -r requirements.txt
3336
cd -
37+
cd test/chromium
38+
pip install --user -r requirements.txt
39+
cd -
3440

3541
# Install a hook to run tests before pushing.
3642
ln -sf ../../test.sh .git/hooks/pre-push

‎ruleset-style.md‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ To that end, here are some style guidelines for writing or modifying rulesets.
77
They are intended to help and simplify in places where choices are ambiguous,
88
but like all guidelines they can be broken if the circumstances require it.
99

10-
Avoid using the left-wildcard ("&lt;target host='*.example.com'&gt;") unless you
11-
really mean it. Many rules today specify a left-wildcard target, but the
12-
rewrite rules only rewrite an explicit list of hostnames.
10+
Avoid using the left-wildcard ("&lt;target host='*.example.com'&gt;") unless
11+
you intend to rewrite all or nearly all subdomains. Many rules today specify
12+
a left-wildcard target, but the rewrite rules only rewrite an explicit list
13+
of hostnames.
1314

1415
Instead, prefer listing explicit target hosts and a single rewrite from "^http:" to
1516
"^https:". This saves you time as a ruleset author because each explicit target
@@ -55,7 +56,14 @@ non-capturing form adds extra line noise that makes rules harder to read.
5556
Generally you can achieve the same effect by choosing a correspondingly higher
5657
index for your replacement group to account for the groups you don't care about.
5758

58-
Here is an example ruleset today:
59+
Avoid snapping redirects. For instance, if https://foo.fm serves HTTPS
60+
correctly, but redirects to https://foo.com, it's tempting to rewrite foo.fm to
61+
foo.com, to save users the latency of the redirect. However, such rulesets are
62+
less obviously correct and require more scrutiny. And the redirect can go out of
63+
date and cause problems. HTTPS Everywhere rulesets should change requests the minimum
64+
amount necessary to ensure a secure connection.
65+
66+
Here is an example ruleset pre-style guidelines:
5967

6068
```
6169
<ruleset name="WHATWG.org">

‎run-chromium.sh‎

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

‎src/Changelog‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Firefox 5.1.1 / Chrome 2015.8.25
2+
* Ruleset fixes
3+
* Clean up some unused code that was causing review problems on AMO.
4+
15
Firefox 5.1.0
26
* Signed by AMO so it won't get a warning in Firefox
37

0 commit comments

Comments
 (0)