skybridge 0.0.0-dev.81dc563 → 0.0.0-dev.81ea105

package/dist/server/auth/setup.js

@@ -2,14 +2,21 @@ import { getOAuthProtectedResourceMetadataUrl, mcpAuthMetadataRouter, } from "@m
 import cors from "cors";
 import { optionalBearerAuth, requireBearerAuth } from "../auth.js";
 import { resolveServerOrigin } from "../requestOrigin.js";
+import { clientPrefersInBandChallenge, evaluateSecuritySchemes, httpStatusForFailure, inBandChallengeResult, securitySchemesAllowAnonymous, wwwAuthenticateHeader, } from "./security-schemes.js";
 import { createJwksVerifier } from "./verify.js";
 /** Mounts the well-known OAuth metadata and bearer auth on `/mcp`. */
-export function setupOAuth(app, config) {
-    if (!config.verify?.issuer || !config.verify?.audience) {
-        throw new Error("oauth.verify requires both `issuer` and `audience`");
+export function setupOAuth(app, config, schemesByTool) {
+    if (!config.verify?.issuer) {
+        throw new Error("oauth.verify requires an `issuer`");
     }
+    const acceptsAnonymous = () => [...schemesByTool.values()].some(securitySchemesAllowAnonymous);
     const verifier = createJwksVerifier(config.verify);
-    const bearer = config.enforcement === "optional" ? optionalBearerAuth : requireBearerAuth;
+    const bearer = (options) => {
+        const required = requireBearerAuth(options);
+        const optional = optionalBearerAuth(options);
+        return (req, res, next) => (acceptsAnonymous() ? optional : required)(req, res, next);
+    };
+    let resourceMetadataUrl;
     // baseUrl known at boot: bake the resource URLs once, no Host-header trust.
     if (config.baseUrl !== undefined) {
         let baseUrl;
@@ -24,29 +31,62 @@ export function setupOAuth(app, config) {
             resourceServerUrl: baseUrl,
             scopesSupported: config.scopesSupported,
         }));
-        app.use("/mcp", bearer({
-            verifier,
-            requiredScopes: config.requiredScopes,
-            resourceMetadataUrl: getOAuthProtectedResourceMetadataUrl(baseUrl),
-        }));
-        return;
+        const url = getOAuthProtectedResourceMetadataUrl(baseUrl);
+        resourceMetadataUrl = () => url;
     }
-    // No baseUrl: resolve the resource origin per request from forwarded headers
-    // (same precedence the framework uses for view serverUrl). Origin headers are
-    // pathless, so the PRM path stays at root, matching the SDK's static layout.
-    const resolveOrigin = (req) => new URL(resolveServerOrigin((key) => req.get(key)));
-    app.use("/.well-known/oauth-authorization-server", cors(), (_req, res) => void res.json(config.oauthMetadata));
-    app.use("/.well-known/oauth-protected-resource", cors(), (req, res) => {
-        res.json({
-            resource: resolveOrigin(req).href,
-            authorization_servers: [config.oauthMetadata.issuer],
-            scopes_supported: config.scopesSupported,
+    else {
+        // No baseUrl: resolve the resource origin per request from forwarded headers
+        // (same precedence the framework uses for view serverUrl). Origin headers are
+        // pathless, so the PRM path stays at root, matching the SDK's static layout.
+        const resolveOrigin = (getHeader) => new URL(resolveServerOrigin(getHeader));
+        app.use("/.well-known/oauth-authorization-server", cors(), (_req, res) => void res.json(config.oauthMetadata));
+        app.use("/.well-known/oauth-protected-resource", cors(), (req, res) => {
+            res.json({
+                resource: resolveOrigin((key) => req.get(key)).href,
+                authorization_servers: [config.oauthMetadata.issuer],
+                scopes_supported: config.scopesSupported,
+            });
         });
-    });
+        resourceMetadataUrl = (getHeader) => getOAuthProtectedResourceMetadataUrl(resolveOrigin(getHeader));
+    }
     app.use("/mcp", (req, res, next) => bearer({
         verifier,
         requiredScopes: config.requiredScopes,
-        resourceMetadataUrl: getOAuthProtectedResourceMetadataUrl(resolveOrigin(req)),
+        resourceMetadataUrl: resourceMetadataUrl((key) => req.get(key)),
     })(req, res, next));
+    app.use("/mcp", (req, res, next) => {
+        const body = req.body;
+        const calls = Array.isArray(body) ? body : [body];
+        const auth = req.auth;
+        let failure;
+        for (const call of calls) {
+            const tool = call?.params?.name;
+            if (call?.method === "tools/call" && tool && schemesByTool.has(tool)) {
+                failure = evaluateSecuritySchemes(schemesByTool.get(tool), auth);
+                if (failure) {
+                    break;
+                }
+            }
+        }
+        if (!failure) {
+            return next();
+        }
+        const url = resourceMetadataUrl((key) => req.get(key));
+        if (!Array.isArray(body) &&
+            clientPrefersInBandChallenge(req.get("user-agent"))) {
+            res.json({
+                jsonrpc: "2.0",
+                id: body?.id ?? null,
+                result: inBandChallengeResult(failure, url),
+            });
+            return;
+        }
+        res.set("WWW-Authenticate", wwwAuthenticateHeader(failure, url));
+        res.status(httpStatusForFailure(failure)).json({
+            error: failure.error,
+            error_description: failure.description,
+        });
+    });
+    return resourceMetadataUrl;
 }
 //# sourceMappingURL=setup.js.map

package/dist/server/auth/setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/server/auth/setup.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getOAuthProtectedResourceMetadataUrl,\n  mcpAuthMetadataRouter,\n} from \"@modelcontextprotocol/sdk/server/auth/router.js\";\nimport cors from \"cors\";\nimport type { Express, Request } from \"express\";\nimport { optionalBearerAuth, requireBearerAuth } from \"../auth.js\";\nimport { resolveServerOrigin } from \"../requestOrigin.js\";\nimport type { OAuthConfig } from \"./index.js\";\nimport { createJwksVerifier } from \"./verify.js\";\n\n/** Mounts the well-known OAuth metadata and bearer auth on `/mcp`. */\nexport function setupOAuth(app: Express, config: OAuthConfig): void {\n  if (!config.verify?.issuer || !config.verify?.audience) {\n    throw new Error(\"oauth.verify requires both `issuer` and `audience`\");\n  }\n\n  const verifier = createJwksVerifier(config.verify);\n  const bearer =\n    config.enforcement === \"optional\" ? optionalBearerAuth : requireBearerAuth;\n\n  // baseUrl known at boot: bake the resource URLs once, no Host-header trust.\n  if (config.baseUrl !== undefined) {\n    let baseUrl: URL;\n    try {\n      baseUrl = new URL(config.baseUrl);\n    } catch {\n      throw new Error(\n        `oauth.baseUrl must be a valid absolute URL, got: ${JSON.stringify(\n          config.baseUrl,\n        )}`,\n      );\n    }\n    app.use(\n      mcpAuthMetadataRouter({\n        oauthMetadata: config.oauthMetadata,\n        resourceServerUrl: baseUrl,\n        scopesSupported: config.scopesSupported,\n      }),\n    );\n    app.use(\n      \"/mcp\",\n      bearer({\n        verifier,\n        requiredScopes: config.requiredScopes,\n        resourceMetadataUrl: getOAuthProtectedResourceMetadataUrl(baseUrl),\n      }),\n    );\n    return;\n  }\n\n  // No baseUrl: resolve the resource origin per request from forwarded headers\n  // (same precedence the framework uses for view serverUrl). Origin headers are\n  // pathless, so the PRM path stays at root, matching the SDK's static layout.\n  const resolveOrigin = (req: Request) =>\n    new URL(resolveServerOrigin((key) => req.get(key)));\n\n  app.use(\n    \"/.well-known/oauth-authorization-server\",\n    cors(),\n    (_req, res) => void res.json(config.oauthMetadata),\n  );\n  app.use(\"/.well-known/oauth-protected-resource\", cors(), (req, res) => {\n    res.json({\n      resource: resolveOrigin(req).href,\n      authorization_servers: [config.oauthMetadata.issuer],\n      scopes_supported: config.scopesSupported,\n    });\n  });\n  app.use(\"/mcp\", (req, res, next) =>\n    bearer({\n      verifier,\n      requiredScopes: config.requiredScopes,\n      resourceMetadataUrl: getOAuthProtectedResourceMetadataUrl(\n        resolveOrigin(req),\n      ),\n    })(req, res, next),\n  );\n}\n"]}
+{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/server/auth/setup.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BearerAuthMiddlewareOptions } from \"@modelcontextprotocol/sdk/server/auth/middleware/bearerAuth.js\";\nimport {\n  getOAuthProtectedResourceMetadataUrl,\n  mcpAuthMetadataRouter,\n} from \"@modelcontextprotocol/sdk/server/auth/router.js\";\nimport cors from \"cors\";\nimport type { Express, Request, RequestHandler } from \"express\";\nimport type { AuthInfo } from \"../auth.js\";\nimport { optionalBearerAuth, requireBearerAuth } from \"../auth.js\";\nimport { resolveServerOrigin } from \"../requestOrigin.js\";\nimport type { SecurityScheme } from \"../server.js\";\nimport type { OAuthConfig } from \"./index.js\";\nimport {\n  clientPrefersInBandChallenge,\n  evaluateSecuritySchemes,\n  httpStatusForFailure,\n  inBandChallengeResult,\n  type SchemeFailure,\n  securitySchemesAllowAnonymous,\n  wwwAuthenticateHeader,\n} from \"./security-schemes.js\";\nimport { createJwksVerifier } from \"./verify.js\";\n\nexport type ResourceMetadataUrlResolver = (\n  getHeader: (key: string) => string | undefined,\n) => string;\n\n/** Mounts the well-known OAuth metadata and bearer auth on `/mcp`. */\nexport function setupOAuth(\n  app: Express,\n  config: OAuthConfig,\n  schemesByTool: Map<string, SecurityScheme[] | undefined>,\n): ResourceMetadataUrlResolver {\n  if (!config.verify?.issuer) {\n    throw new Error(\"oauth.verify requires an `issuer`\");\n  }\n\n  const acceptsAnonymous = () =>\n    [...schemesByTool.values()].some(securitySchemesAllowAnonymous);\n  const verifier = createJwksVerifier(config.verify);\n  const bearer = (options: BearerAuthMiddlewareOptions): RequestHandler => {\n    const required = requireBearerAuth(options);\n    const optional = optionalBearerAuth(options);\n    return (req, res, next) =>\n      (acceptsAnonymous() ? optional : required)(req, res, next);\n  };\n\n  let resourceMetadataUrl: ResourceMetadataUrlResolver;\n\n  // baseUrl known at boot: bake the resource URLs once, no Host-header trust.\n  if (config.baseUrl !== undefined) {\n    let baseUrl: URL;\n    try {\n      baseUrl = new URL(config.baseUrl);\n    } catch {\n      throw new Error(\n        `oauth.baseUrl must be a valid absolute URL, got: ${JSON.stringify(\n          config.baseUrl,\n        )}`,\n      );\n    }\n    app.use(\n      mcpAuthMetadataRouter({\n        oauthMetadata: config.oauthMetadata,\n        resourceServerUrl: baseUrl,\n        scopesSupported: config.scopesSupported,\n      }),\n    );\n    const url = getOAuthProtectedResourceMetadataUrl(baseUrl);\n    resourceMetadataUrl = () => url;\n  } else {\n    // No baseUrl: resolve the resource origin per request from forwarded headers\n    // (same precedence the framework uses for view serverUrl). Origin headers are\n    // pathless, so the PRM path stays at root, matching the SDK's static layout.\n    const resolveOrigin = (getHeader: (key: string) => string | undefined) =>\n      new URL(resolveServerOrigin(getHeader));\n    app.use(\n      \"/.well-known/oauth-authorization-server\",\n      cors(),\n      (_req, res) => void res.json(config.oauthMetadata),\n    );\n    app.use(\"/.well-known/oauth-protected-resource\", cors(), (req, res) => {\n      res.json({\n        resource: resolveOrigin((key) => req.get(key)).href,\n        authorization_servers: [config.oauthMetadata.issuer],\n        scopes_supported: config.scopesSupported,\n      });\n    });\n    resourceMetadataUrl = (getHeader) =>\n      getOAuthProtectedResourceMetadataUrl(resolveOrigin(getHeader));\n  }\n\n  app.use(\"/mcp\", (req, res, next) =>\n    bearer({\n      verifier,\n      requiredScopes: config.requiredScopes,\n      resourceMetadataUrl: resourceMetadataUrl((key) => req.get(key)),\n    })(req, res, next),\n  );\n\n  app.use(\"/mcp\", (req, res, next) => {\n    type Call = {\n      id?: string | number | null;\n      method?: string;\n      params?: { name?: string };\n    };\n    const body = req.body as Call | Call[] | undefined;\n    const calls = Array.isArray(body) ? body : [body];\n    const auth = (req as Request & { auth?: AuthInfo }).auth;\n    let failure: SchemeFailure | undefined;\n    for (const call of calls) {\n      const tool = call?.params?.name;\n      if (call?.method === \"tools/call\" && tool && schemesByTool.has(tool)) {\n        failure = evaluateSecuritySchemes(schemesByTool.get(tool), auth);\n        if (failure) {\n          break;\n        }\n      }\n    }\n    if (!failure) {\n      return next();\n    }\n    const url = resourceMetadataUrl((key) => req.get(key));\n    if (\n      !Array.isArray(body) &&\n      clientPrefersInBandChallenge(req.get(\"user-agent\"))\n    ) {\n      res.json({\n        jsonrpc: \"2.0\",\n        id: body?.id ?? null,\n        result: inBandChallengeResult(failure, url),\n      });\n      return;\n    }\n    res.set(\"WWW-Authenticate\", wwwAuthenticateHeader(failure, url));\n    res.status(httpStatusForFailure(failure)).json({\n      error: failure.error,\n      error_description: failure.description,\n    });\n  });\n\n  return resourceMetadataUrl;\n}\n"]}

package/dist/server/auth/setup.test.js

@@ -36,10 +36,10 @@ async function startJwks() {
     const port = server.address().port;
     return { privateKey, jwksUri: `http://localhost:${port}/jwks` };
 }
-function signToken(key) {
+function signToken(key, scope = "openid email") {
     return new jose.SignJWT({
         client_id: "client-1",
-        scope: "openid email",
+        scope,
         sub: "user-1",
     })
         .setProtectedHeader({ alg: "RS256", kid: "test-key" })
@@ -48,7 +48,7 @@ function signToken(key) {
         .setExpirationTime("1h")
         .sign(key);
 }
-async function bootServer(jwksUri, { baseUrl = "https://app.example.test", enforcement = "required", } = {}) {
+async function bootServer(jwksUri, { baseUrl = "https://app.example.test" } = {}) {
     const { createApp } = await import("../express.js");
     const server = new McpServer({ name: "auth-test", version: "0.0.0" }, { capabilities: {} }, {
         oauth: {
@@ -62,7 +62,6 @@ async function bootServer(jwksUri, { baseUrl = "https://app.example.test", enfor
             verify: { issuer: ISSUER, audience: AUDIENCE, jwksUri },
             scopesSupported: ["openid", "email"],
             requiredScopes: ["openid"],
-            enforcement,
         },
     }).registerTool({
         name: "whoami",
@@ -128,6 +127,29 @@ describe("baseUrl inferred from headers", () => {
         const body = (await res.json());
         expect(body.resource).toBe("https://infer.example.test/");
     });
+    it("uses the first hop of a forwarded-host chain", async () => {
+        const { jwksUri } = await startJwks();
+        const base = await bootServer(jwksUri, { baseUrl: null });
+        const res = await fetch(`${base}/.well-known/oauth-protected-resource`, {
+            headers: {
+                "x-forwarded-host": "public.example, internal.local",
+                "x-forwarded-proto": "https, http",
+            },
+        });
+        expect(res.status).toBe(200);
+        const body = (await res.json());
+        expect(body.resource).toBe("https://public.example/");
+    });
+    it("ignores the client Origin header, using Host instead", async () => {
+        const { jwksUri } = await startJwks();
+        const base = await bootServer(jwksUri, { baseUrl: null });
+        const res = await fetch(`${base}/.well-known/oauth-protected-resource`, {
+            headers: { origin: "https://chatgpt.com" },
+        });
+        expect(res.status).toBe(200);
+        const body = (await res.json());
+        expect(body.resource).toMatch(/^http:\/\/(localhost|127\.0\.0\.1):/);
+    });
     it("points the 401 WWW-Authenticate at the inferred host", async () => {
         const { jwksUri } = await startJwks();
         const base = await bootServer(jwksUri, { baseUrl: null });
@@ -143,10 +165,122 @@ describe("baseUrl inferred from headers", () => {
         expect(res.headers.get("www-authenticate")).toMatch(/resource_metadata="https:\/\/infer\.example\.test\//);
     });
 });
-describe("enforcement: optional", () => {
-    it("lets an anonymous /mcp request through", async () => {
+async function bootMixedServer(jwksUri) {
+    const { createApp } = await import("../express.js");
+    const server = new McpServer({ name: "mixed-auth-test", version: "0.0.0" }, { capabilities: {} }, {
+        oauth: {
+            baseUrl: "https://app.example.test",
+            oauthMetadata: {
+                issuer: ISSUER,
+                authorization_endpoint: `${ISSUER}/authorize`,
+                token_endpoint: `${ISSUER}/token`,
+                response_types_supported: ["code"],
+            },
+            verify: { issuer: ISSUER, audience: AUDIENCE, jwksUri },
+        },
+    })
+        .registerTool({
+        name: "public-whoami",
+        description: "Public.",
+        inputSchema: {},
+        auth: { allowsAnonymous: true },
+    }, (_args, extra) => ({
+        content: [{ type: "text", text: extra.authInfo?.clientId ?? "anon" }],
+    }))
+        .registerTool({
+        name: "private-whoami",
+        description: "Private.",
+        inputSchema: {},
+        auth: {},
+    }, (_args, extra) => ({
+        content: [{ type: "text", text: extra.authInfo?.clientId ?? "anon" }],
+    }));
+    server.registerTool("legacy-whoami", {
+        description: "Registered via the legacy string overload.",
+        inputSchema: {},
+    }, (_args, extra) => ({
+        content: [{ type: "text", text: extra.authInfo?.clientId ?? "anon" }],
+    }));
+    const httpServer = http.createServer();
+    await createApp({ mcpServer: server, httpServer });
+    const listening = http.createServer(server.express);
+    await new Promise((resolve) => listening.listen(0, resolve));
+    appServer = listening;
+    const port = listening.address().port;
+    return `http://localhost:${port}`;
+}
+describe("mixed-auth door", () => {
+    it("lets an anonymous caller initialize and run a noauth tool", async () => {
         const { jwksUri } = await startJwks();
-        const base = await bootServer(jwksUri, { enforcement: "optional" });
+        const base = await bootMixedServer(jwksUri);
+        const client = new Client({ name: "test-client", version: "0.0.0" });
+        await client.connect(new StreamableHTTPClientTransport(new URL(`${base}/mcp`)));
+        const result = (await client.callTool({
+            name: "public-whoami",
+            arguments: {},
+        }));
+        expect(result.content[0]?.text).toBe("anon");
+        await client.close();
+    });
+    it("exposes securitySchemes at the top level of tools/list (not only _meta)", async () => {
+        const { jwksUri } = await startJwks();
+        const base = await bootMixedServer(jwksUri);
+        const headers = {
+            "Content-Type": "application/json",
+            Accept: "application/json, text/event-stream",
+        };
+        await fetch(`${base}/mcp`, {
+            method: "POST",
+            headers,
+            body: JSON.stringify({
+                jsonrpc: "2.0",
+                id: 1,
+                method: "initialize",
+                params: {
+                    protocolVersion: "2025-06-18",
+                    capabilities: {},
+                    clientInfo: { name: "c", version: "0" },
+                },
+            }),
+        });
+        const res = await fetch(`${base}/mcp`, {
+            method: "POST",
+            headers,
+            body: JSON.stringify({ jsonrpc: "2.0", id: 2, method: "tools/list" }),
+        });
+        const text = await res.text();
+        const json = JSON.parse((text.match(/\{[\s\S]*\}/) ?? ["{}"])[0]);
+        const whoami = json.result.tools.find((t) => t.name === "private-whoami");
+        expect(whoami?.securitySchemes).toEqual([{ type: "oauth2" }]);
+    });
+    it("denies a protected tool inside an anonymous JSON-RPC batch", async () => {
+        const { jwksUri } = await startJwks();
+        const base = await bootMixedServer(jwksUri);
+        const res = await fetch(`${base}/mcp`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                Accept: "application/json, text/event-stream",
+            },
+            body: JSON.stringify([
+                {
+                    jsonrpc: "2.0",
+                    id: 1,
+                    method: "tools/call",
+                    params: { name: "private-whoami", arguments: {} },
+                },
+            ]),
+        });
+        expect(res.status).toBe(401);
+        const wwwAuthenticate = res.headers.get("www-authenticate") ?? "";
+        expect(wwwAuthenticate).toMatch(/^Bearer /);
+        expect(wwwAuthenticate).toContain("resource_metadata=");
+        const text = await res.text();
+        expect(text).not.toContain("client-1");
+    });
+    it("gates a tool registered via the legacy string overload (secure default)", async () => {
+        const { jwksUri } = await startJwks();
+        const base = await bootMixedServer(jwksUri);
         const res = await fetch(`${base}/mcp`, {
             method: "POST",
             headers: {
@@ -155,16 +289,169 @@ describe("enforcement: optional", () => {
             },
             body: JSON.stringify({
                 jsonrpc: "2.0",
-                method: "initialize",
                 id: 1,
-                params: {
-                    protocolVersion: "2025-06-18",
-                    capabilities: {},
-                    clientInfo: { name: "anon", version: "0.0.0" },
-                },
+                method: "tools/call",
+                params: { name: "legacy-whoami", arguments: {} },
+            }),
+        });
+        expect(res.status).toBe(401);
+    });
+    it("returns 401 + WWW-Authenticate for a protected tool while anonymous", async () => {
+        const { jwksUri } = await startJwks();
+        const base = await bootMixedServer(jwksUri);
+        const res = await fetch(`${base}/mcp`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                Accept: "application/json, text/event-stream",
+            },
+            body: JSON.stringify({
+                jsonrpc: "2.0",
+                id: 1,
+                method: "tools/call",
+                params: { name: "private-whoami", arguments: {} },
+            }),
+        });
+        expect(res.status).toBe(401);
+        expect(res.headers.get("www-authenticate")).toMatch(/error="invalid_token"/);
+        expect(res.headers.get("www-authenticate")).toMatch(/resource_metadata=/);
+    });
+    it("returns an in-band mcp/www_authenticate array to ChatGPT (not a transport 401)", async () => {
+        const { jwksUri } = await startJwks();
+        const base = await bootMixedServer(jwksUri);
+        const res = await fetch(`${base}/mcp`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                Accept: "application/json, text/event-stream",
+                "User-Agent": "openai-mcp/1.0",
+            },
+            body: JSON.stringify({
+                jsonrpc: "2.0",
+                id: 7,
+                method: "tools/call",
+                params: { name: "private-whoami", arguments: {} },
             }),
         });
         expect(res.status).toBe(200);
+        expect(res.headers.get("www-authenticate")).toBeNull();
+        const body = (await res.json());
+        expect(body.id).toBe(7);
+        expect(body.result.isError).toBe(true);
+        const challenge = body.result._meta["mcp/www_authenticate"];
+        expect(Array.isArray(challenge)).toBe(true);
+        expect(challenge[0]).toMatch(/error="invalid_token"/);
+        expect(challenge[0]).toMatch(/resource_metadata=/);
+    });
+    it("fails closed on a ChatGPT batch (transport 401, no in-band challenge)", async () => {
+        const { jwksUri } = await startJwks();
+        const base = await bootMixedServer(jwksUri);
+        const res = await fetch(`${base}/mcp`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                Accept: "application/json, text/event-stream",
+                "User-Agent": "openai-mcp/1.0",
+            },
+            body: JSON.stringify([
+                {
+                    jsonrpc: "2.0",
+                    id: 1,
+                    method: "tools/call",
+                    params: { name: "private-whoami", arguments: {} },
+                },
+            ]),
+        });
+        expect(res.status).toBe(401);
+        expect(res.headers.get("www-authenticate")).toMatch(/^Bearer /);
+        const text = await res.text();
+        expect(text).not.toContain("client-1");
+    });
+});
+async function bootScopedServer(jwksUri) {
+    const { createApp } = await import("../express.js");
+    const server = new McpServer({ name: "scoped-auth-test", version: "0.0.0" }, { capabilities: {} }, {
+        oauth: {
+            baseUrl: "https://app.example.test",
+            oauthMetadata: {
+                issuer: ISSUER,
+                authorization_endpoint: `${ISSUER}/authorize`,
+                token_endpoint: `${ISSUER}/token`,
+                response_types_supported: ["code"],
+            },
+            verify: { issuer: ISSUER, audience: AUDIENCE, jwksUri },
+        },
+    }).registerTool({
+        name: "checkout",
+        description: "Needs the checkout scope.",
+        inputSchema: {},
+        auth: { scopes: ["checkout"] },
+    }, () => ({ content: [{ type: "text", text: "ok" }] }));
+    const httpServer = http.createServer();
+    await createApp({ mcpServer: server, httpServer });
+    const listening = http.createServer(server.express);
+    await new Promise((resolve) => listening.listen(0, resolve));
+    appServer = listening;
+    const port = listening.address().port;
+    return `http://localhost:${port}`;
+}
+describe("per-tool scope enforcement in fully-authenticated mode", () => {
+    it("returns 403 for a valid token missing the tool's scope", async () => {
+        const { privateKey, jwksUri } = await startJwks();
+        const base = await bootScopedServer(jwksUri);
+        const token = await signToken(privateKey, "openid");
+        const res = await fetch(`${base}/mcp`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                Accept: "application/json, text/event-stream",
+                Authorization: `Bearer ${token}`,
+            },
+            body: JSON.stringify({
+                jsonrpc: "2.0",
+                id: 1,
+                method: "tools/call",
+                params: { name: "checkout", arguments: {} },
+            }),
+        });
+        expect(res.status).toBe(403);
+        const header = res.headers.get("www-authenticate");
+        expect(header).toMatch(/error="insufficient_scope"/);
+        expect(header).toMatch(/scope="checkout"/);
+    });
+    it("allows a token carrying the tool's scope", async () => {
+        const { privateKey, jwksUri } = await startJwks();
+        const base = await bootScopedServer(jwksUri);
+        const token = await signToken(privateKey, "openid checkout");
+        const client = new Client({ name: "test-client", version: "0.0.0" });
+        await client.connect(new StreamableHTTPClientTransport(new URL(`${base}/mcp`), {
+            requestInit: { headers: { Authorization: `Bearer ${token}` } },
+        }));
+        const result = (await client.callTool({
+            name: "checkout",
+            arguments: {},
+        }));
+        expect(result.content[0]?.text).toBe("ok");
+        await client.close();
+    });
+});
+describe("auth shorthand validation", () => {
+    it("throws when `auth` requires sign-in but no oauth provider is configured", () => {
+        expect(() => new McpServer({ name: "t", version: "0" }).registerTool({ name: "x", inputSchema: {}, auth: {} }, () => ({ content: [{ type: "text", text: "" }] }))).toThrow(/no `oauth` provider/);
+    });
+    it("throws when `auth` sets scopes but no oauth provider is configured", () => {
+        expect(() => new McpServer({ name: "t", version: "0" }).registerTool({ name: "x", inputSchema: {}, auth: { scopes: ["checkout"] } }, () => ({ content: [{ type: "text", text: "" }] }))).toThrow(/no `oauth` provider/);
+    });
+    it("allows `auth: { allowsAnonymous: true }` without an oauth provider", () => {
+        expect(() => new McpServer({ name: "t", version: "0" }).registerTool({ name: "x", inputSchema: {}, auth: { allowsAnonymous: true } }, () => ({ content: [{ type: "text", text: "" }] }))).not.toThrow();
+    });
+    it("prefers `securitySchemes` over `auth` when both are set (untyped path)", () => {
+        expect(() => new McpServer({ name: "t", version: "0" }).registerTool({
+            name: "x",
+            inputSchema: {},
+            auth: {},
+            securitySchemes: [{ type: "oauth2" }],
+        }, () => ({ content: [{ type: "text", text: "" }] }))).not.toThrow();
     });
 });
 describe("oauth config validation", () => {