mcp-trellis 1.0.0 → 2.2.0

package/dist/oauth/endpoints/authorize.js

@@ -0,0 +1,209 @@
+import { GET_ONLY, requireHttpMethod } from "../../http/http.js";
+import { auditLegacyKeyUsage } from "../audit.js";
+import { cimdFetchOpts, isCimdClientId, resolveCimdClient } from "../cimd/cimd.js";
+import { advertisedScopes, defaultScopes, oauthError, registeredClientsRequired, resolveSecrets, unregisteredClientError, } from "../config.js";
+import { OAUTH_ERRORS } from "../constants.js";
+import { issueAuthCode } from "../crypto/codes.js";
+import { unsealAny } from "../crypto/sealed.js";
+import { isAllowedRedirectUri } from "../policy/redirect.js";
+import { canonicalResource, resourceErrorInfo } from "../policy/resource.js";
+import { formatScope, requestedScopes, scopeErrorInfo } from "../policy/scope.js";
+import { codeRedirect, errorRedirect, secureRedirect } from "./callback.js";
+import { isPreApproved, issueConsentTicket, renderConsent } from "./consent.js";
+/** BASE64URL(SHA-256(verifier)) without padding is always exactly 43 characters. */
+const S256_CHALLENGE = /^[A-Za-z0-9_-]{43}$/;
+/** Reflected into `Location` on denial — an unbounded `state` is a header-size DoS knob. */
+const MAX_STATE_LENGTH = 2048;
+/**
+ * A client bound to a known redirect-URI list — either pre-registered via
+ * `clientStore`, or a sealed assertion this server itself issued via
+ * `/register` (see `sealed.ts`). Unbound clients fall back to the global
+ * allowlist, unless `requireRegisteredClients` forbids that entirely.
+ */
+const redirectAllowed = (redirectUri, boundRedirectUris, allowlist) => {
+    if (!redirectUri)
+        return false;
+    if (boundRedirectUris)
+        return boundRedirectUris.includes(redirectUri);
+    return isAllowedRedirectUri(redirectUri, allowlist);
+};
+const redirectToLogin = (request, url, options) => {
+    const next = `${url.pathname}${url.search}`;
+    const login = options.ports.loginUrl(request, next);
+    let loginTarget;
+    try {
+        loginTarget = new URL(login, url.origin);
+    }
+    catch {
+        return oauthError(OAUTH_ERRORS.invalidRequest, 500, "loginUrl must be absolute or same-origin relative");
+    }
+    if (loginTarget.protocol !== "http:" && loginTarget.protocol !== "https:") {
+        return oauthError(OAUTH_ERRORS.invalidRequest, 500, "loginUrl must be absolute or same-origin relative");
+    }
+    return secureRedirect(loginTarget.toString());
+};
+/**
+ * Resolves `client_id` against `clientStore`, this server's own sealed
+ * `/register` assertions, and (when enabled) CIMD — in that order — and
+ * rejects when none recognize it and the config requires one to. A sealed
+ * assertion binds its own `redirectUris` like a pre-registered client,
+ * without ever touching storage.
+ */
+const resolveAuthorizeClient = async (options, clientId, secrets) => {
+    const registered = (await options.ports.clientStore?.get(clientId)) ?? null;
+    const assertion = registered ? null : await unsealClientAssertion(options, clientId, secrets);
+    const isCimdId = options.cimd === true && isCimdClientId(clientId);
+    const cimdDoc = !registered && !assertion && isCimdId
+        ? await resolveCimdClient(clientId, cimdFetchOpts(options))
+        : null;
+    if (!registered && !assertion && !cimdDoc) {
+        const unknown = unknownClientError(options, isCimdId);
+        if (unknown)
+            return unknown;
+    }
+    return {
+        registered,
+        boundRedirectUris: registered?.redirectUris ?? assertion?.redirectUris ?? cimdDoc?.redirect_uris ?? null,
+    };
+};
+/** This server's own `/register` assertion for `clientId`, auditing a legacy-key unseal. */
+const unsealClientAssertion = async (options, clientId, secrets) => {
+    const unsealed = await unsealAny(secrets, "client", clientId);
+    await auditLegacyKeyUsage(options, {
+        clientId,
+        keyIndex: unsealed?.keyIndex,
+        source: "client assertion unsealed",
+    });
+    return unsealed?.value ?? null;
+};
+/** The rejection for a `client_id` nothing resolved, or null when the config admits it. */
+const unknownClientError = (options, isCimdId) => {
+    const unregistered = unregisteredClientError(options, {
+        code: OAUTH_ERRORS.unauthorizedClient,
+        status: 400,
+    });
+    if (unregistered)
+        return unregistered;
+    if (isCimdId) {
+        return oauthError(OAUTH_ERRORS.unauthorizedClient, 400, "CIMD client_id could not be resolved");
+    }
+    if (!registeredClientsRequired(options))
+        return null;
+    return oauthError(OAUTH_ERRORS.unauthorizedClient, 400, "client_id must come from clientStore or this server's own /register");
+};
+/**
+ * Pre-trust tier: `redirect_uri` is not yet verified as belonging to a
+ * legitimate party, so these two stay direct JSON responses. Redirecting
+ * here is exactly the open-redirect risk RFC 6749 §4.1.2.1 exists to
+ * avoid — the URI itself is what's in question. An oversized `state` is
+ * included in this tier too, for a narrower reason: reflecting it back
+ * into the error redirect it would otherwise trigger recreates the
+ * header-size DoS the cap exists to prevent, on the one input the cap
+ * can't safely echo.
+ */
+const firstPreTrustError = (callback, boundRedirectUris, options) => {
+    if (!redirectAllowed(callback.redirectUri, boundRedirectUris, options.redirect)) {
+        return oauthError(OAUTH_ERRORS.invalidRequest, 400, "invalid redirect_uri");
+    }
+    if (callback.state.length > MAX_STATE_LENGTH) {
+        return oauthError(OAUTH_ERRORS.invalidRequest, 400, `state must be at most ${MAX_STATE_LENGTH} characters`);
+    }
+    return null;
+};
+/**
+ * Post-trust tier: `redirect_uri` is now trusted, so every remaining error
+ * goes back to the client's own callback per RFC 6749 §4.1.2.1 instead of a
+ * bare JSON body the connector never parses.
+ */
+const firstPostTrustError = ({ url, callback, expectedResource }, options) => {
+    const redirectError = (code, description) => errorRedirect(callback, code, description);
+    const responseType = url.searchParams.get("response_type") ?? "";
+    if (responseType !== "code") {
+        return redirectError(OAUTH_ERRORS.unsupportedResponseType, "response_type must be code");
+    }
+    const codeChallenge = url.searchParams.get("code_challenge") ?? "";
+    // RFC 7636 defaults an absent method to `plain`; this AS only supports
+    // S256, so an absent method is read as S256 for client compatibility —
+    // a plain-style challenge then fails the shape check below anyway.
+    const challengeMethod = url.searchParams.get("code_challenge_method") ?? "S256";
+    if (!codeChallenge || challengeMethod !== "S256") {
+        return redirectError(OAUTH_ERRORS.invalidRequest, "PKCE S256 code_challenge required");
+    }
+    if (!S256_CHALLENGE.test(codeChallenge)) {
+        return redirectError(OAUTH_ERRORS.invalidRequest, "code_challenge must be a base64url SHA-256 digest (43 characters)");
+    }
+    const resourceIssue = resourceErrorInfo(url.searchParams.get("resource") ?? "", expectedResource);
+    if (resourceIssue)
+        return redirectError(resourceIssue.code, resourceIssue.description);
+    const advertised = advertisedScopes(options);
+    const granted = requestedScopes(url.searchParams.get("scope") ?? "", defaultScopes(options));
+    const scopeIssue = scopeErrorInfo(granted, advertised);
+    if (scopeIssue)
+        return redirectError(scopeIssue.code, scopeIssue.description);
+    return { codeChallenge, granted };
+};
+/** Pre-approved clients skip straight to a code; everyone else gets a consent ticket. */
+const issueAuthorizeOutcome = async (options, secrets, { context, clientId, registered, user, codeChallenge, granted }) => {
+    const { callback, expectedResource } = context;
+    const grant = {
+        clientId,
+        redirectUri: callback.redirectUri,
+        codeChallenge,
+        userId: user.id,
+        resource: expectedResource,
+        scope: formatScope(granted),
+    };
+    if (isPreApproved(options, clientId, registered)) {
+        return codeRedirect(callback, await issueAuthCode(secrets[0], grant));
+    }
+    const ticket = await issueConsentTicket(secrets[0], { ...grant, state: callback.state });
+    return renderConsent(options, {
+        clientId,
+        registeredClient: registered,
+        redirectUri: callback.redirectUri,
+        scope: granted,
+        resource: expectedResource,
+        user,
+        ticket,
+        oauthPath: options.oauthPath,
+    });
+};
+export const handleAuthorize = async (request, options) => {
+    const methodError = requireHttpMethod(request, GET_ONLY);
+    if (methodError)
+        return methodError;
+    const url = new URL(request.url);
+    const expectedResource = canonicalResource(url.origin, options.resourcePath);
+    const clientId = url.searchParams.get("client_id") ?? "";
+    if (!clientId) {
+        return oauthError(OAUTH_ERRORS.invalidRequest, 400, "client_id required");
+    }
+    const secrets = await resolveSecrets(options.ports, request);
+    const clientResolution = await resolveAuthorizeClient(options, clientId, secrets);
+    if (clientResolution instanceof Response)
+        return clientResolution;
+    const { registered, boundRedirectUris } = clientResolution;
+    const callback = {
+        redirectUri: url.searchParams.get("redirect_uri") ?? "",
+        state: url.searchParams.get("state") ?? "",
+        issuer: url.origin,
+    };
+    const preTrustError = firstPreTrustError(callback, boundRedirectUris, options);
+    if (preTrustError)
+        return preTrustError;
+    const context = { url, callback, expectedResource };
+    const validated = firstPostTrustError(context, options);
+    if (validated instanceof Response)
+        return validated;
+    const user = await options.ports.resolveUser(request);
+    if (!user)
+        return redirectToLogin(request, url, options);
+    return issueAuthorizeOutcome(options, secrets, {
+        ...validated,
+        context,
+        clientId,
+        registered,
+        user,
+    });
+};
+//# sourceMappingURL=authorize.js.map

package/dist/oauth/endpoints/authorize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"authorize.js","sourceRoot":"","sources":["../../../src/oauth/endpoints/authorize.ts"],"names":[],"mappings":"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"}

package/dist/oauth/endpoints/callback.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Responses that send the user agent back to the client's own, already
+ * validated `redirect_uri` — the code on success, the error otherwise
+ * (RFC 6749 §4.1.2 / §4.1.2.1), with `iss` per RFC 9207.
+ */
+/** The validated client callback one authorize/consent round trip returns to. */
+export type Callback = {
+    redirectUri: string;
+    state: string;
+    issuer: string;
+};
+export declare const secureRedirect: (location: string) => Response;
+export declare const codeRedirect: (callback: Callback, code: string) => Response;
+export declare const errorRedirect: (callback: Callback, error: string, description?: string) => Response;
+/**
+ * URL form of `errorRedirect`, for hosts composing their own authorize flow
+ * (`mcp-trellis/advanced`). `issuer`, when set, adds `iss` (RFC 9207).
+ */
+export declare const buildErrorRedirectUrl: (redirectUri: string, error: string, description: string, state: string, issuer?: string) => string;
+//# sourceMappingURL=callback.d.ts.map

package/dist/oauth/endpoints/callback.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"callback.d.ts","sourceRoot":"","sources":["../../../src/oauth/endpoints/callback.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,iFAAiF;AACjF,MAAM,MAAM,QAAQ,GAAG;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,UAAU,MAAM,KAAG,QAQ9C,CAAC;AAeL,eAAO,MAAM,YAAY,GAAI,UAAU,QAAQ,EAAE,MAAM,MAAM,KAAG,QACf,CAAC;AAElD,eAAO,MAAM,aAAa,GAAI,UAAU,QAAQ,EAAE,OAAO,MAAM,EAAE,oBAAgB,KAAG,QACF,CAAC;AAEnF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,aAAa,MAAM,EACnB,OAAO,MAAM,EACb,aAAa,MAAM,EACnB,OAAO,MAAM,EACb,SAAS,MAAM,KACd,MAAgG,CAAC"}

package/dist/oauth/endpoints/callback.js

@@ -0,0 +1,31 @@
+/**
+ * Responses that send the user agent back to the client's own, already
+ * validated `redirect_uri` — the code on success, the error otherwise
+ * (RFC 6749 §4.1.2 / §4.1.2.1), with `iss` per RFC 9207.
+ */
+export const secureRedirect = (location) => new Response(null, {
+    status: 302,
+    headers: {
+        Location: location,
+        "Referrer-Policy": "no-referrer",
+        "Cache-Control": "no-store",
+    },
+});
+/** Empty values are omitted, and `state` / `iss` always come last. */
+const callbackUrl = (callback, params) => {
+    const target = new URL(callback.redirectUri);
+    const entries = [...Object.entries(params), ["state", callback.state], ["iss", callback.issuer]];
+    for (const [key, value] of entries) {
+        if (key && value)
+            target.searchParams.set(key, value);
+    }
+    return target.toString();
+};
+export const codeRedirect = (callback, code) => secureRedirect(callbackUrl(callback, { code }));
+export const errorRedirect = (callback, error, description = "") => secureRedirect(callbackUrl(callback, { error, error_description: description }));
+/**
+ * URL form of `errorRedirect`, for hosts composing their own authorize flow
+ * (`mcp-trellis/advanced`). `issuer`, when set, adds `iss` (RFC 9207).
+ */
+export const buildErrorRedirectUrl = (redirectUri, error, description, state, issuer) => callbackUrl({ redirectUri, state, issuer }, { error, error_description: description });
+//# sourceMappingURL=callback.js.map

package/dist/oauth/endpoints/callback.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../src/oauth/endpoints/callback.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,QAAgB,EAAY,EAAE,CAC3D,IAAI,QAAQ,CAAC,IAAI,EAAE;IACjB,MAAM,EAAE,GAAG;IACX,OAAO,EAAE;QACP,QAAQ,EAAE,QAAQ;QAClB,iBAAiB,EAAE,aAAa;QAChC,eAAe,EAAE,UAAU;KAC5B;CACF,CAAC,CAAC;AAEL,sEAAsE;AACtE,MAAM,WAAW,GAAG,CAClB,QAA6E,EAC7E,MAA8B,EACtB,EAAE;IACV,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IACjG,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,OAAO,EAAE,CAAC;QACnC,IAAI,GAAG,IAAI,KAAK;YAAE,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACxD,CAAC;IACD,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,QAAkB,EAAE,IAAY,EAAY,EAAE,CACzE,cAAc,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAElD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,QAAkB,EAAE,KAAa,EAAE,WAAW,GAAG,EAAE,EAAY,EAAE,CAC7F,cAAc,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;AAEnF;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,WAAmB,EACnB,KAAa,EACb,WAAmB,EACnB,KAAa,EACb,MAAe,EACP,EAAE,CAAC,WAAW,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,CAAC,CAAC"}

package/dist/oauth/endpoints/consent-page.d.ts

@@ -0,0 +1,5 @@
+/** The built-in consent interstitial, used when the host supplies no `consent.render`. */
+import type { ConsentRequest } from "../types.js";
+/** Built-in hardened interstitial — used whenever the host doesn't supply `consent.render`. */
+export declare const renderBuiltInConsent: (input: ConsentRequest) => Response;
+//# sourceMappingURL=consent-page.d.ts.map

package/dist/oauth/endpoints/consent-page.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"consent-page.d.ts","sourceRoot":"","sources":["../../../src/oauth/endpoints/consent-page.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAE1F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AA+BlD,+FAA+F;AAC/F,eAAO,MAAM,oBAAoB,GAAI,OAAO,cAAc,KAAG,QAmC5D,CAAC"}

package/dist/oauth/endpoints/consent-page.js

@@ -0,0 +1,63 @@
+/** The built-in consent interstitial, used when the host supplies no `consent.render`. */
+const ESCAPE_HTML = {
+    "&": "&",
+    "<": "&lt;",
+    ">": "&gt;",
+    '"': "&quot;",
+    "'": "&#39;",
+};
+const escapeHtml = (value) => value.replace(/[&<>"']/g, (ch) => ESCAPE_HTML[ch] ?? ch);
+/**
+ * `form-action` governs where a form (and the redirect chain it triggers)
+ * may end up — not just the immediate POST target. Chromium enforces it on
+ * the 302 this page's own submission produces, so `'self'` alone blocks the
+ * approve/deny POST to `${oauthPath}/consent` from ever reaching a
+ * `redirectUri` on another origin (the common case — Claude, Gemini,
+ * loopback clients). `redirectUri` is already validated by `authorize.ts`
+ * before this renders, so its origin is safe to add here.
+ */
+const consentSecurityHeaders = (redirectUri) => ({
+    "Content-Security-Policy": `default-src 'none'; style-src 'unsafe-inline'; ` +
+        `form-action 'self' ${new URL(redirectUri).origin}; frame-ancestors 'none'`,
+    "X-Frame-Options": "DENY",
+    "Referrer-Policy": "no-referrer",
+    "Cache-Control": "no-store",
+});
+/** Built-in hardened interstitial — used whenever the host doesn't supply `consent.render`. */
+export const renderBuiltInConsent = (input) => {
+    const html = `<!doctype html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<title>Authorize access</title>
+<style>
+  body { font: 16px system-ui, sans-serif; max-width: 32rem; margin: 3rem auto; padding: 0 1rem; }
+  dl { display: grid; grid-template-columns: auto 1fr; gap: 0.25rem 1rem; }
+  dt { font-weight: 600; }
+  button { font-size: 1rem; padding: 0.5rem 1.25rem; margin-right: 0.5rem; }
+</style>
+</head>
+<body>
+<h1>Authorize access</h1>
+<p><strong>${escapeHtml(input.clientId)}</strong> is requesting access to your account.</p>
+<dl>
+  <dt>Redirect URI</dt><dd>${escapeHtml(input.redirectUri)}</dd>
+  <dt>Scope</dt><dd>${escapeHtml(input.scope.join(" ") || "(none)")}</dd>
+  <dt>Resource</dt><dd>${escapeHtml(input.resource)}</dd>
+</dl>
+<form method="POST" action="${escapeHtml(input.oauthPath)}/consent">
+  <input type="hidden" name="consent_ticket" value="${escapeHtml(input.ticket)}">
+  <button type="submit" name="approved" value="true">Allow</button>
+  <button type="submit" name="approved" value="false">Deny</button>
+</form>
+</body>
+</html>`;
+    return new Response(html, {
+        status: 200,
+        headers: {
+            "Content-Type": "text/html; charset=utf-8",
+            ...consentSecurityHeaders(input.redirectUri),
+        },
+    });
+};
+//# sourceMappingURL=consent-page.js.map

package/dist/oauth/endpoints/consent-page.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"consent-page.js","sourceRoot":"","sources":["../../../src/oauth/endpoints/consent-page.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAI1F,MAAM,WAAW,GAA2B;IAC1C,GAAG,EAAE,OAAO;IACZ,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,QAAQ;IACb,GAAG,EAAE,OAAO;CACb,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,KAAa,EAAU,EAAE,CAC3C,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;AAE3D;;;;;;;;GAQG;AACH,MAAM,sBAAsB,GAAG,CAAC,WAAmB,EAA0B,EAAE,CAAC,CAAC;IAC/E,yBAAyB,EACvB,iDAAiD;QACjD,sBAAsB,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,MAAM,0BAA0B;IAC7E,iBAAiB,EAAE,MAAM;IACzB,iBAAiB,EAAE,aAAa;IAChC,eAAe,EAAE,UAAU;CAC5B,CAAC,CAAC;AAEH,+FAA+F;AAC/F,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,KAAqB,EAAY,EAAE;IACtE,MAAM,IAAI,GAAG;;;;;;;;;;;;;;aAcF,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC;;6BAEV,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC;sBACpC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC;yBAC1C,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC;;8BAErB,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC;sDACH,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC;;;;;QAKtE,CAAC;IACP,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE;QACxB,MAAM,EAAE,GAAG;QACX,OAAO,EAAE;YACP,cAAc,EAAE,0BAA0B;YAC1C,GAAG,sBAAsB,CAAC,KAAK,CAAC,WAAW,CAAC;SAC7C;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/oauth/endpoints/consent.d.ts

@@ -0,0 +1,29 @@
+/**
+ * The consent step between a resolved user and code issuance (RFC 6749
+ * §4.1.1 "the resource owner grants or denies the ... request").
+ *
+ * `/authorize` seals everything the eventual `/consent` POST needs into an
+ * opaque, single-use ticket — the ticket carries `clientId`, `redirectUri`,
+ * `codeChallenge`, `resource`, and `scope` from the *validated* request, so
+ * `handleConsent` trusts nothing from the POST body except which ticket and
+ * whether the user approved it. Nothing else in that body is read.
+ */
+import type { ConsentRequest, OAuthRouterOptions, RegisteredClient, ResolvedOAuthRouterOptions } from "../types.js";
+type ConsentTicketPayload = {
+    clientId: string;
+    redirectUri: string;
+    codeChallenge: string;
+    userId: string;
+    resource: string;
+    scope: string;
+    state: string;
+    exp: number;
+    jti: string;
+};
+export declare const issueConsentTicket: (secret: string, payload: Omit<ConsentTicketPayload, "exp" | "jti">) => Promise<string>;
+export declare const renderConsent: (options: OAuthRouterOptions, input: ConsentRequest) => Promise<Response>;
+/** Only honored when `clientStore` actually resolves the id — never a self-invented one. */
+export declare const isPreApproved: (options: OAuthRouterOptions, clientId: string, registered: RegisteredClient | null) => boolean;
+export declare const handleConsent: (request: Request, options: ResolvedOAuthRouterOptions) => Promise<Response>;
+export {};
+//# sourceMappingURL=consent.d.ts.map

package/dist/oauth/endpoints/consent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"consent.d.ts","sourceRoot":"","sources":["../../../src/oauth/endpoints/consent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AASH,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAElB,gBAAgB,EAChB,0BAA0B,EAC3B,MAAM,aAAa,CAAC;AAMrB,KAAK,oBAAoB,GAAG;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,MAAM,EACd,SAAS,IAAI,CAAC,oBAAoB,EAAE,KAAK,GAAG,KAAK,CAAC,KACjD,OAAO,CAAC,MAAM,CAKkB,CAAC;AAEpC,eAAO,MAAM,aAAa,GACxB,SAAS,kBAAkB,EAC3B,OAAO,cAAc,KACpB,OAAO,CAAC,QAAQ,CAA6D,CAAC;AAEjF,4FAA4F;AAC5F,eAAO,MAAM,aAAa,GACxB,SAAS,kBAAkB,EAC3B,UAAU,MAAM,EAChB,YAAY,gBAAgB,GAAG,IAAI,KAClC,OAC0F,CAAC;AAyD9F,eAAO,MAAM,aAAa,GACxB,SAAS,OAAO,EAChB,SAAS,0BAA0B,KAClC,OAAO,CAAC,QAAQ,CAmClB,CAAC"}

package/dist/oauth/endpoints/consent.js

@@ -0,0 +1,98 @@
+/**
+ * The consent step between a resolved user and code issuance (RFC 6749
+ * §4.1.1 "the resource owner grants or denies the ... request").
+ *
+ * `/authorize` seals everything the eventual `/consent` POST needs into an
+ * opaque, single-use ticket — the ticket carries `clientId`, `redirectUri`,
+ * `codeChallenge`, `resource`, and `scope` from the *validated* request, so
+ * `handleConsent` trusts nothing from the POST body except which ticket and
+ * whether the user approved it. Nothing else in that body is read.
+ */
+import { NO_CORS, POST_ONLY, requireHttpMethod } from "../../http/http.js";
+import { auditLegacyKeyUsage } from "../audit.js";
+import { oauthError, resolveSecrets } from "../config.js";
+import { OAUTH_ERRORS } from "../constants.js";
+import { issueAuthCode } from "../crypto/codes.js";
+import { seal, unsealAny } from "../crypto/sealed.js";
+import { readBodyOrError, readOAuthBody } from "../policy/reqbody.js";
+import { codeRedirect, errorRedirect } from "./callback.js";
+import { renderBuiltInConsent } from "./consent-page.js";
+const CONSENT_TICKET_TTL_MS = 300_000;
+export const issueConsentTicket = (secret, payload) => seal(secret, "consent", {
+    ...payload,
+    exp: Date.now() + CONSENT_TICKET_TTL_MS,
+    jti: crypto.randomUUID(),
+});
+export const renderConsent = async (options, input) => (options.consent?.render ?? renderBuiltInConsent)(input);
+/** Only honored when `clientStore` actually resolves the id — never a self-invented one. */
+export const isPreApproved = (options, clientId, registered) => Boolean(registered) && (options.consent?.preApprovedClientIds?.includes(clientId) ?? false);
+/** Unseals `ticket`, checks its expiry/jti shape, and audits a legacy-key unseal. */
+const readValidTicket = async (request, options, ticket) => {
+    const secrets = await resolveSecrets(options.ports, request);
+    const unsealed = await unsealAny(secrets, "consent", ticket);
+    const payload = unsealed?.value ?? null;
+    if (!payload ||
+        typeof payload.exp !== "number" ||
+        payload.exp < Date.now() ||
+        typeof payload.jti !== "string" ||
+        !payload.jti) {
+        return oauthError(OAUTH_ERRORS.invalidGrant, 400, "invalid or expired consent_ticket");
+    }
+    await auditLegacyKeyUsage(options, {
+        clientId: payload.clientId,
+        keyIndex: unsealed?.keyIndex,
+        source: "consent ticket unsealed",
+    });
+    return { payload, secrets };
+};
+/**
+ * The resolved user, once the ticket is confirmed as theirs and burned.
+ * Consumed only after the user check — a POST from the wrong session must
+ * not burn the rightful user's ticket — but before either outcome (code or
+ * denial), so single-use holds. Auth codes share this store; the `ct:`
+ * prefix keeps a ticket's jti apart from a code's.
+ */
+const consumeTicketForUser = async (request, options, payload) => {
+    const user = await options.ports.resolveUser(request);
+    if (!user || user.id !== payload.userId) {
+        return oauthError(OAUTH_ERRORS.invalidGrant, 400, "consent_ticket does not match the current user");
+    }
+    const fresh = await options.ports.codeStore.consume(`ct:${payload.jti}`, payload.exp);
+    return fresh ? user : oauthError(OAUTH_ERRORS.invalidGrant, 400, "consent_ticket already used");
+};
+export const handleConsent = async (request, options) => {
+    const methodError = requireHttpMethod(request, POST_ONLY, NO_CORS);
+    if (methodError)
+        return methodError;
+    const body = await readBodyOrError(() => readOAuthBody(request));
+    if (body instanceof Response)
+        return body;
+    const ticket = body.consent_ticket ?? "";
+    if (!ticket) {
+        return oauthError(OAUTH_ERRORS.invalidRequest, 400, "consent_ticket required");
+    }
+    const resolved = await readValidTicket(request, options, ticket);
+    if (resolved instanceof Response)
+        return resolved;
+    const { payload, secrets } = resolved;
+    const user = await consumeTicketForUser(request, options, payload);
+    if (user instanceof Response)
+        return user;
+    const callback = {
+        redirectUri: payload.redirectUri,
+        state: payload.state,
+        issuer: new URL(request.url).origin,
+    };
+    if (body.approved !== "true")
+        return errorRedirect(callback, OAUTH_ERRORS.accessDenied);
+    const code = await issueAuthCode(secrets[0], {
+        clientId: payload.clientId,
+        redirectUri: payload.redirectUri,
+        codeChallenge: payload.codeChallenge,
+        userId: user.id,
+        resource: payload.resource,
+        scope: payload.scope,
+    });
+    return codeRedirect(callback, code);
+};
+//# sourceMappingURL=consent.js.map

package/dist/oauth/endpoints/consent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"consent.js","sourceRoot":"","sources":["../../../src/oauth/endpoints/consent.ts"],"names":[],"mappings":"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"}

package/dist/oauth/{metadata.d.ts → endpoints/metadata.d.ts}

@@ -1,5 +1,5 @@
-import { type GrantType, type TokenEndpointAuthMethod } from "./constants.js";
-export type { GrantType } from "./constants.js";
+import { type GrantType, type TokenEndpointAuthMethod } from "../constants.js";
+export type { GrantType } from "../constants.js";
 export type ProtectedResourceMetadata = {
     resource: string;
     authorization_servers: string[];
@@ -22,6 +22,10 @@ export type AuthorizationServerMetadata = {
     /** Omitted when `revokeToken` is not configured. */
     revocation_endpoint?: string;
     revocation_endpoint_auth_methods_supported?: TokenEndpointAuthMethod[];
+    /** RFC 9207 — authorize redirect includes `iss`. */
+    authorization_response_iss_parameter_supported?: boolean;
+    /** Client ID Metadata Documents (MCP 2026-07-28). */
+    client_id_metadata_document_supported?: boolean;
 };
 export type MetadataOptions = {
     origin: string;
@@ -38,6 +42,8 @@ export type MetadataOptions = {
     dcrEnabled?: boolean | undefined;
     /** Advertise `revocation_endpoint`. Default false. */
     revocationEnabled?: boolean | undefined;
+    /** Advertise CIMD support. Default false. */
+    cimdSupported?: boolean | undefined;
 };
 export declare const protectedResourceMetadata: (options: MetadataOptions) => ProtectedResourceMetadata;
 export declare const authorizationServerMetadata: (options: MetadataOptions) => AuthorizationServerMetadata;

package/dist/oauth/endpoints/metadata.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../../src/oauth/endpoints/metadata.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,SAAS,EAEd,KAAK,uBAAuB,EAC7B,MAAM,iBAAiB,CAAC;AAGzB,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB,EAAE,MAAM,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,+EAA+E;IAC/E,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,gCAAgC,EAAE,MAAM,EAAE,CAAC;IAC3C,qCAAqC,EAAE,uBAAuB,EAAE,CAAC;IACjE,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,kEAAkE;IAClE,4BAA4B,EAAE,OAAO,CAAC;IACtC,oDAAoD;IACpD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,0CAA0C,CAAC,EAAE,uBAAuB,EAAE,CAAC;IACvE,oDAAoD;IACpD,8CAA8C,CAAC,EAAE,OAAO,CAAC;IACzD,qDAAqD;IACrD,qCAAqC,CAAC,EAAE,OAAO,CAAC;CACjD,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,sCAAsC;IACtC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,4CAA4C;IAC5C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,uDAAuD;IACvD,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9B,uEAAuE;IACvE,wBAAwB,CAAC,EAAE,uBAAuB,EAAE,GAAG,SAAS,CAAC;IACjE,uDAAuD;IACvD,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,sDAAsD;IACtD,iBAAiB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACxC,6CAA6C;IAC7C,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACrC,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAI,SAAS,eAAe,KAAG,yBAKnE,CAAC;AAEH,eAAO,MAAM,2BAA2B,GACtC,SAAS,eAAe,KACvB,2BA2BF,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,MAAM,EACd,qBAAoC,EACpC,cAAa,KACZ,MAIC,CAAC"}

package/dist/oauth/{metadata.js → endpoints/metadata.js}

@@ -1,5 +1,6 @@
-import { DEFAULT_SCOPE, TOKEN_ENDPOINT_AUTH_METHODS, } from "./constants.js";
-import { canonicalResource, DEFAULT_RESOURCE_PATH } from "./resource.js";
+import { wwwAuthenticateHeader } from "../../auth/bearer.js";
+import { DEFAULT_OAUTH_PATH, DEFAULT_SCOPE, TOKEN_ENDPOINT_AUTH_METHODS, } from "../constants.js";
+import { canonicalResource, DEFAULT_RESOURCE_PATH } from "../policy/resource.js";
 export const protectedResourceMetadata = (options) => ({
     resource: canonicalResource(options.origin, options.resourcePath),
     authorization_servers: [options.origin],
@@ -7,7 +8,7 @@ export const protectedResourceMetadata = (options) => ({
     scopes_supported: options.scopes ?? [DEFAULT_SCOPE],
 });
 export const authorizationServerMetadata = (options) => {
-    const oauthPath = options.oauthPath ?? "/mcp/oauth";
+    const oauthPath = options.oauthPath ?? DEFAULT_OAUTH_PATH;
     const tokenEndpointAuthMethods = options.tokenEndpointAuthMethods ?? [
         TOKEN_ENDPOINT_AUTH_METHODS.none,
     ];
@@ -30,7 +31,12 @@ export const authorizationServerMetadata = (options) => {
         token_endpoint_auth_methods_supported: tokenEndpointAuthMethods,
         scopes_supported: options.scopes ?? [DEFAULT_SCOPE],
         resource_parameter_supported: true,
+        authorization_response_iss_parameter_supported: true,
+        ...(options.cimdSupported ? { client_id_metadata_document_supported: true } : {}),
     };
 };
-export const mcpWwwAuthenticate = (origin, resourcePath = DEFAULT_RESOURCE_PATH, realm = "mcp") => `Bearer realm="${realm}", resource_metadata="${origin}/.well-known/oauth-protected-resource${resourcePath}"`;
+export const mcpWwwAuthenticate = (origin, resourcePath = DEFAULT_RESOURCE_PATH, realm = "mcp") => wwwAuthenticateHeader({
+    realm,
+    resourceMetadataUrl: `${origin}/.well-known/oauth-protected-resource${resourcePath}`,
+});
 //# sourceMappingURL=metadata.js.map

package/dist/oauth/endpoints/metadata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/oauth/endpoints/metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EACL,kBAAkB,EAClB,aAAa,EAEb,2BAA2B,GAE5B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAoDjF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,OAAwB,EAA6B,EAAE,CAAC,CAAC;IACjG,QAAQ,EAAE,iBAAiB,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;IACjE,qBAAqB,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC;IACvC,wBAAwB,EAAE,CAAC,QAAQ,CAAC;IACpC,gBAAgB,EAAE,OAAO,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC;CACpD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CACzC,OAAwB,EACK,EAAE;IAC/B,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,kBAAkB,CAAC;IAC1D,MAAM,wBAAwB,GAAG,OAAO,CAAC,wBAAwB,IAAI;QACnE,2BAA2B,CAAC,IAAI;KACjC,CAAC;IACF,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,sBAAsB,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,YAAY;QACjE,cAAc,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,QAAQ;QACrD,GAAG,CAAC,OAAO,CAAC,UAAU,KAAK,KAAK;YAC9B,CAAC,CAAC,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,WAAW,EAAE;YACrE,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,OAAO,CAAC,iBAAiB;YAC3B,CAAC,CAAC;gBACE,mBAAmB,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,SAAS;gBAC3D,0CAA0C,EAAE,wBAAwB;aACrE;YACH,CAAC,CAAC,EAAE,CAAC;QACP,wBAAwB,EAAE,CAAC,MAAM,CAAC;QAClC,qBAAqB,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;QAC9C,gCAAgC,EAAE,CAAC,MAAM,CAAC;QAC1C,qCAAqC,EAAE,wBAAwB;QAC/D,gBAAgB,EAAE,OAAO,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC;QACnD,4BAA4B,EAAE,IAAI;QAClC,8CAA8C,EAAE,IAAI;QACpD,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,qCAAqC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAClF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,MAAc,EACd,YAAY,GAAG,qBAAqB,EACpC,KAAK,GAAG,KAAK,EACL,EAAE,CACV,qBAAqB,CAAC;IACpB,KAAK;IACL,mBAAmB,EAAE,GAAG,MAAM,wCAAwC,YAAY,EAAE;CACrF,CAAC,CAAC"}

package/dist/oauth/endpoints/register.d.ts

@@ -0,0 +1,10 @@
+/**
+ * RFC 7591 Dynamic Client Registration — `POST ${oauthPath}/register`.
+ *
+ * Zero storage: the issued `client_id` is a sealed assertion of the validated
+ * `redirect_uris` (see `sealed.ts`). Unauthenticated callers can still mint
+ * their own id; consent + `requireRegisteredClients` address impersonation.
+ */
+import type { OAuthRouterOptions } from "../types.js";
+export declare const handleRegister: (request: Request, options: OAuthRouterOptions) => Promise<Response>;
+//# sourceMappingURL=register.d.ts.map

package/dist/oauth/endpoints/register.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../src/oauth/endpoints/register.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAUH,OAAO,KAAK,EAAmB,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAsFvE,eAAO,MAAM,cAAc,GACzB,SAAS,OAAO,EAChB,SAAS,kBAAkB,KAC1B,OAAO,CAAC,QAAQ,CAgBlB,CAAC"}