From 5592e304d4f4f33be1dae563e62c899213d34584 Mon Sep 17 00:00:00 2001 From: Luke Warlow Date: Tue, 23 Apr 2024 17:28:15 +0100 Subject: [PATCH] Update IDL for script enforcement (#484) * Update IDL for script enforcement - Node/textContent, and Element/innerText are both now shadowed on HTMLScriptElement. - Swap to using union types for all the Script properties. --- spec/index.bs | 82 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 65 insertions(+), 17 deletions(-) diff --git a/spec/index.bs b/spec/index.bs index 8049000..dda269e 100644 --- a/spec/index.bs +++ b/spec/index.bs @@ -120,6 +120,12 @@ spec:ECMA-262; urlPrefix: https://tc39.github.io/ecma262/ type:dfn; text:current realm record; url: current-realm spec: HTML; urlPrefix: https://html.spec.whatwg.org/ type: dfn; text: prepare the script element; url: prepare-the-script-element + type: dfn; text: get the text steps; url: get-the-text-steps + type: dfn; text: set the inner text steps; url: set-the-inner-text-steps + type: dfn; text: src; url: attr-script-src +spec:DOM; urlPrefix: https://dom.spec.whatwg.org/ + type: dfn; text: get text content; url: get-text-content + type: dfn; text: set text content; url: set-text-content 
@@ -1129,36 +1135,78 @@ type policy factory]].
 
 ### Enforcement for scripts ### {#enforcement-in-scripts}
 
+This document modifies how {{HTMLScriptElement}} [=child text content=] can be set to allow applications to control dynamically created scripts. It does so by
+adding the {{HTMLElement/innerText}} and {{Node/textContent}} attributes directly on {{HTMLScriptElement}}. The behavior of the attributes remains the same
+as in their original counterparts, apart from the additional behavior of calling [$Get Trusted Type compliant string$].
+
+Note: Using these IDL attributes is the recommended way of dynamically setting the URL or a text of a script. Manipulating attribute nodes or text nodes directly will call a default policy on the final value when the script is prepared.
+
+
+partial interface HTMLScriptElement {
+ [CEReactions] attribute ([LegacyNullToEmptyString] DOMString or TrustedScript) innerText;
+ [CEReactions] attribute (DOMString or TrustedScript)? textContent;
+ [CEReactions] attribute (USVString or TrustedScriptURL) src;
+ [CEReactions] attribute (DOMString or TrustedScript) text;
+};
+

+
 #### Slots with trusted values #### {#slots-with-trusted-values}
 
 This document modifies {{HTMLScriptElement}}s. Each script has:
 
 : an associated string script text.
 ::  A string, containing the body of the script to execute that was set
-    through a {{StringContext}} compliant sink. Equivalent to script's
+    through a compliant sink. Equivalent to script's
     [=child text content=]. Initially an empty string.
 
-#### Setting slot values #### {#setting-slot-values}
+#### The {{HTMLScriptElement/innerText}} IDL attribute #### {#the-innerText-idl-attribute}
 
-This document modifies how {{HTMLScriptElement}} [=child text content=] can be set to allow applications to control dynamically created scripts. It does so by
-adding the {{HTMLElement/innerText}} and {{Node/textContent}} attributes directly on {{HTMLScriptElement}}. The behavior of the attributes remains the same
-as in their original counterparts, apart from additional behavior triggered by the {{StringContext}} extended attribute presence.
+The {{HTMLScriptElement/innerText}} setter steps are:
 
-Note: Using these IDL attributes is the recommended way of dynamically setting URL or a text of a script. Manipulating attribute nodes or text nodes directly will call a default policy on the final value when the script is prepared.
+1.  Let |value| be the result of calling [$Get Trusted Type compliant string$] with
+    {{TrustedScript}}, [=this=]'s [=relevant global object=], the given value, `HTMLScriptElement innerText`, and
+    `script`.
+1.  Set [=this=]'s [=script text=] value to |value|.
+1.  Run [=set the inner text steps=] with [=this=] and |value|.
 
-
-partial interface HTMLScriptElement {
- [CEReactions] attribute [LegacyNullToEmptyString] ScriptString innerText;
- [CEReactions] attribute ScriptString? textContent;
- [CEReactions] attribute ScriptURLString src;
- [CEReactions] attribute ScriptString text;
-};
-

+The {{HTMLScriptElement/innerText}} getter steps are:
+
+1.  Return the result of running [=get the text steps=] with [=this=].
+
+#### The {{HTMLScriptElement/textContent}} IDL attribute #### {#the-textContent-idl-attribute}
+
+The {{HTMLScriptElement/textContent}} setter steps are to, if the given value is null, act as if it was the
+empty string instead, and then do as described below:
+
+1.  Let |value| be the result of calling [$Get Trusted Type compliant string$] with
+    {{TrustedScript}}, [=this=]'s [=relevant global object=], the given value, `HTMLScriptElement textContent`, and
+    `script`.
+1.  Set [=this=]'s [=script text=] value to |value|.
+1.  Run [=set text content=] with [=this=] and |value|.
+
+The {{HTMLScriptElement/textContent}} getter steps are:
+
+1.  Return the result of running [=get text content=] with [=this=].
+
+#### The {{HTMLScriptElement/text}} IDL attribute #### {#the-text-idl-attribute}
+
+Update the {{HTMLScriptElement/text}} setter steps algorithm as follows.
+
+1.  Let |value| be the result of calling [$Get Trusted Type compliant string$] with
+    {{TrustedScript}}, [=this=]'s [=relevant global object=], the given value, `HTMLScriptElement text`, and
+    `script`.
+1.  Set [=this=]'s [=script text=] value to the given value.
+1.  [=String replace all=] with the given value within [=this=].
+
+
+#### The {{HTMLScriptElement/src}} IDL attribute #### {#the-src-idl-attribute}
 
-On setting the {{HTMLElement/innerText}}, {{Node/textContent}} and {{HTMLScriptElement/text}} IDL attributes execute the following algorithm:
+The {{HTMLScriptElement/src}} setter steps are:
 
-1. Set [=script text=] value to the stringified attribute value.
-1. Perform the usual attribute setter steps.
+1.  Let |value| be the result of calling [$Get Trusted Type compliant string$] with
+    {{TrustedScriptURL}}, [=this=]'s [=relevant global object=], the given value, `HTMLScriptElement src`, and
+    `script`.
+1.  Set [=this=]'s [=src=] content attribute to |value|.
 
 #### Slot value verification #### {#slot-value-verification}