Bug 1299483 - CSP: Implement 'strict-dynamic', mochitests. r=dveditz,freddyb

This commit is contained in:
Christoph Kerschbaumer 2016-11-08 13:33:27 +01:00
Родитель d9efe93bac
Коммит 7148985f09
5 изменённых файлов: 144 добавлений и 0 удалений

Просмотреть файл

@ -0,0 +1 @@
document.getElementById("testdiv").innerHTML = "allowed";

Просмотреть файл

@ -0,0 +1,10 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Bug 1299483 - CSP: Implement 'strict-dynamic'</title>
</head>
<body>
<div id="testdiv">blocked</div>
<script nonce="foo" src="http://example.com/tests/dom/security/test/csp/file_strict_dynamic.js"></script>
</body>
</html>

Просмотреть файл

@ -0,0 +1,14 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Bug 1299483 - CSP: Implement 'strict-dynamic'</title>
</head>
<body>
<div id="testdiv">blocked</div>
<script nonce="foo">
document.getElementById("testdiv").innerHTML = "allowed";
</script>
</body>
</html>

Просмотреть файл

@ -189,6 +189,9 @@ support-files =
file_upgrade_insecure_docwrite_iframe.sjs
file_data-uri_blocked.html
file_data-uri_blocked.html^headers^
file_strict_dynamic_script_inline.html
file_strict_dynamic_script_extern.html
file_strict_dynamic.js
[test_base-uri.html]
[test_blob_data_schemes.html]
@ -272,3 +275,4 @@ tags = mcb
[test_upgrade_insecure_docwrite_iframe.html]
[test_bug1242019.html]
[test_bug1312272.html]
[test_strict_dynamic.html]

Просмотреть файл

@ -0,0 +1,115 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Bug 1299483 - CSP: Implement 'strict-dynamic'</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>
<iframe style="width:100%;" id="testframe"></iframe>
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
SpecialPowers.setBoolPref("security.csp.enableStrictDynamic", true);
/* Description of the test:
* We load scripts with a CSP of 'strict-dynamic' with valid
* and invalid nonces and make sure scripts are allowed/blocked
* accordingly. Different tests load inline and external scripts
* also using a CSP including http: and https: making sure
* other srcs are invalided by 'strict-dynamic'.
*/
var tests = [
{
desc: "strict-dynamic with valid nonce should be allowed",
result: "allowed",
file: "file_strict_dynamic_script_extern.html",
policy: "script-src 'strict-dynamic' 'nonce-foo' https: 'none' 'self'"
},
{
desc: "strict-dynamic with invalid nonce should be blocked",
result: "blocked",
file: "file_strict_dynamic_script_extern.html",
policy: "script-src 'strict-dynamic' 'nonce-bar' http: http://example.com"
},
{
desc: "strict-dynamic, whitelist and invalid nonce should be blocked",
result: "blocked",
file: "file_strict_dynamic_script_extern.html",
policy: "script-src 'strict-dynamic' 'nonce-bar' 'unsafe-inline' http: http://example.com"
},
{
desc: "strict-dynamic with no 'nonce-' should be blocked",
result: "blocked",
file: "file_strict_dynamic_script_extern.html",
policy: "script-src 'strict-dynamic'"
},
// inline scripts
{
desc: "strict-dynamic with valid nonce should be allowed",
result: "allowed",
file: "file_strict_dynamic_script_inline.html",
policy: "script-src 'strict-dynamic' 'nonce-foo' https: 'none' 'self'"
},
{
desc: "strict-dynamic with invalid nonce should be blocked",
result: "blocked",
file: "file_strict_dynamic_script_inline.html",
policy: "script-src 'strict-dynamic' 'nonce-bar' http: http://example.com"
},
{
desc: "strict-dynamic, unsafe-inline and invalid nonce should be blocked",
result: "blocked",
file: "file_strict_dynamic_script_inline.html",
policy: "script-src 'strict-dynamic' 'nonce-bar' 'unsafe-inline' http: http://example.com"
},
{
desc: "strict-dynamic with no 'nonce-' should be blocked",
result: "blocked",
file: "file_strict_dynamic_script_inline.html",
policy: "script-src 'strict-dynamic'"
},
];
var counter = 0;
var curTest;
function loadNextTest() {
if (counter == tests.length) {
SimpleTest.finish();
return;
}
curTest = tests[counter++];
var src = "file_testserver.sjs?file=";
// append the file that should be served
src += escape("tests/dom/security/test/csp/" + curTest.file)
// append the CSP that should be used to serve the file
src += "&csp=" + escape(curTest.policy);
document.getElementById("testframe").addEventListener("load", test, false);
document.getElementById("testframe").src = src;
}
function test() {
try {
document.getElementById("testframe").removeEventListener('load', test, false);
var testframe = document.getElementById("testframe");
var divcontent = testframe.contentWindow.document.getElementById('testdiv').innerHTML;
is(divcontent, curTest.result, curTest.desc);
}
catch (e) {
ok(false, "ERROR: could not access content for test: '" + curTest.desc + "'");
}
loadNextTest();
}
// start running the tests
loadNextTest();
</script>
</body>
</html>