Bug 808292 - CSP: Implement path-level host-source matching, redirect tests (r=grobinson,sstamm)

This commit is contained in:
Christoph Kerschbaumer 2014-08-13 13:04:31 -07:00
parent 3f47547831
commit cff1769d37
4 changed files with 115 additions and 0 deletions

View File

@ -0,0 +1,10 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Bug 808292 - Implement path-level host-source matching to CSP</title>
</head>
<body>
<div id="testdiv">blocked</div>
<script src="http://example.com/tests/content/base/test/csp/file_csp_path_matching_redirect_server.sjs"></script>
</body>
</html>

View File

@ -0,0 +1,13 @@
// Redirect server specifically to handle redirects
// for path-level host-source matching
// see https://bugzilla.mozilla.org/show_bug.cgi?id=808292
function handleRequest(request, response)
{
var newLocation = "http://test1.example.com/tests/content/base/test/csp/file_csp_path_matching.js";
response.setStatusLine("1.1", 302, "Found");
response.setHeader("Cache-Control", "no-cache", false);
response.setHeader("Location", newLocation, false);
}

View File

@ -83,6 +83,8 @@ support-files =
file_self_none_as_hostname_confusion.html^headers^
file_csp_path_matching.html
file_csp_path_matching.js
file_csp_path_matching_redirect.html
file_csp_path_matching_redirect_server.sjs
file_csp_testserver.sjs
file_report_uri_missing_in_report_only_header.html
file_report_uri_missing_in_report_only_header.html^headers^
@ -122,6 +124,7 @@ skip-if = e10s || buildapp == 'b2g' # can't compute hashes in child process (bug
[test_self_none_as_hostname_confusion.html]
[test_bug949549.html]
[test_csp_path_matching.html]
[test_csp_path_matching_redirect.html]
[test_report_uri_missing_in_report_only_header.html]
[test_csp_report.html]
skip-if = e10s || buildapp == 'b2g' # http-on-opening-request observer not supported in child process (bug 1009632)

View File

@ -0,0 +1,89 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Bug 808292 - Implement path-level host-source matching to CSP (redirects)</title>
<!-- Including SimpleTest.js so we can use waitForExplicitFinish !-->
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<p id="display"></p>
<div id="content" style="visibility: hidden">
<iframe style="width:100%;" id="testframe"></iframe>
</div>
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
/* Description of the test:
* First, we try to load a script where the *path* does not match.
* Second, we try to load a script which is allowed by the CSPs
* script-src directive. The script then gets redirected to
* an URL where the host matches, but the path wouldn't.
* Since 'paths' should not be taken into account after redirects,
* that load should succeed. We are using a similar test setup
* as described in the spec, see:
* http://www.w3.org/TR/CSP11/#source-list-paths-and-redirects
*/
var policy = "script-src http://example.com http://test1.example.com/CSPAllowsScriptsInThatFolder";
var tests = [
{
// the script in file_csp_path_matching.html
// <script src="http://test1.example.com/tests/content/base/..">
// is not within the whitelisted path by the csp-policy
// hence the script is 'blocked' by CSP.
expected: "blocked",
uri: "tests/content/base/test/csp/file_csp_path_matching.html"
},
{
// the script in file_csp_path_matching_redirect.html
// <script src="http://example.com/tests/content/..">
// gets redirected to: http://test1.example.com/tests/content
// where after the redirect the path of the policy is not enforced
// anymore and hence execution of the script is 'allowed'.
expected: "allowed",
uri: "tests/content/base/test/csp/file_csp_path_matching_redirect.html"
},
];
var counter = 0;
var curTest;
function checkResult() {
try {
document.getElementById("testframe").removeEventListener('load', checkResult, false);
var testframe = document.getElementById("testframe");
var divcontent = testframe.contentWindow.document.getElementById('testdiv').innerHTML;
is(divcontent, curTest.expected, "should be blocked in test " + (counter - 1) + "!");
}
catch (e) {
ok(false, "ERROR: could not access content in test " + (counter - 1) + "!");
}
loadNextTest();
}
function loadNextTest() {
if (counter == tests.length) {
SimpleTest.finish();
}
else {
curTest = tests[counter++];
var src = "file_csp_testserver.sjs";
// append the file that should be served
src += "?file=" + escape(curTest.uri);
// append the CSP that should be used to serve the file
src += "&csp=" + escape(policy);
document.getElementById("testframe").addEventListener("load", checkResult, false);
document.getElementById("testframe").src = src;
}
}
loadNextTest();
</script>
</body>
</html>