Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(dom): validate Document insertion before mutation

ldm07f98be640ac2
diff --git a/moli-renderer-v8/src/native_bridge/document/detached_objects/mutation.rs b/moli-renderer-v8/src/native_bridge/document/detached_objects/mutation.rs
index ae1b9ad9e..378cd1708 100644
--- a/moli-renderer-v8/src/native_bridge/document/detached_objects/mutation.rs
+++ b/moli-renderer-v8/src/native_bridge/document/detached_objects/mutation.rs
@@ -800,6 +800,21 @@ fn detached_insert_node_with_current_queue_policy<'s>(
"The operation would yield an invalid node tree.",
));
}
+ let parent_is_document = detached_node_type(scope, parent) == Some(9);
+ // Pre-insert validates a Document before removing the input node. An
+ // existing root/doctype cannot be reinserted, even at its old position.
+ if parent_is_document
+ && matches!(child_type, 1 | 10)
+ && current_children
+ .iter()
+ .any(|candidate| candidate.strict_equals(child.into()))
+ {
+ return Err((
+ "HierarchyRequestError",
+ 3,
+ "The operation would yield an invalid node tree.",
+ ));
+ }
let prospective = current_children
.iter()
.copied()
@@ -822,9 +837,7 @@ fn detached_insert_node_with_current_queue_policy<'s>(
insert_nodes.iter().copied(),
);
- if detached_node_type(scope, parent) == Some(9)
- && !detached_validate_document_children(scope, &prospective)
- {
+ if parent_is_document && !detached_validate_document_children(scope, &prospective) {
return Err((
"HierarchyRequestError",
3,
diff --git a/moli-renderer-v8/src/native_bridge/node/mutation/core.rs b/moli-renderer-v8/src/native_bridge/node/mutation/core.rs
index 938621a7c..5e63cc823 100644
--- a/moli-renderer-v8/src/native_bridge/node/mutation/core.rs
+++ b/moli-renderer-v8/src/native_bridge/node/mutation/core.rs
@@ -100,6 +100,9 @@ pub(in crate::native_bridge) fn node_append_child_callback<'s>(
) else {
return;
};
+ if !validate_pre_insert_handles(scope, unsafe { &*runtime_ptr }, parent, child, None, &[]) {
+ return;
+ }
let child_value = args.get(0);
let post_insert_event_handles =
inserted_handles_for_post_insert_events(unsafe { &*runtime_ptr }, child);
@@ -200,7 +203,7 @@ pub(in crate::native_bridge) fn node_insert_before_callback<'s>(
parent,
child,
reference_child,
- &[child],
+ &[],
) {
return;
}
@@ -292,13 +295,17 @@ fn validate_pre_insert_node_type_and_document(
throw_dom_exception(scope, "HierarchyRequestError", 3, "Hierarchy Error");
return false;
};
+ let parent_is_document = node_is_document(runtime, parent);
if !node_type_is_insertable(child_node_type)
- || (node_type_is_text_like(child_node_type) && node_is_document(runtime, parent))
- || (child_node_type == NodeType::DocumentType && !node_is_document(runtime, parent))
+ || (node_type_is_text_like(child_node_type) && parent_is_document)
+ || (child_node_type == NodeType::DocumentType && !parent_is_document)
{
throw_dom_exception(scope, "HierarchyRequestError", 3, "Hierarchy Error");
return false;
}
+ if !parent_is_document {
+ return true;
+ }
let inserted = pre_insert_validation_handles(runtime, child);
if !validate_document_sequence(runtime, parent, reference_child, &inserted, skipped) {
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/crypto_misc.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/crypto_misc.rs
index 611f98ed3..0cbb9e992 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/crypto_misc.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/crypto_misc.rs
@@ -328,7 +328,7 @@ fn crypto_secure_context_exposure_matches_wpt_historical_and_idl() {
}
#[test]
fn crypto_secure_context_inherited_child_frames_use_creator_origin() {
- let mut vm = new_storage_test_vm("https://example.com/");
+ let mut vm = new_storage_html_test_vm("https://example.com/");
let result = vm
.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/events_selection_storage/event_classes_ranges_and_selection.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/events_selection_storage/event_classes_ranges_and_selection.rs
index a76fb0900..eadf76009 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/events_selection_storage/event_classes_ranges_and_selection.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/events_selection_storage/event_classes_ranges_and_selection.rs
@@ -440,7 +440,7 @@ fn child_window_forwarded_constructors_use_captured_native_intrinsics() {
#[test]
fn cross_realm_listener_throw_reports_listener_global_not_target_global() {
- let mut vm = new_storage_test_vm("https://event-listener-multiple-globals.test/");
+ let mut vm = new_storage_html_test_vm("https://event-listener-multiple-globals.test/");
vm.eval(
r#"
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/events_selection_storage/postmessage_selection_and_errors.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/events_selection_storage/postmessage_selection_and_errors.rs
index e8a8bd2ed..64b2c4d44 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/events_selection_storage/postmessage_selection_and_errors.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/events_selection_storage/postmessage_selection_and_errors.rs
@@ -1043,7 +1043,7 @@ const childSelection = frame.contentWindow.getSelection();
#[test]
fn selection_get_composed_ranges_rescopes_shadow_boundaries() {
- let mut vm = new_storage_test_vm("https://selection-composed-ranges.test/");
+ let mut vm = new_storage_html_test_vm("https://selection-composed-ranges.test/");
let result = vm
.eval(
@@ -1098,7 +1098,7 @@ fn selection_get_composed_ranges_rescopes_shadow_boundaries() {
#[test]
fn selection_get_composed_ranges_static_range_init_ignores_prototype_setters() {
- let mut vm = new_storage_test_vm("https://selection-composed-ranges-init.test/");
+ let mut vm = new_storage_html_test_vm("https://selection-composed-ranges-init.test/");
let result = vm
.eval(
@@ -1167,7 +1167,7 @@ fn selection_get_composed_ranges_static_range_init_ignores_prototype_setters() {
#[test]
fn selection_get_range_at_returns_shadow_collapsed_range_for_cross_root_selection() {
- let mut vm = new_storage_test_vm("https://selection-cross-root-range-at.test/");
+ let mut vm = new_storage_html_test_vm("https://selection-cross-root-range-at.test/");
let result = vm
.eval(
@@ -1287,7 +1287,7 @@ fn selection_cross_root_set_base_and_extent_collapses_legacy_to_focus() {
#[test]
fn selection_set_base_and_extent_to_earlier_shadow_root_collapses_to_anchor() {
- let mut vm = new_storage_test_vm("https://selection-cross-root-backward-collapse.test/");
+ let mut vm = new_storage_html_test_vm("https://selection-cross-root-backward-collapse.test/");
let result = vm
.eval(
@@ -1420,7 +1420,7 @@ fn selection_get_composed_ranges_orders_slotted_boundary_like_chromium() {
#[test]
fn selection_get_composed_ranges_tracks_associated_range_updates() {
- let mut vm = new_storage_test_vm("https://selection-composed-range-update.test/");
+ let mut vm = new_storage_html_test_vm("https://selection-composed-range-update.test/");
let result = vm
.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/idle_callbacks.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/idle_callbacks.rs
index 12883324c..d8570dff3 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/idle_callbacks.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/idle_callbacks.rs
@@ -202,7 +202,7 @@ async fn idle_callback_uses_webidl_callback_function_semantics() {
#[tokio::test]
async fn idle_callback_exception_and_retirement_use_the_callback_realm() {
let loader = ResourceRequestClient::new(&moli_fetch::FetchConfig::default()).expect("loader");
- let mut vm = new_storage_test_vm("https://idle-callback-lifetime.test/");
+ let mut vm = new_storage_html_test_vm("https://idle-callback-lifetime.test/");
vm.eval(
r#"
const errorFrame = document.createElement("iframe");
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/css_surface.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/css_surface.rs
index 89d099e29..3a75c70a0 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/css_surface.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/css_surface.rs
@@ -52,7 +52,7 @@ fn css_escape_rethrows_string_conversion_errors() {
}
#[test]
fn get_computed_style_accepts_adopted_child_frame_node_wrapper() {
- let mut vm = new_storage_test_vm("https://style-adopted-child-frame-node.test/");
+ let mut vm = new_storage_html_test_vm("https://style-adopted-child-frame-node.test/");
let result = vm
.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/events_errors.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/events_errors.rs
index 26b28cf8a..b410a960a 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/events_errors.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/events_errors.rs
@@ -306,8 +306,8 @@ async fn showing_popover_focuses_autofocus_descendant_before_toggle_event() {
.eval(
r#"
(() => {
- const html = document.appendChild(document.createElement("html"));
- const body = html.appendChild(document.createElement("body"));
+ const html = document.documentElement || document.appendChild(document.createElement("html"));
+ const body = document.body || html.appendChild(document.createElement("body"));
const button = document.createElement("button");
const popover = document.createElement("div");
const focusTarget = document.createElement("button");
@@ -365,8 +365,8 @@ async fn removing_open_popover_dispatches_forced_close_events() {
.eval(
r#"
(() => {
- const html = document.appendChild(document.createElement("html"));
- const body = html.appendChild(document.createElement("body"));
+ const html = document.documentElement || document.appendChild(document.createElement("html"));
+ const body = document.body || html.appendChild(document.createElement("body"));
const popover = document.createElement("div");
popover.popover = "auto";
body.append(popover);
@@ -452,8 +452,8 @@ async fn popover_toggle_events_coalesce_within_one_task() {
(() => {
const popover = document.createElement("div");
popover.setAttribute("popover", "");
- const html = document.appendChild(document.createElement("html"));
- html.appendChild(document.createElement("body")).appendChild(popover);
+ const html = document.documentElement || document.appendChild(document.createElement("html"));
+ (document.body || html.appendChild(document.createElement("body"))).appendChild(popover);
globalThis.__lmPopoverToggleEvents = [];
popover.addEventListener("toggle", event => {
globalThis.__lmPopoverToggleEvents.push(`${event.oldState}->${event.newState}`);
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/fonts.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/fonts.rs
index fc8965907..daf24e3ad 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/fonts.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/fonts.rs
@@ -1047,7 +1047,7 @@ fn document_fonts_tracks_connected_style_candidates() {
}
#[test]
fn document_fonts_updates_only_the_changed_owner_contribution() {
- let mut vm = new_storage_test_vm("https://document-fonts-owner-projection.test/");
+ let mut vm = new_storage_html_test_vm("https://document-fonts-owner-projection.test/");
let result = vm
.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/navigator_devices.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/navigator_devices.rs
index c5bbf5409..6b3e50871 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/navigator_devices.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/navigator_devices.rs
@@ -257,7 +257,7 @@ fn navigator_geolocation_clear_watch_cancels_only_the_exact_pending_watch() {
}
#[test]
fn navigator_geolocation_retires_with_target_or_callback_window() {
- let mut vm = new_storage_test_vm("https://geolocation-window-retirement.test/");
+ let mut vm = new_storage_html_test_vm("https://geolocation-window-retirement.test/");
vm.eval(
r#"
const callbackFrame = document.createElement("iframe");
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/popup_window.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/popup_window.rs
index a28b2e906..2ffe05e8a 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/popup_window.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/popup_window.rs
@@ -94,7 +94,7 @@ fn window_open_rejects_invalid_urls_before_selecting_a_target() {
}
#[test]
fn window_open_resolves_relative_urls_against_the_entry_function_realm() {
- let mut vm = new_storage_test_vm("https://entry-realm.test/top/page.html");
+ let mut vm = new_storage_html_test_vm("https://entry-realm.test/top/page.html");
let result = vm
.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/navigation/element_navigation.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/navigation/element_navigation.rs
index b307bf70b..1cf3e7806 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/navigation/element_navigation.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/navigation/element_navigation.rs
@@ -288,10 +288,8 @@ async fn hyperlink_target_blank_reloads_rel_opener_policy_for_each_activation()
window.close();
<\/script>
`], { type: "text/html" }));
- const html = document.createElement("html");
- const body = document.createElement("body");
- html.appendChild(body);
- document.appendChild(html);
+ const html = document.documentElement || document.appendChild(document.createElement("html"));
+ const body = document.body || html.appendChild(document.createElement("body"));
globalThis.__hyperlink = document.createElement("a");
__hyperlink.target = "_blank";
__hyperlink.rel = "noopener";
diff --git a/moli-renderer-v8/src/script_vm/tests/document_preinsert_validation.js b/moli-renderer-v8/src/script_vm/tests/document_preinsert_validation.js
new file mode 100644
index 000000000..0f2283738
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/document_preinsert_validation.js
@@ -0,0 +1,117 @@
+(() => {
+ const check = (value, message) => { if (!value) throw new Error(message); };
+ const sameNodes = (actual, expected) => actual.length === expected.length &&
+ expected.every((node, index) => actual[index] === node);
+ const frame = globalThis.__observerCallbackFrame || document.querySelector("iframe");
+ const documents = [
+ ["main", document],
+ ["iframe", frame.contentDocument],
+ ["HTML", document.implementation.createHTMLDocument("")],
+ ["XML", document.implementation.createDocument(null, "root",
+ document.implementation.createDocumentType("root", "", ""))],
+ ["parsed HTML", new DOMParser().parseFromString("<!doctype html><body></body>", "text/html")],
+ ["parsed XML", new DOMParser().parseFromString("<!DOCTYPE root><root/>", "application/xml")],
+ ];
+ const failures = [];
+ function run(label, callback) {
+ try { callback(); } catch (error) { failures.push(label + ": " + error.message); }
+ }
+ function fragment(owner, children) {
+ const value = owner.createDocumentFragment();
+ children.forEach(node => value.appendChild(node));
+ return value;
+ }
+ const invalid = [
+ ["second element", owner => owner.createElement("extra")],
+ ["two roots", owner => fragment(owner, [owner.createElement("one"), owner.createElement("two")])],
+ ["fragment root", owner => fragment(owner, [owner.createElement("extra")])],
+ ["text", owner => owner.createTextNode("text")],
+ ["fragment text", owner => fragment(owner, [owner.createComment("before"), owner.createTextNode("text")])],
+ ["new doctype", owner => owner.implementation.createDocumentType("extra", "", "")],
+ ["existing root", owner => owner.documentElement],
+ ["existing doctype", owner => owner.doctype],
+ ];
+ for (const [name, owner] of documents) {
+ for (const borrowed of [false, true]) {
+ for (const method of ["appendChild", "insertBefore"]) {
+ const insert = (node, reference = null) => borrowed ?
+ Node.prototype[method].call(owner, node, reference) : owner[method](node, reference);
+ for (const [kind, create] of invalid) {
+ // Initial about:blank iframe documents do not have a doctype.
+ if (kind === "existing doctype" && !owner.doctype) continue;
+ run([name, borrowed, method, kind].join("/"), () => {
+ const node = create(owner);
+ const original = [...owner.childNodes];
+ const originalParent = node.parentNode;
+ const originalOwner = node.ownerDocument;
+ const children = [...node.childNodes];
+ const range = owner.createRange();
+ range.selectNodeContents(owner);
+ const observer = new MutationObserver(() => {});
+ observer.observe(owner, {childList: true, subtree: true});
+ observer.observe(node, {childList: true, subtree: true});
+ try {
+ let error;
+ try { insert(node, originalParent === owner ? node : null); }
+ catch (caught) { error = caught; }
+ check(error && error.name === "HierarchyRequestError", "must reject invalid insertion");
+ check(sameNodes(owner.childNodes, original), "document unchanged");
+ check(node.parentNode === originalParent && node.ownerDocument === originalOwner, "node not removed or adopted");
+ check(sameNodes(node.childNodes, children), "fragment children unchanged");
+ check(observer.takeRecords().length === 0, "no mutation records");
+ check(range.startContainer === owner && range.startOffset === 0 &&
+ range.endContainer === owner && range.endOffset === original.length, "range unchanged");
+ } finally {
+ observer.disconnect();
+ for (const child of [...owner.childNodes]) {
+ if (!original.includes(child)) owner.removeChild(child);
+ }
+ // Restore ordering even on an engine that accepts invalid moves.
+ for (let i = original.length - 1; i >= 0; i--) {
+ const next = original[i + 1] || null;
+ if (original[i].nextSibling !== next) owner.insertBefore(original[i], next);
+ }
+ }
+ });
+ }
+ run([name, borrowed, method, "allowed children"].join("/"), () => {
+ const original = [...owner.childNodes];
+ const comment = owner.createComment("allowed");
+ const pi = owner.createProcessingInstruction("allowed", "data");
+ const empty = owner.createDocumentFragment();
+ try {
+ check(insert(comment) === comment && insert(pi) === pi && insert(empty) === empty, "return original node");
+ check(sameNodes(owner.childNodes, [...original, comment, pi]), "comment and PI are allowed");
+ check(insert(comment) === comment, "moving an existing comment is allowed");
+ check(sameNodes(owner.childNodes, [...original, pi, comment]), "moved comment appears once");
+ } finally {
+ for (const child of [...owner.childNodes]) {
+ if (!original.includes(child)) owner.removeChild(child);
+ }
+ }
+ });
+ }
+ }
+ }
+ run("failed insertion preserves foreign subtree and reactions", () => {
+ const reactions = [];
+ customElements.define("preinsert-reactions", class extends HTMLElement {
+ disconnectedCallback() { reactions.push("disconnected"); }
+ adoptedCallback() { reactions.push("adopted"); }
+ });
+ const node = document.body.appendChild(document.createElement("preinsert-reactions"));
+ const owner = document.implementation.createHTMLDocument("");
+ const observer = new MutationObserver(() => {});
+ observer.observe(document.body, {childList: true});
+ observer.observe(owner, {childList: true});
+ try {
+ let error;
+ try { Node.prototype.appendChild.call(owner, node); } catch (caught) { error = caught; }
+ check(error && error.name === "HierarchyRequestError", "reject foreign second root");
+ check(node.ownerDocument === document && node.parentNode === document.body, "foreign node unchanged");
+ check(observer.takeRecords().length === 0 && reactions.length === 0, "no removal/adoption side effects");
+ } finally { observer.disconnect(); node.remove(); }
+ });
+ if (failures.length) throw new Error(failures.join("\n"));
+ return true;
+})()
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/custom_state_and_reaction_order.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/custom_state_and_reaction_order.rs
index 122caba1a..621074104 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/custom_state_and_reaction_order.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/custom_state_and_reaction_order.rs
@@ -1071,7 +1071,7 @@ fn custom_element_dataset_and_dom_token_list_use_native_reaction_path() {
#[test]
fn custom_element_inner_and_outer_text_replacements_enqueue_disconnected_callback() {
- let mut vm = new_storage_test_vm("https://example.com/");
+ let mut vm = new_storage_html_test_vm("https://example.com/");
let result = vm
.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/detached_documents_and_reactions.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/detached_documents_and_reactions.rs
index 59716432a..a5c8d8281 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/detached_documents_and_reactions.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/detached_documents_and_reactions.rs
@@ -910,7 +910,7 @@ fn document_adopt_node_defers_disconnected_reaction_until_owner_retarget() {
#[test]
fn form_associated_custom_element_validation_participates_in_forms() {
- let mut vm = new_storage_test_vm("https://example.com/");
+ let mut vm = new_storage_html_test_vm("https://example.com/");
let result = vm
.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/parser.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/parser.rs
index f70f21bbe..b7f914a25 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/parser.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/parser.rs
@@ -631,7 +631,7 @@ fn child_parser_write_queues_mutation_records_for_parser_insertions() {
#[test]
fn child_parser_guards_dynamic_markup_during_construction_and_attribute_reactions() {
- let mut vm = new_storage_test_vm("https://child-parser-dynamic-markup.test/");
+ let mut vm = new_storage_html_test_vm("https://child-parser-dynamic-markup.test/");
let result = vm.eval(r#"
(() => {
const frame = document.createElement('iframe');
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/registry_reactions_and_builtins.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/registry_reactions_and_builtins.rs
index 7860f4f31..84fd67dba 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/registry_reactions_and_builtins.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/registry_reactions_and_builtins.rs
@@ -648,7 +648,7 @@ fn scoped_registry_initialize_upgrades_existing_associated_nodes() {
#[test]
fn custom_element_registry_associations_survive_tree_mutations_and_adoption() {
- let mut vm = new_storage_test_vm("https://example.com/");
+ let mut vm = new_storage_html_test_vm("https://example.com/");
let result = vm
.eval(
@@ -1055,7 +1055,7 @@ fn unresolved_custom_elements_in_detached_documents_use_current_realm_prototypes
#[test]
fn unresolved_custom_elements_adopted_from_detached_documents_upgrade_in_live_document() {
- let mut vm = new_storage_test_vm("https://example.com/");
+ let mut vm = new_storage_html_test_vm("https://example.com/");
let result = vm
.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/registry_scoping_and_fragments.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/registry_scoping_and_fragments.rs
index dc002a0b9..cbfdde4ec 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/registry_scoping_and_fragments.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/custom_elements/registry_scoping_and_fragments.rs
@@ -951,7 +951,7 @@ fn scoped_registry_define_upgrades_open_popup_documents() {
#[test]
fn scoped_registry_upgrade_order_follows_cross_document_shadow_tree_adoption() {
- let mut vm = new_storage_test_vm("https://example.com/");
+ let mut vm = new_storage_html_test_vm("https://example.com/");
let result = vm
.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/document_and_tree_mutations.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/document_and_tree_mutations.rs
index 7ba6c7c0b..135d28eec 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/document_and_tree_mutations.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/document_and_tree_mutations.rs
@@ -486,7 +486,7 @@ fn sandboxed_fragment_parsers_parse_noscript_when_scripting_disabled() {
}
#[test]
fn globally_disabled_fragment_parsers_parse_noscript_markup() {
- let mut vm = new_storage_test_vm("https://disabled-fragment-noscript.test/");
+ let mut vm = new_storage_html_test_vm("https://disabled-fragment-noscript.test/");
vm.set_script_execution_disabled(true);
let result = vm
@@ -515,7 +515,7 @@ fn globally_disabled_fragment_parsers_parse_noscript_markup() {
}
#[test]
fn document_fragment_script_start_revalidates_after_an_earlier_script_mutates_the_batch() {
- let mut vm = new_storage_test_vm("https://document-fragment-script-revalidation.test/");
+ let mut vm = new_storage_html_test_vm("https://document-fragment-script-revalidation.test/");
let result = vm
.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/element_and_document_behavior.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/element_and_document_behavior.rs
index f566c9bee..750c940bd 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/element_and_document_behavior.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/element_and_document_behavior.rs
@@ -1403,7 +1403,7 @@ fn document_named_item_does_not_shadow_legacy_unforgeable_document_alias() {
}
#[test]
fn response_csp_sandbox_disables_top_document_scripting_semantics() {
- let mut vm = new_storage_test_vm("https://response-sandbox-noscript.test/");
+ let mut vm = new_storage_html_test_vm("https://response-sandbox-noscript.test/");
vm.set_response_content_security_policies(&["sandbox".to_owned()]);
let result = vm
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/elements_and_mutations.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/elements_and_mutations.rs
index 14368d485..30f59bd3a 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/elements_and_mutations.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/elements_and_mutations.rs
@@ -1098,7 +1098,7 @@ fn contextual_fragment_scripts_run_when_inserted() {
}
#[test]
fn document_fragment_insert_runs_nested_scripts_in_tree_order() {
- let mut vm = new_storage_test_vm("https://document-fragment-script-order.test/");
+ let mut vm = new_storage_html_test_vm("https://document-fragment-script-order.test/");
let result = vm
.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/frame_navigation_and_history.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/frame_navigation_and_history.rs
index 2c22b04d5..de836d1b0 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/frame_navigation_and_history.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/frame_navigation_and_history.rs
@@ -314,7 +314,7 @@ fn navigation_runtime_state_ignores_proto_pollution_slots() {
}
#[test]
fn targeted_anchor_click_dispatches_navigate_on_named_child_window() {
- let mut vm = new_storage_test_vm("https://targeted-child-navigate.test/page.html");
+ let mut vm = new_storage_html_test_vm("https://targeted-child-navigate.test/page.html");
let result = vm
.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/window_and_frame_surfaces.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/window_and_frame_surfaces.rs
index fe80333f9..a81002f3b 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/window_and_frame_surfaces.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/window_and_frame_surfaces.rs
@@ -681,7 +681,7 @@ fn child_webassembly_constructors_use_newtarget_child_realm_default_prototype()
}
#[test]
fn targeted_anchor_click_reports_same_document_hash_change_for_child_window() {
- let mut vm = new_storage_test_vm("https://targeted-child-hash.test/page.html");
+ let mut vm = new_storage_html_test_vm("https://targeted-child-hash.test/page.html");
let result = vm
.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/text_controls.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/text_controls.rs
index 74d6135cc..eead2fc40 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/text_controls.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/text_controls.rs
@@ -448,7 +448,7 @@ fn text_control_default_value_type_and_reset_paths_clamp_selection() {
#[test]
fn input_click_activation_state_and_type_change_defaults_match_browser_order() {
- let mut vm = new_storage_test_vm("https://forms-input-click-activation.test/");
+ let mut vm = new_storage_html_test_vm("https://forms-input-click-activation.test/");
let result = vm
.eval(
@@ -537,7 +537,7 @@ fn input_click_activation_state_and_type_change_defaults_match_browser_order() {
#[test]
fn checkbox_click_activation_tracks_trust_and_indeterminate_state() {
- let mut vm = new_storage_test_vm("https://forms-checkbox-click-activation.test/");
+ let mut vm = new_storage_html_test_vm("https://forms-checkbox-click-activation.test/");
let result = vm
.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/computed_style_access.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/computed_style_access.rs
index 9899a92aa..d08a85025 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/computed_style_access.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/computed_style_access.rs
@@ -1714,7 +1714,7 @@ fn computed_absolute_grid_inset_left_defaults_to_zero() {
#[test]
fn computed_grid_column_auto_and_unset_resolve_to_auto() {
- let mut vm = new_storage_test_vm("https://computed-grid-column-auto.test/");
+ let mut vm = new_storage_html_test_vm("https://computed-grid-column-auto.test/");
let result = vm
.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/properties_and_selectors.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/properties_and_selectors.rs
index 58c8d9a39..08e9fc1a2 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/properties_and_selectors.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/properties_and_selectors.rs
@@ -562,7 +562,7 @@ fn computed_style_map_uses_native_reads_and_validates_typed_om_calls() {
#[test]
fn computed_style_enumerates_registered_custom_properties() {
- let mut vm = new_storage_test_vm("https://computed-style-custom-properties.test/");
+ let mut vm = new_storage_html_test_vm("https://computed-style-custom-properties.test/");
let result = vm
.eval(
@@ -1705,7 +1705,7 @@ fn live_inline_font_shorthand_serializes_line_height_slash_spacing() {
#[test]
fn computed_color_normalizes_named_and_hex_colors() {
- let mut vm = new_storage_test_vm("https://computed-color-normalization.test/");
+ let mut vm = new_storage_html_test_vm("https://computed-color-normalization.test/");
let result = vm
.eval(
@@ -1715,7 +1715,7 @@ fn computed_color_normalizes_named_and_hex_colors() {
return values.map((value) => {
const element = document.createElement('div');
element.style.color = value;
- document.appendChild(element);
+ document.body.appendChild(element);
return getComputedStyle(element).color;
}).join('|');
})()
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms.rs
index 09623d45b..4bb6a0af9 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms.rs
@@ -1293,7 +1293,7 @@ fn form_reset_clears_option_selectedness_dirty_flag() {
#[test]
fn form_reset_event_uses_form_wrapper_realm_after_cross_frame_move() {
- let mut vm = new_storage_test_vm("https://form-reset-event-realm.test/");
+ let mut vm = new_storage_html_test_vm("https://form-reset-event-realm.test/");
let result = vm
.eval(
@@ -2871,7 +2871,7 @@ fn submit_event_constructor_surface() {
}
#[test]
fn live_form_request_submit_dispatches_submit_event_with_submitter() {
- let mut vm = new_storage_test_vm("https://submit-event-requestsubmit.test/");
+ let mut vm = new_storage_html_test_vm("https://submit-event-requestsubmit.test/");
let result = vm
.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/misc.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/misc.rs
index 3a2ea2cd9..a23ab0b92 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/misc.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/misc.rs
@@ -604,7 +604,7 @@ fn node_move_before_parent_node_surface_and_validation() {
}
#[test]
fn node_move_before_preserves_nonce_content_attribute() {
- let mut vm = new_storage_test_vm("https://node-move-before-nonce.test/");
+ let mut vm = new_storage_html_test_vm("https://node-move-before-nonce.test/");
let result = vm
.eval(
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 a1e71b60b..5d97cf654 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
@@ -3809,7 +3809,7 @@ fn document_import_node_resolves_shadow_adopted_sheets_against_destination_docum
}
#[test]
fn declarative_shadow_adopted_stylesheets_resolve_same_document_css_module() {
- let mut vm = new_storage_test_vm("https://shadow-adopted-css-module.test/");
+ let mut vm = new_storage_html_test_vm("https://shadow-adopted-css-module.test/");
let result = vm
.eval(
@@ -3819,7 +3819,7 @@ fn declarative_shadow_adopted_stylesheets_resolve_same_document_css_module() {
style.setAttribute('type', 'module');
style.setAttribute('specifier', 'foo');
style.textContent = 'span { color: blue }';
- document.appendChild(style);
+ document.head.appendChild(style);
const wrapper = document.createElement('section');
wrapper.setHTMLUnsafe(
@@ -3829,7 +3829,7 @@ fn declarative_shadow_adopted_stylesheets_resolve_same_document_css_module() {
"</template>" +
"</div>"
);
- document.appendChild(wrapper);
+ document.body.appendChild(wrapper);
const host = document.getElementById('host');
const parsed = Document.parseHTMLUnsafe(
diff --git a/moli-renderer-v8/src/script_vm/tests/extracted/realms_and_teardown.rs b/moli-renderer-v8/src/script_vm/tests/extracted/realms_and_teardown.rs
index 8a78912d5..cc2a7cc7a 100644
--- a/moli-renderer-v8/src/script_vm/tests/extracted/realms_and_teardown.rs
+++ b/moli-renderer-v8/src/script_vm/tests/extracted/realms_and_teardown.rs
@@ -937,7 +937,7 @@ fn page_context_teardown_releases_all_context_owned_v8_finalizers() {
}
#[test]
fn embedded_frame_owners_create_child_contexts_only_for_document_content() {
- let mut vm = new_storage_test_vm("https://embedded-frame-owner-selection.test/");
+ let mut vm = new_storage_html_test_vm("https://embedded-frame-owner-selection.test/");
assert_eq!(
vm.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/lazy_storage.rs b/moli-renderer-v8/src/script_vm/tests/lazy_storage.rs
index c51c32c51..1a6cf10db 100644
--- a/moli-renderer-v8/src/script_vm/tests/lazy_storage.rs
+++ b/moli-renderer-v8/src/script_vm/tests/lazy_storage.rs
@@ -276,7 +276,7 @@ fn every_declared_lazy_window_interface_materializes_with_data_property_shape()
fn many_unused_child_realms_keep_storage_surfaces_unmaterialized() {
const CHILD_COUNT: usize = 16;
- let mut vm = new_storage_test_vm("https://lazy-unused-child-realms.test/");
+ let mut vm = new_storage_html_test_vm("https://lazy-unused-child-realms.test/");
assert_eq!(
vm.eval(&format!(
r#"
diff --git a/moli-renderer-v8/src/script_vm/tests/mod.rs b/moli-renderer-v8/src/script_vm/tests/mod.rs
index 0288ac195..699018b72 100644
--- a/moli-renderer-v8/src/script_vm/tests/mod.rs
+++ b/moli-renderer-v8/src/script_vm/tests/mod.rs
@@ -536,6 +536,14 @@ fn new_storage_test_vm(url: &str) -> StandaloneScriptVmHarness {
new_storage_test_vm_with_completion_sender(url, resource_completion_queue.sender())
}
+fn new_storage_html_test_vm(url: &str) -> StandaloneScriptVmHarness {
+ let mut vm = new_storage_test_vm(url);
+ vm.document_runtime
+ .dom_host_mut()
+ .reset_html_document_shell();
+ vm
+}
+
fn refresh_layout_for_test(vm: &mut StandaloneScriptVmHarness) {
assert!(
vm.refresh_layout_snapshot_for_test(moli_layout::LayoutViewport::new(800, 600, 1.0,))
diff --git a/moli-renderer-v8/src/script_vm/tests/observer_callbacks.rs b/moli-renderer-v8/src/script_vm/tests/observer_callbacks.rs
index eb851c064..f80ee0a58 100644
--- a/moli-renderer-v8/src/script_vm/tests/observer_callbacks.rs
+++ b/moli-renderer-v8/src/script_vm/tests/observer_callbacks.rs
@@ -20,6 +20,16 @@ fn observer_callback_test_vm(url: &str) -> StandaloneScriptVmHarness {
vm
}
+#[test]
+fn document_preinsert_validation_precedes_mutation_and_adoption() {
+ let mut vm = observer_callback_test_vm("https://document-preinsert.test/");
+ assert_eq!(
+ vm.eval(include_str!("document_preinsert_validation.js"))
+ .expect("Document pre-insert validation should precede mutation and adoption"),
+ "true"
+ );
+}
+
#[test]
fn windowless_fragment_insertions_preserve_native_mutation_records() {
let mut vm = observer_callback_test_vm("https://windowless-fragments.test/");
diff --git a/moli-renderer-v8/src/script_vm/tests/webidl_fetch/webidl_and_transform_streams.rs b/moli-renderer-v8/src/script_vm/tests/webidl_fetch/webidl_and_transform_streams.rs
index 9bce0ce1b..e73419694 100644
--- a/moli-renderer-v8/src/script_vm/tests/webidl_fetch/webidl_and_transform_streams.rs
+++ b/moli-renderer-v8/src/script_vm/tests/webidl_fetch/webidl_and_transform_streams.rs
@@ -66,7 +66,7 @@ fn webidl_required_nullable_dictionary_rejects_undefined_member() {
#[test]
fn fetch_url_constructors_use_child_frame_base_url() {
- let mut vm = new_storage_test_vm("https://fetch-current.test/entry/page.html");
+ let mut vm = new_storage_html_test_vm("https://fetch-current.test/entry/page.html");
let result = vm
.eval(
diff --git a/moli-renderer-v8/src/script_vm/tests/windowless_fragment_mutations.js b/moli-renderer-v8/src/script_vm/tests/windowless_fragment_mutations.js
index e6e5c1e6d..0cfb1eb67 100644
--- a/moli-renderer-v8/src/script_vm/tests/windowless_fragment_mutations.js
+++ b/moli-renderer-v8/src/script_vm/tests/windowless_fragment_mutations.js
@@ -101,7 +101,7 @@
check(error && error.name === expected, "empty fragment still validates insertion");
}
});
- if (owner.defaultView === null) run(name + "/invalid document insertion", () => {
+ run(name + "/invalid document insertion", () => {
const fragment = owner.createDocumentFragment();
const nodes = [owner.createElement("one"), owner.createElement("two")];
nodes.forEach(node => fragment.appendChild(node));