From e40a1f7d6ea937723f944a2e4cf956b5868508d7 Mon Sep 17 00:00:00 2001 From: "pavel.guseynov" Date: Thu, 5 Nov 2026 22:04:55 +0500 Subject: [PATCH] fix(tool-gateway): advertise only the MCP capabilities the gateway token may list initialize always advertised tools, resources and prompts. A token that allows only tools/list and tools/call was then refused on resources/list and prompts/list. Each capability is now advertised only when the token allows its list action. This continues #17688. Co-Authored-By: Claude Opus 5.5 --- server/src/__tests__/tool-gateway.test.ts | 51 +++++++++++++++++++++++ server/src/routes/tool-gateway.ts | 11 ++++- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/server/src/__tests__/tool-gateway.test.ts b/server/src/__tests__/tool-gateway.test.ts index 64f09143526..905aafe8ad7 100644 --- a/server/src/__tests__/tool-gateway.test.ts +++ b/server/src/__tests__/tool-gateway.test.ts @@ -47,6 +47,7 @@ import { } from "@paperclipai/db"; import { buildPaperclipRuntimeMcpServers } from "../services/heartbeat.js"; import { resolveNativeRuntimeMcpSnapshot } from "../services/native-runtime/runtime-context.js"; +import type { ToolMcpGatewayTokenAction } from "@paperclipai/shared"; import type { PluginToolDispatcher } from "../services/plugin-tool-dispatcher.js"; import { mcpGatewayProtocolRoutes, toolGatewayRoutes } from "../routes/tool-gateway.js"; import { toolAccessService } from "../services/tool-access.js"; @@ -6096,4 +6097,54 @@ rl.on("line", (line) => { (error) => expectGatewayError(error, 403, "run_context_mismatch"), ); }); + + it("advertises on initialize only the capabilities that the gateway token may list", async () => { + const company = await createCompany(db); + const [profile] = await db.insert(toolProfiles).values({ + companyId: company.id, + profileKey: `capability-gateway-${randomUUID()}`, + name: `Capability gateway ${randomUUID()}`, + defaultAction: "deny", + }).returning(); + const gateway = createTestToolGatewayService(db); + const created = await gateway.createNamedGateway({ + companyId: company.id, + body: { name: "Capability gateway", profileId: profile!.id }, + }); + const app = createGatewayRouteApp(db, gateway); + const createToken = (allowedActions?: ToolMcpGatewayTokenAction[]) => + gateway.createNamedGatewayToken({ + companyId: company.id, + gatewayId: created.id, + body: { + name: `Token ${randomUUID()}`, + clientLabel: "Capability client", + ownerNote: "Capability fixture token", + ...(allowedActions ? { allowedActions } : {}), + }, + }); + const capabilitiesFor = async (allowedActions?: ToolMcpGatewayTokenAction[]) => { + const token = await createToken(allowedActions); + const initialized = await request(app) + .post(`/api/tool-gateway/gateways/${created.id}/mcp`) + .set("authorization", `Bearer ${token.token}`) + .send({ jsonrpc: "2.0", id: 1, method: "initialize" }) + .expect(200); + return initialized.body.result.capabilities; + }; + + expect(await capabilitiesFor(["tools/list", "tools/call"])).toEqual({ tools: {} }); + expect(await capabilitiesFor(["tools/list", "tools/call", "prompts/list"])).toEqual({ tools: {}, prompts: {} }); + expect(await capabilitiesFor(["tools/list", "resources/list", "resources/read"])).toEqual({ tools: {}, resources: {} }); + expect(await capabilitiesFor(["tools/call", "resources/read", "prompts/get"])).toEqual({}); + expect(await capabilitiesFor()).toEqual({ tools: {}, resources: {}, prompts: {} }); + + const toolsOnly = await createToken(["tools/list", "tools/call"]); + const resources = await request(app) + .post(`/api/tool-gateway/gateways/${created.id}/mcp`) + .set("authorization", `Bearer ${toolsOnly.token}`) + .send({ jsonrpc: "2.0", id: 2, method: "resources/list" }) + .expect(403); + expect(resources.body.error.data.reasonCode).toBe("gateway_token_action_denied"); + }); }); diff --git a/server/src/routes/tool-gateway.ts b/server/src/routes/tool-gateway.ts index 9dd4fb9425e..51ba531cacc 100644 --- a/server/src/routes/tool-gateway.ts +++ b/server/src/routes/tool-gateway.ts @@ -87,17 +87,24 @@ async function handleMcpGatewayProtocol( const body = (req.body ?? {}) as { jsonrpc?: string; id?: unknown; method?: string; params?: Record }; const id = body.id ?? null; if (body.method === "initialize") { - await toolGateway.initializeNamedGatewayProtocol({ + const session = await toolGateway.initializeNamedGatewayProtocol({ ...locator, bearerToken: token, callerHeaders: headers, }); + const allowedActions = session.gatewayTokenAllowedActions; + const mayList = (action: "tools/list" | "resources/list" | "prompts/list") => + !allowedActions || allowedActions.includes(action); res.json({ jsonrpc: "2.0", id, result: { protocolVersion: "2025-03-26", - capabilities: { tools: {}, resources: {}, prompts: {} }, + capabilities: { + ...(mayList("tools/list") ? { tools: {} } : {}), + ...(mayList("resources/list") ? { resources: {} } : {}), + ...(mayList("prompts/list") ? { prompts: {} } : {}), + }, serverInfo: { name: "Paperclip MCP Gateway", version: "1.0.0" }, _meta: { "paperclip/mcp-app-ui": "unsupported",