mcp-trellis 1.0.0 → 2.2.0

package/dist/oauth/config.js

@@ -0,0 +1,108 @@
+/** OAuth construction asserts and small response helpers. */
+import { jsonResponse } from "../http/http.js";
+import { DEFAULT_SCOPE } from "./constants.js";
+/** Default true — see `OAuthRouterOptions.allowUnregisteredClients`. */
+export const unregisteredClientsAllowed = (options) => options.allowUnregisteredClients !== false;
+/** Default true since 1.0 — see `OAuthRouterOptions.requireRegisteredClients`. */
+export const registeredClientsRequired = (options) => options.requireRegisteredClients !== false;
+/** Scopes this AS advertises and is willing to grant. */
+export const advertisedScopes = (options) => options.scopes ?? [DEFAULT_SCOPE];
+/**
+ * Scopes granted when a client omits `scope`. Falls back to the full
+ * advertised set only when that set has at most one entry — see
+ * `assertScopeConfig`, which forbids the ambiguous multi-scope case at
+ * construction instead of silently over-granting here.
+ */
+export const defaultScopes = (options) => options.defaultScopes ?? advertisedScopes(options);
+/**
+ * A multi-scope server MUST say what an omitted `scope` grants — the
+ * alternative (silently granting everything advertised) is exactly the
+ * escalation least-privilege scoping exists to prevent.
+ *
+ * This controls only what a *token* is granted at authorize time —
+ * `defaultScopes: []` still leaves any tool that omits `ToolDef.scope`
+ * callable by a principal holding zero scopes, since that check happens
+ * per tool-call, not here. `createMcpApp` has the matching guard on the
+ * tool side: it refuses to construct with an unscoped tool once `scopes`
+ * has more than one entry (`assertToolScopesConfigured` in `app.ts`).
+ */
+export const assertScopeConfig = (options) => {
+    const advertised = advertisedScopes(options);
+    if (advertised.length > 1 && !options.defaultScopes) {
+        throw new Error("scopes has more than one entry — defaultScopes must say what an omitted " +
+            "scope request grants (e.g. defaultScopes: [] for least privilege)");
+    }
+    const unknown = (options.defaultScopes ?? []).find((scope) => !advertised.includes(scope));
+    if (unknown !== undefined) {
+        throw new Error(`defaultScopes contains "${unknown}", which is not in scopes`);
+    }
+};
+/**
+ * `codeSecret` can forge an auth code for any userId/scope/resource, so a
+ * weak or copy-pasted one is a full authorization bypass, not a footgun.
+ * Copy-paste from this package's docs is the realistic failure mode: every
+ * published example secret is either under the length floor or carries
+ * the marker below (enforced by test/oauth/crypto/codesecret.test.ts).
+ */
+const MIN_CODE_SECRET_LENGTH = 32;
+const DENYLISTED_CODE_SECRET_MARKER = "do-not-reuse";
+const GENERATE_HINT = "generate one with `openssl rand -base64 32`";
+export const assertCodeSecret = (secret) => {
+    // Checked before the length rule so a copied example is named for what it is.
+    if (secret.includes(DENYLISTED_CODE_SECRET_MARKER)) {
+        throw new Error(`codeSecret must not be a literal published in this package's own docs or examples — ${GENERATE_HINT}`);
+    }
+    if (secret.length < MIN_CODE_SECRET_LENGTH) {
+        throw new Error(`codeSecret must be at least ${MIN_CODE_SECRET_LENGTH} characters (got ${secret.length}) — ${GENERATE_HINT}`);
+    }
+};
+/**
+ * Resolves `codeSecret` to a non-empty key list — a single string becomes a
+ * one-element array. The **first** entry is the one every caller here uses
+ * to seal new material or hash new client secrets; the full array is what a
+ * caller trying to unseal/verify existing material tries in order (see
+ * `unsealAny`, `verifyClientSecretAny`). Every entry is validated the same
+ * way a lone string always was.
+ */
+export const resolveSecrets = async (ports, request) => {
+    const resolved = typeof ports.codeSecret === "function" ? await ports.codeSecret(request) : ports.codeSecret;
+    const secrets = Array.isArray(resolved) ? resolved : [resolved];
+    if (secrets.length === 0) {
+        throw new Error("codeSecret must resolve to at least one key, not an empty array");
+    }
+    secrets.forEach(assertCodeSecret);
+    // Cast is sound: the length check above guarantees at least one element.
+    return secrets;
+};
+export const oauthError = (error, status, description) => jsonResponse({
+    data: description ? { error, error_description: description } : { error },
+    status,
+    cors: false,
+});
+const UNREGISTERED_CLIENT_DESCRIPTION = "unknown client_id — this server only serves pre-registered clients";
+/** Direct JSON error when this AS does not serve unknown `client_id`s. */
+export const unregisteredClientError = (options, reject) => {
+    if (unregisteredClientsAllowed(options))
+        return null;
+    return oauthError(reject.code, reject.status, UNREGISTERED_CLIENT_DESCRIPTION);
+};
+/**
+ * `grantedScope` is what the auth code carried (or a narrowed refresh
+ * request); the port may narrow it further. With neither, `scope` is
+ * omitted (optional when unchanged, RFC 6749 §5.1) rather than guessed.
+ */
+export const tokenResponse = (minted, grantedScope) => {
+    const scope = minted.scope ?? grantedScope;
+    return jsonResponse({
+        data: {
+            access_token: minted.accessToken,
+            token_type: minted.tokenType ?? "bearer",
+            expires_in: minted.expiresIn,
+            ...(scope !== undefined ? { scope } : {}),
+            ...(minted.refreshToken ? { refresh_token: minted.refreshToken } : {}),
+        },
+        status: 200,
+        cors: false,
+    });
+};
+//# sourceMappingURL=config.js.map

package/dist/oauth/config.js.map

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

package/dist/oauth/constants.d.ts

@@ -8,6 +8,8 @@ export declare const OAUTH_ERRORS: {
     readonly invalidGrant: "invalid_grant";
     readonly unsupportedGrantType: "unsupported_grant_type";
     readonly invalidRedirectUri: "invalid_redirect_uri";
+    /** RFC 7591 §3.2.2 — DCR `/register`: a client metadata field's value itself is invalid. */
+    readonly invalidClientMetadata: "invalid_client_metadata";
     /** Token endpoint — client authentication failed, or the client is unknown. */
     readonly invalidClient: "invalid_client";
     /** Authorization endpoint — this client may not use this method. RFC 6749 §4.1.2.1. */
@@ -33,4 +35,13 @@ export declare const TOKEN_ENDPOINT_AUTH_METHODS: {
 };
 export type TokenEndpointAuthMethod = (typeof TOKEN_ENDPOINT_AUTH_METHODS)[keyof typeof TOKEN_ENDPOINT_AUTH_METHODS];
 export declare const DEFAULT_SCOPE = "mcp";
+/** Default OAuth path prefix when `oauthPath` is unset. Router, `/authorize`, and metadata must agree. */
+export declare const DEFAULT_OAUTH_PATH = "/mcp/oauth";
+/**
+ * Cap on a client's redirect URIs, self-registered or from a CIMD document.
+ * RFC 7591 sets none, but `/register` seals the whole list into the
+ * `client_id`, which then travels as an `/authorize` query parameter with
+ * real length ceilings (browsers, proxies, logs). A client needs a handful.
+ */
+export declare const MAX_CLIENT_REDIRECT_URIS = 10;
 //# sourceMappingURL=constants.d.ts.map

package/dist/oauth/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/oauth/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW;;;CAGd,CAAC;AAEX,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,CAAC;AAEvE,eAAO,MAAM,YAAY;;;;;IAKvB,+EAA+E;;IAE/E,uFAAuF;;IAEvF,kGAAkG;;IAElG,2DAA2D;;IAE3D,uDAAuD;;IAEvD,iFAAiF;;IAEjF,6DAA6D;;CAErD,CAAC;AAEX,eAAO,MAAM,2BAA2B;IACtC,8CAA8C;;IAE9C,+CAA+C;;IAE/C,uCAAuC;;CAE/B,CAAC;AAEX,MAAM,MAAM,uBAAuB,GACjC,CAAC,OAAO,2BAA2B,CAAC,CAAC,MAAM,OAAO,2BAA2B,CAAC,CAAC;AAEjF,eAAO,MAAM,aAAa,QAAQ,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/oauth/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW;;;CAGd,CAAC;AAEX,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,CAAC;AAEvE,eAAO,MAAM,YAAY;;;;;IAKvB,4FAA4F;;IAE5F,+EAA+E;;IAE/E,uFAAuF;;IAEvF,kGAAkG;;IAElG,2DAA2D;;IAE3D,uDAAuD;;IAEvD,iFAAiF;;IAEjF,6DAA6D;;CAErD,CAAC;AAEX,eAAO,MAAM,2BAA2B;IACtC,8CAA8C;;IAE9C,+CAA+C;;IAE/C,uCAAuC;;CAE/B,CAAC;AAEX,MAAM,MAAM,uBAAuB,GACjC,CAAC,OAAO,2BAA2B,CAAC,CAAC,MAAM,OAAO,2BAA2B,CAAC,CAAC;AAEjF,eAAO,MAAM,aAAa,QAAQ,CAAC;AAEnC,0GAA0G;AAC1G,eAAO,MAAM,kBAAkB,eAAe,CAAC;AAE/C;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,KAAK,CAAC"}

package/dist/oauth/constants.js

@@ -7,6 +7,8 @@ export const OAUTH_ERRORS = {
     invalidGrant: "invalid_grant",
     unsupportedGrantType: "unsupported_grant_type",
     invalidRedirectUri: "invalid_redirect_uri",
+    /** RFC 7591 §3.2.2 — DCR `/register`: a client metadata field's value itself is invalid. */
+    invalidClientMetadata: "invalid_client_metadata",
     /** Token endpoint — client authentication failed, or the client is unknown. */
     invalidClient: "invalid_client",
     /** Authorization endpoint — this client may not use this method. RFC 6749 §4.1.2.1. */
@@ -31,4 +33,13 @@ export const TOKEN_ENDPOINT_AUTH_METHODS = {
     post: "client_secret_post",
 };
 export const DEFAULT_SCOPE = "mcp";
+/** Default OAuth path prefix when `oauthPath` is unset. Router, `/authorize`, and metadata must agree. */
+export const DEFAULT_OAUTH_PATH = "/mcp/oauth";
+/**
+ * Cap on a client's redirect URIs, self-registered or from a CIMD document.
+ * RFC 7591 sets none, but `/register` seals the whole list into the
+ * `client_id`, which then travels as an `/authorize` query parameter with
+ * real length ceilings (browsers, proxies, logs). A client needs a handful.
+ */
+export const MAX_CLIENT_REDIRECT_URIS = 10;
 //# sourceMappingURL=constants.js.map

package/dist/oauth/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/oauth/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,iBAAiB,EAAE,oBAAoB;IACvC,YAAY,EAAE,eAAe;CACrB,CAAC;AAIX,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,cAAc,EAAE,iBAAiB;IACjC,YAAY,EAAE,eAAe;IAC7B,oBAAoB,EAAE,wBAAwB;IAC9C,kBAAkB,EAAE,sBAAsB;IAC1C,+EAA+E;IAC/E,aAAa,EAAE,gBAAgB;IAC/B,uFAAuF;IACvF,kBAAkB,EAAE,qBAAqB;IACzC,kGAAkG;IAClG,uBAAuB,EAAE,2BAA2B;IACpD,2DAA2D;IAC3D,YAAY,EAAE,eAAe;IAC7B,uDAAuD;IACvD,aAAa,EAAE,gBAAgB;IAC/B,iFAAiF;IACjF,WAAW,EAAE,cAAc;IAC3B,6DAA6D;IAC7D,YAAY,EAAE,eAAe;CACrB,CAAC;AAEX,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,8CAA8C;IAC9C,IAAI,EAAE,MAAM;IACZ,+CAA+C;IAC/C,KAAK,EAAE,qBAAqB;IAC5B,uCAAuC;IACvC,IAAI,EAAE,oBAAoB;CAClB,CAAC;AAKX,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/oauth/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,iBAAiB,EAAE,oBAAoB;IACvC,YAAY,EAAE,eAAe;CACrB,CAAC;AAIX,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,cAAc,EAAE,iBAAiB;IACjC,YAAY,EAAE,eAAe;IAC7B,oBAAoB,EAAE,wBAAwB;IAC9C,kBAAkB,EAAE,sBAAsB;IAC1C,4FAA4F;IAC5F,qBAAqB,EAAE,yBAAyB;IAChD,+EAA+E;IAC/E,aAAa,EAAE,gBAAgB;IAC/B,uFAAuF;IACvF,kBAAkB,EAAE,qBAAqB;IACzC,kGAAkG;IAClG,uBAAuB,EAAE,2BAA2B;IACpD,2DAA2D;IAC3D,YAAY,EAAE,eAAe;IAC7B,uDAAuD;IACvD,aAAa,EAAE,gBAAgB;IAC/B,iFAAiF;IACjF,WAAW,EAAE,cAAc;IAC3B,6DAA6D;IAC7D,YAAY,EAAE,eAAe;CACrB,CAAC;AAEX,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,8CAA8C;IAC9C,IAAI,EAAE,MAAM;IACZ,+CAA+C;IAC/C,KAAK,EAAE,qBAAqB;IAC5B,uCAAuC;IACvC,IAAI,EAAE,oBAAoB;CAClB,CAAC;AAKX,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC;AAEnC,0GAA0G;AAC1G,MAAM,CAAC,MAAM,kBAAkB,GAAG,YAAY,CAAC;AAE/C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,EAAE,CAAC"}

package/dist/oauth/{base64url.d.ts → crypto/base64url.d.ts}

@@ -1,5 +1,4 @@
 /** Shared base64url helpers (WebCrypto / DOM — no Node Buffer). */
 export declare const bytesToBase64Url: (bytes: ArrayBuffer | Uint8Array) => string;
-export declare const textToBase64Url: (text: string) => string;
 export declare const fromBase64Url: (text: string) => Uint8Array<ArrayBuffer>;
 //# sourceMappingURL=base64url.d.ts.map

package/dist/oauth/crypto/base64url.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"base64url.d.ts","sourceRoot":"","sources":["../../../src/oauth/crypto/base64url.ts"],"names":[],"mappings":"AAAA,mEAAmE;AAEnE,eAAO,MAAM,gBAAgB,GAAI,OAAO,WAAW,GAAG,UAAU,KAAG,MAIlE,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,KAAG,UAAU,CAAC,WAAW,CAKlE,CAAC"}

package/dist/oauth/{base64url.js → crypto/base64url.js}

@@ -4,7 +4,6 @@ export const bytesToBase64Url = (bytes) => {
     const binary = Array.from(u8, (byte) => String.fromCharCode(byte)).join("");
     return btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 };
-export const textToBase64Url = (text) => bytesToBase64Url(new TextEncoder().encode(text));
 export const fromBase64Url = (text) => {
     const padded = text.replace(/-/g, "+").replace(/_/g, "/");
     const pad = padded.length % 4 === 0 ? "" : "=".repeat(4 - (padded.length % 4));

package/dist/oauth/crypto/base64url.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base64url.js","sourceRoot":"","sources":["../../../src/oauth/crypto/base64url.ts"],"names":[],"mappings":"AAAA,mEAAmE;AAEnE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAA+B,EAAU,EAAE;IAC1E,MAAM,EAAE,GAAG,KAAK,YAAY,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5E,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACjF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAY,EAA2B,EAAE;IACrE,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IAC/E,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC;IAC/B,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC,CAAC"}

package/dist/oauth/crypto/clientauth.d.ts

@@ -0,0 +1,13 @@
+/** Token-endpoint client authentication (RFC 6749 §2.3.1). */
+import { type TokenEndpointAuthMethod } from "../constants.js";
+import type { OAuthRouterOptions } from "../types.js";
+export type ClientAuth = {
+    clientId: string;
+    secret: string | null;
+    method: TokenEndpointAuthMethod;
+};
+/** Credentials from the Authorization header, else from the body. */
+export declare const readClientAuth: (request: Request, body: Record<string, string>) => ClientAuth | null;
+/** Enforce the registered auth method for known clients — see the helpers above for each branch. */
+export declare const firstClientAuthError: (auth: ClientAuth, options: OAuthRouterOptions, request: Request) => Promise<Response | null>;
+//# sourceMappingURL=clientauth.d.ts.map

package/dist/oauth/crypto/clientauth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clientauth.d.ts","sourceRoot":"","sources":["../../../src/oauth/crypto/clientauth.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAU9D,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAGV,kBAAkB,EAEnB,MAAM,aAAa,CAAC;AAIrB,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,uBAAuB,CAAC;CACjC,CAAC;AA6BF,qEAAqE;AACrE,eAAO,MAAM,cAAc,GACzB,SAAS,OAAO,EAChB,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAC3B,UAAU,GAAG,IAaf,CAAC;AA2LF,oGAAoG;AACpG,eAAO,MAAM,oBAAoB,GAC/B,MAAM,UAAU,EAChB,SAAS,kBAAkB,EAC3B,SAAS,OAAO,KACf,OAAO,CAAC,QAAQ,GAAG,IAAI,CAMzB,CAAC"}

package/dist/oauth/crypto/clientauth.js

@@ -0,0 +1,195 @@
+/** Token-endpoint client authentication (RFC 6749 §2.3.1). */
+import { auditLegacyKeyUsage, safeOAuthAudit } from "../audit.js";
+import { cimdFetchOpts, isCimdClientId, resolveCimdClient } from "../cimd/cimd.js";
+import { oauthError, registeredClientsRequired, resolveSecrets, unregisteredClientsAllowed, } from "../config.js";
+import { OAUTH_ERRORS, TOKEN_ENDPOINT_AUTH_METHODS, } from "../constants.js";
+import { unsealAny } from "./sealed.js";
+import { verifyClientSecretAny } from "./secrethash.js";
+/** RFC 7235 §2.1 — the auth-scheme token is case-insensitive. */
+const BASIC_SCHEME_RE = /^basic\s+/i;
+/** RFC 6749 §2.3.1 — id and secret are form-urlencoded, so `+` means a space. */
+const decodeFormComponent = (value) => decodeURIComponent(value.replace(/\+/g, " "));
+/** `Authorization: Basic base64(urlencode(id):urlencode(secret))`. */
+const parseBasicAuth = (header) => {
+    const scheme = header ? BASIC_SCHEME_RE.exec(header) : null;
+    if (!header || !scheme)
+        return null;
+    try {
+        const decoded = atob(header.slice(scheme[0].length).trim());
+        const separator = decoded.indexOf(":");
+        if (separator < 0)
+            return null;
+        const clientId = decodeFormComponent(decoded.slice(0, separator));
+        if (!clientId)
+            return null;
+        return {
+            clientId,
+            secret: decodeFormComponent(decoded.slice(separator + 1)),
+            method: TOKEN_ENDPOINT_AUTH_METHODS.basic,
+        };
+    }
+    catch {
+        return null;
+    }
+};
+/** Credentials from the Authorization header, else from the body. */
+export const readClientAuth = (request, body) => {
+    const basic = parseBasicAuth(request.headers.get("Authorization"));
+    if (basic)
+        return basic;
+    const clientId = body.client_id ?? "";
+    if (!clientId)
+        return null;
+    const secret = body.client_secret ?? "";
+    return {
+        clientId,
+        secret: secret.length > 0 ? secret : null,
+        method: secret.length > 0 ? TOKEN_ENDPOINT_AUTH_METHODS.post : TOKEN_ENDPOINT_AUTH_METHODS.none,
+    };
+};
+/**
+ * Every failure below returns the same code, status, and description.
+ * Distinguishable messages here ("client requires client_secret_basic" vs.
+ * "unknown client_id" vs. "client_secret required" vs. …) let an
+ * unauthenticated caller enumerate which client_ids this server actually
+ * knows about and how each is configured, just by reading error text —
+ * a real information leak on the one endpoint whose entire job is to
+ * reject an untrusted caller. `/authorize`'s `unauthorized_client` stays
+ * descriptive on purpose: it's a human debugging an OAuth flow in a
+ * browser, not a bare API response, and a locked-down server already
+ * announces the same fact by omitting `registration_endpoint` from its
+ * metadata.
+ */
+const CLIENT_AUTH_FAILED = "client authentication failed";
+/** The generic response every failure below returns to the caller. */
+const invalidClient = () => oauthError(OAUTH_ERRORS.invalidClient, 401, CLIENT_AUTH_FAILED);
+/** The response above, plus the real reason to `ports.audit` — never to the caller. */
+const invalidClientAudited = async ({ auth, options }, reason) => {
+    await safeOAuthAudit(options, { event: "client_auth_failed", clientId: auth.clientId, reason });
+    return invalidClient();
+};
+/**
+ * Never a real credential — exists only so the locked-down branch below
+ * does the same amount of comparison work whether or not a secret was
+ * actually presented, and whether or not a stored hash actually exists.
+ */
+const DUMMY_SECRET = "dummy-secret-for-constant-time-padding";
+const DUMMY_STORED_HASH = "hmac-sha256$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
+/**
+ * Rejects with `reason`, but only after paying the same
+ * `verifyClientSecretAny` cost a real (wrong-secret) rejection would — a
+ * missing or empty secret is replaced by `DUMMY_SECRET`, so a caller who
+ * presented nothing can't be told apart, by timing, from a wrong secret.
+ */
+const rejectWithDummyCompare = async (context, reason) => {
+    const codeSecretValues = await resolveSecrets(context.options.ports, context.request);
+    const presented = context.auth.secret || DUMMY_SECRET;
+    await verifyClientSecretAny(presented, DUMMY_STORED_HASH, codeSecretValues);
+    return invalidClientAudited(context, reason);
+};
+/**
+ * True when `clientId` is this server's own sealed `/register` assertion or,
+ * with CIMD enabled, a resolvable CIMD document. URL-shaped ids are always
+ * re-resolved, never accepted by shape alone.
+ */
+const isSelfRegisteredOrCimdClient = async ({ auth, options, request, }) => {
+    const codeSecretValues = await resolveSecrets(options.ports, request);
+    const unsealed = await unsealAny(codeSecretValues, "client", auth.clientId);
+    if (unsealed) {
+        await auditLegacyKeyUsage(options, {
+            clientId: auth.clientId,
+            keyIndex: unsealed.keyIndex,
+            source: "client assertion unsealed",
+        });
+        return true;
+    }
+    if (options.cimd !== true || !isCimdClientId(auth.clientId))
+        return false;
+    if (await resolveCimdClient(auth.clientId, cimdFetchOpts(options)))
+        return true;
+    // Without `cimdCache` every refresh/revoke re-fetches — a flaky document
+    // host logs users out. Surface that distinctly.
+    await safeOAuthAudit(options, {
+        event: "cimd_resolve_failed",
+        clientId: auth.clientId,
+        reason: "CIMD document could not be resolved at token/revoke time",
+    });
+    return false;
+};
+/**
+ * An unknown client_id is treated as public — PKCE is its only proof —
+ * unless `allowUnregisteredClients` is false, in which case it is rejected.
+ * On that locked-down path a dummy secret comparison runs even for a
+ * client_id this server has never heard of, so timing can't distinguish
+ * "unknown" from "known, wrong secret". Public clients never pay that cost.
+ *
+ * Under `requireRegisteredClients`, a client_id resolved by neither
+ * `clientStore`, this server's own sealed `/register` assertion, nor CIMD is
+ * rejected — the same rule `/authorize` enforces. It lives in this shared
+ * gate so the `refresh_token` grant and `/revoke` cannot be reached with an
+ * invented id that never went through `/authorize`.
+ */
+const unregisteredClientAuthError = async (context) => {
+    if (!unregisteredClientsAllowed(context.options)) {
+        return rejectWithDummyCompare(context, "unknown client_id");
+    }
+    if (!registeredClientsRequired(context.options))
+        return null;
+    if (await isSelfRegisteredOrCimdClient(context))
+        return null;
+    return invalidClientAudited(context, "client_id must come from clientStore or this server's own /register");
+};
+/** Compare against `ClientStore.secretHash` — the same cost whether a hash is on file or not. */
+const secretHashAuthError = async (context, secret, secretHash) => {
+    const { auth, options, request } = context;
+    const codeSecretValues = await resolveSecrets(options.ports, request);
+    const stored = await secretHash(auth.clientId);
+    const { ok, keyIndex } = await verifyClientSecretAny(secret, stored ?? DUMMY_STORED_HASH, codeSecretValues);
+    if (ok && stored !== null) {
+        await auditLegacyKeyUsage(options, {
+            clientId: auth.clientId,
+            keyIndex,
+            source: "client_secret_hash verified",
+        });
+        return null;
+    }
+    return invalidClientAudited(context, stored === null ? "no secretHash on file for this client" : "secretHash mismatch");
+};
+/** Delegate the comparison to the host's `ClientStore.verifySecret`. */
+const verifySecretAuthError = async (context, secret, verifySecret) => {
+    if (!verifySecret) {
+        return invalidClientAudited(context, "clientStore.verifySecret is not configured");
+    }
+    if (!(await verifySecret(context.auth.clientId, secret))) {
+        return invalidClientAudited(context, "verifySecret returned false");
+    }
+    return null;
+};
+/** Enforce a known client's own `tokenEndpointAuthMethod`. */
+const registeredClientAuthError = async (context, registered) => {
+    const { auth, options } = context;
+    const expected = registered.tokenEndpointAuthMethod;
+    if (expected === TOKEN_ENDPOINT_AUTH_METHODS.none)
+        return null;
+    // A wrong method or a missing secret pays the same comparison cost as a
+    // wrong secret, so neither branch leaks "this client exists and needs a
+    // secret" through response timing.
+    if (auth.method !== expected) {
+        return rejectWithDummyCompare(context, `client requires ${expected}, got ${auth.method}`);
+    }
+    if (!auth.secret)
+        return rejectWithDummyCompare(context, "client_secret required");
+    const store = options.ports.clientStore;
+    return store?.secretHash
+        ? secretHashAuthError(context, auth.secret, store.secretHash)
+        : verifySecretAuthError(context, auth.secret, store?.verifySecret);
+};
+/** Enforce the registered auth method for known clients — see the helpers above for each branch. */
+export const firstClientAuthError = async (auth, options, request) => {
+    const context = { auth, options, request };
+    const registered = (await options.ports.clientStore?.get(auth.clientId)) ?? null;
+    return registered
+        ? registeredClientAuthError(context, registered)
+        : unregisteredClientAuthError(context);
+};
+//# sourceMappingURL=clientauth.js.map

package/dist/oauth/crypto/clientauth.js.map

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

package/dist/oauth/crypto/codes.d.ts

@@ -0,0 +1,65 @@
+export type AuthCodeRecord = {
+    clientId: string;
+    redirectUri: string;
+    codeChallenge: string;
+    /** Consenting user id — required so minted tokens are bound. */
+    userId: string;
+    /** RFC 8707 resource indicator — audience for the eventual access token. */
+    resource: string;
+    /** Space-delimited scope granted at authorize time. */
+    scope: string;
+    exp: number;
+};
+export type CodeStore = {
+    /**
+     * Mark a code jti as consumed; return false if already used.
+     * `expMs` is the code expiry (ms since epoch) for TTL-backed stores.
+     */
+    consume: (jti: string, expMs: number) => Promise<boolean> | boolean;
+};
+/**
+ * Process-local jti → expMs map when no shared codeStore is provided.
+ * ponytail: single-process only; multi-instance → pass ports.codeStore (KV/Redis SET NX EX).
+ */
+export declare const createMemoryCodeStore: () => CodeStore;
+/**
+ * The one process-wide in-memory store. Shared rather than per router: an
+ * app built per request (`buildApp(env).fetch(req)`) would otherwise get a
+ * fresh map each time and lose single-use entirely. `createOAuthRouter`
+ * resolves it into `ports.codeStore` only when `allowInMemoryCodeStore` is
+ * set; endpoint handlers never fall back on their own.
+ */
+export declare const processCodeStore: CodeStore;
+/**
+ * Issue an AES-GCM sealed auth code (v2). Single-use via codeStore, or
+ * pruning in-memory Map when omitted.
+ */
+export declare const issueAuthCode: (secret: string, record: Omit<AuthCodeRecord, "exp">, nowMs?: number) => Promise<string>;
+/**
+ * Rotation-aware `consumeAuthCode`, also reporting which `secret` entry
+ * actually unsealed the code — used only by `token.ts` to audit
+ * `"legacy_code_secret_used"` without a second decrypt pass. Not part of
+ * the public API; `consumeAuthCode` below is the stable, exported surface.
+ */
+export declare const consumeAuthCodeDetailed: (secret: string | readonly string[], code: string, options?: {
+    codeStore?: CodeStore | undefined;
+    nowMs?: number | undefined;
+}) => Promise<{
+    record: AuthCodeRecord;
+    keyIndex: number;
+} | null>;
+/**
+ * `secret` may be a single key or a list — every entry is tried, so a code
+ * sealed under an older `codeSecret` keeps redeeming during rotation. See
+ * `resolveSecrets`/`OAuthPorts.codeSecret` for the rotation contract.
+ *
+ * Omitting `options.codeStore` is deprecated: it falls back to a
+ * process-local map that cannot enforce single use across instances, and
+ * `codeStore` becomes required in 3.0.
+ */
+export declare const consumeAuthCode: (secret: string | readonly string[], code: string, options?: {
+    codeStore?: CodeStore | undefined;
+    nowMs?: number | undefined;
+}) => Promise<AuthCodeRecord | null>;
+export declare const newClientId: () => string;
+//# sourceMappingURL=codes.d.ts.map

package/dist/oauth/crypto/codes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"codes.d.ts","sourceRoot":"","sources":["../../../src/oauth/crypto/codes.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,gEAAgE;IAChE,MAAM,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,QAAQ,EAAE,MAAM,CAAC;IACjB,uDAAuD;IACvD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB;;;OAGG;IACH,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;CACrE,CAAC;AAQF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,QAAO,SAiBxC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,EAAE,SAAmC,CAAC;AAEnE;;;GAGG;AACH,eAAO,MAAM,aAAa,GACxB,QAAQ,MAAM,EACd,QAAQ,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,EACnC,cAAkB,KACjB,OAAO,CAAC,MAAM,CAOhB,CAAC;AAmCF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GAClC,QAAQ,MAAM,GAAG,SAAS,MAAM,EAAE,EAClC,MAAM,MAAM,EACZ,UAAS;IAAE,SAAS,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAO,KAC9E,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAqB7D,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,eAAe,GAC1B,QAAQ,MAAM,GAAG,SAAS,MAAM,EAAE,EAClC,MAAM,MAAM,EACZ,UAAS;IAAE,SAAS,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAO,KAC9E,OAAO,CAAC,cAAc,GAAG,IAAI,CAG/B,CAAC;AAEF,eAAO,MAAM,WAAW,QAAO,MAA6B,CAAC"}

package/dist/oauth/crypto/codes.js

@@ -0,0 +1,121 @@
+import { randomBase64Url } from "./pkce.js";
+import { seal, unsealAny } from "./sealed.js";
+const CODE_TTL_MS = 600_000;
+/** AES-GCM sealed auth codes — authenticated and encrypted (see `sealed.ts`). */
+const SEALED_PREFIX = "v2.";
+/**
+ * Prune the in-memory store at most this often: a full `Map` scan on every
+ * `consume` would run for every code and consent-ticket redemption.
+ */
+const PRUNE_INTERVAL_MS = 60_000;
+/**
+ * Process-local jti → expMs map when no shared codeStore is provided.
+ * ponytail: single-process only; multi-instance → pass ports.codeStore (KV/Redis SET NX EX).
+ */
+export const createMemoryCodeStore = () => {
+    const used = new Map();
+    let lastPrunedAtMs = 0;
+    return {
+        consume: (jti, expMs) => {
+            const nowMs = Date.now();
+            if (nowMs - lastPrunedAtMs >= PRUNE_INTERVAL_MS) {
+                lastPrunedAtMs = nowMs;
+                for (const [key, exp] of used) {
+                    if (exp < nowMs)
+                        used.delete(key);
+                }
+            }
+            if (used.has(jti))
+                return false;
+            used.set(jti, expMs);
+            return true;
+        },
+    };
+};
+/**
+ * The one process-wide in-memory store. Shared rather than per router: an
+ * app built per request (`buildApp(env).fetch(req)`) would otherwise get a
+ * fresh map each time and lose single-use entirely. `createOAuthRouter`
+ * resolves it into `ports.codeStore` only when `allowInMemoryCodeStore` is
+ * set; endpoint handlers never fall back on their own.
+ */
+export const processCodeStore = createMemoryCodeStore();
+/**
+ * Issue an AES-GCM sealed auth code (v2). Single-use via codeStore, or
+ * pruning in-memory Map when omitted.
+ */
+export const issueAuthCode = async (secret, record, nowMs = Date.now()) => {
+    const body = {
+        ...record,
+        exp: nowMs + CODE_TTL_MS,
+        jti: randomBase64Url(12),
+    };
+    return `${SEALED_PREFIX}${await seal(secret, "code", body)}`;
+};
+const shapeCheckedRecord = (data, nowMs) => {
+    if (typeof data.clientId !== "string" ||
+        typeof data.redirectUri !== "string" ||
+        typeof data.codeChallenge !== "string" ||
+        typeof data.userId !== "string" ||
+        typeof data.resource !== "string" ||
+        data.resource.length === 0 ||
+        typeof data.scope !== "string" ||
+        typeof data.exp !== "number" ||
+        data.exp < nowMs ||
+        typeof data.jti !== "string" ||
+        data.jti.length === 0) {
+        return null;
+    }
+    return {
+        clientId: data.clientId,
+        redirectUri: data.redirectUri,
+        codeChallenge: data.codeChallenge,
+        userId: data.userId,
+        resource: data.resource,
+        scope: data.scope,
+        exp: data.exp,
+        jti: data.jti,
+    };
+};
+/**
+ * Rotation-aware `consumeAuthCode`, also reporting which `secret` entry
+ * actually unsealed the code — used only by `token.ts` to audit
+ * `"legacy_code_secret_used"` without a second decrypt pass. Not part of
+ * the public API; `consumeAuthCode` below is the stable, exported surface.
+ */
+export const consumeAuthCodeDetailed = async (secret, code, options = {}) => {
+    const secrets = (Array.isArray(secret) ? secret : [secret]).filter((candidate) => Boolean(candidate));
+    if (!code || secrets.length === 0)
+        return null;
+    // Only AES-GCM sealed (`v2.`) codes redeem.
+    if (!code.startsWith(SEALED_PREFIX))
+        return null;
+    const nowMs = options.nowMs ?? Date.now();
+    const unsealed = await unsealAny(secrets, "code", code.slice(SEALED_PREFIX.length));
+    if (!unsealed)
+        return null;
+    const record = shapeCheckedRecord(unsealed.value, nowMs);
+    if (!record)
+        return null;
+    const store = options.codeStore ?? processCodeStore;
+    const fresh = await store.consume(record.jti, record.exp);
+    if (!fresh)
+        return null;
+    const { jti: _jti, ...rest } = record;
+    return { record: rest, keyIndex: unsealed.keyIndex };
+};
+/**
+ * `secret` may be a single key or a list — every entry is tried, so a code
+ * sealed under an older `codeSecret` keeps redeeming during rotation. See
+ * `resolveSecrets`/`OAuthPorts.codeSecret` for the rotation contract.
+ *
+ * Omitting `options.codeStore` is deprecated: it falls back to a
+ * process-local map that cannot enforce single use across instances, and
+ * `codeStore` becomes required in 3.0.
+ */
+export const consumeAuthCode = async (secret, code, options = {}) => {
+    const result = await consumeAuthCodeDetailed(secret, code, options);
+    return result?.record ?? null;
+};
+export const newClientId = () => randomBase64Url(16);
+//# sourceMappingURL=codes.js.map

package/dist/oauth/crypto/codes.js.map

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

package/dist/oauth/crypto/hkdf.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Purpose-bound keys derived from `codeSecret` with HKDF-SHA256, cached so
+ * rotation (`unsealAny`, `verifyClientSecretAny`) doesn't re-run
+ * `importKey` + `deriveKey` for every entry on every request.
+ */
+/** What a derived key is for. `info` is the domain separator: one value per purpose. */
+export type HkdfKeyPurpose = {
+    info: string;
+    algorithm: AesKeyGenParams | HmacKeyGenParams;
+    usage: KeyUsage;
+};
+export declare const hkdfKey: (secret: string, purpose: HkdfKeyPurpose) => Promise<CryptoKey>;
+//# sourceMappingURL=hkdf.d.ts.map