From b147f7f3da251257bc473d009f643630ffbff5ee Mon Sep 17 00:00:00 2001
From: Scott Haseley <[email protected]>
Date: Tue, 08 Sep 2026 16:57:13 -0700
Subject: [PATCH] Use correct world for setTimeout CSP check

This CL changes setTimeout and setInterval to use the CSP policy for the
relevant world for script eval, matching the behavior of other script
eval checks (v8_initializer.cc).

Fixed: 513735469
Change-Id: I724314c20cb877d3296dac8187fddf57c32dd85c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/8375161
Reviewed-by: Nate Chapin <[email protected]>
Commit-Queue: Scott Haseley <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1694194}
---
diff --git a/third_party/blink/renderer/core/scheduler/dom_timer.cc b/third_party/blink/renderer/core/scheduler/dom_timer.cc
index ac7aee1..6b5d77cc 100644
--- a/third_party/blink/renderer/core/scheduler/dom_timer.cc
+++ b/third_party/blink/renderer/core/scheduler/dom_timer.cc
@@ -44,6 +44,7 @@
 #include "third_party/blink/renderer/core/probe/core_probes.h"
 #include "third_party/blink/renderer/core/scheduler/scheduled_action.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
+#include "third_party/blink/renderer/platform/bindings/script_state.h"
 #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
 #include "third_party/blink/renderer/platform/instrumentation/tracing/trace_event.h"
 #include "third_party/blink/renderer/platform/scheduler/public/scheduling_policy.h"
@@ -147,13 +148,20 @@
   int timer_nesting_level_ = 0;
 };
 
-bool IsAllowed(ExecutionContext& context, bool is_eval, const String& source) {
+// `context` is the global that setTimeout() or setInterval() is being called
+// on, which might differ from the `ExecutionContext` associated with
+// `script_state`.
+bool IsAllowed(ScriptState* script_state,
+               ExecutionContext& context,
+               bool is_eval,
+               const String& source) {
   if (context.IsContextDestroyed()) {
     return false;
   }
-  if (is_eval && !context.GetContentSecurityPolicy()->AllowEval(
-                     ReportingDisposition::kReport,
-                     ContentSecurityPolicy::kWillNotThrowException, source)) {
+  if (is_eval &&
+      !context.GetContentSecurityPolicyForWorld(&script_state->World())
+           ->AllowEval(ReportingDisposition::kReport,
+                       ContentSecurityPolicy::kWillNotThrowException, source)) {
     return false;
   }
   if (auto* window = DynamicTo<LocalDOMWindow>(context);
@@ -172,7 +180,7 @@
                          V8Function* handler,
                          int timeout,
                          const HeapVector<ScriptValue>& arguments) {
-  if (!IsAllowed(context, false, g_empty_string)) {
+  if (!IsAllowed(script_state, context, false, g_empty_string)) {
     return 0;
   }
   auto* action = MakeGarbageCollected<ScheduledAction>(script_state, context,
@@ -205,7 +213,7 @@
     return 0;
   }
 
-  if (!IsAllowed(context, true, handler)) {
+  if (!IsAllowed(script_state, context, true, handler)) {
     return 0;
   }
   // Don't allow setting timeouts to run empty functions.  Was historically a
@@ -226,7 +234,7 @@
                           V8Function* handler,
                           int timeout,
                           const HeapVector<ScriptValue>& arguments) {
-  if (!IsAllowed(context, false, g_empty_string)) {
+  if (!IsAllowed(script_state, context, false, g_empty_string)) {
     return 0;
   }
   auto* action = MakeGarbageCollected<ScheduledAction>(script_state, context,
@@ -254,7 +262,7 @@
     return 0;
   }
 
-  if (!IsAllowed(context, true, handler)) {
+  if (!IsAllowed(script_state, context, true, handler)) {
     return 0;
   }
   // Don't allow setting timeouts to run empty functions.  Was historically a