Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(performance): reject structured cloning entries

ldm04634749b6936
diff --git a/moli-renderer-v8/src/context_bootstrap.rs b/moli-renderer-v8/src/context_bootstrap.rs
index 61ef4d1a2..ac546e4eb 100644
--- a/moli-renderer-v8/src/context_bootstrap.rs
+++ b/moli-renderer-v8/src/context_bootstrap.rs
@@ -346,7 +346,8 @@ 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, record_performance_dom_content_loaded_event_end,
+ increment_performance_event_count, is_performance_entry_object,
+ 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/performance_runtime.rs b/moli-renderer-v8/src/context_bootstrap/performance_runtime.rs
index ab96696c2..fb397b19b 100644
--- a/moli-renderer-v8/src/context_bootstrap/performance_runtime.rs
+++ b/moli-renderer-v8/src/context_bootstrap/performance_runtime.rs
@@ -96,6 +96,7 @@ 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 be2620233..36858b971 100644
--- a/moli-renderer-v8/src/context_bootstrap/performance_runtime/entries.rs
+++ b/moli-renderer-v8/src/context_bootstrap/performance_runtime/entries.rs
@@ -578,6 +578,15 @@ 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/script_vm/tests/browser_api/structured_clone.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/structured_clone.rs
index 0741d5c76..11a388cac 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
@@ -61,6 +61,58 @@ 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 result = vm
+ .eval(
+ r#"
+ (() => {
+ const probe = callback => {
+ try {
+ callback();
+ return "ok";
+ } catch (error) {
+ return error && error.name;
+ }
+ };
+ const navigation = performance.getEntriesByType("navigation")[0];
+ performance.mark("clone-mark");
+ const mark = performance.getEntriesByName("clone-mark")[0];
+ performance.measure("clone-measure");
+ const measure = performance.getEntriesByName("clone-measure")[0];
+ navigation.expando = "still not clonable";
+
+ const fake = Object.create(PerformanceEntry.prototype);
+ fake.value = 7;
+ const fakeClone = structuredClone(fake);
+ const plainClone = structuredClone({
+ name: navigation.name,
+ entryType: navigation.entryType,
+ startTime: navigation.startTime,
+ duration: navigation.duration
+ });
+
+ return JSON.stringify({
+ navigation: probe(() => structuredClone(navigation)),
+ mark: probe(() => structuredClone(mark)),
+ measure: probe(() => structuredClone(measure)),
+ postMessage: probe(() => window.postMessage(navigation, "*")),
+ fake: [fakeClone.value, fakeClone instanceof PerformanceEntry],
+ plain: [plainClone.entryType, typeof plainClone.startTime]
+ });
+ })()
+ "#,
+ )
+ .expect("PerformanceEntry structured clone probe should evaluate");
+
+ assert_eq!(
+ result,
+ r#"{"navigation":"DataCloneError","mark":"DataCloneError","measure":"DataCloneError","postMessage":"DataCloneError","fake":[7,false],"plain":["navigation","number"]}"#
+ );
+}
+
#[test]
fn structured_clone_preserves_dom_exception_fields_and_brand() {
let mut vm = new_storage_test_vm("https://dom-exception-clone.test/");
diff --git a/moli-renderer-v8/src/structured_clone.rs b/moli-renderer-v8/src/structured_clone.rs
index 22ed2f630..83979b7b4 100644
--- a/moli-renderer-v8/src/structured_clone.rs
+++ b/moli-renderer-v8/src/structured_clone.rs
@@ -21,11 +21,12 @@ use crate::{
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_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,
+ 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,
+ prepare_transform_stream_transfer, prepare_writable_stream_transfer,
+ quota_exceeded_error_clone_fields, require_internal_stream_value,
+ selected_file_from_object,
},
dom::native::SelectedFile,
types::MessagePortId,
@@ -310,6 +311,7 @@ impl v8::ValueSerializerImpl for WireSerializer {
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)