inspector/core/auth/ema/idpOidc.ts
cliffhall f4fb4b50c9 Forward RFC 9207 iss to the v2 SDK (fixes OAuth + EMA leg 1)
SDK v2 added RFC 9207 §2.4 authorization-response issuer validation
(`validateAuthorizationResponseIssuer` / `IssuerMismatchError`) as a mix-up
attack defense. It is strict: when AS metadata advertises
`authorization_response_iss_parameter_supported: true` and no `iss` reaches
`exchangeAuthorization`/`auth()`, the exchange throws.

v1.29.0 had no `iss` parameter and no RFC 9207 validation at all, so dropping
the callback `iss` was harmless. The migration swapped in the stricter SDK
without feeding it the new input, breaking the authorization-code exchange
against any RFC 9207 authorization server (Okta/xaa.dev advertise it):

    Issuer mismatch in authorization response (RFC 9207):
    expected "https://idp.xaa.dev", received undefined

Found by smoke-testing EMA against live xaa.dev staging; not caught by CI
because the mock IdP never advertised the parameter, so the SDK took its
lenient path (a missing `iss` is only fatal when advertised).

`iss` was dropped in three places, with the plumbing half-built —
`oauthManager`/`inspectorClient` already accepted `iss`, but nothing supplied
or forwarded it:

- `parseOAuthCallbackParams` never extracted `iss` from the callback query
- `mcpAuth` never forwarded `options.iss` to SDK `auth()` — its own comment
  ("forwarded on v2 upgrade; ignored by v1 SDK auth()") predicted this exact
  gap, so standard OAuth was broken identically, not just EMA
- EMA leg 1 (`completeIdpOidcAuthorization`) never passed `iss` to
  `exchangeAuthorization`

Thread `iss` end to end: callback query -> CallbackParams -> resumeAfterOAuth
-> completeOAuthFlow -> {mcpAuth | EMA leg 1} -> SDK. The Node callback server
and runner carry it for CLI/TUI.

Tests: `ema-mock-servers.ts` now advertises
`authorization_response_iss_parameter_supported: true` so the mock is at least
as strict as real IdPs — with it absent the SDK silently takes the lenient path
and a dropped `iss` goes unnoticed. Flipping it made three existing tests
reproduce the failure. Adds regression coverage for forwarding and for
rejecting a mismatched `iss` before any network call.

Verified end to end against live xaa.dev staging: EMA legs 1-3 (IdP SSO ->
ID-JAG mint -> resource token) now complete and the MCP session initializes.

web 3099, cli 212, tui 274 green.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01VjMemXZohSR2EndBQYif2b
2026-07-15 20:16:43 -04:00

248 lines
7.2 KiB
TypeScript

import {
discoverAuthorizationServerMetadata,
exchangeAuthorization,
startAuthorization,
} from "@modelcontextprotocol/client";
import type {
OAuthClientInformation,
OAuthMetadata,
} from "@modelcontextprotocol/client";
import { OAuthMetadataSchema } from "@modelcontextprotocol/core";
import type { OAuthStorage } from "../storage.js";
import type { EnterpriseManagedAuthIdpConfig } from "../../client/types.js";
import { generateOAuthState, parseHttpUrl } from "../utils.js";
import { IDP_OIDC_SCOPES } from "./constants.js";
import { isJwtExpired, jwtExpiresAtMs } from "./jwt.js";
import { idpOAuthStorageKey, normalizeIdpIssuer } from "./storage.js";
import {
parseOAuthTokenErrorResponse,
postOAuthTokenRequest,
} from "./tokenEndpoint.js";
function idpClientInformation(
idp: EnterpriseManagedAuthIdpConfig,
): OAuthClientInformation {
return {
client_id: idp.clientId,
client_secret: idp.clientSecret,
token_endpoint_auth_method: "client_secret_post",
} as OAuthClientInformation;
}
async function resolveIdpMetadata(
issuer: string,
storage: OAuthStorage,
fetchFn?: typeof fetch,
): Promise<OAuthMetadata> {
const storageKey = idpOAuthStorageKey(issuer);
const cached = await storage.getServerMetadata(storageKey);
if (cached?.token_endpoint) {
return cached;
}
return discoverIdpMetadata(issuer, fetchFn);
}
export async function discoverIdpMetadata(
issuer: string,
fetchFn?: typeof fetch,
): Promise<OAuthMetadata> {
const issuerUrl = parseHttpUrl(issuer, "EMA IdP issuer (Client Settings)");
const metadata = await discoverAuthorizationServerMetadata(issuerUrl, {
fetchFn,
});
if (!metadata) {
throw new Error(
`Failed to discover OIDC metadata for IdP issuer ${issuer}`,
);
}
return OAuthMetadataSchema.parse(metadata);
}
export async function startIdpOidcAuthorization(params: {
idp: EnterpriseManagedAuthIdpConfig;
redirectUrl: string;
storage: OAuthStorage;
fetchFn?: typeof fetch;
}): Promise<{ authorizationUrl: URL }> {
const issuer = normalizeIdpIssuer(params.idp.issuer);
const metadata = await resolveIdpMetadata(
issuer,
params.storage,
params.fetchFn,
);
const clientInformation = idpClientInformation(params.idp);
const storageKey = idpOAuthStorageKey(issuer);
const state = generateOAuthState();
const issuerUrl = parseHttpUrl(issuer, "EMA IdP issuer (Client Settings)");
const { authorizationUrl, codeVerifier } = await startAuthorization(
issuerUrl,
{
metadata,
clientInformation,
redirectUrl: params.redirectUrl,
scope: IDP_OIDC_SCOPES,
state,
},
);
await params.storage.saveCodeVerifier(storageKey, codeVerifier);
await params.storage.savePreregisteredClientInformation(
storageKey,
clientInformation,
);
// Stash IdP metadata for token exchange on callback.
await params.storage.saveServerMetadata(storageKey, metadata);
return { authorizationUrl };
}
export async function completeIdpOidcAuthorization(params: {
idp: EnterpriseManagedAuthIdpConfig;
authorizationCode: string;
/**
* RFC 9207 `iss` from the IdP callback. Forwarded to the SDK, which rejects
* the exchange when the IdP metadata advertises
* `authorization_response_iss_parameter_supported` but no `iss` arrives.
*/
iss?: string;
redirectUrl: string;
storage: OAuthStorage;
fetchFn?: typeof fetch;
}): Promise<{
idToken: string;
refreshToken?: string;
idTokenExpiresAt?: number;
}> {
const issuer = normalizeIdpIssuer(params.idp.issuer);
const storageKey = idpOAuthStorageKey(issuer);
const metadata = await params.storage.getServerMetadata(storageKey);
if (!metadata) {
throw new Error("IdP OAuth metadata not found — restart EMA IdP login");
}
const clientInformation =
(await params.storage.getClientInformation(storageKey, true)) ??
(await params.storage.getClientInformation(storageKey));
if (!clientInformation) {
throw new Error("IdP client information not found — restart EMA IdP login");
}
const codeVerifier = await params.storage.getCodeVerifier(storageKey);
if (!codeVerifier) {
throw new Error("IdP PKCE verifier not found — restart EMA IdP login");
}
const issuerUrl = parseHttpUrl(issuer, "EMA IdP issuer (Client Settings)");
const tokens = await exchangeAuthorization(issuerUrl, {
metadata,
clientInformation,
authorizationCode: params.authorizationCode,
iss: params.iss,
codeVerifier,
redirectUri: params.redirectUrl,
fetchFn: params.fetchFn,
});
const idToken = tokens.id_token;
if (!idToken) {
throw new Error("IdP token response did not include an ID Token");
}
await params.storage.clearCodeVerifier(storageKey);
const idTokenExpiresAt = jwtExpiresAtMs(idToken);
await params.storage.saveIdpSession(issuer, {
idToken,
refreshToken: tokens.refresh_token,
idTokenExpiresAt,
});
return {
idToken,
refreshToken: tokens.refresh_token,
idTokenExpiresAt,
};
}
/** Redeem a cached IdP refresh token for a new ID Token (OIDC refresh grant). */
export async function refreshIdpOidcSession(params: {
idp: EnterpriseManagedAuthIdpConfig;
storage: OAuthStorage;
fetchFn?: typeof fetch;
}): Promise<string> {
const issuer = normalizeIdpIssuer(params.idp.issuer);
const session = await params.storage.getIdpSession(issuer);
if (!session?.refreshToken) {
throw new Error("IdP refresh token not available");
}
const metadata = await resolveIdpMetadata(
issuer,
params.storage,
params.fetchFn,
);
if (!metadata.token_endpoint) {
throw new Error("IdP metadata missing token_endpoint");
}
const body = new URLSearchParams({
grant_type: "refresh_token",
refresh_token: session.refreshToken,
});
const response = await postOAuthTokenRequest(
parseHttpUrl(
metadata.token_endpoint,
"IdP token_endpoint (from OIDC discovery)",
),
body,
metadata,
idpClientInformation(params.idp),
params.fetchFn,
);
if (!response.ok) {
throw await parseOAuthTokenErrorResponse(
response,
"EMA IdP refresh (OIDC refresh_token grant)",
);
}
const json = (await response.json()) as {
id_token?: string;
refresh_token?: string;
};
const idToken = json.id_token;
if (!idToken) {
throw new Error("IdP refresh did not return an ID Token");
}
await params.storage.saveIdpSession(issuer, {
idToken,
refreshToken: json.refresh_token ?? session.refreshToken,
idTokenExpiresAt: jwtExpiresAtMs(idToken),
});
return idToken;
}
/**
* Returns a non-expired IdP ID Token from storage, refreshing via refresh_token
* when the cached ID Token has expired but a refresh token remains.
*/
export async function getValidIdToken(params: {
idp: EnterpriseManagedAuthIdpConfig;
storage: OAuthStorage;
fetchFn?: typeof fetch;
}): Promise<string | undefined> {
const issuer = normalizeIdpIssuer(params.idp.issuer);
const session = await params.storage.getIdpSession(issuer);
if (!session?.idToken) {
return undefined;
}
if (!isJwtExpired(session.idToken)) {
return session.idToken;
}
if (!session.refreshToken) {
return undefined;
}
try {
return await refreshIdpOidcSession(params);
} catch {
return undefined;
}
}