Skip to content

Commit 13f5328

Browse files
jpds-zzjpds-zz
committed
Merged remote-tracking branch 'origin/master'.
Fixed conflict in utils/trivial-validate.py.
1 parent 8e1b854 commit 13f5328

40 files changed

+468
-45
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ src/chrome/content/rules/default.rulesets
99
tokenkeys.py*
1010
.idea
1111
*.pyc
12+
from-preloads/

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// were applied, and which ones weren't but might have been, to the contents
33
// of a given page (top level nsIDOMWindow)
44

5-
serial_number = 0
5+
serial_number = 0;
66

77
function ApplicableList(logger, doc, domWin) {
88
this.domWin = domWin;
@@ -24,7 +24,7 @@ function ApplicableList(logger, doc, domWin) {
2424
serial_number += 1;
2525
this.serial = serial_number;
2626
this.log(DBUG,"Alist serial #" + this.serial + " for " + this.home);
27-
};
27+
}
2828

2929
ApplicableList.prototype = {
3030

@@ -106,7 +106,7 @@ ApplicableList.prototype = {
106106
this.prepend_child(enableLabel);
107107

108108
// add the label at the top
109-
var any_rules = false
109+
var any_rules = false;
110110
for(var x in this.all) {
111111
any_rules = true; // how did JavaScript get this ugly?
112112
break;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CtxCapturingListener.prototype = {
1414
onDataAvailable: function(request, ctx, inputStream, offset, count) {},
1515
onStopRequest: function(request, ctx, statusCode) {},
1616
QueryInterface: xpcom_generateQI([Ci.nsIStreamListener])
17-
}
17+
};
1818

1919
function ChannelReplacement(chan, newURI, newMethod) {
2020
return this._init(chan, newURI, newMethod);
@@ -241,9 +241,9 @@ ChannelReplacement.prototype = {
241241
} else {
242242
// legacy (Gecko < 2)
243243
self.observeCapture = function(req, ccl) {
244-
self.open = function() { self._redirect(ccl) }
244+
self.open = function() { self._redirect(ccl); };
245245
callback(self);
246-
}
246+
};
247247
oldChan.cancel(NS_BINDING_REDIRECTED);
248248
}
249249

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Cookie.prototype = {
8585
v = true;
8686
break;
8787
default:
88-
n = 'unknown'
88+
n = 'unknown';
8989
}
9090
this[n] = v;
9191
}
@@ -145,4 +145,4 @@ Cookie.prototype = {
145145
status: 0,
146146
QueryInterface: xpcom_generateQI([Ci.nsICookie, Ci.nsICookie2])
147147

148-
}
148+
};

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ const HTTPS = {
243243
var cookieManager = Components.classes["@mozilla.org/cookiemanager;1"]
244244
.getService(Components.interfaces.nsICookieManager2);
245245
//some braindead cookies apparently use umghzabilliontrabilions
246-
var expiry = Math.min(c.expiry, Math.pow(2,31))
246+
var expiry = Math.min(c.expiry, Math.pow(2,31));
247247
cookieManager.remove(c.host, c.name, c.path, false);
248248
cookieManager.add(c.host, c.path, c.name, c.value, true, c.isHTTPOnly, c.isSession, expiry);
249249
}
@@ -307,7 +307,7 @@ const HTTPS = {
307307

308308
} else {
309309
this.log(WARN,"Detected unsafe navigation with NoScript-secured cookies: " + origin + " -> " + uri.spec);
310-
this.log(WARN,uri.prePath + " cannot support secure cookies because it does not use HTTPS. Consider forcing HTTPS for " + uri.host + " in NoScript's Advanced HTTPS options panel.")
310+
this.log(WARN,uri.prePath + " cannot support secure cookies because it does not use HTTPS. Consider forcing HTTPS for " + uri.host + " in NoScript's Advanced HTTPS options panel.");
311311
}
312312

313313
var cs = CC['@mozilla.org/cookieService;1'].getService(CI.nsICookieService).getCookieString(uri, req);
@@ -320,12 +320,12 @@ const HTTPS = {
320320

321321
if (cs) {
322322
dcookies.push.apply(
323-
dcookies, cs.split(/\s*;\s*/).map(function(cs) { var nv = cs.split("="); return { name: nv.shift(), value: nv.join("=") } })
324-
.filter(function(c) { return dcookies.every(function(x) { return x.name != c.name }) })
323+
dcookies, cs.split(/\s*;\s*/).map(function(cs) { var nv = cs.split("="); return { name: nv.shift(), value: nv.join("=") }; })
324+
.filter(function(c) { return dcookies.every(function(x) { return x.name != c.name; }); })
325325
);
326326
}
327327

328-
cs = dcookies.map(function(c) { return c.name + "=" + c.value }).join("; ");
328+
cs = dcookies.map(function(c) { return c.name + "=" + c.value; }).join("; ");
329329

330330
this.log(WARN,"Sending Cookie for " + dhost + ": " + cs);
331331
req.setRequestHeader("Cookie", cs, false); // "false" because merge syntax breaks Cookie header

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function nsISupportsWrapper(wrapped) {
5858
}
5959
nsISupportsWrapper.prototype = {
6060
QueryInterface: xpcom_generateQI([])
61-
}
61+
};
6262

6363
const IOUtil = {
6464
asyncNetworking: true,
@@ -241,7 +241,7 @@ const IOUtil = {
241241
if (!this._qsRx.test(qs)) return '';
242242

243243
var cookieNames, hasCookies;
244-
if ((hasCookies = !!cookie)) cookieNames = cookie.split(/\s*;\s*/).map(this._splitName)
244+
if ((hasCookies = !!cookie)) cookieNames = cookie.split(/\s*;\s*/).map(this._splitName);
245245

246246
let parms = qs.split("&");
247247
for (j = parms.length; j-- > 0;) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var Thread = {
1717

1818
_spinInternal: function(ctrl) {
1919
var t = ctrl.startTime;
20-
var maxTime = parseInt(ctrl.maxTime)
20+
var maxTime = parseInt(ctrl.maxTime);
2121
if (maxTime) {
2222
while(ctrl.running && this.hostRunning) {
2323
this.yield();

‎src/chrome/content/observatory-xul.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,16 @@ function recursive_set(node, attrib, value) {
105105
recursive_set(node.childNodes[i], attrib, value)
106106
}
107107

108-
// called from the popup
109108

110109
function set_obs_anon(val) {
111110
obsprefs.setBoolPref( "extensions.https_everywhere._observatory.use_custom_proxy", !val);
112111
}
112+
113+
// called from the popup only
113114
function enable_observatory() {
114115
obsprefs.setBoolPref("extensions.https_everywhere._observatory.enabled", true);
116+
var torbutton_avail = ssl_observatory.proxy_test_successful;
117+
set_obs_anon(torbutton_avail);
115118
}
116119

117120
function disable_observatory() {

‎src/chrome/content/preferences.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ function https_prefs_accept() {
259259
.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
260260
.getInterface(Components.interfaces.nsIDOMWindow);
261261

262-
if (outer) outer.close()
262+
if (outer) outer.close();
263263
else alert("no outer space");
264264

265265
return true; // https://developer.mozilla.org/en/XUL/dialog#a-ondialogaccept

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!-- This rule was automatically generated based on an HSTS
2+
preload rule in the Chromium browser. See
3+
https://src.chromium.org/viewvc/chrome/trunk/src/net/http/transport_security_state_static.h
4+
for the list of preloads. Sites are added to the Chromium HSTS
5+
preload list on request from their administrators, so HTTPS should
6+
work properly everywhere on this site.
7+
8+
Because Chromium and derived browsers automatically force HTTPS for
9+
every access to this site, this rule applies only to Firefox. -->
10+
<ruleset name="Appseccalifornia.org" platform="firefox">
11+
<target host="appseccalifornia.org" />
12+
13+
<securecookie host="^appseccalifornia\.org$" name=".+" />
14+
15+
<rule from="^http://appseccalifornia\.org/" to="https://appseccalifornia.org/" />
16+
</ruleset>

0 commit comments

Comments
 (0)