Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
fix(import-maps): reuse inline source validation before registration
ldm0e4d923c4219d
diff --git a/moli-renderer-v8/src/document_runtime/mutation_commands.rs b/moli-renderer-v8/src/document_runtime/mutation_commands.rsindex fb07b7ff0..4abf685f8 100644--- a/moli-renderer-v8/src/document_runtime/mutation_commands.rs+++ b/moli-renderer-v8/src/document_runtime/mutation_commands.rs@@ -1904,7 +1904,7 @@ pub(super) fn finish_runtime_script_start_candidate(let Some(plan) = runtime.host_plan_script_start(node, &host_script_handle) else {return;};- match unsafe { &mut *host_ptr }.commit_current_main_runtime_script_start(runtime, plan) {+ match unsafe { &mut *host_ptr }.commit_current_main_runtime_script_start(scope, runtime, plan) {Ok(Some(committed)) => {execute_committed_inline_classic_script(runtime, scope, host_ptr, committed);}diff --git a/moli-renderer-v8/src/document_runtime/script_scheduling/module_facade.rs b/moli-renderer-v8/src/document_runtime/script_scheduling/module_facade.rsindex b7b8c42ad..7ee40424d 100644--- a/moli-renderer-v8/src/document_runtime/script_scheduling/module_facade.rs+++ b/moli-renderer-v8/src/document_runtime/script_scheduling/module_facade.rs@@ -78,6 +78,16 @@ impl DocumentRuntime {.register_import_map(source, base_url)}+ pub(crate) fn register_runtime_owned_import_map_source(+ &mut self,+ source: &str,+ base_url: &Url,+ ) {+ self.script_lifecycle+ .scripts_mut()+ .register_dynamic_import_map(base_url, source);+ }+pub(crate) fn resolve_module_specifier(&mut self,specifier: &str,diff --git a/moli-renderer-v8/src/host/scripts.rs b/moli-renderer-v8/src/host/scripts.rsindex f0a23897e..acbaab3f9 100644--- a/moli-renderer-v8/src/host/scripts.rs+++ b/moli-renderer-v8/src/host/scripts.rs@@ -1449,15 +1449,11 @@ impl HostScriptScheduler {)}- fn register_dynamic_import_map(- &mut self,- preparation: &RuntimeScriptPreparationContext,- source: &str,- ) {- if let Err(message) = self.register_import_map(source, &preparation.base_url) {+ pub(crate) fn register_dynamic_import_map(&mut self, base_url: &Url, source: &str) {+ if let Err(message) = self.register_import_map(source, base_url) {let work = self.plan_window_script_failure_report_lifecycle_work(&message,- Some(preparation.base_url.as_str()),+ Some(base_url.as_str()),None,);self.enqueue_post_parse_lifecycle_work(work);diff --git a/moli-renderer-v8/src/host/scripts/runtime.rs b/moli-renderer-v8/src/host/scripts/runtime.rsindex c56de688b..5073f3b07 100644--- a/moli-renderer-v8/src/host/scripts/runtime.rs+++ b/moli-renderer-v8/src/host/scripts/runtime.rs@@ -70,6 +70,11 @@ pub(crate) enum PreparedRuntimeScriptStartCommit {host_script_handle: String,source: String,},+ InlineImportMap {+ node: NativeNodeId,+ base_url: url::Url,+ source: String,+ },Admission {reservation: RuntimeScriptStartReservation,payload: Box<RuntimeScriptAdmissionPayload>,@@ -210,7 +215,7 @@ impl PreparedRuntimeScriptStart {scripts.cancel_script_start(host_script_handle, node);return Ok(None);}- scripts.register_dynamic_import_map(&preparation, &source);+ scripts.register_dynamic_import_map(&preparation.base_url, &source);Ok(None)}RuntimeScriptStartDecision::RejectExternalImportMap => {@@ -402,16 +407,20 @@ pub(crate) fn prepare_runtime_script_start_commit(})}RuntimeScriptStartDecision::RegisterImportMap { source } => {- if finish_local_runtime_script_start(+ if !finish_local_runtime_script_start(dom_host,scripts,node,&host_script_handle,ScriptStartCommitKind::RegisterImportMap,) {- scripts.register_dynamic_import_map(&preparation, &source);+ return Ok(PreparedRuntimeScriptStartCommit::Noop);}- Ok(PreparedRuntimeScriptStartCommit::Noop)+ Ok(PreparedRuntimeScriptStartCommit::InlineImportMap {+ node,+ base_url: preparation.base_url,+ source,+ })}RuntimeScriptStartDecision::RejectExternalImportMap => {if finish_local_runtime_script_start(diff --git a/moli-renderer-v8/src/host/scripts/tests.rs b/moli-renderer-v8/src/host/scripts/tests.rsindex 666da3cea..120d25f6a 100644--- a/moli-renderer-v8/src/host/scripts/tests.rs+++ b/moli-renderer-v8/src/host/scripts/tests.rs@@ -202,7 +202,10 @@ fn draining_dynamic_scripts_keeps_async_and_in_order_lanes_separate() {fn dynamic_importmap_registration_does_not_enter_script_batch() {let preparation = preparation("https://example.test/", NodeId::new(0));let mut scheduler = HostScriptScheduler::default();- scheduler.register_dynamic_import_map(&preparation, "{\"imports\":{\"fixture\":\"/mod.js\"}}");+ scheduler.register_dynamic_import_map(+ &preparation.base_url,+ "{\"imports\":{\"fixture\":\"/mod.js\"}}",+ );let batch = scheduler.drain_dynamic_scripts();assert!(batch.in_order.is_empty());@@ -242,7 +245,7 @@ fn dynamic_external_module_uses_import_map_integrity_when_attribute_is_absent()let preparation = preparation("https://example.test/", NodeId::new(0));let mut scheduler = HostScriptScheduler::default();scheduler.register_dynamic_import_map(- &preparation,+ &preparation.base_url,r#"{"integrity":{"/mod.js":"sha384-from-map"}}"#,);scheduler@@ -269,7 +272,7 @@ fn dynamic_external_module_empty_integrity_overrides_import_map() {preparation.fetch_metadata.integrity = Some(String::new());let mut scheduler = HostScriptScheduler::default();scheduler.register_dynamic_import_map(- &preparation,+ &preparation.base_url,r#"{"integrity":{"/mod.js":"sha384-from-map"}}"#,);scheduler@@ -304,7 +307,10 @@ fn queueing_dynamic_module_does_not_block_later_import_map_merge() {ScriptMode::Async,).expect("module script should queue");- scheduler.register_dynamic_import_map(&preparation, "{\"imports\":{\"late\":\"/late.mjs\"}}");+ scheduler.register_dynamic_import_map(+ &preparation.base_url,+ "{\"imports\":{\"late\":\"/late.mjs\"}}",+ );let batch = scheduler.drain_dynamic_scripts();assert_eq!(batch.async_scripts.len(), 1);diff --git a/moli-renderer-v8/src/host_bindings.rs b/moli-renderer-v8/src/host_bindings.rsindex 4450da17d..53557a8dd 100644--- a/moli-renderer-v8/src/host_bindings.rs+++ b/moli-renderer-v8/src/host_bindings.rs@@ -444,7 +444,7 @@ fn host_prepare_script_start_callback(rv.set_undefined();return;};- match host.plan_and_commit_current_main_runtime_script_start(node, &host_script_handle) {+ match host.plan_and_commit_current_main_runtime_script_start(scope, node, &host_script_handle) {Ok(Some(committed)) => {let (_, _, source) = committed.into_parts();if let Some(source) = v8_string(scope, &source) {diff --git a/moli-renderer-v8/src/native_bridge/context_host/main_document_lifecycle.rs b/moli-renderer-v8/src/native_bridge/context_host/main_document_lifecycle.rsindex 9577061b6..82f2c7567 100644--- a/moli-renderer-v8/src/native_bridge/context_host/main_document_lifecycle.rs+++ b/moli-renderer-v8/src/native_bridge/context_host/main_document_lifecycle.rs@@ -20,6 +20,7 @@ use crate::{impl JsContextHost {pub(crate) fn plan_and_commit_current_main_runtime_script_start(&mut self,+ scope: &mut v8::PinScope<'_, '_>,node: crate::document_runtime::DomHandle,host_script_handle: &str,) -> std::result::Result<Option<CommittedInlineClassicScript>, String> {@@ -27,11 +28,12 @@ impl JsContextHost {let Some(plan) = runtime.host_plan_script_start(node, host_script_handle) else {return Ok(None);};- self.commit_current_main_runtime_script_start(runtime, plan)+ self.commit_current_main_runtime_script_start(scope, runtime, plan)}pub(crate) fn commit_current_main_runtime_script_start(&mut self,+ scope: &mut v8::PinScope<'_, '_>,runtime: &mut DocumentRuntime,plan: RuntimeScriptStartPlan,) -> std::result::Result<Option<CommittedInlineClassicScript>, String> {@@ -82,6 +84,38 @@ impl JsContextHost {source,)))}+ PreparedRuntimeScriptStartCommit::InlineImportMap {+ node,+ base_url,+ source,+ } => {+ debug_assert!(load_delay_binding.is_none());+ let nonce = runtime+ .dom_host()+ .node(node)+ .and_then(crate::dom::native::Node::as_element)+ .and_then(|element| {+ element+ .cryptographic_nonce()+ .or_else(|| element.attribute("nonce"))+ })+ .map(str::to_owned);+ let request =+ crate::content_security_policy::ContentSecurityPolicyScriptElementRequest {+ nonce: nonce.as_deref(),+ integrity: None,+ parser_inserted: false,+ };+ let host_ptr: *mut JsContextHost = self;+ if let Some(source) =+ crate::native_bridge::element::inline_script_source_for_execution(+ scope, host_ptr, node, &source, request,+ )+ {+ runtime.register_runtime_owned_import_map_source(&source, &base_url);+ }+ Ok(None)+ }PreparedRuntimeScriptStartCommit::Admission {reservation,payload,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.rsindex 566a0f0ae..348d37b16 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@@ -445,6 +445,70 @@ fn trusted_types_default_policy_can_make_changed_empty_script_sources_executable);}+#[test]+fn trusted_types_default_policy_prepares_runtime_import_maps_before_registration() {+ let mut vm = new_storage_test_vm("https://runtime-import-map-trusted-types.test/");+ vm.set_response_content_security_policies(&["require-trusted-types-for 'script'".to_owned()]);++ let result = vm+ .eval(+ r#"+(() => {+ const root = document.body ||+ (document.documentElement || document.appendChild(document.createElement("html")))+ .appendChild(document.createElement("body"));+ const calls = [];+ trustedTypes.createPolicy("default", {+ createScript(value, type, sink) {+ calls.push([value, type, sink]);+ const specifier = sink === "SVGScriptElement text" ? "svg-mapped" : "html-mapped";+ return JSON.stringify({ imports: { [specifier]: `/${specifier}.mjs` } });+ }+ });++ const htmlScript = document.createElement("script");+ htmlScript.type = "importmap";+ htmlScript.appendChild(document.createTextNode("html-map"));+ root.appendChild(htmlScript);++ const svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");+ root.appendChild(svg);+ const svgScript = document.createElementNS("http://www.w3.org/2000/svg", "script");+ svgScript.setAttribute("type", "importmap");+ svgScript.appendChild(document.createTextNode("svg-map"));+ svg.appendChild(svgScript);++ return JSON.stringify(calls);+})()+"#,+ )+ .expect("runtime import maps should pass through the Trusted Types source gate");++ assert_eq!(+ result,+ r#"[["html-map","TrustedScript","HTMLScriptElement text"],["svg-map","TrustedScript","SVGScriptElement text"]]"#+ );+ let base_url = vm.document_runtime.document_url().clone();+ for (specifier, expected) in [+ (+ "html-mapped",+ "https://runtime-import-map-trusted-types.test/html-mapped.mjs",+ ),+ (+ "svg-mapped",+ "https://runtime-import-map-trusted-types.test/svg-mapped.mjs",+ ),+ ] {+ assert_eq!(+ vm.document_runtime+ .resolve_module_specifier(specifier, &base_url)+ .expect("default-policy import map entry should resolve")+ .as_str(),+ expected+ );+ }+}+#[test]fn inline_module_graph_roots_use_trusted_types_compliant_source() {let mut vm = new_storage_test_vm("https://module-source-trusted-types.test/");