Test active script propagation through Web IDL

domenic · domenic · commit 17e54b7dec80 · 2020-07-09T14:18:05.000-04:00
Follows whatwg/webidl#902.
diff --git a/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/setTimeout-eval.js b/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/setTimeout-eval.js
@@ -0,0 +1,2 @@
+// import()s in eval are resolved relative to the script, even when indirected through Web IDL callbacks
+setTimeout(eval, 0, `import('../../imports-a.js?label=' + window.label).then(window.continueTest, window.errorTest)`);
diff --git a/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-external-classic.html b/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-external-classic.html
@@ -31,6 +31,7 @@
 const evaluators = [
   "setTimeout",
   "eval",
+  "setTimeout-eval",
   "Function",
   "reflected-inline-event-handlers",
   "inline-event-handlers-UA-code"
diff --git a/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-external-module.html b/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-external-module.html
@@ -32,6 +32,7 @@
 const evaluators = [
   "setTimeout",
   "eval",
+  "setTimeout-eval",
   "Function",
   "reflected-inline-event-handlers",
   "inline-event-handlers-UA-code"
diff --git a/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-inline-classic.html b/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-inline-classic.html
@@ -23,6 +23,9 @@
 const evaluators = {
   setTimeout,
   eval,
+  "setTimeout + eval"(x) {
+    setTimeout(eval, 0, x);
+  },
   "the Function constructor"(x) {
     Function(x)();
   },
diff --git a/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-inline-module.html b/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-inline-module.html
@@ -23,6 +23,9 @@
 const evaluators = {
   setTimeout,
   eval,
+  "setTimeout + eval"(x) {
+    setTimeout(eval, 0, x);
+  },
   "the Function constructor"(x) {
     Function(x)();
   },
diff --git a/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-classic.html b/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-classic.html
@@ -24,6 +24,9 @@
   "the Function constructor"(x) {
     Function(x)();
   },
+  "setTimeout + eval"(x) {
+    setTimeout(eval, 0, x);
+  },
   "reflected inline event handlers"(x) {
     dummyDiv.setAttribute("onclick", x);
     dummyDiv.onclick();
diff --git a/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-module.html b/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-module.html
@@ -21,6 +21,9 @@
 const evaluators = {
   eval,
   setTimeout,
+  "setTimeout + eval"(x) {
+    setTimeout(eval, 0, x);
+  },
   "the Function constructor"(x) {
     Function(x)();
   },
diff --git a/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-classic.html b/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-classic.html
@@ -59,6 +59,14 @@
   return promise.then(assertSuccessful);
 }, "indirect eval must inherit the nonce from the triggering script, thus execute");
 
+promise_test(t => {
+  const promise = createTestPromise(t);
+
+  setTimeout(eval, 0, `import('../imports-a.js?label=direct eval').then(window.continueTest, window.errorTest)`);
+
+  return promise.then(assertSuccessful);
+}, "setTimeout + eval must inherit the nonce from the triggering script, thus execute");
+
 promise_test(t => {
   const promise = createTestPromise(t);
 
diff --git a/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-module.html b/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-module.html
@@ -58,6 +58,14 @@
   return promise.then(assertSuccessful);
 }, "indirect eval must inherit the nonce from the triggering script, thus execute");
 
+promise_test(t => {
+  const promise = createTestPromise(t);
+
+  setTimeout(eval, 0, `import('../imports-a.js?label=direct eval').then(window.continueTest, window.errorTest)`);
+
+  return promise.then(assertSuccessful);
+}, "setTimeout + eval must inherit the nonce from the triggering script, thus execute");
+
 promise_test(t => {
   const promise = createTestPromise(t);
 
diff --git a/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-of-promise-result.html b/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-of-promise-result.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>import() inside compiled strings inside a classic script</title>
+<title>Compiling strings resulting from Promise resolution</title>
 <link rel="help" href="https://github.com/whatwg/html/pull/3163">
 <link rel="help" href="https://github.com/tc39/ecma262/issues/871#issuecomment-292493142">
 <link rel="author" title="Domenic Denicola" href="mailto:d@domenic.me">
diff --git a/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-other-document.html b/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-other-document.html
@@ -23,6 +23,9 @@
   const evaluators = {
     eval: otherWindow.eval,
     setTimeout: otherWindow.setTimeout,
+    "setTimeout + eval"(x) {
+      otherWindow.setTimeout(otherWIndow.eval, 0, x);
+    },
     "the Function constructor"(x) {
       otherWindow.Function(x)();
     },

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+// import()s in eval are resolved relative to the script, even when indirected through Web IDL callbacks`
	`2`	+setTimeout(eval, 0, `import('../../imports-a.js?label=' + window.label).then(window.continueTest, window.errorTest)`);