corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 825070 - systemXHR loads should be subject to checkLoadURI checks. r=sicking

Browse Source
This commit is contained in:
Philipp von Weitershausen
2012-12-29 10:10:51 -08:00
parent 5243ded0b8
commit db2677e2d2
5 changed files with 91 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
content/base/src/nsXMLHttpRequest.cpp
View File

@@ -1636,8 +1636,17 @@ nsXMLHttpRequest::IsSystemXHR()
nsresult
nsXMLHttpRequest::CheckChannelForCrossSiteRequest(nsIChannel* aChannel)
{
// First check if cross-site requests are enabled...
// A system XHR (chrome code or a web app with the right permission) can
// always perform cross-site requests. In the web app case, however, we
// must still check for protected URIs like file:///.
if (IsSystemXHR()) {
if (!nsContentUtils::IsSystemPrincipal(mPrincipal)) {
nsIScriptSecurityManager *secMan = nsContentUtils::GetSecurityManager();
nsCOMPtr<nsIURI> uri;
aChannel->GetOriginalURI(getter_AddRefs(uri));
return secMan->CheckLoadURIWithPrincipal(
mPrincipal, uri, nsIScriptSecurityManager::STANDARD);
}
return NS_OK;
}

2
content/base/test/Makefile.in
View File

@@ -586,6 +586,8 @@ MOCHITEST_FILES_B = \
test_XHR_onuploadprogress.html \
test_XHR_anon.html \
file_XHR_anon.sjs \
file_XHR_system_redirect.html \
file_XHR_system_redirect.html^headers^ \
test_XHR_system.html \
test_XHR_parameters.html \
test_ipc_messagemanager_blob.html \

5
content/base/test/file_XHR_system_redirect.html Normal file
View File

@@ -0,0 +1,5 @@
<!DOCTYPE html>
<html>
<body>
</body>
</html>

2
content/base/test/file_XHR_system_redirect.html^headers^ Normal file
View File

@@ -0,0 +1,2 @@
HTTP 302 Found
Location: file:///etc/passwd

91
content/base/test/test_XHR_system.html
View File

@@ -15,35 +15,88 @@
<pre id="test">
<script class="testbody" type="application/javascript;version=1.8">
function runTests() {
var comp = SpecialPowers.wrap(SpecialPowers.Components);
SimpleTest.waitForExplicitFinish();
SpecialPowers.addPermission("systemXHR", true, document);
let tests = [];
function tearDown() {
SpecialPowers.removePermission("systemXHR", document);
SimpleTest.finish();
}
const PROTECTED_URL = "file:///etc/passwd";
const REDIRECT_URL = window.location.protocol + "//" + window.location.host + "/tests/content/base/test/file_XHR_system_redirect.html";
const CROSSSITE_URL = "http://example.com/tests/content/base/test/test_XHR_system.html";
// An XHR with system privileges will be able to do cross-site calls.
tests.push(function test_cross_origin() {
// System XHR can load cross-origin resources.
const TEST_URL = "http://example.com/tests/content/base/test/test_XHR_system.html";
is(window.location.hostname, "mochi.test");
is(window.location.hostname, "mochi.test", "correct origin");
let xhr = new XMLHttpRequest({mozSystem: true});
is(xhr.mozSystem, true, ".mozSystem == true");
xhr.open("GET", TEST_URL);
xhr.open("GET", CROSSSITE_URL);
xhr.onload = function onload() {
is(xhr.status, 200);
ok(xhr.responseText != null);
ok(xhr.responseText.length);
tearDown();
is(xhr.status, 200, "correct HTTP status");
ok(xhr.responseText != null, "HTTP response non-null");
ok(xhr.responseText.length, "HTTP response not empty");
runNextTest();
};
xhr.onerror = function onerror() {
ok(false, "Got an error event!");
tearDown();
xhr.onerror = function onerror(event) {
ok(false, "Got an error event: " + event);
runNextTest();
}
xhr.send();
});
tests.push(function test_file_uri() {
// System XHR is not permitted to access file:/// URIs.
let xhr = new XMLHttpRequest({mozSystem: true});
is(xhr.mozSystem, true, ".mozSystem == true");
xhr.open("GET", PROTECTED_URL);
let error;
try {
xhr.send();
} catch (ex) {
error = ex;
}
ok(!!error, "got exception");
is(error.name, "NS_ERROR_DOM_BAD_URI");
is(error.message, "Access to restricted URI denied");
runNextTest();
});
tests.push(function test_redirect_to_file_uri() {
// System XHR won't load file:/// URIs even if an HTTP resource redirects there.
let xhr = new XMLHttpRequest({mozSystem: true});
is(xhr.mozSystem, true, ".mozSystem == true");
xhr.open("GET", REDIRECT_URL);
xhr.onload = function onload() {
ok(false, "Should not have loaded");
runNextTest();
};
xhr.onerror = function onerror(event) {
ok(true, "Got an error event: " + event);
is(xhr.status, 0, "HTTP status is 0");
runNextTest();
}
xhr.send();
});
function runNextTest() {
if (!tests.length) {
return;
}
tests.shift()();
}
function runTests() {
SimpleTest.waitForExplicitFinish();
SpecialPowers.addPermission("systemXHR", true, document);
tests.push(function tearDown() {
SpecialPowers.removePermission("systemXHR", document);
SimpleTest.finish();
});
runNextTest();
}
</script>