@3ngram/server 1.0.2 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. package/dist/app.d.ts +6 -0
  2. package/dist/app.js +10 -2
  3. package/dist/app.js.map +1 -1
  4. package/dist/boot.d.ts +6 -0
  5. package/dist/boot.js +6 -0
  6. package/dist/boot.js.map +1 -1
  7. package/dist/mcp/errors.d.ts +1 -1
  8. package/dist/mcp/prompts.d.ts +1 -1
  9. package/dist/mcp/prompts.js +7 -13
  10. package/dist/mcp/prompts.js.map +1 -1
  11. package/dist/mcp/server.d.ts +9 -2
  12. package/dist/mcp/server.js +17 -5
  13. package/dist/mcp/server.js.map +1 -1
  14. package/dist/mcp/tools-admin.js +10 -12
  15. package/dist/mcp/tools-admin.js.map +1 -1
  16. package/dist/mcp/tools-orient.js +4 -4
  17. package/dist/mcp/tools-orient.js.map +1 -1
  18. package/dist/mcp/tools.d.ts +8 -13
  19. package/dist/mcp/tools.js +9 -9
  20. package/dist/mcp/tools.js.map +1 -1
  21. package/dist/middleware/authenticate.d.ts +2 -0
  22. package/dist/middleware/authenticate.js.map +1 -1
  23. package/dist/middleware/mcp-header-observability.d.ts +19 -0
  24. package/dist/middleware/mcp-header-observability.js +73 -0
  25. package/dist/middleware/mcp-header-observability.js.map +1 -0
  26. package/dist/middleware/oauth-bearer.js +12 -2
  27. package/dist/middleware/oauth-bearer.js.map +1 -1
  28. package/dist/routes/health.d.ts +2 -2
  29. package/dist/routes/health.js +27 -2
  30. package/dist/routes/health.js.map +1 -1
  31. package/dist/routes/mcp.d.ts +13 -5
  32. package/dist/routes/mcp.js +50 -49
  33. package/dist/routes/mcp.js.map +1 -1
  34. package/dist/routes/oauth-authorize.d.ts +2 -0
  35. package/dist/routes/oauth-authorize.js +22 -11
  36. package/dist/routes/oauth-authorize.js.map +1 -1
  37. package/dist/routes/oauth-token.d.ts +3 -1
  38. package/dist/routes/oauth-token.js +24 -31
  39. package/dist/routes/oauth-token.js.map +1 -1
  40. package/dist/routes/well-known.js +3 -1
  41. package/dist/routes/well-known.js.map +1 -1
  42. package/package.json +9 -6
@@ -0,0 +1,19 @@
1
+ import type { NextFunction, Request, Response } from 'express';
2
+ type HeaderStatus = 'missing_method' | 'unknown_method' | 'missing_name' | 'unknown_name' | 'recognized';
3
+ export interface McpHeaderObservation {
4
+ method: string;
5
+ name: string;
6
+ status: HeaderStatus;
7
+ }
8
+ /**
9
+ * Collapse attacker-controlled headers into bounded metric labels. The literal
10
+ * raw values never leave this function.
11
+ */
12
+ export declare function classifyMcpHeaders(methodHeader: string | undefined, nameHeader: string | undefined): McpHeaderObservation;
13
+ /**
14
+ * Observe MCP headers before express.json(). The downstream SDK remains the
15
+ * only header/body validator; this middleware never accepts, rejects, meters,
16
+ * rate-limits, or authorizes a request.
17
+ */
18
+ export declare function mcpHeaderObservability(req: Request, _res: Response, next: NextFunction): void;
19
+ export {};
@@ -0,0 +1,73 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ // Pre-parser MCP routing observability for SEP-2243 standard headers.
3
+ //
4
+ // Mcp-Method and Mcp-Name are UNTRUSTED hints here. Values are reduced to
5
+ // closed allowlists before entering metrics or log context. The SDK later
6
+ // cross-checks the headers against the parsed body, and tool authorization
7
+ // remains inside the verified per-request handler.
8
+ import { bindContext, mcpHeaderRequests } from '@3ngram/config';
9
+ import { PROMPTS } from '../mcp/prompts.js';
10
+ import { TOOLS } from '../mcp/tools.js';
11
+ const KNOWN_METHODS = new Set([
12
+ 'server/discover',
13
+ 'initialize',
14
+ 'ping',
15
+ 'tools/list',
16
+ 'tools/call',
17
+ 'prompts/list',
18
+ 'prompts/get',
19
+ ]);
20
+ const TOOL_NAMES = new Set(TOOLS.map((tool) => tool.name));
21
+ const PROMPT_NAMES = new Set(PROMPTS.map((prompt) => prompt.name));
22
+ /**
23
+ * Collapse attacker-controlled headers into bounded metric labels. The literal
24
+ * raw values never leave this function.
25
+ */
26
+ export function classifyMcpHeaders(methodHeader, nameHeader) {
27
+ if (methodHeader === undefined) {
28
+ return { method: 'missing', name: 'none', status: 'missing_method' };
29
+ }
30
+ if (!KNOWN_METHODS.has(methodHeader)) {
31
+ return { method: 'unknown', name: 'none', status: 'unknown_method' };
32
+ }
33
+ const names = methodHeader === 'tools/call'
34
+ ? TOOL_NAMES
35
+ : methodHeader === 'prompts/get'
36
+ ? PROMPT_NAMES
37
+ : undefined;
38
+ if (names === undefined) {
39
+ return { method: methodHeader, name: 'none', status: 'recognized' };
40
+ }
41
+ if (nameHeader === undefined) {
42
+ return { method: methodHeader, name: 'missing', status: 'missing_name' };
43
+ }
44
+ if (!names.has(nameHeader)) {
45
+ return { method: methodHeader, name: 'unknown', status: 'unknown_name' };
46
+ }
47
+ return { method: methodHeader, name: nameHeader, status: 'recognized' };
48
+ }
49
+ /**
50
+ * Observe MCP headers before express.json(). The downstream SDK remains the
51
+ * only header/body validator; this middleware never accepts, rejects, meters,
52
+ * rate-limits, or authorizes a request.
53
+ */
54
+ export function mcpHeaderObservability(req, _res, next) {
55
+ const observation = classifyMcpHeaders(req.header('mcp-method'), req.header('mcp-name'));
56
+ mcpHeaderRequests.add(1, {
57
+ method: observation.method,
58
+ name: observation.name,
59
+ status: observation.status,
60
+ });
61
+ const operation = observation.method === 'missing' || observation.method === 'unknown'
62
+ ? undefined
63
+ : observation.method;
64
+ bindContext({
65
+ surface: 'mcp',
66
+ ...(operation === undefined ? {} : { operation }),
67
+ ...(observation.method === 'tools/call' && observation.status === 'recognized'
68
+ ? { toolName: observation.name }
69
+ : {}),
70
+ });
71
+ next();
72
+ }
73
+ //# sourceMappingURL=mcp-header-observability.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"mcp-header-observability.js","sourceRoot":"","sources":["../../src/middleware/mcp-header-observability.ts"],"names":[],"mappings":"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"}
@@ -91,7 +91,8 @@ export function oauthBearerAuth(req, res, next) {
91
91
  challenge(res);
92
92
  return;
93
93
  }
94
- verifyAccessToken(token, loadOAuthConfig())
94
+ const config = loadOAuthConfig();
95
+ verifyAccessToken(token, config)
95
96
  .then((result) => {
96
97
  if (!result.ok) {
97
98
  challenge(res, 'invalid_token');
@@ -103,7 +104,16 @@ export function oauthBearerAuth(req, res, next) {
103
104
  // a token with no/empty scope claim yields an empty set, so a later
104
105
  // memory:write check fails. Scope VALUES are not content, but they are not
105
106
  // logged either (only the user-id hash enters the log context).
106
- req.oauthScopes = [...parseScopes(result.token.scope)];
107
+ const scopes = [...parseScopes(result.token.scope)];
108
+ req.oauthScopes = scopes;
109
+ req.auth = {
110
+ token,
111
+ clientId: result.token.clientId,
112
+ scopes,
113
+ expiresAt: Math.floor(result.token.expiresAt.getTime() / 1000),
114
+ resource: new URL(config.resource),
115
+ extra: { userId: result.token.userId },
116
+ };
107
117
  bindContext({ userIdHash: hashUserId(result.token.userId) });
108
118
  next();
109
119
  })
@@ -1 +1 @@
1
- {"version":3,"file":"oauth-bearer.js","sourceRoot":"","sources":["../../src/middleware/oauth-bearer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oauth-bearer.js","sourceRoot":"","sources":["../../src/middleware/oauth-bearer.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { Router } from 'express';
2
2
  /**
3
3
  * Liveness only — no DB hit (the S5 capture hook polls this on every tool
4
- * call; its latency budget rules out a round-trip). Readiness with a DB ping
5
- * arrives with the first DB-backed route (Phase 1C2).
4
+ * call; its latency budget rules out a round-trip). Readiness (/ready) below
5
+ * carries the DB-backed tenant-isolation check.
6
6
  */
7
7
  export declare const healthRouter: Router;
@@ -1,12 +1,37 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
+ import { log } from '@3ngram/config';
3
+ import { assertRlsInForce } from '@3ngram/core';
2
4
  import { Router } from 'express';
3
5
  /**
4
6
  * Liveness only — no DB hit (the S5 capture hook polls this on every tool
5
- * call; its latency budget rules out a round-trip). Readiness with a DB ping
6
- * arrives with the first DB-backed route (Phase 1C2).
7
+ * call; its latency budget rules out a round-trip). Readiness (/ready) below
8
+ * carries the DB-backed tenant-isolation check.
7
9
  */
8
10
  export const healthRouter = Router();
9
11
  healthRouter.get('/health', (_req, res) => {
10
12
  res.json({ status: 'ok' });
11
13
  });
14
+ /**
15
+ * Readiness — fail-closed tenant-isolation check. Runs the runtime RLS guard
16
+ * against the live database (current_user is the NOBYPASSRLS runtime role and
17
+ * FORCE ROW LEVEL SECURITY is set on the tenant-data tables). If the guard
18
+ * throws, the instance reports NOT READY (503) so the platform keeps it out of
19
+ * rotation instead of letting a misconfigured DB serve cross-tenant reads.
20
+ *
21
+ * Distinct from /health: liveness must stay DB-free and cheap; readiness
22
+ * deliberately takes the DB round-trip. Both live on healthRouter, mounted
23
+ * before the edge limiter, so platform probes are never throttled.
24
+ */
25
+ healthRouter.get('/ready', async (_req, res) => {
26
+ try {
27
+ await assertRlsInForce();
28
+ res.json({ status: 'ready' });
29
+ }
30
+ catch (error) {
31
+ // No silent swallow: log the specific violations, report not-ready to the
32
+ // platform, but do NOT leak catalog/role detail in the HTTP response.
33
+ log().error({ err: error }, 'readiness: RLS guard failed — tenant isolation not in force');
34
+ res.status(503).json({ status: 'not-ready' });
35
+ }
36
+ });
12
37
  //# sourceMappingURL=health.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"health.js","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAEhC;;;;GAIG;AACH,MAAM,CAAC,MAAM,YAAY,GAAW,MAAM,EAAE,CAAA;AAE5C,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;IACxC,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;AAC5B,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"health.js","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAEhC;;;;GAIG;AACH,MAAM,CAAC,MAAM,YAAY,GAAW,MAAM,EAAE,CAAA;AAE5C,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;IACxC,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;AAC5B,CAAC,CAAC,CAAA;AAEF;;;;;;;;;;GAUG;AACH,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;IAC7C,IAAI,CAAC;QACH,MAAM,gBAAgB,EAAE,CAAA;QACxB,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;IAC/B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,0EAA0E;QAC1E,sEAAsE;QACtE,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,6DAA6D,CAAC,CAAA;QAC1F,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAA;IAC/C,CAAC;AACH,CAAC,CAAC,CAAA"}
@@ -1,5 +1,6 @@
1
1
  import type { AccessGate, BudgetEnforcement, LimitsResolver } from '@3ngram/core';
2
2
  import type { Gateway } from '@3ngram/llm';
3
+ import { type McpHttpHandler } from '@modelcontextprotocol/server';
3
4
  import { Router } from 'express';
4
5
  import type { RateLimiterMiddleware } from '../middleware/rate-limit.js';
5
6
  /** Options the boot wiring injects: the embedding gateway, undefined when not configured. */
@@ -19,11 +20,18 @@ export interface McpRouterOptions {
19
20
  /** Billing-neutral resource-limit resolver. Omitted fields are unlimited. */
20
21
  limits?: LimitsResolver | undefined;
21
22
  }
23
+ type McpProtocolOptions = Omit<McpRouterOptions, 'limiter'>;
22
24
  /**
23
- * Build the /mcp router. Streamable HTTP handles POST (JSON-RPC), GET (SSE
24
- * stream) and DELETE (session close) on one path; in stateless mode each is
25
- * served by a per-request transport with no shared state. The SDK's
26
- * handleRequest writes the response; on an unexpected pre-response failure we
27
- * emit a generic 500 (no content) and never leak the error to the client.
25
+ * Build the web-standard dual-era handler. The default legacy mode is
26
+ * deliberately explicit here: 2025-era stateless requests and modern
27
+ * 2026-07-28 requests share this one factory and therefore cannot drift.
28
+ */
29
+ export declare function createMcpProtocolHandler(options: McpProtocolOptions): McpHttpHandler;
30
+ /**
31
+ * Build the /mcp Express router. The Node adapter forwards req.auth and the
32
+ * already-parsed JSON body into the dual-era handler. Tool authorization still
33
+ * runs inside the registered handler from verified scopes; transport headers
34
+ * are never an authorization source.
28
35
  */
29
36
  export declare function mcpRouter(options: McpRouterOptions): Router;
37
+ export {};
@@ -1,77 +1,78 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- // MCP Streamable HTTP transport at /mcp.
2
+ // MCP dual-era Streamable HTTP handler at /mcp.
3
3
  //
4
- // STATELESS by design: a fresh McpServer + StreamableHTTPServerTransport per
5
- // request (sessionIdGenerator: undefined). No in-process session state — any
6
- // instance serves any request (Railway redeploy = non-event).
4
+ // STATELESS by design: createMcpHandler calls the factory for every request.
5
+ // Its default legacy:'stateless' path preserves 2025-era clients while its
6
+ // modern path serves 2026-07-28. No tenant/session state lives in process.
7
7
  //
8
8
  // AUTH: BEARER-ONLY (strict RS). The route mounts BEHIND the
9
9
  // existing oauthBearerAuth middleware ONLY — NOT the apiKeyAuth chain — so
10
10
  // an X-API-Key alone never reaches a tool; a 401 without a valid Bearer carries
11
11
  // the RFC 9728 WWW-Authenticate challenge the discovery doc already advertises.
12
- // req.userId is the strict-aud-verified token subject by the time a handler runs.
12
+ // oauthBearerAuth also attaches the SDK AuthInfo bridge consumed by the Node
13
+ // adapter. The tenant id stays in verified authInfo.extra; clientId remains the
14
+ // OAuth client identifier and is never treated as the tenant.
13
15
  //
14
16
  // LAYERING: zero business logic here — the route wires the SDK
15
- // transport to the per-request server and threads the authenticated tenant +
17
+ // handler to the per-request server and threads the authenticated tenant +
16
18
  // optional gateway into the tools. Observability: nothing logged
17
19
  // here echoes request content.
18
20
  import { log } from '@3ngram/config';
19
21
  import { crashSafeError } from '@3ngram/config/otel';
20
- import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
22
+ import { toNodeHandler } from '@modelcontextprotocol/node';
23
+ import { createMcpHandler, } from '@modelcontextprotocol/server';
21
24
  import { Router } from 'express';
22
25
  import { createMcpServer } from '../mcp/server.js';
23
26
  import { oauthBearerAuth } from '../middleware/oauth-bearer.js';
27
+ /** Recover the tenant identity only from the verified SDK auth bridge. */
28
+ function requireUserId(ctx) {
29
+ const userId = ctx.authInfo?.extra?.userId;
30
+ if (typeof userId !== 'string' || userId.length === 0) {
31
+ throw new Error('verified MCP auth context has no tenant id');
32
+ }
33
+ return userId;
34
+ }
35
+ /**
36
+ * Build the web-standard dual-era handler. The default legacy mode is
37
+ * deliberately explicit here: 2025-era stateless requests and modern
38
+ * 2026-07-28 requests share this one factory and therefore cannot drift.
39
+ */
40
+ export function createMcpProtocolHandler(options) {
41
+ return createMcpHandler((ctx) => createMcpServer({
42
+ userId: requireUserId(ctx),
43
+ scopes: ctx.authInfo?.scopes ?? [],
44
+ gateway: options.gateway,
45
+ budget: options.budget,
46
+ access: options.access,
47
+ limits: options.limits,
48
+ }), {
49
+ legacy: 'stateless',
50
+ onerror: (err) => log().error(crashSafeError(err), 'mcp: protocol handler error'),
51
+ });
52
+ }
24
53
  /**
25
- * Build the /mcp router. Streamable HTTP handles POST (JSON-RPC), GET (SSE
26
- * stream) and DELETE (session close) on one path; in stateless mode each is
27
- * served by a per-request transport with no shared state. The SDK's
28
- * handleRequest writes the response; on an unexpected pre-response failure we
29
- * emit a generic 500 (no content) and never leak the error to the client.
54
+ * Build the /mcp Express router. The Node adapter forwards req.auth and the
55
+ * already-parsed JSON body into the dual-era handler. Tool authorization still
56
+ * runs inside the registered handler from verified scopes; transport headers
57
+ * are never an authorization source.
30
58
  */
31
59
  export function mcpRouter(options) {
32
60
  const router = Router();
33
- const handle = async (req, res) => {
34
- // oauthBearerAuth guarantees req.userId + req.oauthScopes are bound before
35
- // this runs. Scopes thread into the per-request context so each tool enforces
36
- // its required scope; fail-closed when the claim was absent
37
- // (req.oauthScopes is then an empty array).
38
- const server = createMcpServer({
39
- userId: req.userId,
40
- scopes: req.oauthScopes ?? [],
41
- gateway: options.gateway,
42
- budget: options.budget,
43
- access: options.access,
44
- limits: options.limits,
45
- });
46
- // Stateless: OMIT sessionIdGenerator (optional) — its absence is what selects
47
- // stateless mode, so no in-process session map is ever created.
48
- const transport = new StreamableHTTPServerTransport({});
49
- // Stateless: tear the per-request server + transport down when the response
50
- // closes so nothing lingers in-process between requests.
51
- res.on('close', () => {
52
- transport.close().catch(() => undefined);
53
- server.close().catch(() => undefined);
54
- });
55
- try {
56
- // The SDK transport declares its optional callbacks as `T | undefined`,
57
- // which trips exactOptionalPropertyTypes against the Transport interface's
58
- // `?:` optionals; the shapes are otherwise identical (an SDK type quirk).
59
- await server.connect(transport);
60
- await transport.handleRequest(req, res, req.body);
61
- }
62
- catch (err) {
63
- log().error(crashSafeError(err), 'mcp: transport error');
64
- if (!res.headersSent) {
65
- res.status(500).json({ error: 'internal_error' });
66
- }
67
- }
68
- };
61
+ const handler = createMcpProtocolHandler({
62
+ gateway: options.gateway,
63
+ budget: options.budget,
64
+ access: options.access,
65
+ limits: options.limits,
66
+ });
67
+ const handle = toNodeHandler(handler, {
68
+ onerror: (err) => log().error(crashSafeError(err), 'mcp: node adapter error'),
69
+ });
69
70
  // Bearer-only guard on every method (POST/GET/DELETE). The 401 challenge +
70
71
  // WWW-Authenticate is the RFC 9728 client bootstrap. The per-user limiter runs
71
72
  // AFTER auth so it keys on the verified req.userId (docs/concepts/mcp-design.mdx per-user
72
73
  // bucket); an unauthenticated request is rejected before it can consume a point.
73
74
  router.all('/mcp', oauthBearerAuth, options.limiter, (req, res) => {
74
- handle(req, res).catch((err) => {
75
+ handle(req, res, req.body).catch((err) => {
75
76
  log().error(crashSafeError(err), 'mcp: unhandled handler rejection');
76
77
  if (!res.headersSent)
77
78
  res.status(500).json({ error: 'internal_error' });
@@ -1 +1 @@
1
- {"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/routes/mcp.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,yCAAyC;AACzC,EAAE;AACF,6EAA6E;AAC7E,6EAA6E;AAC7E,8DAA8D;AAC9D,EAAE;AACF,6DAA6D;AAC7D,2EAA2E;AAC3E,gFAAgF;AAChF,gFAAgF;AAChF,kFAAkF;AAClF,EAAE;AACF,+DAA+D;AAC/D,6EAA6E;AAC7E,iEAAiE;AACjE,+BAA+B;AAC/B,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAGpD,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAA;AAElG,OAAO,EAA+B,MAAM,EAAE,MAAM,SAAS,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAqB/D;;;;;;GAMG;AACH,MAAM,UAAU,SAAS,CAAC,OAAyB;IACjD,MAAM,MAAM,GAAG,MAAM,EAAE,CAAA;IAEvB,MAAM,MAAM,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAiB,EAAE;QAClE,2EAA2E;QAC3E,8EAA8E;QAC9E,4DAA4D;QAC5D,4CAA4C;QAC5C,MAAM,MAAM,GAAG,eAAe,CAAC;YAC7B,MAAM,EAAE,GAAG,CAAC,MAAgB;YAC5B,MAAM,EAAE,GAAG,CAAC,WAAW,IAAI,EAAE;YAC7B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC,CAAA;QACF,8EAA8E;QAC9E,gEAAgE;QAChE,MAAM,SAAS,GAAG,IAAI,6BAA6B,CAAC,EAAE,CAAC,CAAA;QACvD,4EAA4E;QAC5E,yDAAyD;QACzD,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACnB,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;YACxC,MAAM,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QACvC,CAAC,CAAC,CAAA;QACF,IAAI,CAAC;YACH,wEAAwE;YACxE,2EAA2E;YAC3E,0EAA0E;YAC1E,MAAM,MAAM,CAAC,OAAO,CAAC,SAAsB,CAAC,CAAA;YAC5C,MAAM,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;QACnD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,sBAAsB,CAAC,CAAA;YACxD,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;gBACrB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC,CAAA;YACnD,CAAC;QACH,CAAC;IACH,CAAC,CAAA;IAED,2EAA2E;IAC3E,+EAA+E;IAC/E,0FAA0F;IAC1F,iFAAiF;IACjF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAChE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;YACtC,GAAG,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,kCAAkC,CAAC,CAAA;YACpE,IAAI,CAAC,GAAG,CAAC,WAAW;gBAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC,CAAA;QACzE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAA;AACf,CAAC"}
1
+ {"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/routes/mcp.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,gDAAgD;AAChD,EAAE;AACF,6EAA6E;AAC7E,2EAA2E;AAC3E,2EAA2E;AAC3E,EAAE;AACF,6DAA6D;AAC7D,2EAA2E;AAC3E,gFAAgF;AAChF,gFAAgF;AAChF,6EAA6E;AAC7E,gFAAgF;AAChF,8DAA8D;AAC9D,EAAE;AACF,+DAA+D;AAC/D,2EAA2E;AAC3E,iEAAiE;AACjE,+BAA+B;AAC/B,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAGpD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EACL,gBAAgB,GAGjB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAuB/D,0EAA0E;AAC1E,SAAS,aAAa,CAAC,GAAsB;IAC3C,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAA;IAC1C,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;IAC/D,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAC,OAA2B;IAClE,OAAO,gBAAgB,CACrB,CAAC,GAAG,EAAE,EAAE,CACN,eAAe,CAAC;QACd,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC;QAC1B,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE;QAClC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,EACJ;QACE,MAAM,EAAE,WAAW;QACnB,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,6BAA6B,CAAC;KAClF,CACF,CAAA;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,SAAS,CAAC,OAAyB;IACjD,MAAM,MAAM,GAAG,MAAM,EAAE,CAAA;IACvB,MAAM,OAAO,GAAG,wBAAwB,CAAC;QACvC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAA;IACF,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,EAAE;QACpC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,yBAAyB,CAAC;KAC9E,CAAC,CAAA;IAEF,2EAA2E;IAC3E,+EAA+E;IAC/E,0FAA0F;IAC1F,iFAAiF;IACjF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAChE,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;YAChD,GAAG,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,kCAAkC,CAAC,CAAA;YACpE,IAAI,CAAC,GAAG,CAAC,WAAW;gBAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC,CAAA;QACzE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAA;AACf,CAAC"}
@@ -1,8 +1,10 @@
1
+ import { type ClientMetadataResolver } from '@3ngram/core/auth';
1
2
  import { Router } from 'express';
2
3
  import type { RateLimiterMiddleware } from '../middleware/rate-limit.js';
3
4
  /** Options the boot wiring injects: the per-IP rate limiter seam. */
4
5
  export interface OAuthAuthorizeRouterOptions {
5
6
  limiter: RateLimiterMiddleware;
7
+ clientMetadataResolver: ClientMetadataResolver;
6
8
  }
7
9
  /** Build the /oauth/authorize router behind the injected per-IP limiter. */
8
10
  export declare function oauthAuthorizeRouter(options: OAuthAuthorizeRouterOptions): Router;
@@ -22,7 +22,7 @@
22
22
  // Never log credentials, codes, or CSRF tokens.
23
23
  import { randomBytes, timingSafeEqual } from 'node:crypto';
24
24
  import { loadOAuthConfig } from '@3ngram/config';
25
- import { createOAuthServerProvider, EmailNotVerifiedError, MEMORY_READ_SCOPE, MEMORY_WRITE_SCOPE, oauthClientsStore, resolveRegisteredRedirectUri, verifyCredentials, } from '@3ngram/core/auth';
25
+ import { createOAuthServerProvider, EmailNotVerifiedError, MEMORY_READ_SCOPE, MEMORY_WRITE_SCOPE, resolveOAuthClient, resolveRegisteredRedirectUri, verifyCredentials, } from '@3ngram/core/auth';
26
26
  import { authorizeRequestSchema, consentSubmissionSchema, } from '@3ngram/schema';
27
27
  import { Router, urlencoded } from 'express';
28
28
  const CSRF_COOKIE = 'oauth_csrf';
@@ -92,6 +92,15 @@ function hiddenFields(params, redirectUri, redirectUriSupplied, csrfToken) {
92
92
  .map(([name, value]) => `<input type="hidden" name="${name}" value="${escapeHtml(value)}">`)
93
93
  .join('\n ');
94
94
  }
95
+ function clientMetadataHost(clientId) {
96
+ try {
97
+ const url = new URL(clientId);
98
+ return url.protocol === 'https:' ? url.host : undefined;
99
+ }
100
+ catch {
101
+ return undefined;
102
+ }
103
+ }
95
104
  /** Render the combined credentials + consent page (client name, redirect HOST, scopes). */
96
105
  function renderConsentPage(view) {
97
106
  const scopes = view.params.scope ?? `${MEMORY_READ_SCOPE} ${MEMORY_WRITE_SCOPE}`;
@@ -100,6 +109,8 @@ function renderConsentPage(view) {
100
109
  .map((s) => `<li><code>${escapeHtml(s)}</code></li>`)
101
110
  .join('');
102
111
  const errorLine = view.error === undefined ? '' : `<p class="error">${escapeHtml(view.error)}</p>`;
112
+ const metadataHost = clientMetadataHost(view.client.client_id);
113
+ const clientIdentity = metadataHost === undefined ? '' : `metadata from ${escapeHtml(metadataHost)}; `;
103
114
  return `<!doctype html>
104
115
  <html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1">
105
116
  <title>Authorize ${escapeHtml(view.client.client_name)} — 3ngram</title>
@@ -109,7 +120,7 @@ button{margin-top:1rem;padding:.6rem 1.2rem;cursor:pointer}.host{color:#555}.err
109
120
  <body>
110
121
  <h1>Authorize access</h1>
111
122
  <p><strong>${escapeHtml(view.client.client_name)}</strong>
112
- <span class="host">(redirects to ${escapeHtml(new URL(view.redirectUri).host)})</span>
123
+ <span class="host">(${clientIdentity}redirects to ${escapeHtml(new URL(view.redirectUri).host)})</span>
113
124
  is requesting access to your 3ngram memory:</p>
114
125
  <ul>${scopeItems}</ul>
115
126
  ${errorLine}
@@ -128,9 +139,9 @@ button{margin-top:1rem;padding:.6rem 1.2rem;cursor:pointer}.host{color:#555}.err
128
139
  * client is unknown / the redirect_uri is not registered. The 400 is emitted by
129
140
  * the caller — NEVER a redirect (the URI is unvetted by definition here).
130
141
  */
131
- async function resolveConsentTarget(params, redirectUriSupplied) {
132
- const client = await oauthClientsStore.getClient(params.client_id);
133
- if (client === undefined)
142
+ async function resolveConsentTarget(params, redirectUriSupplied, clientMetadataResolver) {
143
+ const client = await resolveOAuthClient(params.client_id, clientMetadataResolver);
144
+ if (client === undefined || !client.grant_types.includes('authorization_code'))
134
145
  return undefined;
135
146
  const redirectUri = resolveRegisteredRedirectUri(client, params.redirect_uri);
136
147
  if (redirectUri === undefined)
@@ -143,7 +154,7 @@ async function resolveConsentTarget(params, redirectUriSupplied) {
143
154
  return { client, redirectUri, redirectUriSupplied };
144
155
  }
145
156
  /** GET: validate, then serve the consent form with a fresh CSRF pair. */
146
- async function handleAuthorizeGet(req, res) {
157
+ async function handleAuthorizeGet(req, res, clientMetadataResolver) {
147
158
  const parsed = authorizeRequestSchema.safeParse(req.query);
148
159
  if (!parsed.success) {
149
160
  res.status(400).json({ error: 'invalid_request' });
@@ -151,7 +162,7 @@ async function handleAuthorizeGet(req, res) {
151
162
  }
152
163
  // Capture supplied-ness from the CLIENT's authorize request here, GET-time —
153
164
  // this is the only point that sees whether redirect_uri was actually sent.
154
- const target = await resolveConsentTarget(parsed.data, parsed.data.redirect_uri !== undefined);
165
+ const target = await resolveConsentTarget(parsed.data, parsed.data.redirect_uri !== undefined, clientMetadataResolver);
155
166
  if (target === undefined) {
156
167
  res.status(400).json({ error: 'invalid_client' });
157
168
  return;
@@ -163,7 +174,7 @@ async function handleAuthorizeGet(req, res) {
163
174
  .send(renderConsentPage({ ...target, params: parsed.data, csrfToken }));
164
175
  }
165
176
  /** POST: CSRF + credentials, then issue the code and 302 back with state. */
166
- async function handleConsentPost(req, res) {
177
+ async function handleConsentPost(req, res, clientMetadataResolver) {
167
178
  const parsed = consentSubmissionSchema.safeParse(req.body);
168
179
  if (!parsed.success) {
169
180
  res.status(400).json({ error: 'invalid_request' });
@@ -171,7 +182,7 @@ async function handleConsentPost(req, res) {
171
182
  }
172
183
  // Read supplied-ness from the GET-time hidden field — NOT from the POST's
173
184
  // redirect_uri, which always carries the resolved URI.
174
- const target = await resolveConsentTarget(parsed.data, parsed.data.redirect_uri_was_supplied === '1');
185
+ const target = await resolveConsentTarget(parsed.data, parsed.data.redirect_uri_was_supplied === '1', clientMetadataResolver);
175
186
  if (target === undefined) {
176
187
  res.status(400).json({ error: 'invalid_client' });
177
188
  return;
@@ -234,10 +245,10 @@ async function handleConsentPost(req, res) {
234
245
  export function oauthAuthorizeRouter(options) {
235
246
  const router = Router();
236
247
  router.get('/oauth/authorize', options.limiter, (req, res, next) => {
237
- handleAuthorizeGet(req, res).catch(next);
248
+ handleAuthorizeGet(req, res, options.clientMetadataResolver).catch(next);
238
249
  });
239
250
  router.post('/oauth/authorize', options.limiter, urlencoded({ extended: false }), (req, res, next) => {
240
- handleConsentPost(req, res).catch(next);
251
+ handleConsentPost(req, res, options.clientMetadataResolver).catch(next);
241
252
  });
242
253
  return router;
243
254
  }
@@ -1 +1 @@
1
- {"version":3,"file":"oauth-authorize.js","sourceRoot":"","sources":["../../src/routes/oauth-authorize.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oauth-authorize.js","sourceRoot":"","sources":["../../src/routes/oauth-authorize.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import type { LimitsResolver } from '@3ngram/core';
2
- import { OAuthError } from '@modelcontextprotocol/sdk/server/auth/errors.js';
2
+ import { type ClientMetadataResolver } from '@3ngram/core/auth';
3
+ import { OAuthError } from '@modelcontextprotocol/server-legacy/auth';
3
4
  import { Router } from 'express';
4
5
  import type { Redis } from 'ioredis';
5
6
  import type { RateLimiterMiddleware } from '../middleware/rate-limit.js';
@@ -16,6 +17,7 @@ export interface OAuthTokenRouterOptions {
16
17
  redis?: Redis | undefined;
17
18
  /** Billing-neutral active-client limit resolver. */
18
19
  limits?: LimitsResolver | undefined;
20
+ clientMetadataResolver: ClientMetadataResolver;
19
21
  }
20
22
  /**
21
23
  * The per-process fallback counter used when no Redis client is injected