From c93b3262562d07c07bc4013effba9617931908f5 Mon Sep 17 00:00:00 2001 From: ldm0 Date: Mon, 7 Sep 2026 20:07:45 +0800 Subject: [PATCH] fix(service-worker): validate registration URL arguments --- .../window_runtime/service_worker.rs | 3 +++ .../misc/extracted/service_worker_surface.rs | 24 ++++++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/moli-renderer-v8/src/context_bootstrap/window_runtime/service_worker.rs b/moli-renderer-v8/src/context_bootstrap/window_runtime/service_worker.rs index 5a572de4e2e..dd3cad20cca 100644 --- a/moli-renderer-v8/src/context_bootstrap/window_runtime/service_worker.rs +++ b/moli-renderer-v8/src/context_bootstrap/window_runtime/service_worker.rs @@ -418,6 +418,9 @@ pub(in crate::context_bootstrap) fn navigator_service_worker_register_callback<' ) else { return; }; + let Some(options) = service_worker_registration_options(scope, &args) else { + return; + }; let Some(resolver) = v8::PromiseResolver::new(scope) else { return; }; diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/service_worker_surface.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/service_worker_surface.rs index 212b20a7bab..6dea642b2d7 100644 --- a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/service_worker_surface.rs +++ b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/service_worker_surface.rs @@ -2720,6 +2720,14 @@ async fn navigator_service_worker_url_arguments_follow_webidl_and_origin_rules() () => "resolved", error => error && error.name ); + const synchronousErrorName = callback => { + try { + callback(); + return "none"; + } catch (error) { + return error && error.name; + } + }; globalThis.__serviceWorkerUrlArgumentProbe = { state: "pending" }; (async () => { const registration = await sw.register("/worker.js", { scope: "null" }); @@ -2733,17 +2741,17 @@ async fn navigator_service_worker_url_arguments_follow_webidl_and_origin_rules() const nullScope = await rejectionName( sw.register("/resources/worker.js", { scope: null }) ); - const nullType = await rejectionName( - sw.register("/worker.js", { type: null }) + const nullType = synchronousErrorName( + () => sw.register("/worker.js", { type: null }) ); - const nullUpdateViaCache = await rejectionName( - sw.register("/worker.js", { updateViaCache: null }) + const nullUpdateViaCache = synchronousErrorName( + () => sw.register("/worker.js", { updateViaCache: null }) ); - const primitiveOptions = await rejectionName( - sw.register("/worker.js", 1) + const primitiveOptions = synchronousErrorName( + () => sw.register("/worker.js", 1) ); - const symbolClient = await rejectionName( - sw.getRegistration(Symbol("client")) + const symbolClient = synchronousErrorName( + () => sw.getRegistration(Symbol("client")) ); const unregistered = await registration.unregister(); globalThis.__serviceWorkerUrlArgumentProbe = {