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): read submitter from private event state

ldm07fff5b9aeee3
diff --git a/moli-renderer-v8/src/context_bootstrap.rs b/moli-renderer-v8/src/context_bootstrap.rs
index f617317f0..c69b7c460 100644
--- a/moli-renderer-v8/src/context_bootstrap.rs
+++ b/moli-renderer-v8/src/context_bootstrap.rs
@@ -252,6 +252,7 @@ pub(crate) use self::events::{
event_is_error_event, event_is_mouse_event, event_private_value, initialize_event_object,
initialize_event_wrapper, mark_event_trusted, new_event_state, new_event_wrapper,
set_event_composed_path, set_event_internal_flag, set_event_private_value, set_event_trusted,
+ submit_event_submitter_value,
};
pub(crate) use self::file_api::{
DataTransferStringCallbackTask, DataTransferStringCallbackTaskEffect,
diff --git a/moli-renderer-v8/src/context_bootstrap/events.rs b/moli-renderer-v8/src/context_bootstrap/events.rs
index e045fbe45..e74ef7230 100644
--- a/moli-renderer-v8/src/context_bootstrap/events.rs
+++ b/moli-renderer-v8/src/context_bootstrap/events.rs
@@ -413,17 +413,20 @@ pub(super) fn close_event_reason_getter_function<'s>(
rv.set(value);
}
+pub(crate) fn submit_event_submitter_value<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ event: v8::Local<'_, v8::Object>,
+) -> Option<v8::Local<'s, v8::Value>> {
+ event_private_value(scope, event, SUBMIT_EVENT_SUBMITTER_SLOT)
+}
+
pub(super) fn submit_event_submitter_getter_function<'s>(
scope: &mut v8::PinScope<'s, '_>,
args: v8::FunctionCallbackArguments<'s>,
mut rv: v8::ReturnValue<'_, v8::Value>,
) {
- let value = crate::context_bootstrap::event_private_value(
- scope,
- args.this(),
- SUBMIT_EVENT_SUBMITTER_SLOT,
- )
- .unwrap_or_else(|| v8::null(scope).into());
+ let value =
+ submit_event_submitter_value(scope, args.this()).unwrap_or_else(|| v8::null(scope).into());
let Some(context) = args.this().get_creation_context(scope) else {
return;
};
diff --git a/moli-renderer-v8/src/document_runtime/events.rs b/moli-renderer-v8/src/document_runtime/events.rs
index f7622a7b3..27a811df9 100644
--- a/moli-renderer-v8/src/document_runtime/events.rs
+++ b/moli-renderer-v8/src/document_runtime/events.rs
@@ -713,17 +713,14 @@ fn source_target_for_reference_event(
host_ptr: *mut JsContextHost,
event: v8::Local<'_, v8::Object>,
) -> Option<EventTargetHandle> {
- let event_type = crate::context_bootstrap::event_backing(scope, event)
- .get(scope, v8str(scope, "type").into())?
- .to_string(scope)?
- .to_rust_string_lossy(scope);
- let source_property = match event_type.as_str() {
- "beforetoggle" | "command" | "interest" | "loseinterest" | "toggle" => "source",
- "submit" => "submitter",
+ let event_type = public_event_type(scope, event)?;
+ let source = match event_type.as_str() {
+ "beforetoggle" | "command" | "interest" | "loseinterest" | "toggle" => {
+ crate::context_bootstrap::event_attribute(scope, event, "source")?
+ }
+ "submit" => crate::context_bootstrap::submit_event_submitter_value(scope, event)?,
_ => return None,
};
- let source = crate::context_bootstrap::event_backing(scope, event)
- .get(scope, v8str(scope, source_property).into())?;
if source.is_null_or_undefined() || !source.is_object() {
return None;
}
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/shadow_dom.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/shadow_dom.rs
index 43677af5d..d2109c2af 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/shadow_dom.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/shadow_dom.rs
@@ -212,6 +212,42 @@ fn event_related_target_expando_does_not_change_the_dispatch_path() {
assert_eq!(result, "[1,0]");
}
+#[test]
+fn submit_event_private_submitter_controls_shadow_dispatch_path() {
+ let mut vm = new_streamed_parser_test_vm(
+ "https://event-private-submitter.test/",
+ r#"<!doctype html><div id="host"></div><button id="submitter"></button>"#,
+ );
+ let result = vm
+ .eval(
+ r#"
+ const host = document.getElementById('host');
+ const submitter = document.getElementById('submitter');
+ const shadow = host.attachShadow({mode: 'open'});
+ const form = document.createElement('form');
+ shadow.append(form);
+ const event = new SubmitEvent('submit', {bubbles: true, cancelable: true, submitter});
+ const submitterGetter = Object.getOwnPropertyDescriptor(SubmitEvent.prototype, 'submitter').get;
+ let getterCalls = 0;
+ const shadowGetter = () => { getterCalls++; throw new Error('public submitter getter'); };
+ Object.defineProperty(event, 'submitter', {get: shadowGetter});
+ Object.defineProperty(SubmitEvent.prototype, 'submitter', {get: shadowGetter, configurable: true});
+ const seen = [];
+ form.addEventListener('submit', event => {
+ event.preventDefault();
+ seen.push(['form', event.target === form, submitterGetter.call(event) === submitter]);
+ });
+ host.addEventListener('submit', event => {
+ seen.push(['host', event.target === host, submitterGetter.call(event) === submitter]);
+ });
+ form.dispatchEvent(event);
+ JSON.stringify([seen, getterCalls])
+ "#,
+ )
+ .unwrap();
+ assert_eq!(result, r#"[[["form",true,true],["host",true,true]],0]"#);
+}
+
#[test]
fn detached_iframe_shadow_focus_events_retarget_and_trim_paths() {
let mut vm = new_storage_test_vm("https://detached-shadow-focus-events.test/");