Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(input): revalidate contenteditable targets after beforeinput

ldm03c0cdbc5c0b5
diff --git a/moli-renderer-v8/src/native_bridge/element/activation/default_action.rs b/moli-renderer-v8/src/native_bridge/element/activation/default_action.rs
index 15058b468..e1f61295f 100644
--- a/moli-renderer-v8/src/native_bridge/element/activation/default_action.rs
+++ b/moli-renderer-v8/src/native_bridge/element/activation/default_action.rs
@@ -549,6 +549,12 @@ pub(crate) fn replace_contenteditable_selection(
let Some(target) = node_wrapper_from_handle(scope, handle) else {
return false;
};
+ let Some(document) = unsafe { &*runtime_ptr }
+ .dom_host()
+ .owner_document_handle(handle)
+ else {
+ return false;
+ };
if !dispatch_beforeinput(
scope,
runtime_ptr,
@@ -558,6 +564,17 @@ pub(crate) fn replace_contenteditable_selection(
) {
return false;
}
+ // beforeinput can disconnect or adopt the editor, or disable editing.
+ // Revalidate native state before changing its DOM or selection.
+ {
+ let runtime = unsafe { &*runtime_ptr };
+ if runtime.dom_host().owner_document_handle(handle) != Some(document)
+ || !runtime.dom_host().is_connected(handle)
+ || contenteditable_editing_host(runtime, handle).is_none()
+ {
+ return false;
+ }
+ }
let inserted = if let Some(selection) = window_selection(scope) {
if let Some((node, start, end)) = selected_text_node_range(scope, target, selection) {
if !replace_text_node_range(scope, node, start, end, replacement_text) {
diff --git a/moli-renderer-v8/src/script_vm/tests/beforeinput_target_validation.rs b/moli-renderer-v8/src/script_vm/tests/beforeinput_target_validation.rs
new file mode 100644
index 000000000..bb729c702
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/beforeinput_target_validation.rs
@@ -0,0 +1,84 @@
+use super::*;
+
+fn beforeinput_target_change(mutation: &str, should_edit: bool) {
+ for policy in [
+ moli_page_types::LayoutPolicy::Mock,
+ moli_page_types::LayoutPolicy::OnDemand,
+ ] {
+ let mut vm = new_storage_html_test_vm("https://beforeinput-target.test/");
+ vm.set_layout_policy(policy);
+ vm.eval(&r#"
+ globalThis.editor=document.createElement('div');editor.contentEditable='true';
+ editor.textContent='original';document.body.append(editor);editor.focus();
+ const selection=getSelection();selection.selectAllChildren(editor);selection.collapseToEnd();
+ globalThis.calls=[];
+ editor.addEventListener('beforeinput',event=>{
+ calls.push([event.type,event.data,event.defaultPrevented]);
+ MUTATION
+ });
+ editor.addEventListener('input',event=>calls.push([event.type,event.data]));'ready'
+ "#.replace("MUTATION", mutation)).unwrap();
+ let builds = vm.layout_pass_observability_for_test().1;
+ let edited = vm
+ .with_default_context_scope_and_checkpoint_for_test(|scope, host_ptr| {
+ let global = scope.get_current_context().global(scope);
+ let editor = global
+ .get(scope, crate::util::v8str(scope, "editor").into())
+ .unwrap();
+ let object = v8::Local::<v8::Object>::try_from(editor).unwrap();
+ let handle = crate::native_bridge::node_runtime_and_handle_from_object_or_detached(
+ scope, object,
+ )?
+ .1;
+ Ok(
+ crate::native_bridge::element::replace_contenteditable_selection(
+ scope,
+ host_ptr,
+ handle,
+ "X",
+ crate::native_bridge::element::TextEditInputType::InsertText,
+ ),
+ )
+ })
+ .unwrap();
+ assert_eq!(edited, should_edit, "{policy:?}: {mutation}");
+ let facts = vm
+ .eval("JSON.stringify([editor.textContent,calls])")
+ .unwrap();
+ let expected = if should_edit {
+ serde_json::json!(["originalX", [["beforeinput", "X", false], ["input", "X"]]])
+ } else {
+ serde_json::json!(["original", [["beforeinput", "X", false]]])
+ };
+ assert_eq!(
+ serde_json::from_str::<serde_json::Value>(&facts).unwrap(),
+ expected,
+ "{policy:?}: {mutation}"
+ );
+ assert_eq!(vm.layout_pass_observability_for_test().1, builds);
+ }
+}
+
+#[test]
+fn native_edit_stops_when_beforeinput_disconnects_the_editor() {
+ beforeinput_target_change("editor.remove();", false);
+}
+
+#[test]
+fn native_edit_stops_when_beforeinput_adopts_the_editor() {
+ beforeinput_target_change(
+ "document.implementation.createHTMLDocument('other').adoptNode(editor);",
+ false,
+ );
+}
+
+#[test]
+fn native_edit_stops_when_beforeinput_disables_editing() {
+ beforeinput_target_change("editor.contentEditable='false';", false);
+}
+
+#[test]
+fn native_edit_continues_after_beforeinput_with_a_valid_target() {
+ beforeinput_target_change("void 0;", true);
+ beforeinput_target_change("throw new Error('beforeinput-control');", true);
+}
diff --git a/moli-renderer-v8/src/script_vm/tests/mod.rs b/moli-renderer-v8/src/script_vm/tests/mod.rs
index 6ac030d5c..fd844a446 100644
--- a/moli-renderer-v8/src/script_vm/tests/mod.rs
+++ b/moli-renderer-v8/src/script_vm/tests/mod.rs
@@ -1,3 +1,4 @@
+mod beforeinput_target_validation;
mod credential_container;
mod credential_json_options;
mod picture_in_picture_interfaces;