inspector/core/auth/node/runner-interactive-oauth.ts
Cliff Hall 7784553674
fix(auth): explicit re-authorize when the OAuth callback state was lost (#1808) (#1810)
* fix(auth): offer explicit re-authorize when callback state is lost (#1808)

A `/oauth/callback` that arrives with no recorded SEP-2352 discovery state
made the SDK throw `AuthorizationServerMismatchError` and the Inspector
dead-ended, surfacing the raw SDK text with no path forward.

The SDK folds two very different failures into that one error class, so
`core/auth/issuerBinding.ts` classifies them structurally: a recoverable
"lost authorization state" (the SDK puts prose, not an issuer URL, in the
`recordedIssuer` slot) versus a genuine cross-AS `issuer_mismatch`. Only
the first gets a recovery affordance.

Web: the callback failure now raises a dedicated banner ("Authorization
state was lost" / "Authorize again") whose action clears the stale OAuth
state for that server and starts a fresh authorization. A genuine
mismatch stays a red, non-dismissible security notification with both
issuers named and no one-click retry.

Node runners (CLI/TUI): the same classification rewrites the callback
rejection into the shared actionable copy instead of the SDK text.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016S7h83UKNQ7kvSiFDNksCt

* fix(auth): detect the SDK mismatch error via isInstance (#1808)

The callback-leg classifier gated on `err.mcpBrand`, but the SDK declares
that brand in a `static {}` block, so it lives on the constructor and is
never reachable from an instance. The predicate always returned false, so
`findIssuerBindingFailure()` never matched and the #1808 recovery banner
was inert in production — the callback dead-ended exactly as before.

Use the SDK's own `AuthorizationServerMismatchError.isInstance()`, which is
cross-copy safe by construction (it consults a `Symbol.for()`-keyed brand
set), with a `name` fallback for a serialization boundary. Correct the
module doc, which cited cross-bundle safety as the reason to avoid
`instanceof` — the very thing the SDK's branded `hasInstance` provides.

Every fixture now constructs a real `AuthorizationServerMismatchError`
instead of a hand-rolled object with an own `mcpBrand`, which is why a
green `npm run ci` hid this. Adds a test pinning the brand's placement so
the feature cannot silently go inert again.

Review follow-ups: drop the unused `isLostAuthorizationStateError`, remove
the duplicated banner title default, resolve the banner title/action label
where the banner is raised, keep the clear-failure notification open, and
bound remote-supplied issuers in user-facing copy.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016S7h83UKNQ7kvSiFDNksCt

---------

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-07-27 18:08:31 -04:00

162 lines
5.6 KiB
TypeScript

import type { AuthChallenge } from "../challenge.js";
import { findIssuerBindingFailure } from "../issuerBinding.js";
import { issuerBindingFailureCopy } from "../oauthUx.js";
import {
createOAuthCallbackServer,
type OAuthCallbackServer,
} from "./oauth-callback-server.js";
import type { RunnerOAuthCallbackConfig } from "./runner-oauth-callback.js";
/** Minimal InspectorClient surface for runner interactive OAuth. */
export interface RunnerInteractiveOAuthClient {
authenticate(): Promise<URL | undefined>;
beginInteractiveAuthorization(authorizationUrl: URL): Promise<void>;
completeOAuthFlow(authorizationCode: string, iss?: string): Promise<void>;
checkAuthChallengeSatisfied(challenge: AuthChallenge): Promise<boolean>;
}
export interface RunnerInteractiveOAuthRedirectProvider {
redirectUrl: string;
}
export type RunnerInteractiveOAuthResult =
| { kind: "success" }
| { kind: "already_authorized" }
| { kind: "insufficient_scope"; challenge: AuthChallenge };
/** Default wait for loopback OAuth callback (15 minutes). */
export const DEFAULT_RUNNER_INTERACTIVE_OAUTH_TIMEOUT_MS = 15 * 60 * 1000;
export interface RunRunnerInteractiveOAuthOptions {
client: RunnerInteractiveOAuthClient;
redirectUrlProvider: RunnerInteractiveOAuthRedirectProvider;
callbackListen: RunnerOAuthCallbackConfig;
/** When set, use deferred interactive authorization (mid-session step-up / re-login). */
authorizationUrl?: URL;
/** When set, verify scopes after a successful token exchange (SEP-2350 step-up). */
authChallenge?: AuthChallenge;
createCallbackServer?: () => OAuthCallbackServer;
/** Invoked after the listener binds; hosts may keep a ref for unmount cleanup. */
onCallbackServer?: (server: OAuthCallbackServer) => void;
/** Max wait for browser callback; defaults to {@link DEFAULT_RUNNER_INTERACTIVE_OAUTH_TIMEOUT_MS}. */
callbackTimeoutMs?: number;
}
/**
* Replace an opaque SEP-2352 callback-leg failure with actionable copy (#1808).
*
* The runners have no banner to render, so their affordance is the message
* itself: it explains that the recorded authorization state was lost and that
* re-running authorization starts a fresh flow (the next `authenticate()`
* re-runs discovery and records new state). A *genuine* issuer mismatch gets
* the security-flavoured copy instead — never a "just try again" nudge.
*/
function toRunnerOAuthError(err: unknown): Error {
const failure = findIssuerBindingFailure(err);
if (failure) {
const copy = issuerBindingFailureCopy(failure);
return new Error(`${copy.title}. ${copy.message}`, { cause: err });
}
return err instanceof Error ? err : new Error(String(err));
}
/**
* Run interactive OAuth for Node runners (TUI / CLI): loopback callback server,
* browser redirect, authorization-code exchange via {@link completeOAuthFlow}.
*/
export async function runRunnerInteractiveOAuth(
options: RunRunnerInteractiveOAuthOptions,
): Promise<RunnerInteractiveOAuthResult> {
const createServer =
options.createCallbackServer ?? createOAuthCallbackServer;
const server = createServer();
let flowResolve!: () => void;
let flowReject!: (err: Error) => void;
const flowDone = new Promise<void>((resolve, reject) => {
flowResolve = resolve;
flowReject = reject;
});
let timeoutId: ReturnType<typeof setTimeout> | undefined;
try {
const { redirectUrl } = await server.start({
hostname: options.callbackListen.hostname,
port: options.callbackListen.port,
path: options.callbackListen.pathname,
onCallback: async (params) => {
try {
await options.client.completeOAuthFlow(params.code, params.iss);
flowResolve();
} catch (err) {
flowReject(toRunnerOAuthError(err));
}
},
onError: (params) => {
flowReject(
new Error(
/* v8 ignore next -- params.error is a required non-null string, so the "OAuth error" fallback is unreachable */
params.error_description ?? params.error ?? "OAuth error",
),
);
},
});
options.onCallbackServer?.(server);
options.redirectUrlProvider.redirectUrl = redirectUrl;
const timeoutMs =
options.callbackTimeoutMs ?? DEFAULT_RUNNER_INTERACTIVE_OAUTH_TIMEOUT_MS;
const waitForCallback = Promise.race([
flowDone.finally(() => {
/* v8 ignore next 3 -- timeoutId is assigned synchronously while the race is constructed, before flowDone can settle, so the undefined arm is unreachable */
if (timeoutId !== undefined) {
clearTimeout(timeoutId);
}
}),
new Promise<void>((_, reject) => {
timeoutId = setTimeout(() => {
reject(
new Error(
`OAuth callback timed out after ${Math.round(timeoutMs / 1000)}s`,
),
);
}, timeoutMs);
}),
]);
if (options.authorizationUrl) {
await options.client.beginInteractiveAuthorization(
options.authorizationUrl,
);
await waitForCallback;
} else {
const authUrl = await options.client.authenticate();
if (authUrl !== undefined) {
await waitForCallback;
} else {
return { kind: "already_authorized" };
}
}
if (options.authChallenge) {
const satisfied = await options.client.checkAuthChallengeSatisfied(
options.authChallenge,
);
if (!satisfied) {
return {
kind: "insufficient_scope",
challenge: options.authChallenge,
};
}
}
return { kind: "success" };
} finally {
if (timeoutId !== undefined) {
clearTimeout(timeoutId);
}
await server.stop().catch(() => {});
}
}