From e70f7e00528fd61bb06f90c5dc20448efb94eedf Mon Sep 17 00:00:00 2001 From: ldm0 Date: Sun, 1 Nov 2026 03:05:13 +0800 Subject: [PATCH] refactor(messaging): decouple opaque origins from storage partitions --- .../src/context_bootstrap/shared/clone.rs | 107 +++++++++++++++++- .../context_host/window_security_tokens.rs | 1 - moli-renderer-v8/src/structured_clone.rs | 13 +-- moli-renderer-v8/src/worker/thread/mod.rs | 1 - 4 files changed, 107 insertions(+), 15 deletions(-) diff --git a/moli-renderer-v8/src/context_bootstrap/shared/clone.rs b/moli-renderer-v8/src/context_bootstrap/shared/clone.rs index 1bce7169d4b..364e2b657ce 100644 --- a/moli-renderer-v8/src/context_bootstrap/shared/clone.rs +++ b/moli-renderer-v8/src/context_bootstrap/shared/clone.rs @@ -112,7 +112,6 @@ impl RuntimeMessageSourceSecurity { script_url: Option<&url::Url>, creator: Option, owner: crate::resource_owner::ResourceOwnerId, - partition: crate::runtime::RendererStoragePartitionIdentity, agent_cluster: RuntimeMessageAgentCluster, ) -> Self { if script_url.is_some_and(|url| url.scheme() == "blob") @@ -122,8 +121,8 @@ impl RuntimeMessageSourceSecurity { return creator; } let origin = script_url.map(moli_url::origin_ascii_serialization); - let opaque_origin = (origin.as_deref() == Some("null")) - .then(|| RuntimeMessageOpaqueOrigin::worker(owner, partition)); + let opaque_origin = + (origin.as_deref() == Some("null")).then(|| RuntimeMessageOpaqueOrigin::worker(owner)); Self { origin, opaque_origin, @@ -534,6 +533,10 @@ fn throw_post_message_data_clone_error( mod tests { use super::*; use crate::structured_clone::{RuntimeMessageAgentCluster, StructuredCloneMetadata}; + use crate::{ + frame_owner_model::LocalWindowId, native_bridge::WindowExecutionContextOwner, + resource_owner::ResourceOwnerId, + }; fn wasm_message(sender_origin: &str) -> V8StructuredClonePayload { let mut payload = V8StructuredClonePayload::default(); @@ -548,6 +551,104 @@ mod tests { payload } + fn opaque_window(host: ResourceOwnerId, window: u64) -> RuntimeMessageSourceSecurity { + RuntimeMessageSourceSecurity::window( + "null".to_owned(), + Some(RuntimeMessageOpaqueOrigin::window( + host, + WindowExecutionContextOwner::Frame(LocalWindowId(window)), + )), + ) + } + + #[test] + fn wasm_module_message_opaque_windows_require_the_same_host_and_document() { + let host = ResourceOwnerId::new(); + let sender = opaque_window(host, 1); + let mut payload = wasm_message("null"); + attach_runtime_message_source(&mut payload.metadata, sender.clone()); + + assert!(wasm_module_message_allowed_for_target( + &payload, + &opaque_window(host, 1), + )); + for target in [ + opaque_window(ResourceOwnerId::new(), 1), + opaque_window(host, 2), + RuntimeMessageSourceSecurity::window("null".to_owned(), None), + ] { + assert!(!wasm_module_message_allowed_for_target(&payload, &target)); + } + payload.metadata.sender_opaque_origin = None; + assert!(!wasm_module_message_allowed_for_target(&payload, &sender)); + } + + #[test] + fn wasm_module_message_data_workers_require_the_same_resource_owner() { + let creator = opaque_window(ResourceOwnerId::new(), 1); + let script = url::Url::parse("data:text/javascript,onmessage=()=>{}").unwrap(); + let owner = ResourceOwnerId::new(); + let worker = |owner| { + RuntimeMessageSourceSecurity::worker( + Some(&script), + Some(creator.clone()), + owner, + RuntimeMessageAgentCluster::WindowOrDedicatedWorker, + ) + }; + let sender = worker(owner); + assert!(sender.opaque_origin.is_some()); + let mut payload = wasm_message("null"); + attach_runtime_message_source(&mut payload.metadata, sender); + + assert!(wasm_module_message_allowed_for_target( + &payload, + &worker(owner), + )); + for target in [ + worker(ResourceOwnerId::new()), + creator, + opaque_window(owner, 1), + ] { + assert!(!wasm_module_message_allowed_for_target(&payload, &target)); + } + } + + #[test] + fn wasm_module_message_blob_workers_inherit_origin_but_check_agent_cluster_separately() { + let creator = opaque_window(ResourceOwnerId::new(), 1); + let script = url::Url::parse("blob:null/00000000-0000-0000-0000-000000000001").unwrap(); + let mut payload = wasm_message("null"); + attach_runtime_message_source(&mut payload.metadata, creator.clone()); + + for agent_cluster in [ + RuntimeMessageAgentCluster::WindowOrDedicatedWorker, + RuntimeMessageAgentCluster::SharedWorker, + RuntimeMessageAgentCluster::ServiceWorker, + ] { + let child = RuntimeMessageSourceSecurity::worker( + Some(&script), + Some(creator.clone()), + ResourceOwnerId::new(), + agent_cluster, + ); + let nested = RuntimeMessageSourceSecurity::worker( + Some(&script), + Some(child.clone()), + ResourceOwnerId::new(), + agent_cluster, + ); + for target in [child, nested] { + assert_eq!(target.opaque_origin, creator.opaque_origin); + assert_eq!(target.agent_cluster, agent_cluster); + assert_eq!( + wasm_module_message_allowed_for_target(&payload, &target), + agent_cluster == RuntimeMessageAgentCluster::WindowOrDedicatedWorker, + ); + } + } + } + #[test] fn wasm_module_message_origin_check_allows_exact_origin_only_by_default() { let payload = wasm_message("https://example.test"); diff --git a/moli-renderer-v8/src/native_bridge/context_host/window_security_tokens.rs b/moli-renderer-v8/src/native_bridge/context_host/window_security_tokens.rs index a64cea63b00..645f3e5a49c 100644 --- a/moli-renderer-v8/src/native_bridge/context_host/window_security_tokens.rs +++ b/moli-renderer-v8/src/native_bridge/context_host/window_security_tokens.rs @@ -37,7 +37,6 @@ impl JsContextHost { .as_ref()? .resource_owner_id, owner, - self.browser_context_runtime().storage_partition_identity(), )) }); return Some(RuntimeMessageSourceSecurity::window( diff --git a/moli-renderer-v8/src/structured_clone.rs b/moli-renderer-v8/src/structured_clone.rs index d0bc54b23b8..6ee23fae8c2 100644 --- a/moli-renderer-v8/src/structured_clone.rs +++ b/moli-renderer-v8/src/structured_clone.rs @@ -400,12 +400,11 @@ pub(crate) enum RuntimeMessageAgentCluster { ServiceWorker, } -/// Security-origin identity, independent of storage partition nonces. Window -/// identity is scoped by its host, since LocalWindow ids are owner-local. +/// Native opaque security-origin identity, independent of storage partitions +/// and their nonces. Window ids are owner-local, so include the host identity. #[derive(Clone, Debug, Eq, PartialEq)] pub(crate) struct RuntimeMessageOpaqueOrigin { owner: RuntimeOpaqueOriginOwner, - partition: crate::runtime::RendererStoragePartitionIdentity, } #[derive(Clone, Debug, Eq, PartialEq)] @@ -421,21 +420,15 @@ impl RuntimeMessageOpaqueOrigin { pub(crate) fn window( host: crate::resource_owner::ResourceOwnerId, window: crate::native_bridge::WindowExecutionContextOwner, - partition: crate::runtime::RendererStoragePartitionIdentity, ) -> Arc { Arc::new(Self { owner: RuntimeOpaqueOriginOwner::Window { host, window }, - partition, }) } - pub(crate) fn worker( - owner: crate::resource_owner::ResourceOwnerId, - partition: crate::runtime::RendererStoragePartitionIdentity, - ) -> Arc { + pub(crate) fn worker(owner: crate::resource_owner::ResourceOwnerId) -> Arc { Arc::new(Self { owner: RuntimeOpaqueOriginOwner::Worker(owner), - partition, }) } } diff --git a/moli-renderer-v8/src/worker/thread/mod.rs b/moli-renderer-v8/src/worker/thread/mod.rs index 2cf2466f106..fb8c28a74b5 100644 --- a/moli-renderer-v8/src/worker/thread/mod.rs +++ b/moli-renderer-v8/src/worker/thread/mod.rs @@ -1660,7 +1660,6 @@ async fn worker_main( current_script_url.as_ref(), creator_message_security, resource_owner_id, - worker_context_runtime.storage_partition_identity(), message_agent_cluster, ); let state = Rc::new(RefCell::new(WorkerGlobalState {