Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(events): preserve detached Window receiver identity

ldm0c49d1b72babe
diff --git a/moli-benchmark/wpt-cross-current/failed-cases.txt b/moli-benchmark/wpt-cross-current/failed-cases.txt
index cb3c0249e..ad095e4ec 100644
--- a/moli-benchmark/wpt-cross-current/failed-cases.txt
+++ b/moli-benchmark/wpt-cross-current/failed-cases.txt
@@ -3296,7 +3296,6 @@ html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job
html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent.html
html/webappapis/scripting/processing-model-2/runtime-error-cross-origin.html
html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-event-during-parse.html
-html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events-iframe.html
html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html
html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-resolution-order.html
html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-5.html
diff --git a/moli-benchmark/wpt-cross-current/passed-cases.txt b/moli-benchmark/wpt-cross-current/passed-cases.txt
index 755fa5cf9..23c036d47 100644
--- a/moli-benchmark/wpt-cross-current/passed-cases.txt
+++ b/moli-benchmark/wpt-cross-current/passed-cases.txt
@@ -6816,6 +6816,7 @@ html/webappapis/scripting/processing-model-2/runtime-error-same-origin.html
html/webappapis/scripting/processing-model-2/runtime-error.html
html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-event-constructor.html
html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events-attached-in-event.html
+html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events-iframe.html
html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events-onerror.html
html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.dedicatedworker.html
html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.sharedworker.html
diff --git a/moli-renderer-v8/src/script_vm/tests/webidl_receivers/dom.rs b/moli-renderer-v8/src/script_vm/tests/webidl_receivers/dom.rs
index 2153a0a72..e568a49ca 100644
--- a/moli-renderer-v8/src/script_vm/tests/webidl_receivers/dom.rs
+++ b/moli-renderer-v8/src/script_vm/tests/webidl_receivers/dom.rs
@@ -1,5 +1,45 @@
use super::*;
+#[test]
+fn detached_child_window_event_methods_preserve_receiver_identity() {
+ let mut vm = new_parsed_test_vm(
+ "https://detached-window-event-receiver.test/",
+ "<!doctype html><body></body>",
+ );
+ let result = vm.eval(r#"
+(() => {
+ const frame = document.body.appendChild(document.createElement('iframe'));
+ const child = frame.contentWindow;
+ const methods = [child.EventTarget.prototype, EventTarget.prototype];
+ const log = [];
+ const listener = () => log.push('listener');
+ window.addEventListener('test', listener);
+ child.addEventListener('test', listener);
+ frame.remove();
+ for (const methodsInRealm of methods) {
+ const {addEventListener: add, removeEventListener: remove, dispatchEvent: dispatch} = methodsInRealm;
+ remove.call(child, 'test', listener);
+ add.call(child, 'test', listener);
+ log.push(dispatch.call(child, new Event('test')));
+ remove.call(child, 'test', listener);
+ for (const receiver of [{}, Object.create(child), new Proxy(child, {})]) {
+ for (const invoke of [
+ () => add.call(receiver, 'test', listener),
+ () => remove.call(receiver, 'test', listener),
+ () => dispatch.call(receiver, new Event('test'))
+ ]) {
+ try { invoke(); log.push('accepted invalid receiver'); }
+ catch (error) { if (error.name !== 'TypeError') log.push(error.name); }
+ }
+ }
+ }
+ window.dispatchEvent(new Event('test'));
+ return JSON.stringify(log);
+})()
+"#).expect("detached Window remains a valid EventTarget without affecting the parent");
+ assert_eq!(result, r#"[true,true,"listener"]"#);
+}
+
#[test]
fn dom_receiver_templates_reject_invalid_interfaces_before_conversion() {
let mut vm = new_storage_test_vm("https://dom-receiver-templates.test/");
diff --git a/moli-renderer-v8/src/window_host.rs b/moli-renderer-v8/src/window_host.rs
index 7b1a65794..e31ab2b9f 100644
--- a/moli-renderer-v8/src/window_host.rs
+++ b/moli-renderer-v8/src/window_host.rs
@@ -290,8 +290,12 @@ pub(super) fn event_target_add_event_listener_callback<'s>(
}
let child_window_target = child_window_handle(scope, args.this());
let target = if let Some(handle) = child_window_target {
- host.current_child_window_event_target(handle)
- .map(EventTargetHandle::ChildWindow)
+ let Some(target) = host.current_child_window_event_target(handle) else {
+ // Detachment clears the Window's listeners and execution context,
+ // but retained references still have a valid EventTarget receiver.
+ return;
+ };
+ Some(EventTargetHandle::ChildWindow(target))
} else {
event_target_handle_from_this(scope, &args, host_ptr, host)
};
@@ -395,8 +399,11 @@ pub(super) fn event_target_remove_event_listener_callback<'s>(
};
let capture = call.options.capture;
let target = if let Some(handle) = child_window_handle(scope, args.this()) {
- host.current_child_window_event_target(handle)
- .map(EventTargetHandle::ChildWindow)
+ let Some(target) = host.current_child_window_event_target(handle) else {
+ // The listeners were already removed when this Window detached.
+ return;
+ };
+ Some(EventTargetHandle::ChildWindow(target))
} else {
event_target_handle_from_this(scope, &args, host_ptr, host)
};
@@ -2087,15 +2094,9 @@ fn child_window_handle<'s>(
scope: &mut v8::PinScope<'s, '_>,
object: v8::Local<'s, v8::Object>,
) -> Option<crate::document_runtime::DomHandle> {
- let global = scope.get_current_context().global(scope);
- if object.strict_equals(global.into()) {
- return object_child_window_handle(scope, object);
- }
- let field = object
- .get_internal_field(scope, 1)
- .and_then(|value| v8::Local::<v8::Value>::try_from(value).ok())
- .and_then(|value| value.number_value(scope))?;
- if !field.is_finite() || field.fract() != 0.0 || field != 0.0 {
+ // A borrowed method can receive another realm's global Window as well as a
+ // bridge wrapper. Check its native brand, independent of the callee realm.
+ if !crate::web_api_interfaces::Window::is_instance(scope, object) {
return None;
}
object_child_window_handle(scope, object)