diff --git a/moli-csp/src/tests.rs b/moli-csp/src/tests.rs
index dbbba2a03d4..43163815d74 100644
--- a/moli-csp/src/tests.rs
+++ b/moli-csp/src/tests.rs
@@ -493,11 +493,13 @@ fn csp_invalid_directives_preserve_fallbacks_and_trusted_types_requirements() {
assert!(policy_requires_trusted_types_for_script(
&ContentSecurityPolicy::from(policy.as_str())
));
- assert!(policy_allows_trusted_type_policy_name(
- &ContentSecurityPolicy::from(policy.as_str()),
- "unlisted",
- false
- ));
+ for duplicate in [false, true] {
+ assert!(policy_allows_trusted_type_policy_name(
+ &ContentSecurityPolicy::from(policy.as_str()),
+ "unlisted",
+ duplicate,
+ ));
+ }
let policy = format!(
"trusted-types allowed; require-trusted-types-for 'script'{invalid}; img-src 'none'"
@@ -552,11 +554,13 @@ fn csp_invalid_first_values_do_not_activate_later_duplicate_directives() {
);
}
let policy = format!("trusted-types *{invalid}; TRUSTED-TYPES allowed");
- assert!(policy_allows_trusted_type_policy_name(
- &ContentSecurityPolicy::from(policy.as_str()),
- "unlisted",
- false
- ));
+ for duplicate in [false, true] {
+ assert!(policy_allows_trusted_type_policy_name(
+ &ContentSecurityPolicy::from(policy.as_str()),
+ "unlisted",
+ duplicate,
+ ));
+ }
let policy = format!("trusted-types allowed; TRUSTED-TYPES *{invalid}");
assert!(policy_allows_trusted_type_policy_name(
&ContentSecurityPolicy::from(policy.as_str()),
@@ -568,6 +572,11 @@ fn csp_invalid_first_values_do_not_activate_later_duplicate_directives() {
"unlisted",
false
));
+ assert!(!policy_allows_trusted_type_policy_name(
+ &ContentSecurityPolicy::from(policy.as_str()),
+ "allowed",
+ true,
+ ));
}
}
@@ -2826,6 +2835,11 @@ fn trusted_types_csp_name_grammar_matches_only_valid_tokens() {
"valid",
true,
));
+ assert!(!policy_allows_trusted_type_policy_name(
+ &ContentSecurityPolicy::from("trusted-types valid x'allow-duplicates'"),
+ "valid",
+ true,
+ ));
}
#[test]
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/trusted_types.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/trusted_types.rs
index a3974dda690..00725d399cc 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/trusted_types.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/trusted_types.rs
@@ -56,6 +56,30 @@ fn trusted_types_csp_policy_creation_matches_only_valid_name_tokens() {
}
}
+#[test]
+fn trusted_types_invalid_name_directives_preserve_sink_requirements() {
+ for invalid in ['\0', '\u{000b}', '\u{001f}', '\u{007f}', '\u{00a0}'] {
+ let mut vm = new_storage_test_vm("https://trusted-types-invalid-directive.test/");
+ let policy = format!("trusted-types *{invalid}; require-trusted-types-for 'script'");
+ vm.set_response_content_security_policies(std::slice::from_ref(&policy));
+ let result = vm
+ .eval(
+ r#"(() => {
+ const first = trustedTypes.createPolicy('unlisted', {createHTML: value => value});
+ const second = trustedTypes.createPolicy('unlisted', {createHTML: value => value});
+ const element = document.createElement('div');
+ let errorName = 'none';
+ try { element.innerHTML = 'untrusted'; }
+ catch (error) { errorName = error.name; }
+ element.innerHTML = second.createHTML('trusted');
+ return [first !== second, errorName, element.innerHTML].join('|');
+ })()"#,
+ )
+ .expect("discarding an invalid name directive must retain valid sink requirements");
+ assert_eq!(result, "true|TypeError|trusted", "{policy:?}");
+ }
+}
+
#[test]
fn trusted_types_webidl_surface_checks_descriptors_arguments_and_brands() {
let mut vm = new_storage_test_vm("https://trusted-types-webidl.test/");
diff --git a/moli-renderer-v8/src/worker/thread/tests/wasm_csp.rs b/moli-renderer-v8/src/worker/thread/tests/wasm_csp.rs
index 6b3e1149eec..f13636fbb4b 100644
--- a/moli-renderer-v8/src/worker/thread/tests/wasm_csp.rs
+++ b/moli-renderer-v8/src/worker/thread/tests/wasm_csp.rs
@@ -61,8 +61,16 @@ async fn worker_wasm_csp_covers_sync_async_and_streaming_compilation() {
"require-trusted-types-for 'script'; script-src 'trusted-types-eval'",
false,
),
- ("script-src \u{000b}'wasm-unsafe-eval'", false),
- ("script-src 'unsafe-eval'\u{000b}", false),
+ ("script-src \u{000b}'wasm-unsafe-eval'", true),
+ ("script-src 'unsafe-eval'\u{000b}", true),
+ (
+ "default-src 'none'; script-src \u{000b}'wasm-unsafe-eval'",
+ false,
+ ),
+ (
+ "default-src 'none'; script-src 'unsafe-eval'\u{000b}",
+ false,
+ ),
] {
let result = wasm_csp_result(
wasm_csp_options(if allowed { 0 } else { 5 })