Skip to content

Commit 11d5512

Browse files
HainishHainish
committed
Merge branch 'master' into remove-obsolete-listeners
2 parents a2a4398 + 8b49462 commit 11d5512

10,878 files changed

Lines changed: 170607 additions & 23797 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.

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.git/*

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ chromium.pem
33
dummy-chromium.pem
44
pkg/
55
src/chrome/content/rules/default.rulesets
6+
src/chrome/content/rulesets.json
67
src/defaults/rulesets.sqlite
78
*.swp
89
tokenkeys.py*
@@ -11,3 +12,6 @@ tokenkeys.py*
1112
from-preloads/
1213
test_profile/
1314
.venv/
15+
Vagrantfile
16+
.vagrant
17+
src/chrome/content/rulesets.json

‎.gitmodules‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
[submodule "addon-sdk"]
22
path = addon-sdk
33
url = https://github.com/mozilla/addon-sdk.git
4-
[submodule "https-everywhere-checker"]
5-
path = test/rules
6-
url = https://github.com/jsha/https-everywhere-checker.git
7-
branch = updates
84
[submodule "translations"]
95
path = translations
106
url = https://git.torproject.org/translation.git

‎.travis.yml‎

Lines changed: 11 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,12 @@
1-
# Config copied from
2-
# http://www.theautomatedtester.co.uk/blog/2012/using-travis-ci-for-building-and-testing-firefox-addons.html
3-
language: python
4-
python:
5-
- "2.7"
6-
cache:
7-
directories:
8-
- $HOME/.cache/pip
9-
- $HOME/virtualenv/python2.7_with_system_site_packages
10-
addons:
11-
apt:
12-
packages:
13-
- libxml2-dev
14-
- libxml2-utils
15-
- python-dev
16-
- libcurl4-openssl-dev
17-
- python-lxml
18-
- python-software-properties
19-
- chromium-browser
20-
virtualenv:
21-
system_site_packages: true
22-
install:
23-
- pip install -r test/rules/requirements.txt
24-
- pip install -r test/chromium/requirements.txt
25-
env:
26-
- FIREFOX_VERSION=firefox-latest
27-
- FIREFOX_VERSION=firefox-esr-latest
28-
before_script:
29-
- sudo apt-get install chromium-chromedriver
30-
- wget -O /tmp/firefox.tar.bz2 'https://download.mozilla.org/?os=linux64&lang=en-US&product='$FIREFOX_VERSION
31-
- tar xpjf /tmp/firefox.tar.bz2
32-
- export FIREFOX=$PWD/firefox/firefox
33-
script:
34-
- ./test.sh
351
sudo: required
36-
dist: trusty
37-
notifications:
38-
email:
39-
recipients:
40-
- jsha@eff.org
41-
notifications:
42-
irc:
43-
channels:
44-
- "irc.oftc.net#https-everywhere"
45-
on_success: change
46-
on_failure: change
2+
language: generic
3+
services:
4+
- docker
5+
before_install:
6+
- docker build -t httpse .
7+
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"
10+
env:
11+
- FIREFOX=firefox-latest
12+
- FIREFOX=firefox-esr-latest

‎Dockerfile‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM electronicfrontierfoundation/https-everywhere-docker-base
2+
MAINTAINER William Budington "bill@eff.org"
3+
4+
WORKDIR /opt
5+
ADD test/rules/requirements.txt test/rules/requirements.txt
6+
ADD test/chromium/requirements.txt test/chromium/requirements.txt
7+
RUN pip install -r test/rules/requirements.txt
8+
RUN pip install -r test/chromium/requirements.txt
9+
10+
ENV FIREFOX /firefox-latest/firefox/firefox
11+
12+
WORKDIR /opt

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ pkg:
1111
clean:
1212
rm -rf pkg/xpi-amo/ pkg/xpi-eff/
1313
rm -f pkg/*.xpi
14+
rm -f pkg/rulesets.unvalidated.sqlite
1415
rm -f src/chrome/content/rules/default.rulesets
1516
rm -f src/defaults/rulesets.sqlite
1617

‎chromium/background.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ chrome.browserAction.setBadgeText({ text: "" });
4444
// Load prefs about whether http nowhere is on. Structure is:
4545
// { httpNowhere: true/false }
4646
var httpNowhereOn = false;
47-
chrome.storage.sync.get({httpNowhere: false}, function(item) {
47+
storage.get({httpNowhere: false}, function(item) {
4848
httpNowhereOn = item.httpNowhere;
4949
setIconColor();
5050
});
5151
chrome.storage.onChanged.addListener(function(changes, areaName) {
52-
if (areaName === 'sync') {
52+
if (areaName === 'sync' || areaName === 'local') {
5353
for (var key in changes) {
5454
if (key === 'httpNowhere') {
5555
httpNowhereOn = changes[key].newValue;

‎chromium/manifest.json‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
"background": {
66
"scripts": [
77
"rules.js",
8+
"storage.js",
89
"util.js",
9-
"background.js",
10+
"background.js",
1011
"incognito-cache-clearing.js"
1112
]
1213
},
@@ -26,9 +27,9 @@
2627
"16": "icon16.png",
2728
"48": "icon48.png"
2829
},
29-
"incognito": "spanning",
30+
"incognito": "spanning",
3031
"manifest_version": 2,
31-
"minimum_chrome_version": "45",
32+
"minimum_chrome_version": "45",
3233
"name": "__MSG_about_ext_name__",
3334
"permissions": [
3435
"webRequest",
@@ -38,6 +39,11 @@
3839
"storage",
3940
"<all_urls>"
4041
],
42+
"applications": {
43+
"gecko": {
44+
"id": "https-everywhere-eff@eff.org"
45+
}
46+
},
4147
"update_url": "https://www.eff.org/files/https-everywhere-chrome-updates.xml",
42-
"version": "2015.12.16"
43-
}
48+
"version": "2016.5.10"
49+
}

‎chromium/popup.html‎

100755100644
Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<head>
33
<title i18n="about_ext_name"></title>
44

5+
<meta charset="utf-8"/>
6+
57
<!-- Local copy of chrome://resources/css/chrome_shared.css -->
68
<link href="chrome-resources/css/chrome_shared.css" rel="stylesheet" type="text/css"/>
79

@@ -28,25 +30,25 @@ <h1 i18n="about_ext_name"></h1>
2830

2931
<div id="RuleManagement">
3032
<section>
31-
<a href="#" id="add-rule-link" i18n="menu_add_rule"></a>
33+
<a href="#" id="add-rule-link" i18n="chrome_add_rule"></a>
3234
<div id="add-new-rule-div" style="display:none">
33-
<h3 i18n="about_add_new_rule"> </h3>
34-
<p i18n="menu_always_https_for_host"></p>
35-
<label for="new-rule-host" i18n="menu_host"></label> <br><input size="50" id="new-rule-host" type="text" disabled><br>
35+
<h3 i18n="about_add_new_rule"></h3>
36+
<p i18n="chrome_always_https_for_host"></p>
37+
<label for="new-rule-host" i18n="chrome_host"></label> <br><input size="50" id="new-rule-host" type="text" disabled><br>
3638

3739
<div id="new-rule-regular-text">
38-
<p><a href="#" id="new-rule-show-advanced-link" i18n="menu_show_advanced"></a>
40+
<p><a href="#" id="new-rule-show-advanced-link" i18n="chrome_show_advanced"></a>
3941
</div>
4042
<div id="new-rule-advanced" style="display:none;">
41-
<p><a href="#" id="new-rule-hide-advanced-link" i18n="menu_hide_advanced"></a>
43+
<p><a href="#" id="new-rule-hide-advanced-link" i18n="chrome_hide_advanced"></a>
4244
<p>
43-
<label for="new-rule-name" i18n="menu_rule_name"></label><br><input size="50" id="new-rule-name" type="text"><br>
44-
<label for="new-rule-regex" i18n="menu_regex"></label> <br><input size="50" id="new-rule-regex" type="text"><br>
45-
<label for="new-rule-redirect" i18n="menu_redirect_to"></label> <br><input size="50" id="new-rule-redirect" type="text"><br>
45+
<label for="new-rule-name" i18n="chrome_rule_name"></label><br><input size="50" id="new-rule-name" type="text"><br>
46+
<label for="new-rule-regex" i18n="chrome_regex"></label> <br><input size="50" id="new-rule-regex" type="text"><br>
47+
<label for="new-rule-redirect" i18n="chrome_redirect_to"></label> <br><input size="50" id="new-rule-redirect" type="text"><br>
4648
</div>
4749

48-
<button id="add-new-rule-button" i18n="menu_add_new_rule"></button><br>
49-
<button id="cancel-new-rule" i18n="status_cancel_button"></button>
50+
<button id="add-new-rule-button" i18n="chrome_add_new_rule"></button><br>
51+
<button id="cancel-new-rule" i18n="chrome_status_cancel_button"></button>
5052
</div>
5153
</section>
5254
<section id="StableRules" class="rules">
@@ -60,7 +62,8 @@ <h3 i18n="chrome_experimental_rules"></h3>
6062
</div>
6163

6264
<footer>
63-
<a id="aboutTitle" href="https://www.eff.org/https-everywhere" target="_blank" i18n="about_title">blah</a>
65+
<a id="aboutTitle" href="https://www.eff.org/https-everywhere" target="_blank" i18n="about_title"></a><br><br>
66+
<a id="donateEFF" href="https://supporters.eff.org/donate/support-https-everywhere" target="_blank" i18n="menu_donate_eff_imperative"></a>
6467
<p><small>(<span i18n="about_version">Version</span>: <span id="current-version"></span>)</small></p>
6568
</footer>
6669

‎chromium/popup.js‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
"use strict";
2+
23
var backgroundPage = chrome.extension.getBackgroundPage();
34
var stableRules = null;
45
var unstableRules = null;
56
var hostReg = /.*\/\/[^$/]*\//;
7+
var storage = backgroundPage.storage;
68

79
function e(id) {
810
return document.getElementById(id);
@@ -62,7 +64,11 @@ function createRuleLine(ruleset) {
6264
break;
6365
}
6466
}
65-
label.appendChild(favicon);
67+
var xhr = new XMLHttpRequest();
68+
try {
69+
xhr.open("GET", favicon.src, true);
70+
label.appendChild(favicon);
71+
} catch (e) {}
6672

6773
// label text
6874
var text = document.createElement("span");
@@ -186,11 +192,11 @@ function addManualRule() {
186192
hide(e("add-rule-link"));
187193
show(e("add-new-rule-div"));
188194
var newUrl = document.createElement('a');
189-
newUrl.href = tab.url;
195+
newUrl.href = tab[0].url;
190196
newUrl.protocol = "https:";
191197
e("new-rule-host").value = newUrl.host;
192198
var oldUrl = document.createElement('a');
193-
oldUrl.href = tab.url;
199+
oldUrl.href = tab[0].url;
194200
oldUrl.protocol = "http:";
195201
var oldMatcher = "^" + escapeForRegex(oldUrl.protocol + "//" + oldUrl.host+ "/");
196202
e("new-rule-regex").value = oldMatcher;
@@ -232,11 +238,11 @@ function toggleHttpNowhere() {
232238
function getOption_(opt, defaultOpt, callback) {
233239
var details = {};
234240
details[opt] = defaultOpt;
235-
return chrome.storage.sync.get(details, callback);
241+
return storage.get(details, callback);
236242
}
237243

238244
function setOption_(opt, value) {
239245
var details = {};
240246
details[opt] = value;
241-
return chrome.storage.sync.set(details);
247+
return storage.set(details);
242248
}

0 commit comments

Comments
 (0)