Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

fix(csp): report eval source samples

ldm02793b2407fc7
diff --git a/moli-renderer-v8/src/content_security_policy.rs b/moli-renderer-v8/src/content_security_policy.rs
index c8519fce8..f12198cfb 100644
--- a/moli-renderer-v8/src/content_security_policy.rs
+++ b/moli-renderer-v8/src/content_security_policy.rs
@@ -988,23 +988,6 @@ pub(crate) fn content_security_policy_trusted_types_sink_violation_with_disposit
})
}
-pub(crate) fn content_security_policy_non_url_violation_with_disposition_and_reporting_endpoints(
- policy: &str,
- protected_url: &Url,
- kind: ContentSecurityPolicyNonUrlKind,
- disposition: ContentSecurityPolicyDisposition,
- reporting_endpoints: &ContentSecurityPolicyReportingEndpoints,
-) -> Option<ContentSecurityPolicyUrlViolation> {
- content_security_policy_non_url_violation_with_source(
- policy,
- protected_url,
- kind,
- None,
- disposition,
- reporting_endpoints,
- )
-}
-
pub(crate) fn content_security_policy_inline_source_violation_with_disposition_and_reporting_endpoints(
policy: &str,
protected_url: &Url,
@@ -1103,7 +1086,7 @@ pub(crate) fn content_security_policy_inline_style_element_violation_with_dispos
})
}
-fn content_security_policy_non_url_violation_with_source(
+pub(crate) fn content_security_policy_non_url_violation_with_source(
policy: &str,
protected_url: &Url,
kind: ContentSecurityPolicyNonUrlKind,
@@ -3746,25 +3729,26 @@ mod tests {
fn non_url_inline_script_uses_script_src_elem_fallbacks() {
let reporting_endpoints = ContentSecurityPolicyReportingEndpoints::default();
assert!(
- content_security_policy_non_url_violation_with_disposition_and_reporting_endpoints(
+ content_security_policy_non_url_violation_with_source(
"script-src-elem 'unsafe-inline'; script-src 'none'",
&protected_url(),
ContentSecurityPolicyNonUrlKind::DocumentInlineScript,
+ None,
ContentSecurityPolicyDisposition::Enforce,
&reporting_endpoints,
)
.is_none()
);
- let violation =
- content_security_policy_non_url_violation_with_disposition_and_reporting_endpoints(
- "script-src 'self'; default-src 'unsafe-inline'",
- &protected_url(),
- ContentSecurityPolicyNonUrlKind::DocumentInlineScript,
- ContentSecurityPolicyDisposition::Report,
- &reporting_endpoints,
- )
- .expect("script-src should block inline script without unsafe-inline");
+ let violation = content_security_policy_non_url_violation_with_source(
+ "script-src 'self'; default-src 'unsafe-inline'",
+ &protected_url(),
+ ContentSecurityPolicyNonUrlKind::DocumentInlineScript,
+ None,
+ ContentSecurityPolicyDisposition::Report,
+ &reporting_endpoints,
+ )
+ .expect("script-src should block inline script without unsafe-inline");
assert_eq!(violation.effective_directive, "script-src-elem");
assert_eq!(violation.blocked_uri, "inline");
assert_eq!(
@@ -4180,10 +4164,11 @@ mod tests {
"default-src 'unsafe-eval'",
] {
assert!(
- content_security_policy_non_url_violation_with_disposition_and_reporting_endpoints(
+ content_security_policy_non_url_violation_with_source(
policy,
&protected_url(),
ContentSecurityPolicyNonUrlKind::WasmEval,
+ None,
ContentSecurityPolicyDisposition::Enforce,
&reporting_endpoints,
)
@@ -4192,15 +4177,15 @@ mod tests {
);
}
- let violation =
- content_security_policy_non_url_violation_with_disposition_and_reporting_endpoints(
- "default-src 'self'",
- &protected_url(),
- ContentSecurityPolicyNonUrlKind::WasmEval,
- ContentSecurityPolicyDisposition::Enforce,
- &reporting_endpoints,
- )
- .expect("default-src should block wasm eval without unsafe eval source");
+ let violation = content_security_policy_non_url_violation_with_source(
+ "default-src 'self'",
+ &protected_url(),
+ ContentSecurityPolicyNonUrlKind::WasmEval,
+ None,
+ ContentSecurityPolicyDisposition::Enforce,
+ &reporting_endpoints,
+ )
+ .expect("default-src should block wasm eval without unsafe eval source");
assert_eq!(violation.effective_directive, "script-src");
assert_eq!(violation.blocked_uri, "wasm-eval");
}
diff --git a/moli-renderer-v8/src/document_runtime/security_policy.rs b/moli-renderer-v8/src/document_runtime/security_policy.rs
index e25f451fd..864f713e5 100644
--- a/moli-renderer-v8/src/document_runtime/security_policy.rs
+++ b/moli-renderer-v8/src/document_runtime/security_policy.rs
@@ -13,7 +13,7 @@ use crate::content_security_policy::{
content_security_policy_inline_script_element_violation_with_disposition_and_reporting_endpoints,
content_security_policy_inline_source_violation_with_disposition_and_reporting_endpoints,
content_security_policy_inline_style_element_violation_with_disposition_and_reporting_endpoints,
- content_security_policy_non_url_violation_with_disposition_and_reporting_endpoints,
+ content_security_policy_non_url_violation_with_source,
content_security_policy_report_only_headers,
content_security_policy_requires_trusted_types_for_script,
content_security_policy_script_element_url_violation_with_redirect_status_disposition_reporting_endpoints_and_request,
@@ -1024,6 +1024,7 @@ impl DocumentRuntime {
response_report_only_policies: &[String],
response_reporting_endpoints: &ContentSecurityPolicyReportingEndpoints,
kind: ContentSecurityPolicyNonUrlKind,
+ source: Option<&str>,
) -> DocumentContentSecurityPolicyCheck {
let enforced_policies = self
.document_content_security_policy_strings_for_optional_document(
@@ -1035,6 +1036,7 @@ impl DocumentRuntime {
enforced_policies,
document_url,
kind,
+ source,
ContentSecurityPolicyDisposition::Enforce,
);
let report_only_policies = document_response_content_security_policy_strings(
@@ -1045,6 +1047,7 @@ impl DocumentRuntime {
report_only_policies,
document_url,
kind,
+ source,
ContentSecurityPolicyDisposition::Report,
);
DocumentContentSecurityPolicyCheck {
@@ -1246,6 +1249,7 @@ impl DocumentRuntime {
policies,
document_url,
ContentSecurityPolicyNonUrlKind::DocumentInlineScript,
+ None,
ContentSecurityPolicyDisposition::Enforce,
)
}
@@ -1264,6 +1268,7 @@ impl DocumentRuntime {
policies,
document_url,
ContentSecurityPolicyNonUrlKind::DocumentInlineScript,
+ None,
ContentSecurityPolicyDisposition::Report,
)
}
@@ -1272,6 +1277,7 @@ impl DocumentRuntime {
pub(crate) fn wasm_eval_csp_violation(&self) -> Option<DocumentContentSecurityPolicyViolation> {
self.non_url_csp_violation(
ContentSecurityPolicyNonUrlKind::WasmEval,
+ None,
ContentSecurityPolicyDisposition::Enforce,
)
}
@@ -1280,6 +1286,7 @@ impl DocumentRuntime {
fn non_url_csp_violation(
&self,
kind: ContentSecurityPolicyNonUrlKind,
+ source: Option<&str>,
disposition: ContentSecurityPolicyDisposition,
) -> Option<DocumentContentSecurityPolicyViolation> {
let document_url = self.document_url();
@@ -1292,6 +1299,7 @@ impl DocumentRuntime {
policies,
document_url,
kind,
+ source,
disposition,
)
}
@@ -1300,6 +1308,7 @@ impl DocumentRuntime {
fn non_url_csp_report_only_violation(
&self,
kind: ContentSecurityPolicyNonUrlKind,
+ source: Option<&str>,
disposition: ContentSecurityPolicyDisposition,
) -> Option<DocumentContentSecurityPolicyViolation> {
let document_url = self.document_url();
@@ -1313,6 +1322,7 @@ impl DocumentRuntime {
policies,
document_url,
kind,
+ source,
disposition,
)
}
@@ -1323,6 +1333,7 @@ impl DocumentRuntime {
) -> Option<DocumentContentSecurityPolicyViolation> {
self.non_url_csp_report_only_violation(
ContentSecurityPolicyNonUrlKind::WasmEval,
+ None,
ContentSecurityPolicyDisposition::Report,
)
}
@@ -1943,17 +1954,18 @@ fn document_non_url_policy_violation_from_document_policies(
policies: Vec<DocumentContentSecurityPolicyString>,
document_url: &Url,
kind: ContentSecurityPolicyNonUrlKind,
+ source: Option<&str>,
disposition: ContentSecurityPolicyDisposition,
) -> Option<DocumentContentSecurityPolicyViolation> {
policies.into_iter().find_map(|policy| {
- let mut violation =
- content_security_policy_non_url_violation_with_disposition_and_reporting_endpoints(
- &policy.policy,
- document_url,
- kind,
- disposition,
- &policy.reporting_endpoints,
- )?;
+ let mut violation = content_security_policy_non_url_violation_with_source(
+ &policy.policy,
+ document_url,
+ kind,
+ source,
+ disposition,
+ &policy.reporting_endpoints,
+ )?;
apply_document_policy_reporting_flags(&mut violation, &policy);
Some(violation)
})
diff --git a/moli-renderer-v8/src/native_bridge/context_host/security_policy.rs b/moli-renderer-v8/src/native_bridge/context_host/security_policy.rs
index b87712c45..a059bb031 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/security_policy.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/security_policy.rs
@@ -769,6 +769,7 @@ impl JsContextHost {
&mut self,
scope: &mut v8::PinScope<'s, '_>,
allow_trusted_types_eval: bool,
+ source: Option<&str>,
) -> bool {
let owner = policy_owner_dispatch_scope(scope);
let Some(check) = self.non_url_csp_check_for_owner(
@@ -778,6 +779,7 @@ impl JsContextHost {
} else {
ContentSecurityPolicyNonUrlKind::Eval
},
+ source,
) else {
return true;
};
@@ -789,9 +791,11 @@ impl JsContextHost {
scope: &mut v8::PinScope<'s, '_>,
) -> bool {
let owner = policy_owner_dispatch_scope(scope);
- let Some(check) =
- self.non_url_csp_check_for_owner(owner, ContentSecurityPolicyNonUrlKind::WasmEval)
- else {
+ let Some(check) = self.non_url_csp_check_for_owner(
+ owner,
+ ContentSecurityPolicyNonUrlKind::WasmEval,
+ None,
+ ) else {
return true;
};
self.apply_code_generation_csp_check(scope, owner, check, false)
@@ -801,6 +805,7 @@ impl JsContextHost {
&self,
owner: OwnerDispatchScope,
kind: ContentSecurityPolicyNonUrlKind,
+ source: Option<&str>,
) -> Option<DocumentContentSecurityPolicyCheck> {
let snapshot = self.owner_document_policy_snapshot(owner)?;
// SAFETY: JsContextHost is owned by the ScriptVm that owns this DocumentRuntime.
@@ -816,6 +821,7 @@ impl JsContextHost {
.policy_container
.content_security_reporting_endpoints,
kind,
+ source,
),
)
}
@@ -866,6 +872,7 @@ impl JsContextHost {
self.non_url_csp_check_for_owner(
OwnerDispatchScope::Child(handle),
ContentSecurityPolicyNonUrlKind::WasmEval,
+ None,
)?
.into_violations()
.1
diff --git a/moli-renderer-v8/src/script_vm/security_policy.rs b/moli-renderer-v8/src/script_vm/security_policy.rs
index 307dceed3..dc41b047e 100644
--- a/moli-renderer-v8/src/script_vm/security_policy.rs
+++ b/moli-renderer-v8/src/script_vm/security_policy.rs
@@ -161,6 +161,7 @@ pub(super) fn string_code_generation_check_callback<'s>(
if source.is_string() {
StringCodeGenerationPolicyAction::CheckCsp {
allow_trusted_types_eval: true,
+ source: string_code_generation_source(scope, source),
modified_source: None,
}
} else {
@@ -168,6 +169,7 @@ pub(super) fn string_code_generation_check_callback<'s>(
TrustedTypesCodeGenerationCheck::AllowModified(source) => {
StringCodeGenerationPolicyAction::CheckCsp {
allow_trusted_types_eval: true,
+ source: Some(source.clone()),
modified_source: Some(source),
}
}
@@ -191,6 +193,7 @@ pub(super) fn string_code_generation_check_callback<'s>(
NonTrustedTypesCodeGenerationSource::String => {
StringCodeGenerationPolicyAction::CheckCsp {
allow_trusted_types_eval: false,
+ source: string_code_generation_source(scope, source),
modified_source: None,
}
}
@@ -200,6 +203,7 @@ pub(super) fn string_code_generation_check_callback<'s>(
TrustedTypesCodeGenerationCheck::AllowModified(source) => {
StringCodeGenerationPolicyAction::CheckCsp {
allow_trusted_types_eval: false,
+ source: Some(source.clone()),
modified_source: Some(source),
}
}
@@ -217,11 +221,14 @@ pub(super) fn string_code_generation_check_callback<'s>(
StringCodeGenerationPolicyAction::AllowWithoutCsp => true,
StringCodeGenerationPolicyAction::CheckCsp {
allow_trusted_types_eval,
+ source,
modified_source: replacement,
} => {
- if !unsafe { &mut *host_ptr }
- .allows_eval_code_generation_by_csp(scope, allow_trusted_types_eval)
- {
+ if !unsafe { &mut *host_ptr }.allows_eval_code_generation_by_csp(
+ scope,
+ allow_trusted_types_eval,
+ source.as_deref(),
+ ) {
return code_generation_result(false, None);
}
let replacement = match replacement {
@@ -254,6 +261,7 @@ enum StringCodeGenerationPolicyAction {
AllowWithoutCsp,
CheckCsp {
allow_trusted_types_eval: bool,
+ source: Option<String>,
modified_source: Option<String>,
},
Block,
@@ -269,6 +277,7 @@ fn code_generation_action_from_trusted_types_check(
TrustedTypesCodeGenerationCheck::AllowModified(source) => {
StringCodeGenerationPolicyAction::CheckCsp {
allow_trusted_types_eval: false,
+ source: Some(source.clone()),
modified_source: Some(source),
}
}
@@ -276,6 +285,15 @@ fn code_generation_action_from_trusted_types_check(
}
}
+fn string_code_generation_source(
+ scope: &mut v8::PinScope<'_, '_>,
+ source: v8::Local<'_, v8::Value>,
+) -> Option<String> {
+ v8::Local::<v8::String>::try_from(source)
+ .ok()
+ .map(|source| source.to_rust_string_lossy(scope))
+}
+
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub(super) enum NonTrustedTypesCodeGenerationSource {
String,
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 805240863..8b04ca571 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
@@ -957,6 +957,68 @@ fn rejected_default_policy_reports_both_dispositions_and_enforces_once() {
);
}
+#[test]
+fn eval_csp_report_samples_use_trusted_types_compliant_source() {
+ let mut vm = new_storage_test_vm("https://eval-csp-report-sample.test/");
+ vm.set_response_content_security_policies(&[
+ "require-trusted-types-for 'script'".to_owned(),
+ "script-src 'nonce-test' 'report-sample'".to_owned(),
+ ]);
+
+ let result = vm
+ .eval(
+ r#"
+(() => {
+ const samples = [];
+ const defaultCalls = [];
+ document.addEventListener("securitypolicyviolation", event => {
+ if (event.effectiveDirective === "script-src") {
+ samples.push(event.sample);
+ }
+ });
+ globalThis.__evalCspReportSamples = samples;
+
+ const explicit = trustedTypes.createPolicy("explicit-eval", {
+ createScript: value => value
+ });
+ trustedTypes.createPolicy("default", {
+ createScript: value => {
+ defaultCalls.push(value);
+ return value;
+ }
+ });
+ const errors = [
+ () => eval(explicit.createScript("trusted-source")),
+ () => eval("default-source")
+ ].map(run => {
+ try {
+ run();
+ return "none";
+ } catch (error) {
+ return `${error.name}:${error instanceof EvalError}`;
+ }
+ });
+ return JSON.stringify({ errors, defaultCalls, samples });
+})()
+"#,
+ )
+ .expect("eval CSP report-sample probe should evaluate");
+
+ assert_eq!(
+ result,
+ r#"{"errors":["EvalError:true","EvalError:true"],"defaultCalls":["default-source"],"samples":[]}"#
+ );
+ assert_eq!(
+ drain_pre_domcontentloaded_non_script_page_tasks_for_test(&mut vm),
+ 2
+ );
+ assert_eq!(
+ vm.eval("JSON.stringify(globalThis.__evalCspReportSamples)")
+ .expect("queued eval CSP samples should be observable"),
+ r#"["trusted-source","default-source"]"#
+ );
+}
+
#[test]
fn function_constructor_violations_sample_only_parameters_and_body() {
let mut vm = new_storage_test_vm("https://function-constructor-violation.test/");
diff --git a/moli-renderer-v8/src/window_host.rs b/moli-renderer-v8/src/window_host.rs
index e31ab2b9f..5eee87e6f 100644
--- a/moli-renderer-v8/src/window_host.rs
+++ b/moli-renderer-v8/src/window_host.rs
@@ -671,7 +671,7 @@ fn prepare_window_timer_handler<'s>(
let host = unsafe { &mut *host_ptr };
let allow_trusted_types_eval =
requirements.is_enforced() && host.allows_trusted_types_eval(scope);
- host.allows_eval_code_generation_by_csp(scope, allow_trusted_types_eval)
+ host.allows_eval_code_generation_by_csp(scope, allow_trusted_types_eval, Some(source.as_str()))
.then_some(WindowTimerHandler::Source(source))
}