From 758ea543a4f45a7ade41fdc651bb9919ffef6845 Mon Sep 17 00:00:00 2001 From: ldm0 Date: Wed, 16 Sep 2026 15:12:13 +0800 Subject: [PATCH] fix(events): preserve original Window onerror data --- .../tests/browser_api/window_onerror.rs | 155 +++++++++++++++--- 1 file changed, 135 insertions(+), 20 deletions(-) diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/window_onerror.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/window_onerror.rs index a2a1fb45e9a..ab39d23cdef 100644 --- a/moli-renderer-v8/src/script_vm/tests/browser_api/window_onerror.rs +++ b/moli-renderer-v8/src/script_vm/tests/browser_api/window_onerror.rs @@ -113,6 +113,67 @@ async fn window_onerror_uses_native_event_kind_for_arguments_and_cancellation() } } +const SYNTHETIC_PROBE: &str = r#"(() => { + const config = __CONFIG__; + if (!document.body) document.documentElement.appendChild(document.createElement('body')); + const frame = document.createElement('iframe'); + document.body.appendChild(frame); + const child = frame.contentWindow; + const realm = config.kind === 'child' ? child : window; + const target = config.kind === 'popup' ? open('about:blank') : realm; + if (!target) throw new Error('popup did not open'); + if (!realm.document.body) realm.document.documentElement.appendChild(realm.document.createElement('body')); + const holder = config.mode === 'body' ? realm.document.body : target; + const eventRealm = config.mode === 'foreign' ? (realm === window ? child : window) : realm; + const marker = {}; + const ordinary = config.mode === 'plain' || config.mode === 'forged'; + const event = ordinary ? new eventRealm.Event('error', {cancelable:true}) : + new eventRealm.ErrorEvent('error', {message:'original',filename:'source.js',lineno:12,colno:34,error:marker,cancelable:true}); + if (config.mode === 'forged') Object.setPrototypeOf(event, eventRealm.ErrorEvent.prototype); + if (config.mode === 'prototype') Object.setPrototypeOf(event, eventRealm.Event.prototype); + const trace = []; + let reads = 0, proxyGets = 0, called = null; + const shadow = () => { + for (const [name, value] of Object.entries({message:'fake',filename:'fake.js',lineno:90,colno:91,error:42})) { + Object.defineProperty(event, name, {configurable:true, get() { + reads++; + if (config.mode === 'throw') throw new Error('must not read ' + name); + return value; + }}); + } + }; + if (['values','throw','foreign'].includes(config.mode)) shadow(); + const before = value => { + if (value !== event) { trace.push('unexpected-error'); value.preventDefault(); return; } + trace.push('before'); + if (config.mode === 'listener-shadow') shadow(); + }; + const after = value => { if (value === event) trace.push('after'); }; + let callback = function(...args) { + trace.push('handler'); + called = {count:args.length,receiver:this===target, + values:args.length===5 ? [args[0],args[1],args[2],args[3],args[4]===marker] : [args[0]===event]}; + return !ordinary; + }; + if (config.mode === 'proxy') callback = new Proxy(callback, {get() {proxyGets++; throw new Error('callback getter');}}); + const old = holder.onerror; + target.addEventListener('error', before); + holder.onerror = callback; + target.addEventListener('error', after); + let returned = null, threw = null; + try { + returned = config.mode === 'borrowed' ? EventTarget.prototype.dispatchEvent.call(target, event) : target.dispatchEvent(event); + } catch (error) { threw = error.name; } + finally { + holder.onerror = old; + target.removeEventListener('error', before); + target.removeEventListener('error', after); + if (config.kind === 'popup') target.close(); + frame.remove(); + } + return {trace,called,reads,proxyGets,returned,threw}; +})() +"#; const NATIVE_PROBE: &str = r#"(() => { const config = __CONFIG__; if (!document.documentElement) document.appendChild(document.createElement('html')); @@ -162,26 +223,80 @@ const NATIVE_PROBE: &str = r#"(() => { })() "#; +#[tokio::test] +async fn window_onerror_uses_original_event_data_across_native_window_brands() { + for kind in ["window", "child", "popup"] { + let loader = ResourceRequestClient::new(&moli_fetch::FetchConfig::default()).unwrap(); + let (mut vm, _runtime) = + new_service_worker_page_test_vm_with_loader_and_browser_context_runtime( + "https://window-onerror-data.test/", + &loader, + ); + for mode in [ + "order", + "values", + "throw", + "listener-shadow", + "foreign", + "prototype", + "forged", + "plain", + "proxy", + "borrowed", + "body", + ] { + if (kind == "popup" && mode == "body") || (kind != "popup" && mode == "borrowed") { + continue; + } + let source = SYNTHETIC_PROBE.replace( + "__CONFIG__", + &serde_json::json!({"kind":kind,"mode":mode}).to_string(), + ); + let value = vm + .eval(&format!("JSON.stringify({source})")) + .unwrap_or_else(|error| panic!("{kind}/{mode}: {error:?}")); + let actual: serde_json::Value = serde_json::from_str(&value).unwrap(); + let ordinary = matches!(mode, "plain" | "forged"); + let arguments = if ordinary { + serde_json::json!([true]) + } else { + serde_json::json!(["original", "source.js", 12, 34, true]) + }; + assert_eq!( + actual, + serde_json::json!({ + "trace":["before","handler","after"], + "called":{"count":if ordinary {1} else {5},"receiver":true,"values":arguments}, + "reads":0,"proxyGets":0,"returned":false,"threw":null, + }), + "{kind}/{mode}" + ); + } + } +} + #[test] -fn child_window_onerror_preserves_native_exception_after_listener_shadows_attributes() { - for mode in ["values", "throw"] { - let mut vm = new_storage_test_vm("https://window-onerror-data.test/"); - let source = NATIVE_PROBE.replace( - "__CONFIG__", - &serde_json::json!({"kind":"child","mode":mode}).to_string(), - ); - let value = vm - .eval(&format!("JSON.stringify({source})")) - .unwrap_or_else(|error| panic!("{mode}: {error:?}")); - let actual: serde_json::Value = serde_json::from_str(&value).unwrap(); - assert_eq!( - actual, - serde_json::json!({ - "trace":["before","handler","after"], - "called":{"count":5,"receiver":true,"identity":true,"message":true,"locationTypes":["string","number","number"]}, - "reads":0,"returned":true,"threw":null, - }), - "{mode}" - ); +fn window_onerror_native_listener_exceptions_preserve_data_after_attribute_shadowing() { + for kind in ["window", "child"] { + for mode in ["values", "throw"] { + let mut vm = new_storage_test_vm("https://window-onerror-data.test/"); + let source = NATIVE_PROBE.replace( + "__CONFIG__", + &serde_json::json!({"kind":kind,"mode":mode}).to_string(), + ); + let value = vm + .eval(&format!("JSON.stringify({source})")) + .unwrap_or_else(|error| panic!("{kind}/{mode}: {error:?}")); + let actual: serde_json::Value = serde_json::from_str(&value).unwrap(); + assert_eq!( + actual, + serde_json::json!({ + "trace":["before","handler","after"], + "called":{"count":5,"receiver":true,"identity":true,"message":true,"locationTypes":["string","number","number"]}, + "reads":0,"returned":true,"threw":null, + }), + "{kind}/{mode}" + ); + } } }