Skip to content

Commit 72b2423

Browse files
luciancorluciancor
committed
Merge branch 'effRelease'
# Conflicts: # install-dev-dependencies.sh # src/chrome/content/code/HTTPSRules.js # src/components/https-everywhere.js # src/install.rdf
2 parents 2b3e55e + 956b88c commit 72b2423

1,283 files changed

Lines changed: 31207 additions & 5586 deletions

File tree

Some content is hidden

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

‎.editorconfig‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# EditorConfig is awesome: http://EditorConfig.org
2+
3+
root = true
4+
5+
[*]
6+
end_of_line = lf
7+
insert_final_newline = true
8+
charset = utf-8
9+
10+
[src/chrome/content/rules/*.xml]
11+
indent_style = tab
12+
indent_size = 4

‎.gitignore‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1+
*.pyc
2+
*.swp
13
*~
4+
.DS_Store
5+
.idea
6+
.vagrant
7+
.venv/
28
chromium.pem
39
dummy-chromium.pem
10+
from-preloads/
411
pkg/
512
src/chrome/content/rules/default.rulesets
613
src/chrome/content/rulesets.json
714
src/defaults/rulesets.sqlite
8-
*.swp
9-
tokenkeys.py*
10-
.idea
11-
*.pyc
12-
from-preloads/
1315
test_profile/
14-
.venv/
16+
tokenkeys.py*
1517
Vagrantfile
16-
.vagrant
17-
src/chrome/content/rulesets.json

‎.travis.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ sudo: required
22
language: generic
33
services:
44
- docker
5-
before_install:
6-
- docker build -t httpse .
75
script:
8-
- docker run --rm -ti -v $(pwd):/opt -e FIREFOX=/$FIREFOX/firefox/firefox httpse bash -c "./test.sh"
9-
- docker run --rm -ti -v $(pwd):/opt -e FIREFOX=/$FIREFOX/firefox/firefox --privileged httpse bash -c "service miredo start && test/travis-ruleset-fetch.sh"
6+
- test/travis.sh
107
env:
11-
- FIREFOX=firefox-latest
12-
- FIREFOX=firefox-esr-latest
8+
- TEST=firefox FIREFOX=firefox-dev
9+
- TEST=firefox FIREFOX=firefox-latest
10+
- TEST=firefox FIREFOX=firefox-esr-latest
11+
- TEST=chromium
12+
- TEST=rules
13+
- TEST=fetch

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Important directories you might want to know about
6161
Hacking on the Source Code
6262
--------------------------
6363

64-
The current stable release series is 5.0. The maintainers release new versions
64+
The current stable release series is 5.2. The maintainers release new versions
6565
off the current master branch about every two weeks.
6666

6767
To submit changes, either use pull requests on GitHub or email patches to

‎chromium/manifest.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,5 @@
4444
"storage",
4545
"<all_urls>"
4646
],
47-
"update_url": "https://www.eff.org/files/https-everywhere-chrome-updates.xml",
48-
"version": "2016.7.19"
47+
"version": "2016.9.1"
4948
}

‎install-dev-dependencies.sh‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
# Install packages that are necessary and/or useful to build and debug
33
# HTTPS Everywhere
44
set -o errexit -o xtrace
5+
6+
if [ $UID != 0 ]; then
7+
SUDO_SHIM=sudo
8+
fi
9+
510
if type apt-get >/dev/null ; then
611
BROWSERS="firefox chromium-browser"
712
CHROMEDRIVER="chromium-chromedriver"
@@ -12,8 +17,13 @@ if type apt-get >/dev/null ; then
1217
BROWSERS="iceweasel chromium"
1318
CHROMEDRIVER="chromedriver"
1419
fi
20+
<<<<<<< HEAD
1521
sudo apt-get install -y libxml2-dev libxml2-utils libxslt1-dev python-dev \
1622
$BROWSERS zip sqlite3 python-pip libcurl4-openssl-dev xvfb \
23+
=======
24+
$SUDO_SHIM apt-get install libxml2-dev libxml2-utils libxslt1-dev \
25+
python-dev $BROWSERS zip sqlite3 python-pip libcurl4-openssl-dev xvfb \
26+
>>>>>>> effRelease
1727
libssl-dev git $CHROMEDRIVER
1828
elif type brew >/dev/null ; then
1929
brew list python &>/dev/null || brew install python
@@ -22,7 +32,29 @@ elif type brew >/dev/null ; then
2232
echo '/usr/local/bin not found in $PATH, please add it.'
2333
fi
2434
elif type dnf >/dev/null ; then
25-
sudo dnf install libxml2-devel python-devel libxslt-devel
35+
$SUDO_SHIM dnf install firefox gcc git libcurl-devel libxml2-devel \
36+
libxslt-devel python-devel redhat-rpm-config xorg-x11-server-Xvfb which \
37+
findutils procps openssl chromium GConf2
38+
if ! type chromedriver >/dev/null; then
39+
if [ "`uname -m`" == "x86_64" ]; then
40+
ARCH=64
41+
else
42+
ARCH=32
43+
fi
44+
curl -O "https://chromedriver.storage.googleapis.com/2.23/chromedriver_linux$ARCH.zip"
45+
unzip "chromedriver_linux$ARCH.zip"
46+
rm -f "chromedriver_linux$ARCH.zip"
47+
$SUDO_SHIM mv chromedriver /usr/bin/chromedriver
48+
$SUDO_SHIM chown root /usr/bin/chromedriver
49+
$SUDO_SHIM chmod +x /usr/bin/chromedriver
50+
$SUDO_SHIM chmod 755 /usr/bin/chromedriver
51+
fi
52+
# This is needed for Firefox on some systems. See here for more information:
53+
# https://github.com/EFForg/https-everywhere/pull/5584#issuecomment-238655443
54+
if [ ! -f /var/lib/dbus/machine-id ]; then
55+
$SUDO_SHIM sh -c 'dbus-uuidgen > /var/lib/dbus/machine-id'
56+
fi
57+
export PYCURL_SSL_LIBRARY=nss
2658
fi
2759

2860
# Get the addon SDK submodule and rule checker

‎makecrx.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ trap 'rm -f "$pub" "$sig" "$zip"' EXIT
9898
# zip up the crx dir
9999
cwd=$(pwd -P)
100100
(cd "$dir" && ../../utils/create_xpi.py -n "$cwd/$zip" -x "../../.build_exclusions" .)
101-
echo >&2 "Unsigned package has shasum: `shasum "$cwd/$zip"`"
101+
echo >&2 "Unsigned package has sha1sum: `sha1sum "$cwd/$zip"`"
102102

103103
# signature
104104
openssl sha1 -sha1 -binary -sign "$key" < "$zip" > "$sig"

‎rewriter/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"name" : "https-everywhere-rewriter",
3-
"version" : "1.0.0",
4-
"dependencies" : {
5-
"xmldom" : "0.1.17",
6-
"URIjs" : "1.11.2",
7-
"readdirp" : "0.3.2",
8-
"event-stream" : "3.0.20"
2+
"name": "https-everywhere-rewriter",
3+
"version": "1.0.0",
4+
"dependencies": {
5+
"event-stream": "3.0.20",
6+
"readdirp": "0.3.2",
7+
"urijs": "^1.18.1",
8+
"xmldom": "0.1.17"
99
}
1010
}

‎rewriter/rewriter.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var path = require("path"),
2222

2323
rules = require("../chromium/rules"),
2424

25-
URI = require("URIjs");
25+
URI = require("urijs");
2626

2727
var ruleSets = null;
2828

‎ruleset-testing.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ target host with a left-side wildcard, and at least ten test URLs for each
3030
target host with a right-side wildcard. But this is not yet implemented.
3131

3232
# Example:
33-
<ruleset name="example.com">
34-
<target host="example.com" />
35-
<target host="*.example.com" />
33+
<ruleset name="example.com">
34+
<target host="example.com" />
35+
<target host="*.example.com" />
3636

37-
<test url="http://www.example.com/" />
38-
<test url="http://beta.example.com/" />
37+
<test url="http://www.example.com/" />
38+
<test url="http://beta.example.com/" />
3939

40-
<rule from="^http://([\w-]+\.)?example\.com/"
41-
to="https://$1example.com/" />
40+
<rule from="^http://([\w-]+\.)?example\.com/"
41+
to="https://$1example.com/" />
4242

43-
</ruleset>
43+
</ruleset>
4444

4545
This ruleset has one implicit test URL from a target host
4646
("http://example.com/"). The other target host has a wildcard, so creates no

0 commit comments

Comments
 (0)