modelcontextprotocol/inspector
Watch
1
0
Fork
You've already forked inspector
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

fix(auth): explicit re-authorize when the OAuth callback state was lost (#1808) (#1810)

Browse source 
* 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>
This commit is contained in:
Cliff Hall 2026-07-27 18:08:31 -04:00 • committed by GitHub
commit 7784553674
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1003 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/auth/node/runner-interactive-oauth.ts
View file

@ -1,4 +1,6 @@
import type { AuthChallenge } from "../challenge.js";
import { findIssuerBindingFailure } from "../issuerBinding.js";
import { issuerBindingFailureCopy } from "../oauthUx.js";
import {
createOAuthCallbackServer,
type OAuthCallbackServer,
@ -40,6 +42,24 @@ export interface RunRunnerInteractiveOAuthOptions {
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}.
@ -70,7 +90,7 @@ export async function runRunnerInteractiveOAuth(
await options.client.completeOAuthFlow(params.code, params.iss);
flowResolve();
} catch (err) {
flowReject(err instanceof Error ? err : new Error(String(err)));
flowReject(toRunnerOAuthError(err));
}
},
onError: (params) => {