skybridge 0.0.0-dev.c481a1e → 0.0.0-dev.c4eb970

package/dist/server/auth/security-schemes.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"security-schemes.test.js","sourceRoot":"","sources":["../../../src/server/auth/security-schemes.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { describe, expect, it } from \"vitest\";\nimport type { AuthInfo } from \"../auth.js\";\nimport type { SecurityScheme } from \"../server.js\";\nimport {\n  authToSecuritySchemes,\n  clientPrefersInBandChallenge,\n  evaluateSecuritySchemes,\n  securitySchemesAllowAnonymous,\n  wwwAuthenticateHeader,\n} from \"./security-schemes.js\";\n\ndescribe(\"clientPrefersInBandChallenge\", () => {\n  it(\"detects ChatGPT / OpenAI user agents\", () => {\n    expect(clientPrefersInBandChallenge(\"openai-mcp/1.0\")).toBe(true);\n    expect(clientPrefersInBandChallenge(\"ChatGPT\")).toBe(true);\n    expect(clientPrefersInBandChallenge(\"Claude-User/1.0\")).toBe(false);\n    expect(clientPrefersInBandChallenge(undefined)).toBe(false);\n  });\n});\n\ndescribe(\"authToSecuritySchemes\", () => {\n  it(\"maps the auth shorthand\", () => {\n    expect(authToSecuritySchemes({ allowsAnonymous: true })).toEqual([\n      { type: \"noauth\" },\n      { type: \"oauth2\" },\n    ]);\n    expect(authToSecuritySchemes({})).toEqual([{ type: \"oauth2\" }]);\n    expect(authToSecuritySchemes({ scopes: [\"checkout\"] })).toEqual([\n      { type: \"oauth2\", scopes: [\"checkout\"] },\n    ]);\n    expect(\n      authToSecuritySchemes({ allowsAnonymous: true, scopes: [\"checkout\"] }),\n    ).toEqual([{ type: \"noauth\" }, { type: \"oauth2\", scopes: [\"checkout\"] }]);\n  });\n});\n\nconst authInfo = (scopes: string[]): AuthInfo => ({\n  token: \"t\",\n  clientId: \"c\",\n  scopes,\n});\n\ndescribe(\"securitySchemesAllowAnonymous\", () => {\n  it(\"is true only when a noauth scheme is present\", () => {\n    expect(securitySchemesAllowAnonymous([{ type: \"noauth\" }])).toBe(true);\n    expect(\n      securitySchemesAllowAnonymous([{ type: \"noauth\" }, { type: \"oauth2\" }]),\n    ).toBe(true);\n    expect(securitySchemesAllowAnonymous([{ type: \"oauth2\" }])).toBe(false);\n    expect(securitySchemesAllowAnonymous(undefined)).toBe(false);\n  });\n});\n\ndescribe(\"evaluateSecuritySchemes\", () => {\n  it(\"lets anonymous callers through a noauth tool\", () => {\n    const schemes: SecurityScheme[] = [{ type: \"noauth\" }, { type: \"oauth2\" }];\n    expect(evaluateSecuritySchemes(schemes, undefined)).toBeUndefined();\n  });\n\n  it(\"enforces oauth2 scopes on a public tool once a token is present\", () => {\n    const schemes: SecurityScheme[] = [\n      { type: \"noauth\" },\n      { type: \"oauth2\", scopes: [\"checkout\"] },\n    ];\n    expect(evaluateSecuritySchemes(schemes, undefined)).toBeUndefined();\n    expect(evaluateSecuritySchemes(schemes, authInfo([\"openid\"]))?.error).toBe(\n      \"insufficient_scope\",\n    );\n    expect(\n      evaluateSecuritySchemes(schemes, authInfo([\"checkout\"])),\n    ).toBeUndefined();\n  });\n\n  it(\"fails an oauth2-only tool with no token (invalid_token / 401)\", () => {\n    expect(\n      evaluateSecuritySchemes([{ type: \"oauth2\" }], undefined)?.error,\n    ).toBe(\"invalid_token\");\n  });\n\n  it(\"fails when the token is missing a required scope (insufficient_scope / 403)\", () => {\n    const schemes: SecurityScheme[] = [\n      { type: \"oauth2\", scopes: [\"checkout\"] },\n    ];\n    expect(evaluateSecuritySchemes(schemes, authInfo([\"openid\"]))?.error).toBe(\n      \"insufficient_scope\",\n    );\n  });\n\n  it(\"passes when the token carries every required scope\", () => {\n    const schemes: SecurityScheme[] = [\n      { type: \"oauth2\", scopes: [\"checkout\"] },\n    ];\n    expect(\n      evaluateSecuritySchemes(schemes, authInfo([\"openid\", \"checkout\"])),\n    ).toBeUndefined();\n  });\n\n  it(\"treats an undeclared tool as auth-required, satisfied by any valid token\", () => {\n    expect(evaluateSecuritySchemes(undefined, undefined)?.error).toBe(\n      \"invalid_token\",\n    );\n    expect(evaluateSecuritySchemes(undefined, authInfo([]))).toBeUndefined();\n  });\n\n  it(\"carries the tool's required scopes on the failure\", () => {\n    const schemes: SecurityScheme[] = [\n      { type: \"oauth2\", scopes: [\"checkout\"] },\n    ];\n    expect(evaluateSecuritySchemes(schemes, undefined)?.scopes).toEqual([\n      \"checkout\",\n    ]);\n    expect(\n      evaluateSecuritySchemes(schemes, authInfo([\"openid\"]))?.scopes,\n    ).toEqual([\"checkout\"]);\n  });\n});\n\ndescribe(\"wwwAuthenticateHeader\", () => {\n  it(\"names the required scopes so the client can step up\", () => {\n    const header = wwwAuthenticateHeader({\n      error: \"insufficient_scope\",\n      description: \"Missing required scope for this tool.\",\n      scopes: [\"checkout\"],\n    });\n    expect(header).toContain('error=\"insufficient_scope\"');\n    expect(header).toContain('scope=\"checkout\"');\n  });\n\n  it(\"omits the scope parameter when there are none\", () => {\n    const header = wwwAuthenticateHeader({\n      error: \"invalid_token\",\n      description: \"Sign in to use this tool.\",\n      scopes: [],\n    });\n    expect(header).not.toContain(\"scope=\");\n  });\n});\n"]}

package/dist/server/auth/setup.d.ts

@@ -0,0 +1,6 @@
+import type { Express } from "express";
+import type { SecurityScheme } from "../server.js";
+import type { OAuthConfig } from "./index.js";
+export type ResourceMetadataUrlResolver = (getHeader: (key: string) => string | undefined) => string;
+/** Mounts the well-known OAuth metadata and bearer auth on `/mcp`. */
+export declare function setupOAuth(app: Express, config: OAuthConfig<Record<string, unknown>>, schemesByTool: Map<string, SecurityScheme[] | undefined>): ResourceMetadataUrlResolver;

package/dist/server/auth/setup.js

@@ -0,0 +1,91 @@
+import { getOAuthProtectedResourceMetadataUrl, mcpAuthMetadataRouter, } from "@modelcontextprotocol/express";
+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";
+/** Mounts the well-known OAuth metadata and bearer auth on `/mcp`. */
+export function setupOAuth(app, config, schemesByTool) {
+    if (!config.verifier) {
+        throw new Error("oauth requires a `verifier`");
+    }
+    const acceptsAnonymous = () => [...schemesByTool.values()].some(securitySchemesAllowAnonymous);
+    const verifier = config.verifier;
+    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;
+        try {
+            baseUrl = new URL(config.baseUrl);
+        }
+        catch {
+            throw new Error(`oauth.baseUrl must be a valid absolute URL, got: ${JSON.stringify(config.baseUrl)}`);
+        }
+        app.use(mcpAuthMetadataRouter({
+            oauthMetadata: config.oauthMetadata,
+            resourceServerUrl: baseUrl,
+            scopesSupported: config.scopesSupported,
+        }));
+        const url = getOAuthProtectedResourceMetadataUrl(baseUrl);
+        resourceMetadataUrl = () => url;
+    }
+    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: 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

@@ -0,0 +1 @@
+{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/server/auth/setup.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type BearerAuthMiddlewareOptions,\n  getOAuthProtectedResourceMetadataUrl,\n  mcpAuthMetadataRouter,\n} from \"@modelcontextprotocol/express\";\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\";\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<Record<string, unknown>>,\n  schemesByTool: Map<string, SecurityScheme[] | undefined>,\n): ResourceMetadataUrlResolver {\n  if (!config.verifier) {\n    throw new Error(\"oauth requires a `verifier`\");\n  }\n\n  const acceptsAnonymous = () =>\n    [...schemesByTool.values()].some(securitySchemesAllowAnonymous);\n  const verifier = config.verifier;\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

@@ -0,0 +1,498 @@
+// @vitest-environment node
+import http from "node:http";
+import { Client, StreamableHTTPClientTransport, } from "@modelcontextprotocol/client";
+import * as jose from "jose";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { McpServer } from "../server.js";
+import { createJwksVerifier } from "./verify.js";
+vi.mock("@skybridge/devtools", () => ({
+    devtoolsStaticServer: () => ((_req, _res, next) => next()),
+}));
+vi.mock("../viewsDevServer.js", () => ({
+    viewsDevServer: (_httpServer) => ((_req, _res, next) => next()),
+}));
+const ISSUER = "https://issuer.test";
+const AUDIENCE = "api://default";
+let jwksServer;
+let appServer;
+afterEach(() => {
+    jwksServer?.close();
+    appServer?.close();
+});
+async function startJwks() {
+    const { publicKey, privateKey } = await jose.generateKeyPair("RS256");
+    const jwk = {
+        ...(await jose.exportJWK(publicKey)),
+        kid: "test-key",
+        alg: "RS256",
+        use: "sig",
+    };
+    const server = http.createServer((_req, res) => {
+        res.setHeader("content-type", "application/json");
+        res.end(JSON.stringify({ keys: [jwk] }));
+    });
+    await new Promise((resolve) => server.listen(0, resolve));
+    jwksServer = server;
+    const port = server.address().port;
+    return { privateKey, jwksUri: `http://localhost:${port}/jwks` };
+}
+function signToken(key, scope = "openid email") {
+    return new jose.SignJWT({
+        client_id: "client-1",
+        scope,
+        sub: "user-1",
+    })
+        .setProtectedHeader({ alg: "RS256", kid: "test-key" })
+        .setIssuer(ISSUER)
+        .setAudience(AUDIENCE)
+        .setExpirationTime("1h")
+        .sign(key);
+}
+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: {
+            ...(baseUrl === null ? {} : { baseUrl }),
+            oauthMetadata: {
+                issuer: ISSUER,
+                authorization_endpoint: `${ISSUER}/authorize`,
+                token_endpoint: `${ISSUER}/token`,
+                response_types_supported: ["code"],
+            },
+            verifier: createJwksVerifier({
+                issuer: ISSUER,
+                audience: AUDIENCE,
+                jwksUri,
+            }),
+            scopesSupported: ["openid", "email"],
+            requiredScopes: ["openid"],
+        },
+    }).registerTool({
+        name: "whoami",
+        description: "Returns the caller identity.",
+        inputSchema: {},
+    }, (_args, extra) => ({
+        structuredContent: { clientId: extra.http?.authInfo?.clientId ?? null },
+        content: [
+            { type: "text", text: extra.http?.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("setupOAuth wiring", () => {
+    it("serves protected-resource metadata", async () => {
+        const { jwksUri } = await startJwks();
+        const base = await bootServer(jwksUri);
+        const res = await fetch(`${base}/.well-known/oauth-protected-resource`);
+        expect(res.status).toBe(200);
+        const body = (await res.json());
+        expect(body.resource).toBe("https://app.example.test/");
+        expect(body.authorization_servers).toContain(ISSUER);
+        expect(body.scopes_supported).toEqual(["openid", "email"]);
+    });
+    it("rejects /mcp without a token (401 + WWW-Authenticate)", async () => {
+        const { jwksUri } = await startJwks();
+        const base = await bootServer(jwksUri);
+        const res = await fetch(`${base}/mcp`, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ jsonrpc: "2.0", method: "initialize", id: 1 }),
+        });
+        expect(res.status).toBe(401);
+        expect(res.headers.get("www-authenticate")).toMatch(/resource_metadata=/);
+    });
+    it("threads authInfo into the tool handler for a valid token", async () => {
+        const { privateKey, jwksUri } = await startJwks();
+        const base = await bootServer(jwksUri);
+        const token = await signToken(privateKey);
+        const client = new Client({ name: "test-client", version: "0.0.0" });
+        const transport = new StreamableHTTPClientTransport(new URL(`${base}/mcp`), { requestInit: { headers: { Authorization: `Bearer ${token}` } } });
+        await client.connect(transport);
+        const result = (await client.callTool({
+            name: "whoami",
+            arguments: {},
+        }));
+        expect(result.content[0]?.text).toBe("client-1");
+        await client.close();
+    });
+});
+describe("baseUrl inferred from headers", () => {
+    it("derives the resource origin from x-forwarded-host", 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": "infer.example.test" },
+        });
+        expect(res.status).toBe(200);
+        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 });
+        const res = await fetch(`${base}/mcp`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                "x-forwarded-host": "infer.example.test",
+            },
+            body: JSON.stringify({ jsonrpc: "2.0", method: "initialize", id: 1 }),
+        });
+        expect(res.status).toBe(401);
+        expect(res.headers.get("www-authenticate")).toMatch(/resource_metadata="https:\/\/infer\.example\.test\//);
+    });
+});
+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"],
+            },
+            verifier: createJwksVerifier({
+                issuer: ISSUER,
+                audience: AUDIENCE,
+                jwksUri,
+            }),
+        },
+    })
+        .registerTool({
+        name: "public-whoami",
+        description: "Public.",
+        inputSchema: {},
+        auth: { allowsAnonymous: true },
+    }, (_args, extra) => ({
+        content: [
+            { type: "text", text: extra.http?.authInfo?.clientId ?? "anon" },
+        ],
+    }))
+        .registerTool({
+        name: "private-whoami",
+        description: "Private.",
+        inputSchema: {},
+        auth: {},
+    }, (_args, extra) => ({
+        content: [
+            { type: "text", text: extra.http?.authInfo?.clientId ?? "anon" },
+        ],
+    }));
+    server.registerTool({
+        name: "undeclared-whoami",
+        description: "Registered without auth or securitySchemes.",
+        inputSchema: {},
+    }, (_args, extra) => ({
+        content: [
+            { type: "text", text: extra.http?.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 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 with no declared schemes (secure default)", 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: "undeclared-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"],
+            },
+            verifier: createJwksVerifier({
+                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", () => {
+    const validMetadata = {
+        issuer: ISSUER,
+        authorization_endpoint: `${ISSUER}/authorize`,
+        token_endpoint: `${ISSUER}/token`,
+        response_types_supported: ["code"],
+    };
+    it("throws on a non-absolute baseUrl", () => {
+        expect(() => new McpServer({ name: "t", version: "0" }, undefined, {
+            oauth: {
+                baseUrl: "not-a-url",
+                oauthMetadata: validMetadata,
+                verifier: createJwksVerifier({
+                    issuer: ISSUER,
+                    audience: AUDIENCE,
+                }),
+            },
+        })).toThrow(/baseUrl must be a valid absolute URL/);
+    });
+});
+//# sourceMappingURL=setup.test.js.map