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): return only SVG documents from getSVGDocument

ldm0e52e9fd5e616
diff --git a/moli-renderer-v8/src/native_bridge/element/embedded_elements.rs b/moli-renderer-v8/src/native_bridge/element/embedded_elements.rs
index 66b9df1c8..782efc7b5 100644
--- a/moli-renderer-v8/src/native_bridge/element/embedded_elements.rs
+++ b/moli-renderer-v8/src/native_bridge/element/embedded_elements.rs
@@ -170,7 +170,7 @@ pub(super) struct HtmlObjectElementPrototypeDeclaration {
#[webapi(
method = "getSVGDocument",
length = 0,
- callback = object_content_document_getter_function,
+ callback = super::resource_elements::frame_owner_get_svg_document_function,
receiver = web_api_interfaces::HTMLObjectElement::is_instance
)]
get_svg_document: (),
diff --git a/moli-renderer-v8/src/native_bridge/element/resource_elements.rs b/moli-renderer-v8/src/native_bridge/element/resource_elements.rs
index a76df6852..0620ae887 100644
--- a/moli-renderer-v8/src/native_bridge/element/resource_elements.rs
+++ b/moli-renderer-v8/src/native_bridge/element/resource_elements.rs
@@ -1287,65 +1287,75 @@ fn frame_owner_content_document_getter_function<'s>(
args: v8::FunctionCallbackArguments<'s>,
mut rv: v8::ReturnValue<'_, v8::Value>,
) {
- let receiver = args.this();
- let Ok((runtime_ptr, handle)) =
- node_runtime_and_handle_from_object_or_detached(scope, receiver)
- else {
- return;
- };
- if iframe_is_inside_its_own_child_context_document(scope, runtime_ptr, handle) {
- rv.set_null();
- return;
+ match frame_owner_content_document(scope, args.this()) {
+ Some(document) => rv.set(document.into()),
+ None => rv.set_null(),
}
- if iframe_has_inactive_child_context(unsafe { &*runtime_ptr }, handle) {
- rv.set_null();
- return;
+}
+
+pub(super) fn frame_owner_get_svg_document_function<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ args: v8::FunctionCallbackArguments<'s>,
+ mut rv: v8::ReturnValue<'_, v8::Value>,
+) {
+ let document = frame_owner_content_document(scope, args.this()).filter(|document| {
+ node_runtime_and_handle_from_object_or_detached(scope, *document).is_ok_and(
+ |(runtime_ptr, handle)| {
+ unsafe { &*runtime_ptr }
+ .dom_host()
+ .document_content_type_for_handle(handle)
+ == Some("image/svg+xml")
+ },
+ )
+ });
+ match document {
+ Some(document) => rv.set(document.into()),
+ None => rv.set_null(),
}
- if iframe_is_in_own_child_document(unsafe { &*runtime_ptr }, handle) {
- rv.set_null();
- return;
+}
+
+fn frame_owner_content_document<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ receiver: v8::Local<'s, v8::Object>,
+) -> Option<v8::Local<'s, v8::Object>> {
+ let (runtime_ptr, handle) =
+ node_runtime_and_handle_from_object_or_detached(scope, receiver).ok()?;
+ if iframe_is_inside_its_own_child_context_document(scope, runtime_ptr, handle)
+ || iframe_has_inactive_child_context(unsafe { &*runtime_ptr }, handle)
+ || iframe_is_in_own_child_document(unsafe { &*runtime_ptr }, handle)
+ {
+ return None;
}
let runtime = unsafe { &*runtime_ptr };
if iframe_uses_detached_content_cache(runtime, handle)
|| !runtime.dom_host().is_connected(handle)
{
- if iframe_uses_detached_content_cache(runtime, handle)
+ return if iframe_uses_detached_content_cache(runtime, handle)
|| disconnected_iframe_can_materialize_detached_content(runtime, handle)
{
- match detached_iframe_content_document(scope, receiver) {
- Some(document) => rv.set(document.into()),
- None => rv.set_null(),
- }
+ detached_iframe_content_document(scope, receiver)
} else {
- rv.set_null();
- }
- return;
+ None
+ };
}
let runtime = unsafe { &mut *runtime_ptr };
runtime.refresh_child_browsing_context(scope, handle);
if !runtime.child_browsing_context_is_same_origin_with_top(handle) {
- rv.set_null();
- return;
+ return None;
}
- let window = runtime.child_browsing_context_window_wrapper(scope, handle);
- if let Some(window) = window {
+ if let Some(window) = runtime.child_browsing_context_window_wrapper(scope, handle) {
runtime.set_cached_detached_iframe_content_window(scope, handle, window);
if let Some(document) = window
.get(scope, v8str(scope, "document").into())
.and_then(|value| v8::Local::<v8::Object>::try_from(value).ok())
{
runtime.set_cached_detached_iframe_content_document(scope, handle, document);
- rv.set(document.into());
- return;
+ return Some(document);
}
}
- match runtime.child_browsing_context_document_wrapper(scope, handle) {
- Some(document) => {
- runtime.set_cached_detached_iframe_content_document(scope, handle, document);
- rv.set(document.into());
- }
- None => rv.set_null(),
- }
+ let document = runtime.child_browsing_context_document_wrapper(scope, handle)?;
+ runtime.set_cached_detached_iframe_content_document(scope, handle, document);
+ Some(document)
}
fn frame_owner_content_window_getter_function<'s>(
@@ -1933,7 +1943,7 @@ pub(super) struct HtmlEmbedElementUrlPrototypeDeclaration {
#[webapi(
method = "getSVGDocument",
length = 0,
- callback = frame_owner_content_document_getter_function,
+ callback = frame_owner_get_svg_document_function,
receiver = web_api_interfaces::HTMLEmbedElement::is_instance
)]
get_svg_document: (),
@@ -2116,7 +2126,7 @@ pub(super) struct HtmlIFrameElementPrototypeDeclaration {
#[webapi(
method = "getSVGDocument",
length = 0,
- callback = frame_owner_content_document_getter_function,
+ callback = frame_owner_get_svg_document_function,
receiver = web_api_interfaces::HTMLIFrameElement::is_instance
)]
get_svg_document: (),
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 ca8a7a635..91d50a57a 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
@@ -1536,7 +1536,7 @@ fn same_name_isolated_worlds_are_scoped_to_devtools_session_and_detach() {
}
#[test]
-fn frame_owner_get_svg_document_methods_share_content_document_semantics_and_enforce_brands() {
+fn frame_owner_get_svg_document_methods_reject_html_documents_and_enforce_brands() {
let mut vm = new_storage_test_vm("https://frame-owner-get-svg-document.test/");
let result = vm
@@ -1588,11 +1588,9 @@ fn frame_owner_get_svg_document_methods_share_content_document_semantics_and_enf
return JSON.stringify({
descriptors,
- iframeMatches: iframe.getSVGDocument() !== null &&
- iframe.getSVGDocument() === iframe.contentDocument,
- embedHasDocument: embed.getSVGDocument() !== null,
- objectMatches: object.getSVGDocument() !== null &&
- object.getSVGDocument() === object.contentDocument,
+ iframeIsNull: iframe.getSVGDocument() === null,
+ embedIsNull: embed.getSVGDocument() === null,
+ objectIsNull: object.getSVGDocument() === null,
brandErrors,
absentFromBase: !("getSVGDocument" in HTMLElement.prototype)
});
@@ -1603,6 +1601,52 @@ fn frame_owner_get_svg_document_methods_share_content_document_semantics_and_enf
assert_eq!(
result,
- r#"{"descriptors":[{"type":"function","name":"getSVGDocument","length":0,"writable":true,"enumerable":true,"configurable":true},{"type":"function","name":"getSVGDocument","length":0,"writable":true,"enumerable":true,"configurable":true},{"type":"function","name":"getSVGDocument","length":0,"writable":true,"enumerable":true,"configurable":true}],"iframeMatches":true,"embedHasDocument":true,"objectMatches":true,"brandErrors":["TypeError","TypeError","TypeError"],"absentFromBase":true}"#
+ r#"{"descriptors":[{"type":"function","name":"getSVGDocument","length":0,"writable":true,"enumerable":true,"configurable":true},{"type":"function","name":"getSVGDocument","length":0,"writable":true,"enumerable":true,"configurable":true},{"type":"function","name":"getSVGDocument","length":0,"writable":true,"enumerable":true,"configurable":true}],"iframeIsNull":true,"embedIsNull":true,"objectIsNull":true,"brandErrors":["TypeError","TypeError","TypeError"],"absentFromBase":true}"#
+ );
+}
+
+#[test]
+fn frame_owner_get_svg_document_uses_native_document_content_type() {
+ let mut vm = new_storage_html_test_vm("https://frame-owner-svg-type.test/");
+ vm.eval(
+ r#"
+for (const tag of ['iframe', 'embed', 'object']) {
+ const owner = document.createElement(tag);
+ owner.id = tag;
+ if (tag === 'object') owner.data = 'about:blank';
+ else owner.src = 'about:blank';
+ document.body.appendChild(owner);
+ if (owner.getSVGDocument() !== null) throw new Error('HTML document accepted');
+}
+"#,
+ )
+ .expect("frame owner setup should evaluate");
+
+ // Simulate the response MIME metadata at a child document commit. Parsing
+ // and frame navigation are covered separately; this checks the public
+ // method against native metadata rather than author-visible properties.
+ {
+ let mut host = vm._context_host.borrow_mut();
+ for id in ["iframe", "embed", "object"] {
+ let owner = host.dom_host().element_handle_by_id(id).unwrap();
+ let document = host.child_browsing_context_document_handle(owner).unwrap();
+ host.set_dom_document_content_type_for_handle(document, "image/svg+xml");
+ }
+ }
+ assert_eq!(
+ vm.eval(
+ r#"
+['iframe', 'embed', 'object'].every(id => {
+ const owner = document.getElementById(id);
+ const svg = owner.getSVGDocument();
+ if (svg === null || svg.contentType !== 'image/svg+xml') return false;
+ if (id !== 'embed' && svg !== owner.contentDocument) return false;
+ Object.defineProperty(svg, 'contentType', {value: 'text/html', configurable: true});
+ return owner.getSVGDocument() === svg;
+})
+"#
+ )
+ .expect("native SVG document metadata should determine the result"),
+ "true"
);
}