Skip to content

feat(mcp): mount SDK auth router on Express #1142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kunickiaj merged 1 commit into from
May 24, 2026
Merged

feat(mcp): mount SDK auth router on Express #1142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 58 additions & 11 deletions packages/mcp-server/src/http.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,12 @@ describe("MCP HTTP transport", () => {
issuer: "https://codemem.example.test/",
registration_endpoint: "https://codemem.example.test/register",
code_challenge_methods_supported: ["S256"],
token_endpoint_auth_methods_supported: ["none"],
token_endpoint_auth_methods_supported: ["client_secret_post", "none"],
});
expect(protectedResourceMetadata.status).toBe(200);
expect(await protectedResourceMetadata.json()).toEqual({
expect(await protectedResourceMetadata.json()).toMatchObject({
resource: "https://codemem.example.test/mcp",
authorization_servers: ["https://codemem.example.test/"],
bearer_methods_supported: ["header"],
resource_name: "codemem MCP",
});
});
Expand Down Expand Up @@ -264,6 +263,23 @@ describe("MCP HTTP transport", () => {
expect(token.status).toBe(403);
});

it("rejects public OAuth requests with non-public Host headers", async () => {
const server = await startCodememMcpHttpServer({
dbPath: tempDbPath(),
port: 0,
publicUrl: "https://codemem.example.test/mcp",
});
servers.push(server);

const response = await postWithHost(server.url.replace("/mcp", "/register"), "evil.test");
const trailingSlash = await postWithHost(server.url.replace("/mcp", "/register/"), "evil.test");
const mcpTrailingSlash = await postWithHost(`${server.url}/`, "evil.test");

expect(response.statusCode).toBe(403);
expect(trailingSlash.statusCode).toBe(403);
expect(mcpTrailingSlash.statusCode).toBe(403);
});

it("rejects unsupported OAuth redirect URIs", async () => {
const server = await startCodememMcpHttpServer({ dbPath: tempDbPath(), port: 0 });
servers.push(server);
Expand All @@ -279,10 +295,12 @@ describe("MCP HTTP transport", () => {
});

it("fails closed at authorize when OIDC is not configured", async () => {
const { emit, events } = captureAuditEmitter();
const server = await startCodememMcpHttpServer({
dbPath: tempDbPath(),
port: 0,
publicUrl: "https://codemem.example.test/mcp",
auditEmitter: emit,
});
servers.push(server);
const baseUrl = server.url.replace("/mcp", "");
Expand All @@ -304,10 +322,17 @@ describe("MCP HTTP transport", () => {
authorizeUrl.searchParams.set("code_challenge", pkceS256("d".repeat(43)));
authorizeUrl.searchParams.set("state", "state-123");

const authorize = await fetch(authorizeUrl);
const authorize = await fetch(authorizeUrl, { redirect: "manual" });

expect(authorize.status).toBe(400);
expect(await authorize.json()).toMatchObject({ error: "temporarily_unavailable" });
expect(authorize.status).toBe(302);
expect(authorize.headers.get("location")).toContain("error=temporarily_unavailable");
expect(events).toContainEqual(
expect.objectContaining({
kind: "authorize",
outcome: "denied",
reason: "temporarily_unavailable",
}),
);
});

it("requires valid bearer tokens for public MCP requests", async () => {
Expand Down Expand Up @@ -390,10 +415,14 @@ describe("MCP HTTP transport", () => {
}),
});
expect(register.status).toBe(201);
await fetch(`${baseUrl}/oauth/revoke`, {
const registeredForRevocation = await register.json();
await fetch(`${baseUrl}/revoke`, {
method: "POST",
headers: { "content-type": "application/x-www-form-urlencoded" },
body: new URLSearchParams({ token: "ignored-since-unknown" }),
body: new URLSearchParams({
client_id: registeredForRevocation.client_id,
token: "ignored-since-unknown",
}),
});
const missingBearer = await fetch(server.url, {
method: "POST",
Expand Down Expand Up @@ -429,17 +458,29 @@ describe("MCP HTTP transport", () => {

it("rejects expired and revoked bearer tokens", async () => {
const tokenStore = createInMemoryOAuthAccessTokenStore();
const clientId = "client-revoked";
const revocable = tokenStore.issueToken(clientId);
const expired = tokenStore.issueToken("client-expired", Date.now() - 60 * 60 * 1000 - 1);
const revocable = tokenStore.issueToken("client-revoked");
if (!expired || !revocable) throw new Error("expected access tokens");
const { emit, events } = captureAuditEmitter();
const server = await startCodememMcpHttpServer({
dbPath: tempDbPath(),
port: 0,
publicUrl: "https://codemem.example.test/mcp",
oauthAccessTokenStore: tokenStore,
auditEmitter: emit,
});
servers.push(server);
const baseUrl = server.url.replace("/mcp", "");
const registration = await fetch(`${baseUrl}/register`, {
method: "POST",
headers: { "content-type": "application/json" },
body: JSON.stringify({
redirect_uris: ["https://claude.ai/api/mcp/auth_callback"],
token_endpoint_auth_method: "none",
}),
});
const client = await registration.json();

const expiredResponse = await fetch(server.url, {
method: "POST",
Expand All @@ -450,10 +491,10 @@ describe("MCP HTTP transport", () => {
},
body: initializeBody(1),
});
const revoke = await fetch(`${baseUrl}/oauth/revoke`, {
const revoke = await fetch(`${baseUrl}/revoke`, {
method: "POST",
headers: { "content-type": "application/x-www-form-urlencoded" },
body: new URLSearchParams({ token: revocable.token }),
body: new URLSearchParams({ client_id: client.client_id, token: revocable.token }),
});
const revokedResponse = await fetch(server.url, {
method: "POST",
Expand All @@ -469,6 +510,12 @@ describe("MCP HTTP transport", () => {
expect(revoke.status).toBe(200);
expect(await revoke.json()).toEqual({});
expect(revokedResponse.status).toBe(401);
expect(events).toContainEqual(
expect.objectContaining({ kind: "bearer", outcome: "denied", reason: "expired_token" }),
);
expect(events).toContainEqual(
expect.objectContaining({ kind: "bearer", outcome: "denied", reason: "revoked_token" }),
);
});

it("handles repeated MCP initialize requests over POST", async () => {
Expand Down
Loading