Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(structured-clone): dispatch all platform objects through native identity

ldm0c5cf57ff7672
diff --git a/moli-renderer-v8/src/context_bootstrap.rs b/moli-renderer-v8/src/context_bootstrap.rs
index cc71f863c..7df5b7c03 100644
--- a/moli-renderer-v8/src/context_bootstrap.rs
+++ b/moli-renderer-v8/src/context_bootstrap.rs
@@ -125,7 +125,6 @@ pub(crate) use self::events::{
pub(crate) use crypto::{
CryptoKeyAlgorithmClonePayload, CryptoKeyClonePayload, WebCryptoRejection, WebCryptoTaskResult,
crypto_key_clone_payload_from_object, crypto_key_object_from_clone_payload,
- is_crypto_key_object,
};
pub(crate) use css_fontface_runtime::rebuild_font_face_set_faces;
pub(crate) use location_navigation::{
@@ -260,7 +259,7 @@ pub(crate) use self::history_runtime::{
};
pub(crate) use self::image_data::{
ImageDataClonePayload, build_image_data_object_from_clone_payload,
- image_data_clone_payload_from_object, is_image_data_object,
+ image_data_clone_payload_from_object,
};
pub(crate) use self::indexed_db::{
IndexedDbTaskId, discard_indexed_db_task_by_id, flush_blocked_indexed_db_requests,
@@ -346,8 +345,7 @@ pub(crate) use self::notification_runtime::{
};
pub(crate) use self::performance_runtime::{
ResourcePerformanceEntry, bind_window_performance_seed, current_performance_time_origin,
- increment_performance_event_count, is_performance_entry_object,
- record_performance_dom_content_loaded_event_end,
+ increment_performance_event_count, record_performance_dom_content_loaded_event_end,
record_performance_dom_content_loaded_event_start, record_performance_load_event_end,
record_performance_load_event_start, record_resource_performance_entry,
run_resource_timing_buffer_full_task,
diff --git a/moli-renderer-v8/src/context_bootstrap/crypto.rs b/moli-renderer-v8/src/context_bootstrap/crypto.rs
index dbedd8ae9..79f9fdbfc 100644
--- a/moli-renderer-v8/src/context_bootstrap/crypto.rs
+++ b/moli-renderer-v8/src/context_bootstrap/crypto.rs
@@ -17,7 +17,7 @@ pub(in crate::context_bootstrap) use install::{
};
pub(crate) use keys::{
CryptoKeyAlgorithmClonePayload, CryptoKeyClonePayload, crypto_key_clone_payload_from_object,
- crypto_key_object_from_clone_payload, is_crypto_key_object,
+ crypto_key_object_from_clone_payload,
};
/// Owner-neutral result of one blocking WebCrypto operation.
diff --git a/moli-renderer-v8/src/context_bootstrap/image_data.rs b/moli-renderer-v8/src/context_bootstrap/image_data.rs
index 68fc1e23d..38a4e2d62 100644
--- a/moli-renderer-v8/src/context_bootstrap/image_data.rs
+++ b/moli-renderer-v8/src/context_bootstrap/image_data.rs
@@ -364,15 +364,6 @@ pub(crate) fn image_data_clone_payload_from_object<'s>(
})
}
-pub(crate) fn is_image_data_object<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- object: v8::Local<'s, v8::Object>,
-) -> bool {
- image_data_dimensions_from_object(scope, object).is_some()
- && get_private_value(scope, object, IMAGE_DATA_DATA_SLOT)
- .is_some_and(|value| v8::Local::<v8::Uint8ClampedArray>::try_from(value).is_ok())
-}
-
pub(super) fn image_data_dimensions_from_object<'s>(
scope: &mut v8::PinScope<'s, '_>,
object: v8::Local<'s, v8::Object>,
diff --git a/moli-renderer-v8/src/context_bootstrap/indexed_db/core/clone.rs b/moli-renderer-v8/src/context_bootstrap/indexed_db/core/clone.rs
index a0d3afdd3..77cdda0f0 100644
--- a/moli-renderer-v8/src/context_bootstrap/indexed_db/core/clone.rs
+++ b/moli-renderer-v8/src/context_bootstrap/indexed_db/core/clone.rs
@@ -39,11 +39,7 @@ impl v8::ValueSerializerImpl for IndexedDbStructuredCloneSerializer {
scope: &mut v8::PinScope<'s, '_>,
object: v8::Local<'s, v8::Object>,
) -> Option<bool> {
- Some(
- crate::context_bootstrap::is_crypto_key_object(scope, object)
- || crate::blob::is_blob_object(scope, object)
- || file_system_handle_clone_payload_from_object(scope, object).is_some(),
- )
+ Some(moli_webapi_declare::web_api_object_type(scope, object).is_some())
}
fn write_host_object<'s>(
@@ -108,6 +104,20 @@ impl v8::ValueSerializerImpl for IndexedDbStructuredCloneSerializer {
None
}
+ fn get_shared_array_buffer_id<'s>(
+ &self,
+ scope: &mut v8::PinScope<'s, '_>,
+ _buffer: v8::Local<'s, v8::SharedArrayBuffer>,
+ ) -> Option<u32> {
+ let exception = dom_exception_value(
+ scope,
+ "SharedArrayBuffer could not be cloned.",
+ "DataCloneError",
+ );
+ scope.throw_exception(exception);
+ None
+ }
+
fn get_wasm_module_transfer_id(
&self,
scope: &mut v8::PinScope<'_, '_>,
diff --git a/moli-renderer-v8/src/context_bootstrap/navigation_events.rs b/moli-renderer-v8/src/context_bootstrap/navigation_events.rs
index 2aaaad62f..705a9f708 100644
--- a/moli-renderer-v8/src/context_bootstrap/navigation_events.rs
+++ b/moli-renderer-v8/src/context_bootstrap/navigation_events.rs
@@ -148,7 +148,7 @@ struct ActiveNavigateEventDataDeclaration<'scope> {
}
#[derive(WebApiObject)]
-#[webapi(interface = "Object", enumerable)]
+#[webapi(interface = "NavigationDestination", prototype = "Object", enumerable)]
struct NavigationDestinationDeclaration<'scope> {
#[webapi(data_property)]
url: v8::Local<'scope, v8::String>,
@@ -167,7 +167,7 @@ struct NavigationDestinationDeclaration<'scope> {
}
#[derive(WebApiObject)]
-#[webapi(interface = "Object", enumerable)]
+#[webapi(interface = "NavigationDestination", prototype = "Object", enumerable)]
struct NavigationEntryBackedDestinationDeclaration<'scope> {
#[webapi(data_property)]
url: v8::Local<'scope, v8::String>,
diff --git a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/navigator.rs b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/navigator.rs
index 078c7cfeb..e03215114 100644
--- a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/navigator.rs
+++ b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/navigator.rs
@@ -417,7 +417,7 @@ struct NavigatorUaDataPrototypeMethodsDeclaration {
}
#[derive(Default, WebApiObject)]
-#[webapi(interface = "Object")]
+#[webapi(interface = "ServiceWorkerContainer", prototype = "Object")]
struct ServiceWorkerContainerDeclaration {
#[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = SERVICE_WORKER_CONTAINER_LISTENERS_SLOT)]
event_target_slot: (),
diff --git a/moli-renderer-v8/src/context_bootstrap/performance_runtime.rs b/moli-renderer-v8/src/context_bootstrap/performance_runtime.rs
index fb397b19b..ab96696c2 100644
--- a/moli-renderer-v8/src/context_bootstrap/performance_runtime.rs
+++ b/moli-renderer-v8/src/context_bootstrap/performance_runtime.rs
@@ -96,7 +96,6 @@ pub(super) use super::performance_observer_runtime::{
performance_observer_disconnect_callback, performance_observer_observe_callback,
performance_observer_take_records_callback,
};
-pub(crate) use entries::is_performance_entry_object;
use entries::{
append_performance_entry, create_performance_entry, initialize_resource_timing_slots,
push_performance_entry,
diff --git a/moli-renderer-v8/src/context_bootstrap/performance_runtime/entries.rs b/moli-renderer-v8/src/context_bootstrap/performance_runtime/entries.rs
index ac1b36c83..d6efd989a 100644
--- a/moli-renderer-v8/src/context_bootstrap/performance_runtime/entries.rs
+++ b/moli-renderer-v8/src/context_bootstrap/performance_runtime/entries.rs
@@ -578,15 +578,6 @@ pub(in crate::context_bootstrap) fn performance_entry_slot_value<'s>(
get_private_value(scope, object, slot)
}
-pub(crate) fn is_performance_entry_object<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- object: v8::Local<'s, v8::Object>,
-) -> bool {
- PERFORMANCE_ENTRY_BASE_ATTRIBUTE_SLOTS
- .iter()
- .all(|slot| get_private_value(scope, object, slot).is_some())
-}
-
pub(in crate::context_bootstrap) fn performance_entry_slot_string<'s>(
scope: &mut v8::PinScope<'s, '_>,
object: v8::Local<'s, v8::Object>,
diff --git a/moli-renderer-v8/src/context_bootstrap/shared/clone.rs b/moli-renderer-v8/src/context_bootstrap/shared/clone.rs
index 5047e60e7..e936a66af 100644
--- a/moli-renderer-v8/src/context_bootstrap/shared/clone.rs
+++ b/moli-renderer-v8/src/context_bootstrap/shared/clone.rs
@@ -13,15 +13,10 @@ use crate::{
serialize_for_wire_for_storage,
},
types::MessagePortId,
- util::{context_host_ptr_from_global_bridge, get_private_value, v8_string, v8str},
+ util::{context_host_ptr_from_global_bridge, v8_string, v8str},
webidl,
};
-use super::slots::{
- FORM_DATA_ENTRIES_SLOT, NAVIGATOR_RUNTIME_DATA_SLOT, URL_HREF_SLOT,
- URL_SEARCH_PARAMS_PAIRS_SLOT,
-};
-
struct PostMessageTransferList<'s> {
array_buffers: Vec<v8::Local<'s, v8::ArrayBuffer>>,
message_ports: Vec<v8::Local<'s, v8::Object>>,
@@ -96,7 +91,6 @@ pub(crate) fn structured_serialize_value<'s>(
scope: &mut v8::PinScope<'s, '_>,
value: v8::Local<'s, v8::Value>,
) -> Option<V8StructuredClonePayload> {
- reject_uncloneable_web_platform_object(scope, value)?;
serialize_for_wire_for_runtime(scope, value)
}
@@ -104,7 +98,6 @@ pub(crate) fn structured_serialize_value_for_storage<'s>(
scope: &mut v8::PinScope<'s, '_>,
value: v8::Local<'s, v8::Value>,
) -> Option<V8StructuredClonePayload> {
- reject_uncloneable_web_platform_object(scope, value)?;
serialize_for_wire_for_storage(scope, value)
}
@@ -132,16 +125,6 @@ pub(crate) fn structured_serialize_value_for_post_message_with_source_port<'s>(
) -> Option<V8StructuredClonePayload> {
let transfers =
parse_post_message_transfer_list(scope, transfer_arg, interface_name, source_port_id)?;
- if is_uncloneable_web_platform_object(scope, value)
- && !transfer_list_contains_stream_value(value, &transfers)
- {
- throw_post_message_data_clone_error(
- scope,
- interface_name,
- "This object is not structured-serializable.",
- );
- return None;
- }
let mut payload = serialize_for_wire_for_runtime_message(
scope,
value,
@@ -191,16 +174,6 @@ fn structured_serialize_value_for_window_post_message_transfers<'s>(
transfers: PostMessageTransferList<'s>,
source_security: RuntimeMessageSourceSecurity,
) -> Option<V8StructuredClonePayload> {
- if is_uncloneable_web_platform_object(scope, value)
- && !transfer_list_contains_stream_value(value, &transfers)
- {
- throw_post_message_data_clone_error(
- scope,
- "Window",
- "This object is not structured-serializable.",
- );
- return None;
- }
let mut payload = serialize_for_wire_for_runtime_message(
scope,
value,
@@ -224,20 +197,6 @@ fn empty_post_message_transfer_list<'s>() -> PostMessageTransferList<'s> {
}
}
-fn transfer_list_contains_stream_value<'s>(
- value: v8::Local<'s, v8::Value>,
- transfers: &PostMessageTransferList<'s>,
-) -> bool {
- v8::Local::<v8::Object>::try_from(value).is_ok_and(|object| {
- transfers
- .readable_streams
- .iter()
- .chain(&transfers.writable_streams)
- .chain(&transfers.transform_streams)
- .any(|stream| stream.strict_equals(object.into()))
- })
-}
-
pub(crate) fn structured_deserialize_value<'s>(
scope: &mut v8::PinScope<'s, '_>,
payload: &V8StructuredClonePayload,
@@ -346,13 +305,6 @@ pub(crate) fn structured_clone_value_with_options<'s>(
options: v8::Local<'s, v8::Value>,
) -> Option<v8::Local<'s, v8::Value>> {
let transfers = parse_structured_clone_options_transfer_list(scope, options)?;
- if is_uncloneable_web_platform_object(scope, value)
- && !transfer_list_contains_stream_value(value, &transfers)
- {
- TransferListOperation::StructuredClone
- .throw_data_clone_error(scope, "This object is not structured-serializable.");
- return None;
- }
let payload = serialize_for_wire_for_runtime_with_transfers(
scope,
value,
@@ -373,51 +325,6 @@ pub(crate) fn structured_clone_value_for_storage<'s>(
structured_deserialize_value(scope, &bytes)
}
-fn reject_uncloneable_web_platform_object<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- value: v8::Local<'s, v8::Value>,
-) -> Option<()> {
- if value.is_shared_array_buffer() {
- throw_data_clone_error(scope, "SharedArrayBuffer could not be cloned.");
- return None;
- }
- if !is_uncloneable_web_platform_object(scope, value) {
- return Some(());
- }
- throw_data_clone_error(scope, "This object is not structured-serializable.");
- None
-}
-
-fn is_uncloneable_web_platform_object<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- value: v8::Local<'s, v8::Value>,
-) -> bool {
- let Ok(object) = v8::Local::<v8::Object>::try_from(value) else {
- return false;
- };
- has_present_slot(scope, object, URL_HREF_SLOT)
- || crate::native_bridge::object_is_node_wrapper_or_detached(scope, object)
- || has_present_slot(scope, object, URL_SEARCH_PARAMS_PAIRS_SLOT)
- || has_present_slot(scope, object, FORM_DATA_ENTRIES_SLOT)
- || has_present_slot(scope, object, NAVIGATOR_RUNTIME_DATA_SLOT)
- || is_readable_stream_object(scope, object)
- || is_writable_stream_object(scope, object)
- || is_transform_stream_object(scope, object)
-}
-
-fn has_present_slot<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- object: v8::Local<'s, v8::Object>,
- slot: &'static str,
-) -> bool {
- get_private_value(scope, object, slot)
- .or_else(|| {
- let key = v8str(scope, slot);
- object.get(scope, key.into())
- })
- .is_some_and(|value| !value.is_null_or_undefined())
-}
-
fn parse_post_message_transfer_list<'s>(
scope: &mut v8::PinScope<'s, '_>,
transfer_arg: Option<v8::Local<'s, v8::Value>>,
diff --git a/moli-renderer-v8/src/context_bootstrap/streams.rs b/moli-renderer-v8/src/context_bootstrap/streams.rs
index 58232d7f6..d12882c3b 100644
--- a/moli-renderer-v8/src/context_bootstrap/streams.rs
+++ b/moli-renderer-v8/src/context_bootstrap/streams.rs
@@ -8,9 +8,8 @@ use super::stream_adapter::{
readable_stream_byob_request_respond_callback,
readable_stream_byob_request_respond_with_new_view_callback,
readable_stream_byob_request_view_getter, readable_stream_is_byte_stream,
- readable_stream_locked, rejected_promise_value, set_resolved_promise, stream_slot_array,
- stream_slot_object, writable_stream_close_internal, writable_stream_locked,
- writable_stream_snapshot,
+ readable_stream_locked, rejected_promise_value, set_resolved_promise, stream_slot_object,
+ writable_stream_close_internal, writable_stream_locked, writable_stream_snapshot,
};
use super::stream_objects::{
new_readable_stream_byob_reader_object, new_readable_stream_reader_object,
@@ -350,17 +349,14 @@ pub(crate) fn is_writable_stream_object<'s>(
scope: &mut v8::PinScope<'s, '_>,
object: v8::Local<'s, v8::Object>,
) -> bool {
- stream_slot_array(scope, object, WRITABLE_STREAM_STRATEGY_SLOT).is_some()
+ moli_webapi_declare::implements_interface(scope, object, "WritableStream")
}
pub(crate) fn is_transform_stream_object<'s>(
scope: &mut v8::PinScope<'s, '_>,
object: v8::Local<'s, v8::Object>,
) -> bool {
- stream_slot_object(scope, object, TRANSFORM_STREAM_READABLE_SLOT)
- .is_some_and(|readable| is_readable_stream_object(scope, readable))
- && stream_slot_object(scope, object, TRANSFORM_STREAM_WRITABLE_SLOT)
- .is_some_and(|writable| is_writable_stream_object(scope, writable))
+ moli_webapi_declare::implements_interface(scope, object, "TransformStream")
}
pub(super) fn install_stream_template_bindings<'s>(
diff --git a/moli-renderer-v8/src/context_bootstrap/streams/readable.rs b/moli-renderer-v8/src/context_bootstrap/streams/readable.rs
index d0df48218..7b6a29f40 100644
--- a/moli-renderer-v8/src/context_bootstrap/streams/readable.rs
+++ b/moli-renderer-v8/src/context_bootstrap/streams/readable.rs
@@ -3,9 +3,8 @@ use super::super::stream_adapter::{
install_readable_stream_pipe_to_abort_signal, lock_readable_stream,
new_lazy_readable_byte_stream_object, new_readable_byte_stream_object,
new_readable_stream_pipe_owner, prime_readable_stream_pipe_to, readable_stream_access_snapshot,
- readable_stream_queue_exists, register_readable_stream_pipe_owner,
- register_writable_stream_pipe_owner, set_writable_stream_locked,
- suppress_promise_unhandled_rejection, tee_readable_stream,
+ register_readable_stream_pipe_owner, register_writable_stream_pipe_owner,
+ set_writable_stream_locked, suppress_promise_unhandled_rejection, tee_readable_stream,
};
use super::*;
use crate::context_bootstrap::stream_objects::readable_stream_async_iterator_prototype;
@@ -314,7 +313,7 @@ fn has_readable_stream_brand<'s>(
scope: &mut v8::PinScope<'s, '_>,
object: v8::Local<'s, v8::Object>,
) -> bool {
- readable_stream_queue_exists(scope, object)
+ moli_webapi_declare::implements_interface(scope, object, "ReadableStream")
}
fn parse_stream_pipe_options<'s>(
diff --git a/moli-renderer-v8/src/native_bridge/document/detached_objects/method_forwarders.rs b/moli-renderer-v8/src/native_bridge/document/detached_objects/method_forwarders.rs
index ac74a8a58..da633c886 100644
--- a/moli-renderer-v8/src/native_bridge/document/detached_objects/method_forwarders.rs
+++ b/moli-renderer-v8/src/native_bridge/document/detached_objects/method_forwarders.rs
@@ -28,7 +28,7 @@ struct DetachedNodeIteratorDeclaration<'scope> {
}
#[derive(WebApiObject)]
-#[webapi(interface = "Object")]
+#[webapi(interface = "DOMImplementation", prototype = "Object")]
struct DetachedDomImplementationDeclaration<'scope> {
#[webapi(slot = DOM_IMPLEMENTATION_OWNER_DOCUMENT_SLOT)]
owner_document: v8::Local<'scope, v8::Object>,
diff --git a/moli-renderer-v8/src/network_host/headers/store/projection.rs b/moli-renderer-v8/src/network_host/headers/store/projection.rs
index b026e008f..173711e81 100644
--- a/moli-renderer-v8/src/network_host/headers/store/projection.rs
+++ b/moli-renderer-v8/src/network_host/headers/store/projection.rs
@@ -6,7 +6,7 @@ use super::entries::{
use moli_webapi_declare::WebApiObject;
#[derive(WebApiObject)]
-#[webapi(interface = "Object")]
+#[webapi(interface = "Headers", prototype = "Object")]
struct HeadersStorageDeclaration {
#[webapi(slot = HEADERS_ENTRIES_SLOT)]
entries: String,
diff --git a/moli-renderer-v8/src/network_host/xhr/instance_state.rs b/moli-renderer-v8/src/network_host/xhr/instance_state.rs
index 870906246..b68904e04 100644
--- a/moli-renderer-v8/src/network_host/xhr/instance_state.rs
+++ b/moli-renderer-v8/src/network_host/xhr/instance_state.rs
@@ -125,7 +125,7 @@ struct XmlHttpRequestStateDeclaration {
}
#[derive(WebApiObject)]
-#[webapi(interface = "Object")]
+#[webapi(interface = "XMLHttpRequestUpload", prototype = "Object")]
struct XmlHttpRequestUploadDeclaration<'scope> {
#[webapi(prototype)]
prototype: Option<v8::Local<'scope, v8::Object>>,
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/structured_clone.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/structured_clone.rs
index 11a388cac..da5980466 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/structured_clone.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/structured_clone.rs
@@ -63,7 +63,13 @@ fn structured_clone_rejects_native_dom_nodes() {
#[test]
fn structured_clone_rejects_real_performance_entries_without_prototype_spoofing() {
- let mut vm = new_storage_test_vm("https://performance-entry-clone.test/");
+ let document_url = Url::parse("https://performance-entry-clone.test/").expect("document URL");
+ let mut vm = new_storage_test_vm(document_url.as_str());
+ vm.record_script_subresource_network_result(
+ document_url.clone(),
+ document_url.join("resource.js").expect("resource URL"),
+ &Err("synthetic resource failure".to_owned()),
+ );
let result = vm
.eval(
@@ -78,6 +84,7 @@ fn structured_clone_rejects_real_performance_entries_without_prototype_spoofing(
}
};
const navigation = performance.getEntriesByType("navigation")[0];
+ const resource = performance.getEntriesByType("resource")[0];
performance.mark("clone-mark");
const mark = performance.getEntriesByName("clone-mark")[0];
performance.measure("clone-measure");
@@ -96,6 +103,7 @@ fn structured_clone_rejects_real_performance_entries_without_prototype_spoofing(
return JSON.stringify({
navigation: probe(() => structuredClone(navigation)),
+ resource: probe(() => structuredClone(resource)),
mark: probe(() => structuredClone(mark)),
measure: probe(() => structuredClone(measure)),
postMessage: probe(() => window.postMessage(navigation, "*")),
@@ -109,7 +117,57 @@ fn structured_clone_rejects_real_performance_entries_without_prototype_spoofing(
assert_eq!(
result,
- r#"{"navigation":"DataCloneError","mark":"DataCloneError","measure":"DataCloneError","postMessage":"DataCloneError","fake":[7,false],"plain":["navigation","number"]}"#
+ r#"{"navigation":"DataCloneError","resource":"DataCloneError","mark":"DataCloneError","measure":"DataCloneError","postMessage":"DataCloneError","fake":[7,false],"plain":["navigation","number"]}"#
+ );
+}
+
+#[test]
+fn structured_clone_performance_entry_brand_is_private_and_survives_prototype_changes() {
+ let mut vm = new_storage_test_vm("https://performance-entry-brand.test/");
+
+ let result = vm
+ .eval(
+ r#"
+ (() => {
+ const probe = callback => {
+ try {
+ callback();
+ return "ok";
+ } catch (error) {
+ return error && error.name;
+ }
+ };
+ const mark = performance.mark("factory-mark");
+ const constructed = new PerformanceMark("constructed-mark");
+ class DerivedMark extends PerformanceMark {}
+ const derived = new DerivedMark("derived-mark");
+ const inherited = Object.create(mark);
+ inherited.value = 7;
+ const inheritedClone = structuredClone(inherited);
+ const forgedClone = structuredClone({ __moliWebApiType: true });
+ const hiddenBrand = !Reflect.ownKeys(mark).includes("__moliWebApiType");
+ mark.__moliWebApiType = false;
+ Object.setPrototypeOf(mark, null);
+ Object.setPrototypeOf(constructed, Object.prototype);
+
+ return JSON.stringify({
+ hiddenBrand,
+ alteredFactory: probe(() => structuredClone(mark)),
+ alteredConstructor: probe(() => structuredClone(constructed)),
+ derived: probe(() => structuredClone(derived)),
+ nested: probe(() => structuredClone({ entry: mark })),
+ detail: probe(() => performance.mark("entry-as-detail", { detail: mark })),
+ inherited: [inheritedClone.value, inheritedClone instanceof PerformanceEntry],
+ forged: [forgedClone.__moliWebApiType, forgedClone instanceof PerformanceEntry]
+ });
+ })()
+ "#,
+ )
+ .expect("PerformanceEntry private brand probe should evaluate");
+
+ assert_eq!(
+ result,
+ r#"{"hiddenBrand":true,"alteredFactory":"DataCloneError","alteredConstructor":"DataCloneError","derived":"DataCloneError","nested":"DataCloneError","detail":"DataCloneError","inherited":[7,false],"forged":[true,false]}"#
);
}
@@ -443,3 +501,72 @@ fn structured_clone_preserves_quota_exceeded_error_fields_and_brand() {
"true|true|true|QuotaExceededError|full|22|0.1|1|true|true|true"
);
}
+
+#[test]
+fn structured_clone_rejects_platform_objects_in_nested_graphs_without_running_their_getters() {
+ let mut vm = new_storage_test_vm("https://platform-identity-clone.test/");
+ let result = vm.eval(r#"
+ (() => {
+ const objects = [
+ new URL('https://example.test/'), new URLSearchParams('a=b'), new Headers(),
+ new Request('https://example.test/'), new Response('body'), new Response().headers, new FormData(),
+ new Event('event'), new EventTarget(), new AbortController(), new AbortController().signal,
+ navigator, performance, history, localStorage, new Highlight(), CSS.highlights,
+ document, document.implementation, new XMLHttpRequest().upload, document.createElement('select'), document.createTextNode('text'),
+ document.implementation.createHTMLDocument('detached').body,
+ new TextEncoder(), new TextDecoder(), new TextEncoderStream(), new TextDecoderStream(),
+ new CompressionStream('gzip'), new DecompressionStream('gzip'),
+ new URLSearchParams().entries(), new Headers().entries(), new Highlight().values(),
+ ];
+ const failures = [];
+ for (const [index, object] of objects.entries()) {
+ let getterCalls = 0;
+ Object.defineProperty(object, 'cloneProbe', {enumerable: true, get() { getterCalls++; return 1; }});
+ try { structuredClone({nested: new Map([['entry', object]])}); failures.push(`${index}:accepted`); }
+ catch (error) { if (error.name !== 'DataCloneError') failures.push(`${index}:${error.name}`); }
+ if (getterCalls) failures.push(`${index}:getter`);
+ }
+ const buffer = new ArrayBuffer(4);
+ try { structuredClone({buffer, rejected: objects[0]}, {transfer: [buffer]}); }
+ catch (error) { if (error.name !== 'DataCloneError') failures.push('transfer-error'); }
+ if (buffer.byteLength !== 4) failures.push('premature-detach');
+ return failures.join('|');
+ })()
+ "#).expect("platform identity clone matrix should evaluate");
+ assert_eq!(result, "");
+}
+
+#[test]
+fn structured_clone_does_not_read_fake_private_slots_or_inherit_native_identity() {
+ let mut vm = new_storage_test_vm("https://platform-identity-forgery.test/");
+ let result = vm.eval(r#"
+ (() => {
+ let reads = 0;
+ const prototype = Object.create(new URL('https://example.test/'));
+ for (const key of ['__moliWebApiType', '__lmUrlHref', '__lmUrlSearchParamsPairs', '__lmFormDataEntries']) {
+ Object.defineProperty(prototype, key, {get() { reads++; throw Error('must not run'); }});
+ }
+ const object = Object.create(prototype);
+ object.value = 7;
+ const clone = structuredClone(object);
+ const forged = structuredClone({__moliWebApiType: 'URL', __lmUrlHref: 'public'});
+ return [reads, clone.value, Object.getPrototypeOf(clone) === Object.prototype,
+ forged.__moliWebApiType, forged.__lmUrlHref].join('|');
+ })()
+ "#).expect("ordinary records must not trigger native identity checks through author properties");
+ assert_eq!(result, "0|7|true|URL|public");
+}
+
+#[test]
+fn encoding_stream_wrappers_do_not_inherit_transform_transferability() {
+ let mut vm = new_storage_test_vm("https://platform-transfer-types.test/");
+ let result = vm.eval(r#"
+ [new TextEncoderStream(), new TextDecoderStream(), new CompressionStream('gzip'), new DecompressionStream('gzip')]
+ .map(stream => { try { structuredClone(stream, {transfer: [stream]}); return 'accepted'; }
+ catch (error) { return error.name; } }).join('|')
+ "#).expect("only actual transferable stream interfaces should be accepted");
+ assert_eq!(
+ result,
+ "DataCloneError|DataCloneError|DataCloneError|DataCloneError"
+ );
+}
diff --git a/moli-renderer-v8/src/script_vm/tests/indexed_db.rs b/moli-renderer-v8/src/script_vm/tests/indexed_db.rs
index 2bc59862d..7548f0996 100644
--- a/moli-renderer-v8/src/script_vm/tests/indexed_db.rs
+++ b/moli-renderer-v8/src/script_vm/tests/indexed_db.rs
@@ -3189,6 +3189,64 @@ fn indexed_db_put_function_throws_data_clone_error() {
assert_eq!(result, "DataCloneError");
}
+#[test]
+fn indexed_db_put_rejects_performance_entries_without_rejecting_plain_objects() {
+ let mut vm =
+ new_storage_page_task_executor_test_vm("https://indexeddb-performance-clone.test/");
+
+ vm.eval(
+ r#"
+(() => {
+ globalThis.__indexedDbPerformanceClone = "pending";
+ const open = indexedDB.open(`app-${Math.random()}`, 1);
+ open.onupgradeneeded = () => {
+ const store = open.result.createObjectStore("entries");
+ let key = 0;
+ const probe = value => {
+ try {
+ store.put(value, ++key);
+ return "ok";
+ } catch (error) {
+ return error && error.name;
+ }
+ };
+ const navigation = performance.getEntriesByType("navigation")[0];
+ const mark = performance.mark("stored-mark");
+ const measure = performance.measure("stored-measure");
+ const constructed = new PerformanceMark("stored-constructor");
+ const inherited = Object.create(mark);
+ inherited.value = 7;
+ const fake = Object.create(PerformanceEntry.prototype);
+ fake.value = 8;
+
+ globalThis.__indexedDbPerformanceClone = JSON.stringify({
+ navigation: probe(navigation),
+ mark: probe(mark),
+ measure: probe(measure),
+ constructed: probe(constructed),
+ nested: probe({ entry: mark }),
+ plain: probe(mark.toJSON()),
+ inherited: probe(inherited),
+ fake: probe(fake),
+ forged: probe({ __moliWebApiType: true })
+ });
+ };
+ return "scheduled";
+})()
+"#,
+ )
+ .expect("indexeddb PerformanceEntry clone workflow should schedule");
+
+ let result = vm
+ .eval_after_selected_page_tasks("String(globalThis.__indexedDbPerformanceClone)")
+ .expect("indexeddb PerformanceEntry clone result should be readable");
+
+ assert_eq!(
+ result,
+ r#"{"navigation":"DataCloneError","mark":"DataCloneError","measure":"DataCloneError","constructed":"DataCloneError","nested":"DataCloneError","plain":"ok","inherited":"ok","fake":"ok","forged":"ok"}"#
+ );
+}
+
#[test]
fn indexed_db_put_webassembly_module_throws_data_clone_error_for_storage() {
let mut vm = new_storage_page_task_executor_test_vm("https://indexeddb-wasm-dataclone.test/");
diff --git a/moli-renderer-v8/src/structured_clone.rs b/moli-renderer-v8/src/structured_clone.rs
index 83979b7b4..eeccae96e 100644
--- a/moli-renderer-v8/src/structured_clone.rs
+++ b/moli-renderer-v8/src/structured_clone.rs
@@ -20,10 +20,9 @@ use crate::{
ensure_message_port_wrapper_for_id, file_system_file_snapshot_clone_payload_from_object,
file_system_handle_clone_payload_from_object, image_data_clone_payload_from_object,
initialize_readable_stream_clone_shell, initialize_transform_stream_clone_shell,
- initialize_writable_stream_clone_shell, is_crypto_key_object, is_image_data_object,
- is_performance_entry_object, is_readable_stream_object, is_transform_stream_object,
- is_writable_stream_object, message_port_id_from_object, new_dom_exception_value,
- new_quota_exceeded_error_value, prepare_readable_stream_transfer,
+ initialize_writable_stream_clone_shell, is_readable_stream_object,
+ is_transform_stream_object, is_writable_stream_object, message_port_id_from_object,
+ new_dom_exception_value, new_quota_exceeded_error_value, prepare_readable_stream_transfer,
prepare_transform_stream_transfer, prepare_writable_stream_transfer,
quota_exceeded_error_clone_fields, require_internal_stream_value,
selected_file_from_object,
@@ -307,18 +306,7 @@ impl v8::ValueSerializerImpl for WireSerializer {
scope: &mut v8::PinScope<'s, '_>,
object: v8::Local<'s, v8::Object>,
) -> Option<bool> {
- Some(
- message_port_id_from_object(scope, object).is_some()
- || is_image_data_object(scope, object)
- || is_crypto_key_object(scope, object)
- || is_performance_entry_object(scope, object)
- || is_readable_stream_object(scope, object)
- || is_writable_stream_object(scope, object)
- || is_transform_stream_object(scope, object)
- || crate::blob::is_blob_object(scope, object)
- || file_system_handle_clone_payload_from_object(scope, object).is_some()
- || dom_exception_clone_fields(scope, object).is_some(),
- )
+ Some(moli_webapi_declare::web_api_object_type(scope, object).is_some())
}
fn write_host_object<'s>(
@@ -457,6 +445,15 @@ impl v8::ValueSerializerImpl for WireSerializer {
None
}
+ fn get_shared_array_buffer_id<'s>(
+ &self,
+ scope: &mut v8::PinScope<'s, '_>,
+ _buffer: v8::Local<'s, v8::SharedArrayBuffer>,
+ ) -> Option<u32> {
+ throw_data_clone_exception(scope, "SharedArrayBuffer could not be cloned.");
+ None
+ }
+
fn get_wasm_module_transfer_id(
&self,
scope: &mut v8::PinScope<'_, '_>,