File size: 29,436 Bytes
3464008 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 | /**
* POST /oauth/token
*
* U6 of plan 2026-05-10-001 (`feat-pro-mcp-clerk-auth-quota-plan`):
*
* - `authorization_code` and `refresh_token` grants now branch on the
* consumed Redis record's `kind` discriminator. Two shapes coexist
* forever in `oauth:token:<uuid>` and `oauth:refresh:<uuid>`; the
* resolver in `api/_oauth-token.js::resolveBearerToContext` mirrors
* this branching at read time.
*
* Legacy (env-key path, written by `storeNewTokens`):
* oauth:token:<uuid> = JSON.stringify("<sha256-hex-64>")
* oauth:refresh:<uuid> = JSON.stringify({client_id, api_key_hash, scope, family_id})
*
* Pro (Clerk-grant path, written by `storeProTokens`):
* oauth:token:<uuid> = JSON.stringify({kind:'pro', userId, mcpTokenId})
* oauth:refresh:<uuid> = JSON.stringify({kind:'pro', client_id, userId, mcpTokenId, scope, family_id})
*
* - Pro refresh-grant additionally calls `validateProMcpToken(mcpTokenId)`
* against Convex (no positive cache; revoke must be authoritative on
* the next request β see U2). Null result β `invalid_grant` 400 (do
* NOT leak that the row was specifically revoked).
*
* - Legacy `client_credentials` grant is intentionally untouched (see
* `storeLegacyToken`).
*
* Inner handler is exported as `tokenHandler(req, deps)` for unit tests
* (mirrors `authorize-pro.ts`'s pattern). The default export wires the
* production deps (Redis HTTP + Convex `validateProMcpToken`).
*/
import { Ratelimit } from '@upstash/ratelimit';
import { Redis } from '@upstash/redis';
// @ts-expect-error β JS module, no declaration file
import { getClientIp } from '../_rate-limit.js';
// @ts-expect-error β JS module, no declaration file
import { getPublicCorsHeaders } from '../_cors.js';
// @ts-expect-error β JS module, no declaration file
import { jsonResponse } from '../_json-response.js';
// @ts-expect-error β JS module, no declaration file
import { keyFingerprint, sha256Hex, timingSafeIncludes, verifyPkceS256 } from '../_crypto.js';
import { validateProMcpToken } from '../../server/_shared/pro-mcp-token';
import type { ProMcpValidateUnion } from '../../server/_shared/pro-mcp-token';
export const config = { runtime: 'edge' };
const TOKEN_TTL_SECONDS = 3600;
const REFRESH_TTL_SECONDS = 604800;
const CLIENT_TTL_SECONDS = 90 * 24 * 3600;
const NO_STORE = { 'Cache-Control': 'no-store', Pragma: 'no-cache' };
function jsonResp(body: unknown, status = 200): Response {
return jsonResponse(body, status, { ...getPublicCorsHeaders('POST, OPTIONS'), ...NO_STORE });
}
// Tight rate limiter for credential endpoint
let _rl: Ratelimit | null = null;
function getRatelimit(): Ratelimit | null {
if (_rl) return _rl;
const url = process.env.UPSTASH_REDIS_REST_URL;
const token = process.env.UPSTASH_REDIS_REST_TOKEN;
if (!url || !token) return null;
_rl = new Ratelimit({
redis: new Redis({ url, token }),
limiter: Ratelimit.slidingWindow(10, '60 s'),
prefix: 'rl:oauth-token',
analytics: false,
});
return _rl;
}
async function validateSecret(secret: string | null | undefined): Promise<boolean> {
if (!secret) return false;
const validKeys = (process.env.WORLDMONITOR_VALID_KEYS || '').split(',').filter(Boolean);
return timingSafeIncludes(secret, validKeys);
}
// ---------------------------------------------------------------------------
// Production Redis helpers (raw `oauth:*` keys, no env-prefix). Mirror the
// shape used by `api/oauth/authorize.js` so both sides agree on key bytes.
// ---------------------------------------------------------------------------
type PipelineCommand = (string | number | unknown)[];
interface PipelineResult { result?: string; error?: string }
async function rawRedisPipeline(commands: PipelineCommand[]): Promise<PipelineResult[] | null> {
const url = process.env.UPSTASH_REDIS_REST_URL;
const token = process.env.UPSTASH_REDIS_REST_TOKEN;
if (!url || !token) return null;
try {
const resp = await fetch(`${url}/pipeline`, {
method: 'POST',
headers: { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json' },
body: JSON.stringify(commands),
signal: AbortSignal.timeout(3_000),
});
if (!resp.ok) return null;
return (await resp.json().catch(() => null)) as PipelineResult[] | null;
} catch {
return null;
}
}
/**
* Atomic GETDEL β read and delete in one round-trip. Returns null on genuine
* key-miss; throws on transport/HTTP failure so callers can distinguish
* "expired/used" from "storage unavailable".
*/
async function rawRedisGetDel(key: string): Promise<unknown | null> {
const url = process.env.UPSTASH_REDIS_REST_URL;
const token = process.env.UPSTASH_REDIS_REST_TOKEN;
if (!url || !token) throw new Error('Redis not configured');
const resp = await fetch(`${url}/getdel/${encodeURIComponent(key)}`, {
headers: { Authorization: `Bearer ${token}` },
signal: AbortSignal.timeout(3_000),
});
if (!resp.ok) throw new Error(`Redis HTTP ${resp.status}`);
const data = (await resp.json()) as { result?: string | null };
if (!data?.result) return null;
try {
return JSON.parse(data.result);
} catch {
return null;
}
}
/** Returns null on genuine key-miss; throws on transport/HTTP failure. */
async function rawRedisGet(key: string): Promise<unknown | null> {
const url = process.env.UPSTASH_REDIS_REST_URL;
const token = process.env.UPSTASH_REDIS_REST_TOKEN;
if (!url || !token) throw new Error('Redis not configured');
const resp = await fetch(`${url}/get/${encodeURIComponent(key)}`, {
headers: { Authorization: `Bearer ${token}` },
signal: AbortSignal.timeout(3_000),
});
if (!resp.ok) throw new Error(`Redis HTTP ${resp.status}`);
const data = (await resp.json()) as { result?: string | null };
if (!data?.result) return null;
try {
return JSON.parse(data.result);
} catch {
return null;
}
}
// ---------------------------------------------------------------------------
// Token-record writers β split by shape so the pipeline values are obvious
// at the call site and tests can assert one writer was used (not the other).
// ---------------------------------------------------------------------------
/**
* Legacy `client_credentials` writer β 16-char fingerprint, NOT the full
* SHA-256. Backward compat with `oauth:token:<uuid>` records that pre-date
* the authorization-code flow. Untouched by U6.
*/
async function storeLegacyToken(
pipeline: (commands: PipelineCommand[]) => Promise<PipelineResult[] | null>,
uuid: string,
apiKey: string,
): Promise<boolean> {
const fingerprint = await keyFingerprint(apiKey);
const results = await pipeline([
['SET', `oauth:token:${uuid}`, JSON.stringify(fingerprint), 'EX', TOKEN_TTL_SECONDS],
]);
return Array.isArray(results) && results[0]?.result === 'OK';
}
/**
* Legacy `authorization_code` / `refresh_token` writer.
*
* Token/refresh record shapes are unchanged (backward compat is load-bearing
* for any already-issued bearers and refresh tokens still in flight), but
* GHSA-f6gj also writes sibling family pointers used for reuse containment:
* oauth:token:<uuid> = JSON.stringify("<sha256-hex-64>")
* oauth:refresh:<uuid> = JSON.stringify({client_id, api_key_hash, scope, family_id})
* oauth:tokenfam:<uuid> = JSON.stringify(family_id)
* oauth:famptr:<uuid> = JSON.stringify(family_id)
*/
async function storeNewTokens(
pipeline: (commands: PipelineCommand[]) => Promise<PipelineResult[] | null>,
accessUuid: string,
refreshUuid: string,
apiKeyHash: string,
clientId: string,
scope: string,
familyId: string,
): Promise<boolean> {
const results = await pipeline([
['SET', `oauth:token:${accessUuid}`, JSON.stringify(apiKeyHash), 'EX', TOKEN_TTL_SECONDS],
['SET', accessTokenFamilyKey(accessUuid), JSON.stringify(familyId), 'EX', TOKEN_TTL_SECONDS],
[
'SET',
`oauth:refresh:${refreshUuid}`,
JSON.stringify({ client_id: clientId, api_key_hash: apiKeyHash, scope, family_id: familyId }),
'EX',
REFRESH_TTL_SECONDS,
],
// Persistent family pointer (GHSA-f6gj): survives the GETDEL of the refresh
// record so a later replay of this token can be traced to its family and
// trigger family revocation. Same TTL as the refresh token.
['SET', refreshFamilyPointerKey(refreshUuid), JSON.stringify(familyId), 'EX', REFRESH_TTL_SECONDS],
]);
return Array.isArray(results) && results.every((r) => r?.result === 'OK');
}
/**
* NEW Pro writer β for tokens issued via the Clerk-grant `/oauth/authorize-pro`
* flow. Produces the discriminated `kind:'pro'` shape consumed by
* `resolveBearerToContext` (see `api/_oauth-token.js`).
*
* Pipeline values:
* oauth:token:<uuid> = JSON.stringify({kind:'pro', userId, mcpTokenId})
* oauth:refresh:<uuid> = JSON.stringify({kind:'pro', client_id, userId, mcpTokenId, scope, family_id})
* oauth:tokenfam:<uuid> = JSON.stringify(family_id)
* oauth:famptr:<uuid> = JSON.stringify(family_id)
*
* `family_id` is preserved across refresh rotation and, together with the
* persistent `oauth:famptr:<uuid>` pointer, powers reuse-detection family
* revocation (GHSA-f6gj) β replaying a rotated token revokes the whole family.
*/
async function storeProTokens(
pipeline: (commands: PipelineCommand[]) => Promise<PipelineResult[] | null>,
accessUuid: string,
refreshUuid: string,
userId: string,
mcpTokenId: string,
clientId: string,
scope: string,
familyId: string,
): Promise<boolean> {
const results = await pipeline([
[
'SET',
`oauth:token:${accessUuid}`,
JSON.stringify({ kind: 'pro', userId, mcpTokenId }),
'EX',
TOKEN_TTL_SECONDS,
],
['SET', accessTokenFamilyKey(accessUuid), JSON.stringify(familyId), 'EX', TOKEN_TTL_SECONDS],
[
'SET',
`oauth:refresh:${refreshUuid}`,
JSON.stringify({ kind: 'pro', client_id: clientId, userId, mcpTokenId, scope, family_id: familyId }),
'EX',
REFRESH_TTL_SECONDS,
],
// Persistent family pointer (GHSA-f6gj) β see storeNewTokens.
['SET', refreshFamilyPointerKey(refreshUuid), JSON.stringify(familyId), 'EX', REFRESH_TTL_SECONDS],
]);
return Array.isArray(results) && results.every((r) => r?.result === 'OK');
}
function accessTokenFamilyKey(accessToken: string): string {
return `oauth:tokenfam:${accessToken}`;
}
function refreshFamilyPointerKey(refreshToken: string): string {
return `oauth:famptr:${refreshToken}`;
}
function refreshFamilyRevocationKey(familyId: string): string {
return `oauth:famrev:${familyId}`;
}
function pipelineOk(results: PipelineResult[] | null): boolean {
return Array.isArray(results) && results.every((r) => r?.result === 'OK');
}
async function persistRefreshFamilyPointer(
deps: TokenHandlerDeps,
refreshToken: string,
familyId: string,
): Promise<boolean> {
return pipelineOk(await deps.redisPipeline([
['SET', refreshFamilyPointerKey(refreshToken), JSON.stringify(familyId), 'EX', REFRESH_TTL_SECONDS],
]));
}
async function markRefreshFamilyRevoked(deps: TokenHandlerDeps, familyId: string): Promise<boolean> {
return pipelineOk(await deps.redisPipeline([
['SET', refreshFamilyRevocationKey(familyId), '1', 'EX', REFRESH_TTL_SECONDS],
]));
}
async function restoreConsumedRefreshToken(
deps: TokenHandlerDeps,
refreshToken: string,
refreshData: RefreshDataPro | RefreshDataLegacy,
): Promise<boolean> {
const commands: PipelineCommand[] = [
['SET', `oauth:refresh:${refreshToken}`, JSON.stringify(refreshData), 'EX', REFRESH_TTL_SECONDS],
];
if (refreshData.family_id) {
commands.push([
'SET',
refreshFamilyPointerKey(refreshToken),
JSON.stringify(refreshData.family_id),
'EX',
REFRESH_TTL_SECONDS,
]);
}
return pipelineOk(await deps.redisPipeline(commands));
}
// ---------------------------------------------------------------------------
// Inner handler β exported for unit tests with injected deps.
// ---------------------------------------------------------------------------
export interface TokenHandlerDeps {
/** Atomic GETDEL on `oauth:code:<code>` / `oauth:refresh:<token>`. Throws on transport failure. */
redisGetDel: (key: string) => Promise<unknown | null>;
/** Non-consuming parsed read of raw `oauth:*` keys. Throws on transport failure. */
redisGet: (key: string) => Promise<unknown | null>;
/** Pipeline writer used by the three storeXxx writers + the sliding TTL EXPIRE. */
redisPipeline: (commands: PipelineCommand[]) => Promise<PipelineResult[] | null>;
/**
* Convex round-trip β discriminated union. Refresh-grant branches on the
* `ok` discriminator: `valid` rotates, `revoked` returns invalid_grant
* (consumes the token), `transient` restores the token to Redis and
* returns 503 + Retry-After (so a Convex blip doesn't force re-auth).
* F3 of the U7+U8 review pass.
*/
validateProMcpToken: typeof validateProMcpToken;
/** Random UUID β injectable so tests can assert specific ids in the response payload. */
randomUuid: () => string;
}
interface CodeDataPro {
kind: 'pro';
userId: string;
mcpTokenId: string;
client_id: string;
redirect_uri: string;
code_challenge: string;
scope?: string;
}
interface CodeDataLegacy {
client_id: string;
redirect_uri: string;
code_challenge: string;
scope?: string;
api_key_hash: string;
kind?: undefined;
}
interface RefreshDataPro {
kind: 'pro';
client_id: string;
userId: string;
mcpTokenId: string;
scope: string;
family_id: string;
}
interface RefreshDataLegacy {
client_id: string;
api_key_hash: string;
scope: string;
family_id: string;
kind?: undefined;
}
// ---------------------------------------------------------------------------
// Per-grant handlers β extracted so the top-level `tokenHandler` stays under
// the cognitive-complexity threshold (biome lint rule). Each helper assumes
// rate-limiting + method dispatch already happened at the caller.
// ---------------------------------------------------------------------------
async function handleAuthorizationCode(
params: URLSearchParams,
clientId: string | null,
deps: TokenHandlerDeps,
): Promise<Response> {
const code = params.get('code');
const codeVerifier = params.get('code_verifier');
const redirectUri = params.get('redirect_uri');
if (!code || !codeVerifier || !clientId || !redirectUri) {
return jsonResp(
{
error: 'invalid_request',
error_description: 'Missing required parameters: code, code_verifier, client_id, redirect_uri',
},
400,
);
}
// Validate code_verifier format before any crypto work
if (
codeVerifier.length < 43 ||
codeVerifier.length > 128 ||
!/^[A-Za-z0-9\-._~]+$/.test(codeVerifier)
) {
return jsonResp(
{
error: 'invalid_request',
error_description: 'code_verifier must be 43-128 URL-safe characters [A-Za-z0-9-._~]',
},
400,
);
}
// Atomically consume the auth code (GETDEL β prevents concurrent exchange race).
let codeData: CodeDataPro | CodeDataLegacy | null;
try {
codeData = (await deps.redisGetDel(`oauth:code:${code}`)) as CodeDataPro | CodeDataLegacy | null;
} catch {
return jsonResp(
{ error: 'server_error', error_description: 'Auth service temporarily unavailable. Please retry.' },
503,
);
}
if (!codeData) {
return jsonResp(
{ error: 'invalid_grant', error_description: 'Authorization code is invalid, expired, or already used' },
400,
);
}
if (codeData.client_id !== clientId) {
return jsonResp({ error: 'invalid_grant', error_description: 'client_id mismatch' }, 400);
}
if (codeData.redirect_uri !== redirectUri) {
return jsonResp({ error: 'invalid_grant', error_description: 'redirect_uri mismatch' }, 400);
}
// Verify PKCE (same for both kinds)
const pkceVerify = await verifyPkceS256(codeVerifier, codeData.code_challenge);
if (pkceVerify === null) {
return jsonResp({ error: 'invalid_request', error_description: 'Malformed PKCE parameters' }, 400);
}
if (pkceVerify === false) {
return jsonResp(
{ error: 'invalid_grant', error_description: 'code_verifier does not match code_challenge' },
400,
);
}
const clientCheck = await checkClientExists(deps, clientId);
if (clientCheck) return clientCheck;
const accessUuid = deps.randomUuid();
const refreshUuid = deps.randomUuid();
const familyId = deps.randomUuid();
// Branch by code-record kind. Pro records carry `userId` + `mcpTokenId`;
// legacy records carry the `api_key_hash` SHA-256.
if (codeData.kind === 'pro') {
const scope = codeData.scope ?? 'mcp_pro';
const stored = await storeProTokens(
deps.redisPipeline,
accessUuid,
refreshUuid,
codeData.userId,
codeData.mcpTokenId,
clientId,
scope,
familyId,
);
if (!stored) {
return jsonResp({ error: 'server_error', error_description: 'Token storage failed' }, 500);
}
return jsonResp({
access_token: accessUuid,
token_type: 'Bearer',
expires_in: TOKEN_TTL_SECONDS,
refresh_token: refreshUuid,
scope,
});
}
// Legacy env-key path β unchanged
const scope = codeData.scope ?? 'mcp';
const stored = await storeNewTokens(
deps.redisPipeline,
accessUuid,
refreshUuid,
codeData.api_key_hash,
clientId,
scope,
familyId,
);
if (!stored) {
return jsonResp({ error: 'server_error', error_description: 'Token storage failed' }, 500);
}
return jsonResp({
access_token: accessUuid,
token_type: 'Bearer',
expires_in: TOKEN_TTL_SECONDS,
refresh_token: refreshUuid,
scope,
});
}
async function handleRefreshToken(
params: URLSearchParams,
clientId: string | null,
deps: TokenHandlerDeps,
): Promise<Response> {
const refreshToken = params.get('refresh_token');
if (!refreshToken || !clientId) {
return jsonResp(
{
error: 'invalid_request',
error_description: 'Missing required parameters: refresh_token, client_id',
},
400,
);
}
// Atomically consume the refresh token (GETDEL β prevents concurrent rotation race).
let refreshData: RefreshDataPro | RefreshDataLegacy | null;
try {
refreshData = (await deps.redisGetDel(`oauth:refresh:${refreshToken}`)) as
| RefreshDataPro
| RefreshDataLegacy
| null;
} catch {
return jsonResp(
{ error: 'server_error', error_description: 'Auth service temporarily unavailable. Please retry.' },
503,
);
}
if (!refreshData) {
// Reuse detection (GHSA-f6gj): a GETDEL-miss on a token that still has a
// persistent family pointer means a real, previously-issued token was
// presented AFTER it was already consumed β the classic rotation-reuse
// signal. Revoke the whole family so both the attacker's rotated token and
// the victim's live token are invalidated on their next use (forcing
// re-auth). A miss with no famptr is a genuinely expired/garbage token β
// nothing to revoke, so an attacker can't revoke a family by guessing
// token strings. Redis errors here are retryable security-control
// failures: returning invalid_grant without recording famrev would lose
// the only reuse signal.
try {
const familyId = await deps.redisGet(refreshFamilyPointerKey(refreshToken));
if (typeof familyId === 'string' && familyId) {
const revoked = await markRefreshFamilyRevoked(deps, familyId);
if (!revoked) {
return jsonResp(
{ error: 'server_error', error_description: 'Auth service temporarily unavailable. Please retry.' },
503,
);
}
}
} catch {
return jsonResp(
{ error: 'server_error', error_description: 'Auth service temporarily unavailable. Please retry.' },
503,
);
}
return jsonResp(
{ error: 'invalid_grant', error_description: 'Refresh token is invalid, expired, or already used' },
400,
);
}
if (refreshData.client_id !== clientId) {
return jsonResp({ error: 'invalid_grant', error_description: 'client_id mismatch' }, 400);
}
// Keep a consumed-token family pointer even for tokens issued before this
// patch, and extend old-token pointers so near-expiry replay still revokes
// any freshly issued descendant token.
if (refreshData.family_id) {
const pointerStored = await persistRefreshFamilyPointer(deps, refreshToken, refreshData.family_id);
if (!pointerStored) {
await restoreConsumedRefreshToken(deps, refreshToken, refreshData).catch(() => false);
return jsonResp(
{ error: 'server_error', error_description: 'Auth service temporarily unavailable. Please retry.' },
503,
);
}
}
// Reuse-detection containment (GHSA-f6gj): if this token's family was revoked
// because a sibling token was replayed, refuse to rotate. The GETDEL above
// already consumed this token, so a revoked family forces the client to
// re-authorize β this is what kills the attacker's rotated token (and the
// victim's) once reuse is detected. Unknown revocation state is fail-closed:
// restore the consumed token best-effort and ask the client to retry.
if (refreshData.family_id) {
let familyRevoked = false;
try {
familyRevoked = (await deps.redisGet(refreshFamilyRevocationKey(refreshData.family_id))) != null;
} catch {
await restoreConsumedRefreshToken(deps, refreshToken, refreshData).catch(() => false);
return jsonResp(
{ error: 'server_error', error_description: 'Auth service temporarily unavailable. Please retry.' },
503,
);
}
if (familyRevoked) {
return jsonResp(
{ error: 'invalid_grant', error_description: 'Refresh token is invalid, expired, or already used' },
400,
);
}
}
const clientCheck = await checkClientExists(deps, clientId);
if (clientCheck) return clientCheck;
const accessUuid = deps.randomUuid();
const newRefreshUuid = deps.randomUuid();
if (refreshData.kind === 'pro') {
// F3 (U7+U8 review pass): branch on the discriminated-union result so
// a transient Convex blip does NOT consume the refresh token. The
// GETDEL above already removed the token from Redis; on `transient`
// we best-effort write it BACK with the original TTL and return 503,
// letting the client retry once Convex recovers.
//
// userId-mismatch defensive check on the `valid` branch: if Convex
// ever returns a different user for this tokenId (impossible under
// U1's schema, but cheap), refuse rather than silently rotate to the
// wrong identity.
const validation: ProMcpValidateUnion = await deps.validateProMcpToken(refreshData.mcpTokenId);
if (validation.ok === 'transient') {
// Best-effort restore: the user's refresh token was just consumed
// by GETDEL but Convex hasn't ruled it revoked. Put it back so the
// next attempt can succeed once the blip clears. Restore the family
// pointer in the same operation so a restored near-expiry token cannot
// outlive its replay-detection pointer.
try {
await restoreConsumedRefreshToken(deps, refreshToken, refreshData);
} catch {
// Best-effort. If restore fails the user re-authorizes β same
// outcome as before this fix; we've not made anything worse.
}
return jsonResp(
{ error: 'server_error', error_description: 'Auth service temporarily unavailable. Please retry.' },
503,
);
}
if (validation.ok === 'revoked' || validation.userId !== refreshData.userId) {
// Authoritatively revoked OR cross-user binding violation. The
// refresh token is genuinely consumed (GETDEL); collapse to
// `invalid_grant` so the client re-authorizes. Same opaque error
// copy in both cases β don't leak revoked vs. cross-user.
return jsonResp(
{ error: 'invalid_grant', error_description: 'Refresh token is invalid, expired, or already used' },
400,
);
}
const scope = refreshData.scope ?? 'mcp_pro';
const stored = await storeProTokens(
deps.redisPipeline,
accessUuid,
newRefreshUuid,
refreshData.userId,
refreshData.mcpTokenId,
clientId,
scope,
refreshData.family_id,
);
if (!stored) {
return jsonResp({ error: 'server_error', error_description: 'Token storage failed' }, 500);
}
return jsonResp({
access_token: accessUuid,
token_type: 'Bearer',
expires_in: TOKEN_TTL_SECONDS,
refresh_token: newRefreshUuid,
scope,
});
}
// Legacy env-key path β unchanged
const scope = refreshData.scope ?? 'mcp';
const stored = await storeNewTokens(
deps.redisPipeline,
accessUuid,
newRefreshUuid,
refreshData.api_key_hash,
clientId,
scope,
refreshData.family_id,
);
if (!stored) {
return jsonResp({ error: 'server_error', error_description: 'Token storage failed' }, 500);
}
return jsonResp({
access_token: accessUuid,
token_type: 'Bearer',
expires_in: TOKEN_TTL_SECONDS,
refresh_token: newRefreshUuid,
scope,
});
}
async function handleClientCredentials(
clientSecret: string | null,
deps: TokenHandlerDeps,
): Promise<Response> {
if (!(await validateSecret(clientSecret))) {
return jsonResp({ error: 'invalid_client', error_description: 'Invalid client credentials' }, 401);
}
const uuid = deps.randomUuid();
const stored = await storeLegacyToken(deps.redisPipeline, uuid, clientSecret as string);
if (!stored) {
return jsonResp({ error: 'server_error', error_description: 'Token storage failed' }, 500);
}
return jsonResp({
access_token: uuid,
token_type: 'Bearer',
expires_in: TOKEN_TTL_SECONDS,
scope: 'mcp',
});
}
/**
* Verify `oauth:client:<id>` exists; returns a Response on failure (caller
* short-circuits) or null on success. Also fires the sliding-TTL EXPIRE.
*/
async function checkClientExists(deps: TokenHandlerDeps, clientId: string): Promise<Response | null> {
let client: unknown;
try {
client = await deps.redisGet(`oauth:client:${clientId}`);
} catch {
return jsonResp(
{ error: 'server_error', error_description: 'Auth service temporarily unavailable. Please retry.' },
503,
);
}
if (!client) {
return jsonResp(
{
error: 'invalid_client',
error_description: 'Client registration not found or expired. Please re-register.',
},
401,
);
}
// Extend client TTL (sliding 90-day window) β fire-and-forget
deps.redisPipeline([['EXPIRE', `oauth:client:${clientId}`, CLIENT_TTL_SECONDS]]).catch(() => {});
return null;
}
async function applyRateLimit(
req: Request,
grantType: string | null,
clientSecret: string | null,
clientId: string | null,
): Promise<Response | null> {
const rl = getRatelimit();
if (!rl) return null;
try {
let rlKey: string;
if (grantType === 'client_credentials' && clientSecret) {
rlKey = `cred:${(await sha256Hex(clientSecret)).slice(0, 8)}`;
} else if (clientId) {
rlKey = `cid:${clientId}`;
} else {
rlKey = `ip:${getClientIp(req)}`;
}
const { success } = await rl.limit(rlKey);
if (!success) {
return jsonResp(
{ error: 'rate_limit_exceeded', error_description: 'Too many token requests. Try again later.' },
429,
);
}
return null;
} catch {
return null; // graceful degradation
}
}
export async function tokenHandler(req: Request, deps: TokenHandlerDeps): Promise<Response> {
const corsHeaders = getPublicCorsHeaders('POST, OPTIONS');
if (req.method === 'OPTIONS') {
return new Response(null, { status: 204, headers: corsHeaders });
}
if (req.method !== 'POST') {
return jsonResp({ error: 'method_not_allowed' }, 405);
}
const params = new URLSearchParams(await req.text().catch(() => ''));
const grantType = params.get('grant_type');
const clientSecret = params.get('client_secret');
const clientId = params.get('client_id');
const rateLimited = await applyRateLimit(req, grantType, clientSecret, clientId);
if (rateLimited) return rateLimited;
if (grantType === 'authorization_code') {
return handleAuthorizationCode(params, clientId, deps);
}
if (grantType === 'refresh_token') {
return handleRefreshToken(params, clientId, deps);
}
if (grantType === 'client_credentials') {
return handleClientCredentials(clientSecret, deps);
}
return jsonResp({ error: 'unsupported_grant_type' }, 400);
}
// ---------------------------------------------------------------------------
// Default handler β wires production deps. The Vercel edge entry point.
// ---------------------------------------------------------------------------
export default async function handler(req: Request): Promise<Response> {
return tokenHandler(req, {
redisGetDel: rawRedisGetDel,
redisGet: rawRedisGet,
redisPipeline: rawRedisPipeline,
validateProMcpToken,
randomUuid: () => crypto.randomUUID(),
});
}
|