Closes the two code-side gaps found while auditing the Claude Connectors Directory submission checklist after #682/#683: 1. Origin-header validation on the /mcp endpoint (POST/GET/DELETE) — an explicit directory submission requirement and an MCP spec MUST for the Streamable HTTP transport (DNS-rebinding defense). Requests without an Origin header (claude.ai backend, Claude Desktop, npx gnubok-mcp, Claude Code, MCP Inspector's proxy — every known client) pass through unchanged. A present Origin is allowed only when its host matches the request Host (covers Vercel previews + self-hosted without hardcoding) or NEXT_PUBLIC_APP_URL (proxy-rewritten Host); anything else is 403 with a JSON-RPC error envelope. The endpoint sets no CORS headers, so no currently-working browser flow is affected. 2. serverInfo.title: 'Accounted' (MCP 2025-06-18 display name). name stays 'gnubok' — stable identifier clients may key state on. 3. export-docs-to-website.mts now also exports CONNECT_CLAUDE_MD to the gnubok-website repo, so docs.gnubok.se/connect-claude (the target of the canonical /docs/api redirect) stays in sync. Companion website PR: jakobwennberg/gnubok-website#1. Tests: new origin-guard.test.ts (10 tests — no-Origin pass-through, same-origin, preview host, proxy host via env, foreign/port-mismatch/ null/malformed rejection, 403 envelope, and per-method enforcement on the registered apiRoutes). Full MCP suite 295/295 green. Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
119 lines
3.8 KiB
TypeScript
119 lines
3.8 KiB
TypeScript
import { describe, it, expect, beforeEach, afterEach } from 'vitest'
|
|
import { isForbiddenOrigin, forbiddenOriginResponse } from '../origin-guard'
|
|
|
|
const ENDPOINT = 'https://app.gnubok.se/api/extensions/ext/mcp-server/mcp'
|
|
|
|
function makeRequest(headers: Record<string, string> = {}, url = ENDPOINT): Request {
|
|
return new Request(url, { method: 'POST', headers })
|
|
}
|
|
|
|
describe('isForbiddenOrigin', () => {
|
|
const originalAppUrl = process.env.NEXT_PUBLIC_APP_URL
|
|
|
|
beforeEach(() => {
|
|
delete process.env.NEXT_PUBLIC_APP_URL
|
|
})
|
|
|
|
afterEach(() => {
|
|
if (originalAppUrl === undefined) {
|
|
delete process.env.NEXT_PUBLIC_APP_URL
|
|
} else {
|
|
process.env.NEXT_PUBLIC_APP_URL = originalAppUrl
|
|
}
|
|
})
|
|
|
|
it('allows requests without an Origin header (server-to-server clients)', () => {
|
|
// claude.ai backend, Claude Desktop, npx gnubok-mcp, Claude Code — none
|
|
// send Origin. This is the path every known MCP client takes.
|
|
expect(isForbiddenOrigin(makeRequest())).toBe(false)
|
|
})
|
|
|
|
it('allows a same-origin browser request (Origin host matches Host header)', () => {
|
|
expect(
|
|
isForbiddenOrigin(
|
|
makeRequest({ origin: 'https://app.gnubok.se', host: 'app.gnubok.se' }),
|
|
),
|
|
).toBe(false)
|
|
})
|
|
|
|
it('allows same-origin on a Vercel preview host', () => {
|
|
expect(
|
|
isForbiddenOrigin(
|
|
makeRequest(
|
|
{ origin: 'https://erp-base-abc123.vercel.app', host: 'erp-base-abc123.vercel.app' },
|
|
'https://erp-base-abc123.vercel.app/api/extensions/ext/mcp-server/mcp',
|
|
),
|
|
),
|
|
).toBe(false)
|
|
})
|
|
|
|
it('allows an Origin matching NEXT_PUBLIC_APP_URL even when Host was rewritten by a proxy', () => {
|
|
process.env.NEXT_PUBLIC_APP_URL = 'https://app.gnubok.se'
|
|
expect(
|
|
isForbiddenOrigin(
|
|
makeRequest(
|
|
{ origin: 'https://app.gnubok.se', host: 'internal-proxy.local' },
|
|
'https://internal-proxy.local/api/extensions/ext/mcp-server/mcp',
|
|
),
|
|
),
|
|
).toBe(false)
|
|
})
|
|
|
|
it('rejects a foreign Origin (DNS-rebinding / cross-site browser request)', () => {
|
|
expect(
|
|
isForbiddenOrigin(
|
|
makeRequest({ origin: 'https://evil.example.com', host: 'app.gnubok.se' }),
|
|
),
|
|
).toBe(true)
|
|
})
|
|
|
|
it('rejects a foreign Origin that only differs by port', () => {
|
|
expect(
|
|
isForbiddenOrigin(
|
|
makeRequest({ origin: 'https://app.gnubok.se:8443', host: 'app.gnubok.se' }),
|
|
),
|
|
).toBe(true)
|
|
})
|
|
|
|
it('rejects an opaque "null" Origin', () => {
|
|
expect(isForbiddenOrigin(makeRequest({ origin: 'null', host: 'app.gnubok.se' }))).toBe(true)
|
|
})
|
|
|
|
it('rejects a malformed Origin header', () => {
|
|
expect(
|
|
isForbiddenOrigin(makeRequest({ origin: 'not a url', host: 'app.gnubok.se' })),
|
|
).toBe(true)
|
|
})
|
|
})
|
|
|
|
describe('forbiddenOriginResponse', () => {
|
|
it('returns a 403 JSON-RPC error envelope', async () => {
|
|
const res = forbiddenOriginResponse()
|
|
expect(res.status).toBe(403)
|
|
const body = await res.json()
|
|
expect(body).toEqual({
|
|
jsonrpc: '2.0',
|
|
id: null,
|
|
error: { code: -32600, message: 'Origin not allowed' },
|
|
})
|
|
})
|
|
})
|
|
|
|
describe('mcp-server apiRoutes origin enforcement', () => {
|
|
it('rejects foreign-Origin requests on every /mcp method before dispatch', async () => {
|
|
const { mcpServerExtension } = await import('../index')
|
|
const routes = (mcpServerExtension.apiRoutes ?? []).filter((r) => r.path === '/mcp')
|
|
expect(routes.map((r) => r.method).sort()).toEqual(['DELETE', 'GET', 'POST'])
|
|
|
|
for (const route of routes) {
|
|
const res = await route.handler(
|
|
new Request(ENDPOINT, {
|
|
method: route.method,
|
|
headers: { origin: 'https://evil.example.com', host: 'app.gnubok.se' },
|
|
}),
|
|
)
|
|
expect(res.status, `${route.method} /mcp`).toBe(403)
|
|
}
|
|
})
|
|
})
|