Skip to content

Commit 2924187

Browse files
nicolo-ribaudonicolo-ribaudo
committed
Rewrite CSP tests
1 parent 9504d6f commit 2924187

4 files changed

+96
-70
lines changed

‎content-security-policy/connect-src/connect-src-json-import-allowed.sub.html

+15-18
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11
<!DOCTYPE html>
22
<html>
3-
4-
<head>
5-
<meta http-equiv="Content-Security-Policy" content="connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline';">
3+
<head>
64
<title>connect-src-json-import-allowed</title>
5+
<meta
6+
http-equiv="Content-Security-Policy"
7+
content="connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline';"
8+
/>
79
<script src="/resources/testharness.js"></script>
810
<script src="/resources/testharnessreport.js"></script>
9-
<script src='../support/logTest.sub.js?logs=["allowed"]'></script>
10-
<script src="../support/alertAssert.sub.js?alerts=[]"></script>
11-
</head>
11+
</head>
1212

13-
<body>
13+
<body>
1414
<script>
15-
window.addEventListener('securitypolicyviolation', function(e) {
16-
log("blocked");
17-
});
18-
19-
import("./resources/dummy.json", { with: { type: "json" } }).then(
20-
() => { log("allowed") },
21-
() => { log("error") },
22-
)
15+
promise_test(async (t) => {
16+
window.addEventListener(
17+
"securitypolicyviolation",
18+
t.unreached_func("No security policy violation should be raised.")
19+
);
20+
return import("./resources/dummy.json", { with: { type: "json" } });
21+
}, "import should be allowed");
2322
</script>
24-
<div id="log"></div>
25-
</body>
26-
23+
</body>
2724
</html>

‎content-security-policy/connect-src/connect-src-json-import-blocked.sub.html

+22-17
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,32 @@
11
<!DOCTYPE html>
22
<html>
3-
4-
<head>
5-
<meta http-equiv="Content-Security-Policy" content="connect-src 'none'; script-src 'self' 'unsafe-inline';">
6-
<title>connect-src-json-import-blocked</title>
3+
<head>
4+
<meta
5+
http-equiv="Content-Security-Policy"
6+
content="connect-src 'none'; script-src 'self' 'unsafe-inline';"
7+
/>
78
<script src="/resources/testharness.js"></script>
89
<script src="/resources/testharnessreport.js"></script>
9-
<script src='../support/logTest.sub.js?logs=["allowed"]'></script>
10-
<script src="../support/alertAssert.sub.js?alerts=[]"></script>
11-
</head>
10+
</head>
1211

13-
<body>
12+
<body>
1413
<script>
15-
window.addEventListener('securitypolicyviolation', function(e) {
16-
log("blocked");
14+
promise_test((t) => {
15+
let spv = new Promise((resolve, reject) => {
16+
window.addEventListener("securitypolicyviolation", (e) => {
17+
if (e.blockedURI.endsWith("dummy.json")) {
18+
resolve();
19+
} else {
20+
reject();
21+
}
22+
});
1723
});
1824

19-
import("./resources/dummy.json", { with: { type: "json" } }).then(
20-
() => { log("allowed") },
21-
() => { log("error") },
22-
)
25+
return Promise.all([
26+
promise_rejects_js(t, Error, import("./resources/dummy.json", { with: { type: "json" } })),
27+
check_spv,
28+
]);
29+
});
2330
</script>
24-
<div id="log"></div>
25-
</body>
26-
31+
</body>
2732
</html>

‎content-security-policy/style-src/import-declaration-style-allowed.sub.html

+24-16
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,35 @@
11
<!DOCTYPE html>
22
<html>
3-
4-
<head>
5-
<!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
6-
<meta http-equiv="Content-Security-Policy" content="style-src 'unsafe-inline' 'self' 'http://{{domains[www1]}}:{{ports[http][0]}}'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';">
3+
<head>
74
<title>import-declaration-style-allowed</title>
5+
<meta
6+
http-equiv="Content-Security-Policy"
7+
content="connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline';"
8+
/>
89
<script src="/resources/testharness.js"></script>
910
<script src="/resources/testharnessreport.js"></script>
10-
<script src='../support/logTest.sub.js?logs=["PASS"]'></script>
11-
<script src="../support/alertAssert.sub.js?alerts=[]"></script>
11+
</head>
12+
13+
<body>
1214
<script>
13-
window.addEventListener('securitypolicyviolation', function(e) {
14-
log("FAIL");
15+
promise_test(async (t) => {
16+
window.addEventListener(
17+
"securitypolicyviolation",
18+
t.unreached_func("No security policy violation should be raised.")
19+
);
20+
21+
let load = new Promise((resolve, reject) => {
22+
globalThis.onLoadSuccess = resolve;
23+
globalThis.onLoadError = reject;
1524
});
16-
</script>
17-
</head>
1825

19-
<body>
20-
<script type="module">
21-
import "./resources/allowed.css" assert { type: "css" };
22-
log('PASS');
26+
return load;
27+
}, "import should be allowed");
2328
</script>
24-
<div id="log"></div>
25-
</body>
2629

30+
<script type="module" onerror="onLoadError()">
31+
import "./resources/allowed.css" with { type: "css" };
32+
onLoadSuccess();
33+
</script>
34+
</body>
2735
</html>

‎content-security-policy/style-src/import-declaration-style-blocked.sub.html

+35-19
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,42 @@
11
<!DOCTYPE html>
22
<html>
3-
4-
<head>
5-
<meta http-equiv="Content-Security-Policy" content="style-src 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';">
6-
<title>import-declaration-style-blocked</title>
3+
<head>
4+
<title>import-declaration-style-disallowed</title>
5+
<meta
6+
http-equiv="Content-Security-Policy"
7+
content="style-src 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';"
8+
/>
79
<script src="/resources/testharness.js"></script>
810
<script src="/resources/testharnessreport.js"></script>
9-
<script src='../support/logTest.sub.js?logs=["PASS"]'></script>
10-
<script src="../support/alertAssert.sub.js?alerts=[]"></script>
11-
<script>
12-
window.addEventListener('securitypolicyviolation', function(e) {
13-
log("FAIL");
14-
});
15-
</script>
16-
</head>
11+
</head>
12+
13+
<body>
14+
<body>
15+
<script>
16+
promise_test(async (t) => {
17+
let check_spv = new Promise((resolve, reject) => {
18+
window.addEventListener("securitypolicyviolation", (e) => {
19+
if (e.blockedURI.endsWith("blocked.css")) {
20+
resolve();
21+
} else {
22+
reject();
23+
}
24+
});
25+
});
26+
27+
let load = new Promise((resolve, reject) => {
28+
globalThis.onLoadSuccess = resolve;
29+
globalThis.onLoadError = reject;
30+
});
1731

18-
<body>
19-
<script type="module" onerror="log('PASS')">
20-
import "./resources/blocked.css" assert { type: "css" };
21-
log('FAIL');
22-
</script>
23-
<div id="log"></div>
24-
</body>
32+
return Promise.all([promise_rejects_js(t, Error, load), check_spv]);
33+
}, "import should be allowed");
34+
</script>
2535

36+
<script type="module" onerror="onLoadError()">
37+
import "./resources/blocked.css" with { type: "css" };
38+
onLoadSuccess();
39+
</script>
40+
</body>
41+
</body>
2642
</html>

0 commit comments

Comments
 (0)