From 9d948153f374450af9081089501e03f5ffb62fbe Mon Sep 17 00:00:00 2001 From: Abhyudaya Baiju Tharakan Date: Fri, 9 Oct 2026 16:32:10 +0530 Subject: [PATCH] fix(mcp): make the deferred tools revision on first use Workers reject random values in global scope, so deploying main failed with "Disallowed operation called within global scope" at worker/knowledge/deferred-tools.mjs:11. The per-isolate revision is now created on first use. A test fails if loading the module makes a random value. --- tests/test_deferred_tools_worker.mjs | 11 +++++++++++ worker/knowledge/deferred-tools.mjs | 8 +++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/tests/test_deferred_tools_worker.mjs b/tests/test_deferred_tools_worker.mjs index 6c4ff6e6..add4d63d 100644 --- a/tests/test_deferred_tools_worker.mjs +++ b/tests/test_deferred_tools_worker.mjs @@ -303,3 +303,14 @@ test("HTTP call preflight permits an unadvertised grant and returns real permiss const denied = await handleDeferredMcp(body, env, principal, entries, { service: f.service, validate: () => true }); assert.equal(denied.status, 403); assert.equal((await denied.json()).error.code, "tool_not_granted"); }); + +test("loading the module makes no random values, which Workers forbid in global scope", async () => { + const original = Object.getOwnPropertyDescriptor(globalThis.crypto, "randomUUID"); + globalThis.crypto.randomUUID = () => { throw new Error("randomUUID called while loading the module"); }; + try { + await import(`../worker/knowledge/deferred-tools.mjs?global-scope=${Date.now()}`); + } finally { + if (original) Object.defineProperty(globalThis.crypto, "randomUUID", original); + else delete globalThis.crypto.randomUUID; + } +}); diff --git a/worker/knowledge/deferred-tools.mjs b/worker/knowledge/deferred-tools.mjs index a591d5b2..9c5c3cc9 100644 --- a/worker/knowledge/deferred-tools.mjs +++ b/worker/knowledge/deferred-tools.mjs @@ -8,7 +8,9 @@ export const MAX_DISCOVERY_BYTES = 64 * 1024; export const CURSOR_TTL_SECONDS = 120; const MAX_GRANTS = 4096; const RPC_ENVELOPE_RESERVE = 4096; -const processRevision = crypto.randomUUID(); +// Workers forbid random values in global scope, so the per-isolate revision is made on first use. +let processRevision; +const currentProcessRevision = () => processRevision ??= crypto.randomUUID(); const encoder = new TextEncoder(); const services = new WeakMap(); let warned = false; @@ -86,7 +88,7 @@ export async function readGrantSnapshot(env, principalId) { const grants = results[0].results.map(row => ({ principal_id: row.principal_id, tool_name: row.tool_name, scopes: JSON.parse(row.scopes_json), allowed: row.allowed, revision: row.revision })); validatedGrants(grants, principalId); - const revision = revisionEnabled ? results[1].results[0]?.revision : processRevision; + const revision = revisionEnabled ? results[1].results[0]?.revision : currentProcessRevision(); if (revisionEnabled && (!Number.isSafeInteger(revision) || revision < 0)) throw unavailable(); return { grants, revision }; } catch { throw unavailable(); } @@ -102,7 +104,7 @@ export class DeferredTools { try { const value = await this.readGrants(principal.id); const grants = validatedGrants(Array.isArray(value) ? value : value.grants, principal.id); - const revision = this.revision ? await this.revision() : value.revision ?? processRevision; + const revision = this.revision ? await this.revision() : value.revision ?? currentProcessRevision(); if (!(typeof revision === "string" && revision || Number.isSafeInteger(revision) && revision >= 0)) throw unavailable(); const rows = [...grants.entries()].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([, row]) => row); return { grants, revision, stamp: await hash(rows) };