[WPT] Evaluation and CSP + script text content modification
Both evaluation and CSP should use the text at the time of
#prepare-a-script.
Bug: https://github.com/whatwg/html/issues/7882
Change-Id: I5ba39170a52155473ff3ae7e4845b7f91d6ccf31
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3621689
Reviewed-by: Domenic Denicola <domenic@chromium.org>
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1002405}
diff --git a/html/semantics/scripting-1/the-script-element/script-text-modifications-csp.html b/html/semantics/scripting-1/the-script-element/script-text-modifications-csp.html
new file mode 100644
index 0000000..a991151
--- /dev/null
+++ b/html/semantics/scripting-1/the-script-element/script-text-modifications-csp.html
@@ -0,0 +1,52 @@
+<!doctype html>
+<head>
+<meta charset=utf-8>
+<title>Modify HTMLScriptElement's text after #prepare-a-script that violates CSP</title>
+<link rel=help href="https://html.spec.whatwg.org/multipage/scripting.html#prepare-a-script">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<meta http-equiv="content-security-policy" content="script-src
+ 'nonce-allow'
+ 'sha256-2+5xh6b9uuIi4GaJtmHWtgR2nwRXJpBtMY4nVaOBpfc='
+">
+<!-- The hash is that of the original content of `script0`. -->
+
+<script nonce="allow">
+window.t = async_test("Modify inline script element's text " +
+ "after prepare-a-script before evaluation (CSP)");
+
+const updatedText =
+ 't.unreached_func("CSP check was done against the original text but the updated text was evaluated")();';
+
+function changeScriptText() {
+ document.querySelector('#script0').textContent = updatedText;
+}
+
+t.step_timeout(changeScriptText, 500);
+</script>
+
+<!-- This is "a style sheet that is blocking scripts" and thus ... -->
+<link rel="stylesheet" href="/common/slow.py?pipe=trickle(d1)"></link>
+
+<!-- This inline script becomes a parser-blocking script, and thus
+the step_timeout is evaluated after script0 is inserted into DOM,
+prepare-a-script'ed, but before its evaluation. -->
+<script id="script0">
+t.step(() => {
+ // When this is evaluated after the stylesheet is loaded,
+ // script0's textContent is modified by the async script above,
+ // but the evaluated script is still the original script here,
+ // not what is overwritten, because "child text content" is taken in
+ // #prepare-a-script and passed to "creating a classic script".
+ var s = document.getElementById('script0');
+ assert_equals(s.textContent, updatedText,
+ "<script>'s textContent should be already modified");
+ t.done();
+ });
+</script>
+<script nonce="allow">
+// If this makes the test fail, it indicates `script0` (the original or updated
+// text) was not evaluated, probably blocked by CSP that was checked against the
+// updated text.
+t.unreached_func("CSP check was done against the updated text")();
+</script>
diff --git a/html/semantics/scripting-1/the-script-element/script-text-modifications.html b/html/semantics/scripting-1/the-script-element/script-text-modifications.html
index 0ddec6a..cb54da6 100644
--- a/html/semantics/scripting-1/the-script-element/script-text-modifications.html
+++ b/html/semantics/scripting-1/the-script-element/script-text-modifications.html
@@ -27,17 +27,14 @@
<script id="script0">
t.step(() => {
// When this is evaluated after the stylesheet is loaded,
- // script0's innerText is modified by the async script above,
+ // script0's textContent is modified by the async script above,
// but the evaluated script is still the original script here,
// not what is overwritten, because "child text content" is taken in
// #prepare-a-script and passed to "creating a classic script".
var s = document.getElementById('script0');
- assert_equals(s.innerText,
+ assert_equals(s.textContent,
't.unreached_func("This should not be evaluated")();',
- "<script>'s innerText should be already modified");
- assert_equals(s.text,
- 't.unreached_func("This should not be evaluated")();',
- "<script>'s text should be already modified");
+ "<script>'s textContent should be already modified");
t.done();
});
</script>
