Skip to content

Commit feac9f4

Browse files
jshajsha
committed
Merge remote-tracking branch 'eff/master'
2 parents 92f8871 + c39b4ee commit feac9f4

File tree

264 files changed

+4518
-997
lines changed

Some content is hidden

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

264 files changed

+4518
-997
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ language: python
55
python:
66
- "2.7"
77
addons:
8-
# Firefox 31 doesn't seem to be available on travis-ci.org yet.
9-
firefox: "30.0"
8+
firefox: "33.1.1"
109
install:
1110
- sudo apt-get -qq install libxml2-dev libxslt-dev python-dev
1211
- pip install -r requirements.txt

‎chromium/rules.js‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,6 @@ RuleSets.prototype = {
249249
// Check to see if the Cookie object c meets any of our cookierule citeria
250250
// for being marked as secure. knownHttps is true if the context for this
251251
// cookie being set is known to be https.
252-
//log(DBUG, "Testing cookie:");
253-
//log(DBUG, " name: " + cookie.name);
254-
//log(DBUG, " host: " + cookie.host);
255-
//log(DBUG, " domain: " + cookie.domain);
256-
//log(DBUG, " rawhost: " + cookie.rawHost);
257252
var hostname = cookie.domain;
258253
// cookie domain scopes can start with .
259254
while (hostname.charAt(0) == ".")
@@ -272,10 +267,6 @@ RuleSets.prototype = {
272267
if (cr.host_c.test(cookie.domain) && cr.name_c.test(cookie.name)) {
273268
return ruleset;
274269
}
275-
//log(WARN, "no match domain " + cr.host_c.test(cookie.domain) +
276-
// " name " + cr.name_c.test(cookie.name));
277-
//log(WARN, "with " + cookie.domain + " " + cookie.name);
278-
//log(WARN, "and " + cr.host + " " + cr.name);
279270
}
280271
}
281272
}

‎https-everywhere-tests/test_profile_skeleton/prefs.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ user_pref("extensions.https_everywhere._observatory.popup_shown", true);
55
user_pref("extensions.https_everywhere.toolbar_hint_shown", true);
66
// Show all logs.
77
user_pref("extensions.https_everywhere.LogLevel", 0);
8+
user_pref("extensions.https_everywhere.log_to_stdout", true);
89
// Allow running of Mixed Content Blocking tests.
910
user_pref("extensions.https_everywhere.show_ruleset_tests", true);
1011
// Make it quicker to make manual config changes.

‎install-dev-dependencies.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
set -o errexit -o xtrace
55
if type apt-get >/dev/null ; then
66
sudo apt-get install libxml2-dev libxml2-utils libxslt1-dev python-dev \
7-
firefox chromium-browser zip sqlite3
7+
firefox chromium-browser zip sqlite3 python-pip
88
elif type brew >/dev/null ; then
99
brew install python libxml2 gnu-sed
1010
if ! echo $PATH | grep -ql /usr/local/bin ; then
1111
echo '/usr/local/bin not found in $PATH, please add it.'
1212
fi
1313
fi
14-
pip install --user -r requirements.txt
14+
pip install --user --no-allow-insecure --no-allow-external -r requirements.txt
1515
# Get the addon SDK submodule
1616
git submodule init
1717
git submodule update

‎src/chrome/content/about.xul‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<groupbox>
2323
<caption label="&https-everywhere.about.version;" />
24-
<label>5.0development.1</label>
24+
<label>5.0development.2</label>
2525
</groupbox>
2626

2727
<groupbox>

‎src/chrome/content/code/HTTPS.js‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
INCLUDE('Cookie');
2-
// XXX: Disable STS for now.
3-
var STS = {
4-
isSTSURI : function(uri) {
5-
return false;
6-
}
7-
};
82

93
// Hack. We only need the part of the policystate that tracks content
104
// policy loading.
@@ -156,7 +150,7 @@ const HTTPS = {
156150

157151
handleInsecureCookie: function(c) {
158152
if (HTTPSRules.shouldSecureCookie(null, c, false)) {
159-
this.log(INFO, "Securing cookie from event: " + c.domain + " " + c.name);
153+
this.log(INFO, "Securing cookie from event: " + c.host + " " + c.name);
160154
var cookieManager = Components.classes["@mozilla.org/cookiemanager;1"]
161155
.getService(Components.interfaces.nsICookieManager2);
162156
//some braindead cookies apparently use umghzabilliontrabilions

‎src/chrome/content/code/HTTPSRules.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ const HTTPSRules = {
493493
// Why does JS have no tuples, again?
494494
var blob = {}; blob.newuri = null;
495495
if (!alist) this.log(DBUG, "No applicable list rewriting " + input_uri.spec);
496-
this.log(NOTE, "Processing " + input_uri.spec);
496+
this.log(DBUG, "Processing " + input_uri.spec);
497497

498498
var uri = this.sanitiseURI(input_uri);
499499

@@ -709,7 +709,7 @@ const HTTPSRules = {
709709
// @c : an nsICookie2
710710
// @known_https : true if we know the page setting the cookie is https
711711

712-
this.log(DBUG," rawhost: " + c.rawHost + "\n name: " + c.name + "\n host" + c.host);
712+
this.log(DBUG," rawhost: " + c.rawHost + " name: " + c.name + " host" + c.host);
713713
var i,j;
714714
var rs = this.potentiallyApplicableRulesets(c.host);
715715
for (i = 0; i < rs.length; ++i) {

‎src/chrome/content/code/STS.js‎

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

‎src/chrome/content/fetch-source.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,12 @@ httpsEverywhere.fetchSource = {
150150

151151
// TODO: Test resizing on mulitple platforms
152152
// adjust window resizing
153-
window.onresize = function() {
153+
window.addEventListener("resize", function() {
154154
var textBox = document.getElementById("source-text");
155155
// TODO: Move to constants
156156
textBox.width = window.innerWidth - 100;
157157
textBox.height = window.innerHeight - 150;
158-
};
158+
}, false);
159159

160160
// hook event for init
161161
window.addEventListener("load", httpsEverywhere.fetchSource.init, false);

‎src/chrome/content/rules/23andMe.com.xml‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,32 @@
11
<!--
22
Note: server is configured for rc4 only.
33
4+
5+
Problematic subdomains:
6+
7+
- ^ ¹
8+
- blog ²
9+
- media ²
10+
11+
¹ Redirect differs
12+
² Mismatched (CloudFlare)
13+
14+
15+
Fully covered subdomains:
16+
17+
- (www.) (^ → www)
18+
- api
19+
- customercare
20+
- store
21+
422
-->
5-
<ruleset name="23andMe.com">
23+
<ruleset name="23andMe.com (partial)">
624

725
<target host="23andme.com" />
8-
<target host="www.23andme.com" />
26+
<target host="*.23andme.com" />
927

1028

29+
<securecookie host="^\.23andme\.com$" name="^__cfduid$" />
1130
<securecookie host="^(?:www\.)?23andme\.com$" name=".+" />
1231

1332

@@ -17,4 +36,7 @@
1736
<rule from="^http://(?:www\.)?23andme\.com/"
1837
to="https://www.23andme.com/" />
1938

39+
<rule from="^http://(api|customercare|store)\.23andme\.com/"
40+
to="https://$1.23andme.com/" />
41+
2042
</ruleset>

0 commit comments

Comments
 (0)