From cbefbeea5e6aacfa368a2aba5a1c866312424b99 Mon Sep 17 00:00:00 2001 From: ldm0 Date: Fri, 17 Jul 2026 22:19:32 +0800 Subject: [PATCH] fix(trusted-types): recognize fullscreen event handlers --- moli-benchmark/wpt-cross-current/failed-cases.txt | 1 + moli-benchmark/wpt-cross-current/passed-cases.txt | 1 - moli-renderer-v8/src/native_bridge/element.rs | 2 +- .../src/native_bridge/element/event_handlers/generic.rs | 9 +++++++-- .../src/native_bridge/element/event_handlers/mod.rs | 4 +++- .../src/script_vm/tests/browser_api/fullscreen.rs | 8 ++++---- .../src/script_vm/tests/browser_api/trusted_types.rs | 9 +++++++-- 7 files changed, 23 insertions(+), 11 deletions(-) diff --git a/moli-benchmark/wpt-cross-current/failed-cases.txt b/moli-benchmark/wpt-cross-current/failed-cases.txt index 199c88cc0e6..f391c149047 100644 --- a/moli-benchmark/wpt-cross-current/failed-cases.txt +++ b/moli-benchmark/wpt-cross-current/failed-cases.txt @@ -3281,6 +3281,7 @@ service-workers/service-worker/referrer-policy-header.https.html service-workers/service-worker/registration-schedule-job.https.html service-workers/service-worker/registration-scope-module-static-import.https.html service-workers/service-worker/registration-scope.https.html +service-workers/service-worker/registration-script-url.https.html service-workers/service-worker/request-end-to-end.https.html service-workers/service-worker/resource-timing-cross-origin.https.html service-workers/service-worker/sandboxed-iframe-navigator-serviceworker.https.html diff --git a/moli-benchmark/wpt-cross-current/passed-cases.txt b/moli-benchmark/wpt-cross-current/passed-cases.txt index dba1add31b4..4e30067511a 100644 --- a/moli-benchmark/wpt-cross-current/passed-cases.txt +++ b/moli-benchmark/wpt-cross-current/passed-cases.txt @@ -8885,7 +8885,6 @@ service-workers/service-worker/registration-basic.https.html service-workers/service-worker/registration-end-to-end.https.html service-workers/service-worker/registration-events.https.html service-workers/service-worker/registration-iframe.https.html -service-workers/service-worker/registration-script-url.https.html service-workers/service-worker/rejections.https.html service-workers/service-worker/respond-with-body-accessed-response.https.html service-workers/service-worker/serviceworker-message-event-historical.https.html diff --git a/moli-renderer-v8/src/native_bridge/element.rs b/moli-renderer-v8/src/native_bridge/element.rs index 9b81deb96d0..6d73e4b519b 100644 --- a/moli-renderer-v8/src/native_bridge/element.rs +++ b/moli-renderer-v8/src/native_bridge/element.rs @@ -1497,7 +1497,7 @@ pub(crate) fn install_element_template_bindings<'s>( install_node_event_handler_template_bindings( scope, prototype, - &["onfullscreenchange", "onfullscreenerror"], + event_handlers::ELEMENT_FULLSCREEN_EVENT_HANDLER_PROPERTIES, ); } "Document" => install!(DocumentCustomElementRegistryPrototypeDeclaration), diff --git a/moli-renderer-v8/src/native_bridge/element/event_handlers/generic.rs b/moli-renderer-v8/src/native_bridge/element/event_handlers/generic.rs index 5053ecf00bc..88559396023 100644 --- a/moli-renderer-v8/src/native_bridge/element/event_handlers/generic.rs +++ b/moli-renderer-v8/src/native_bridge/element/event_handlers/generic.rs @@ -119,15 +119,19 @@ pub(crate) const GENERIC_EVENT_HANDLER_PROPERTIES: &[&str] = &[ "onwebkittransitionend", ]; +const ON_FULLSCREEN_CHANGE: &str = "onfullscreenchange"; +const ON_FULLSCREEN_ERROR: &str = "onfullscreenerror"; const DOCUMENT_EVENT_HANDLER_PROPERTIES: &[&str] = &[ "onfreeze", - "onfullscreenchange", - "onfullscreenerror", + ON_FULLSCREEN_CHANGE, + ON_FULLSCREEN_ERROR, "onpointerlockchange", "onpointerlockerror", "onreadystatechange", "onresume", ]; +pub(in crate::native_bridge::element) const ELEMENT_FULLSCREEN_EVENT_HANDLER_PROPERTIES: &[&str] = + &[ON_FULLSCREEN_CHANGE, ON_FULLSCREEN_ERROR]; const ELEMENT_SPECIFIC_EVENT_HANDLER_PROPERTIES: &[&str] = &[ "onencrypted", "onwaitingforkey", @@ -142,6 +146,7 @@ pub(in crate::native_bridge::element) fn is_element_event_handler_content_attrib GENERIC_EVENT_HANDLER_PROPERTIES .iter() .chain(WINDOW_EVENT_HANDLER_PROPERTIES) + .chain(ELEMENT_FULLSCREEN_EVENT_HANDLER_PROPERTIES) .chain(ELEMENT_SPECIFIC_EVENT_HANDLER_PROPERTIES) .copied() .chain(["onmessageerror"]) diff --git a/moli-renderer-v8/src/native_bridge/element/event_handlers/mod.rs b/moli-renderer-v8/src/native_bridge/element/event_handlers/mod.rs index c0afbac5783..18bbc195f2b 100644 --- a/moli-renderer-v8/src/native_bridge/element/event_handlers/mod.rs +++ b/moli-renderer-v8/src/native_bridge/element/event_handlers/mod.rs @@ -8,7 +8,9 @@ pub(crate) use body_window::{ install_body_or_frameset_window_event_handler_accessors, resolve_window_event_handler_content_attribute, }; -pub(super) use generic::is_element_event_handler_content_attribute_name; +pub(super) use generic::{ + ELEMENT_FULLSCREEN_EVENT_HANDLER_PROPERTIES, is_element_event_handler_content_attribute_name, +}; pub(crate) use generic::{ GlobalEventHandlerOwner, canonical_event_handler_event_type, event_handler_content_attribute_name, install_global_event_handler_template_bindings, diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/fullscreen.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/fullscreen.rs index df6451dadd0..71cbdf0620b 100644 --- a/moli-renderer-v8/src/script_vm/tests/browser_api/fullscreen.rs +++ b/moli-renderer-v8/src/script_vm/tests/browser_api/fullscreen.rs @@ -17,7 +17,7 @@ async fn unsupported_fullscreen_requests_reject_and_queue_spec_shaped_error_even globalThis.__fullscreenConversionRejections = []; globalThis.__fullscreenOptionReads = []; document.body.setAttribute("onfullscreenerror", "globalThis.__fullscreenAttributeRan = true"); - const contentAttributeIgnored = document.body.onfullscreenerror === null; + const contentAttributeInstalled = typeof document.body.onfullscreenerror === "function"; document.onfullscreenerror = event => { __fullscreenEvents.push([ event.type, @@ -87,7 +87,7 @@ async fn unsupported_fullscreen_requests_reject_and_queue_spec_shaped_error_even ], promises: request instanceof Promise && exit instanceof Promise, conversionPromiseShapes, - contentAttributeIgnored, + contentAttributeInstalled, optionReads: __fullscreenOptionReads, wrongReceivers: [ outcome(() => Element.prototype.requestFullscreen.call({})), @@ -102,7 +102,7 @@ async fn unsupported_fullscreen_requests_reject_and_queue_spec_shaped_error_even assert_eq!( before, - r#"{"requestShape":["function",0,true,true],"documentShape":["function",0,true,true,false],"promises":true,"conversionPromiseShapes":[true,true,true,true],"contentAttributeIgnored":true,"optionReads":["keyboardLock","navigationUI"],"wrongReceivers":["TypeError","TypeError"],"events":0}"#, + r#"{"requestShape":["function",0,true,true],"documentShape":["function",0,true,true,false],"promises":true,"conversionPromiseShapes":[true,true,true,true],"contentAttributeInstalled":true,"optionReads":["keyboardLock","navigationUI"],"wrongReceivers":["TypeError","TypeError"],"events":0}"#, ); vm.advance_timers_until_deadline_for_test(&loader) @@ -123,6 +123,6 @@ JSON.stringify({ .expect("fullscreen rejection result should evaluate"); assert_eq!( after, - r#"{"events":["fullscreenerror:true:true:false:true"],"rejections":["exit:TypeError","request:TypeError"],"conversionRejections":["enum:TypeError:true","getter:RangeError:true","number:TypeError:true","string:TypeError:true"],"contentAttributeRan":false}"#, + r#"{"events":["fullscreenerror:true:true:false:true"],"rejections":["exit:TypeError","request:TypeError"],"conversionRejections":["enum:TypeError:true","getter:RangeError:true","number:TypeError:true","string:TypeError:true"],"contentAttributeRan":true}"#, ); } diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/trusted_types.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/trusted_types.rs index 00a26f7c939..ee52404729a 100644 --- a/moli-renderer-v8/src/script_vm/tests/browser_api/trusted_types.rs +++ b/moli-renderer-v8/src/script_vm/tests/browser_api/trusted_types.rs @@ -1583,7 +1583,12 @@ fn event_handler_attribute_writes_enforce_trusted_script_at_the_attribute_bounda ordinary.setAttributeNS("urn:test", "onclick", "plain-namespaced"); const uppercaseSvg = document.createElementNS("http://www.w3.org/2000/svg", "g"); uppercaseSvg.setAttributeNS(null, "ONCLICK", "plain-uppercase"); - const elementSpecificRejected = ["onwaitingforkey", "onbegin"].map(name => { + const elementSpecificRejected = [ + "onwaitingforkey", + "onbegin", + "onfullscreenchange", + "onfullscreenerror" + ].map(name => { try { document.createElement("div").setAttribute(name, "plain-special"); return false; @@ -1629,7 +1634,7 @@ fn event_handler_attribute_writes_enforce_trusted_script_at_the_attribute_bounda assert_eq!( result, - r#"{"runs":["trusted","trusted-ns","default"],"unsuitableRejected":true,"unsuitableAttribute":null,"plainRejected":true,"plainAttribute":null,"plainNsRejected":true,"plainNsAttribute":null,"ordinary":["plain-data","plain-unknown","plain-namespaced","plain-uppercase"],"elementSpecificRejected":[true,true],"defaultedAttribute":"globalThis.__eventHandlerAttributeRuns.push('default')","defaultCalls":[["default-input","TrustedScript","Element onclick"]]}"# + r#"{"runs":["trusted","trusted-ns","default"],"unsuitableRejected":true,"unsuitableAttribute":null,"plainRejected":true,"plainAttribute":null,"plainNsRejected":true,"plainNsAttribute":null,"ordinary":["plain-data","plain-unknown","plain-namespaced","plain-uppercase"],"elementSpecificRejected":[true,true,true,true],"defaultedAttribute":"globalThis.__eventHandlerAttributeRuns.push('default')","defaultCalls":[["default-input","TrustedScript","Element onclick"]]}"# ); }