Bug 1931295 - Implement Trusted Types support for Worker/SharedWorker's constructors for Window. r=smaug

Differential Revision: https://phabricator.services.mozilla.com/D229344

UltraBlame original commit: b54dcba0386af7c7204fc3f334d137d9bd22c98d

Author: marco-c

dom/security/trusted-types/TrustedTypeUtils.cpp

@@ -1564,6 +1564,27 @@ std
 is_same_v
 <
 TrustedTypeOrStringArg
+TrustedScriptURLOrUSVString
+>
+)
+{
+return
+aInput
+.
+IsUSVString
+(
+)
+;
+}
+if
+constexpr
+(
+std
+:
+:
+is_same_v
+<
+TrustedTypeOrStringArg
 const
 nsAString
 *
@@ -1689,6 +1710,28 @@ std
 is_same_v
 <
 TrustedTypeOrStringArg
+TrustedScriptURLOrUSVString
+>
+)
+{
+return
+&
+aInput
+.
+GetAsUSVString
+(
+)
+;
+}
+if
+constexpr
+(
+std
+:
+:
+is_same_v
+<
+TrustedTypeOrStringArg
 const
 nsAString
 *
@@ -1810,6 +1853,16 @@ is_same_v
 TrustedTypeOrStringArg
 TrustedScriptURLOrString
 >
+|
+|
+std
+:
+:
+is_same_v
+<
+TrustedTypeOrStringArg
+TrustedScriptURLOrUSVString
+>
 )
 {
 return
@@ -1950,6 +2003,16 @@ is_same_v
 TrustedTypeOrStringArg
 TrustedScriptURLOrString
 >
+|
+|
+std
+:
+:
+is_same_v
+<
+TrustedTypeOrStringArg
+TrustedScriptURLOrUSVString
+>
 )
 {
 return
@@ -2700,6 +2763,13 @@ const
 nsINode
 )
 ;
+IMPL_GET_TRUSTED_TYPES_COMPLIANT_STRING
+(
+TrustedScriptURLOrUSVString
+TrustedScriptURL
+nsIGlobalObject
+)
+;
 MOZ_CAN_RUN_SCRIPT
 const
 nsAString

dom/security/trusted-types/TrustedTypeUtils.h

@@ -234,6 +234,9 @@ class
 TrustedScriptURLOrString
 ;
 class
+TrustedScriptURLOrUSVString
+;
+class
 TrustedHTMLOrTrustedScriptOrTrustedScriptURLOrString
 ;
 namespace
@@ -659,6 +662,38 @@ MOZ_CAN_RUN_SCRIPT
 const
 nsAString
 *
+GetTrustedTypesCompliantString
+(
+const
+TrustedScriptURLOrUSVString
+&
+aInput
+const
+nsAString
+&
+aSink
+const
+nsAString
+&
+aSinkGroup
+nsIGlobalObject
+&
+aGlobalObject
+Maybe
+<
+nsAutoString
+>
+&
+aResultHolder
+ErrorResult
+&
+aError
+)
+;
+MOZ_CAN_RUN_SCRIPT
+const
+nsAString
+*
 GetTrustedTypesCompliantStringForTrustedHTML
 (
 const

dom/webidl/SharedWorker.webidl

@@ -106,7 +106,11 @@ Throws
 ]
 constructor
 (
+(
+TrustedScriptURL
+or
 USVString
+)
 scriptURL
 optional
 (

dom/webidl/Worker.webidl

@@ -173,7 +173,11 @@ Throws
 ]
 constructor
 (
+(
+TrustedScriptURL
+or
 USVString
+)
 scriptURL
 optional
 WorkerOptions

dom/workers/Worker.cpp

@@ -249,6 +249,28 @@ RefPtr
 h
 "
 #
+include
+"
+mozilla
+/
+dom
+/
+TrustedTypeUtils
+.
+h
+"
+#
+include
+"
+mozilla
+/
+dom
+/
+TrustedTypesConstants
+.
+h
+"
+#
 ifdef
 XP_WIN
 #
@@ -281,7 +303,7 @@ GlobalObject
 &
 aGlobal
 const
-nsAString
+TrustedScriptURLOrUSVString
 &
 aScriptURL
 const
@@ -364,6 +386,55 @@ return
 nullptr
 ;
 }
+constexpr
+nsLiteralString
+sink
+=
+u
+"
+Worker
+constructor
+"
+_ns
+;
+Maybe
+<
+nsAutoString
+>
+compliantStringHolder
+;
+const
+nsAString
+*
+compliantString
+=
+TrustedTypeUtils
+:
+:
+GetTrustedTypesCompliantString
+(
+aScriptURL
+sink
+kTrustedTypesOnlySinkGroup
+*
+globalObject
+compliantStringHolder
+aRv
+)
+;
+if
+(
+aRv
+.
+Failed
+(
+)
+)
+{
+return
+nullptr
+;
+}
 RefPtr
 <
 WorkerPrivate
@@ -376,7 +447,8 @@ WorkerPrivate
 Constructor
 (
 cx
-aScriptURL
+*
+compliantString
 false
 /
 *

dom/workers/Worker.h

@@ -194,6 +194,9 @@ class
 WorkerPrivate
 ;
 class
+TrustedScriptURLOrUSVString
+;
+class
 Worker
 :
 public
@@ -209,6 +212,24 @@ NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED
 Worker
 DOMEventTargetHelper
 )
+/
+/
+TODO
+(
+bug
+1749042
+)
+:
+Mark
+as
+MOZ_CAN_RUN_SCRIPT
+when
+IDL
+constructors
+can
+be
+.
+MOZ_CAN_RUN_SCRIPT_BOUNDARY
 static
 already_AddRefed
 <
@@ -221,7 +242,7 @@ GlobalObject
 &
 aGlobal
 const
-nsAString
+TrustedScriptURLOrUSVString
 &
 aScriptURL
 const