wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1243586) for dt5 bustage in netmonitor tests

Browse Source 
Backed out changeset 06a4d2d48fb2 (bug 1243586)
Backed out changeset 846e31fe5eb2 (bug 1243586)

MozReview-Commit-ID: 69kiDIULtm2
This commit is contained in:
Wes Kocher 2016-02-29 10:39:04 -08:00
parent 42411198e7
commit 07c889f1a1
3 changed files with 0 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
dom/security/test/unit/test_csp_upgrade_insecure_request_header.js
View File

@ -1,98 +0,0 @@
var Cu = Components.utils;
var Ci = Components.interfaces;
Cu.import("resource://testing-common/httpd.js");
Cu.import("resource://gre/modules/NetUtil.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGetter(this, "URL", function() {
return "http://localhost:" + httpserver.identity.primaryPort;
});
var httpserver = null;
var channel = null;
var curTest = null;
var testpath = "/footpath";
var tests = [
{
description: "should not set request header for TYPE_OTHER",
expectingHeader: false,
contentType: Ci.nsIContentPolicy.TYPE_OTHER
},
{
description: "should set request header for TYPE_DOCUMENT",
expectingHeader: true,
contentType: Ci.nsIContentPolicy.TYPE_DOCUMENT
},
{
description: "should set request header for TYPE_SUBDOCUMENT",
expectingHeader: true,
contentType: Ci.nsIContentPolicy.TYPE_SUBDOCUMENT
},
{
description: "should not set request header for TYPE_IMG",
expectingHeader: false,
contentType: Ci.nsIContentPolicy.TYPE_IMG
},
];
function ChannelListener() {
}
ChannelListener.prototype = {
onStartRequest: function(request, context) { },
onDataAvailable: function(request, context, stream, offset, count) {
do_throw("Should not get any data!");
},
onStopRequest: function(request, context, status) {
var upgrade_insecure_header = false;
try {
if (request.getRequestHeader("Upgrade-Insecure-Requests")) {
upgrade_insecure_header = true;
}
}
catch (e) {
// exception is thrown if header is not available on the request
}
// debug
// dump("executing test: " + curTest.description);
do_check_eq(upgrade_insecure_header, curTest.expectingHeader)
run_next_test();
},
};
function setupChannel(aContentType) {
var chan = NetUtil.newChannel({
uri: URL + testpath,
loadUsingSystemPrincipal: true,
contentPolicyType: aContentType
});
chan.QueryInterface(Ci.nsIHttpChannel);
chan.requestMethod = "GET";
return chan;
}
function serverHandler(metadata, response) {
// no need to perform anything here
}
function run_next_test() {
curTest = tests.shift();
if (!curTest) {
httpserver.stop(do_test_finished);
return;
}
channel = setupChannel(curTest.contentType);
channel.asyncOpen(new ChannelListener(), null);
}
function run_test() {
// set up the test environment
httpserver = new HttpServer();
httpserver.registerPathHandler(testpath, serverHandler);
httpserver.start(-1);
run_next_test();
do_test_pending();
}

1
dom/security/test/unit/xpcshell.ini
View File

@ -6,4 +6,3 @@ skip-if = toolkit == 'gonk'
[test_csp_reports.js]
skip-if = buildapp == 'mulet'
[test_isURIPotentiallyTrustworthy.js]
[test_csp_upgrade_insecure_request_header.js]

15
netwerk/protocol/http/nsHttpChannel.cpp
View File

@ -315,21 +315,6 @@ nsHttpChannel::Connect()
LOG(("nsHttpChannel::Connect [this=%p]\n", this));
// Note that we are only setting the "Upgrade-Insecure-Requests" request
// header for *all* navigational requests instead of all requests as
// defined in the spec, see:
// https://www.w3.org/TR/upgrade-insecure-requests/#preference
nsContentPolicyType type = mLoadInfo ?
mLoadInfo->GetExternalContentPolicyType() :
nsIContentPolicy::TYPE_OTHER;
if (type == nsIContentPolicy::TYPE_DOCUMENT ||
type == nsIContentPolicy::TYPE_SUBDOCUMENT) {
rv = SetRequestHeader(NS_LITERAL_CSTRING("Upgrade-Insecure-Requests"),
NS_LITERAL_CSTRING("1"), false);
NS_ENSURE_SUCCESS(rv, rv);
}
bool isHttps = false;
rv = mURI->SchemeIs("https", &isHttps);
NS_ENSURE_SUCCESS(rv,rv);