Migrate all three clients + core + test-servers from
@modelcontextprotocol/sdk@1.29 to SDK v2 (2.0.0-beta.4), keeping behavior
identical against legacy (2025-11-25) servers. Foundation for the SDK V2 +
New Spec stack.
Packages
- Split @modelcontextprotocol/sdk -> @modelcontextprotocol/client (Client,
transports, OAuth, error taxonomy, protocol types) + core (Zod schemas);
stdio -> client/stdio, Ajv -> client/validators/ajv. Test-servers ->
@modelcontextprotocol/server (+ server-legacy/sse). Deterministic import
rewrite (schemas -> core, everything else -> client); the codemod misroutes
client code to /server so it was not used for path routing.
- new Client(..., { versionNegotiation: { mode: 'legacy' } }) — nothing
2026-era goes on the wire.
Runtime (core/mcp/inspectorClient.ts)
- Error taxonomy: McpError -> ProtocolError, ErrorCode -> ProtocolErrorCode;
RequestTimeout -> SdkError/SdkErrorCode.
- Handlers take method strings; task methods (tasks/*, notifications/tasks/*)
use the 3-arg custom form (excluded from v2's spec-method set).
- Legacy tasks kept working (per project requirement): requestor tasks re-
implemented over raw client.request + explicit deprecated schemas;
experimental.tasks.callToolStream replaced by a local pollTaskToolCall
async generator (with _progressHandlers revival so task-execution progress
still reaches the caller). Receiver (server-initiated) tasks: the v2 Client
validates a sampling/elicit handler result and rejects the legacy { task }
response with -32602 — installReceiverTaskResponseBypass swaps the wrapped
entry in the private _requestHandlers map for the task-augmented branch so
{ task } reaches the wire (fixes server-initiated sampling-via-task).
- Pagination: list verbs use raw client.request({method}, List*ResultSchema)
for single-page behavior (v2's client.listX() auto-aggregate all pages).
Web / auth / apps
- Rename local JsonSchemaType -> InspectorFormSchema + add toFormSchema()
structural narrowing at the SDK-schema -> form boundary.
- ext-apps still peers on SDK v1: one compat boundary with documented casts
(remove when ext-apps#702 lands a v2 peer).
- OAuth provider saveClientInformation reconciled with v2's
OAuthClientInformationContext; InvalidClientMetadataError re-homed as a
local class (server-legacy/auth is not browser-safe).
- vitest.shared.mts dedupes @modelcontextprotocol/client+core to one copy so
vi.mock intercepts the SUT's import.
Accepted v2 behavior changes (per #1624 / spec §9.2): unknown-tool call
rejects with -32602; cancellation is stream-abort (no guaranteed
notifications/cancelled frame); output-schema strictness restored via the
Inspector's own Ajv check on the default path.
npm run ci green: validate (web 3087 / cli 212 / tui 274 / launcher 5),
coverage (>=90 per-file, all clients), smoke (launcher/cli/web), storybook
(410).
Closes #1624
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
155 lines
4.3 KiB
TypeScript
155 lines
4.3 KiB
TypeScript
/**
|
|
* JWT access-token validation for test MCP servers using an external authorization server.
|
|
*/
|
|
|
|
import { createRemoteJWKSet, customFetch, jwtVerify } from "jose";
|
|
import { discoverAuthorizationServerMetadata } from "@modelcontextprotocol/client";
|
|
import type { ServerConfig } from "./composable-test-server.js";
|
|
|
|
type ExternalValidatorOAuthConfig = Pick<
|
|
NonNullable<ServerConfig["oauth"]>,
|
|
"authorizationServers" | "accessTokenIssuers" | "jwksUri" | "resourceAudience"
|
|
>;
|
|
|
|
function normalizeIssuer(issuer: string): string {
|
|
return issuer.replace(/\/$/, "");
|
|
}
|
|
|
|
function audienceMatches(aud: unknown, expected: string): boolean {
|
|
const normalized = expected.replace(/\/$/, "");
|
|
if (typeof aud === "string") {
|
|
return normalizeIssuer(aud) === normalized;
|
|
}
|
|
if (Array.isArray(aud)) {
|
|
return aud.some(
|
|
(a) => typeof a === "string" && normalizeIssuer(a) === normalized,
|
|
);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
function parseScopeString(scope: string | undefined): string[] {
|
|
if (!scope?.trim()) {
|
|
return [];
|
|
}
|
|
return scope.trim().split(/\s+/).filter(Boolean);
|
|
}
|
|
|
|
/** Extract granted OAuth scopes from a verified JWT access token payload. */
|
|
export function extractScopesFromJwtPayload(
|
|
payload: Record<string, unknown>,
|
|
): string[] {
|
|
if (typeof payload.scope === "string") {
|
|
return parseScopeString(payload.scope);
|
|
}
|
|
if (Array.isArray(payload.scp)) {
|
|
return payload.scp.filter((s): s is string => typeof s === "string");
|
|
}
|
|
if (Array.isArray(payload.scopes)) {
|
|
return payload.scopes.filter((s): s is string => typeof s === "string");
|
|
}
|
|
return [];
|
|
}
|
|
|
|
export interface ValidatedAccessToken {
|
|
valid: boolean;
|
|
scopes: string[];
|
|
}
|
|
|
|
export class ExternalAccessTokenValidator {
|
|
private jwks: ReturnType<typeof createRemoteJWKSet> | null = null;
|
|
private allowedIssuers = new Set<string>();
|
|
private initPromise: Promise<void> | null = null;
|
|
private readonly config: ExternalValidatorOAuthConfig;
|
|
private readonly fetchFn: typeof fetch;
|
|
|
|
constructor(
|
|
config: ExternalValidatorOAuthConfig,
|
|
fetchFn: typeof fetch = fetch,
|
|
) {
|
|
this.config = config;
|
|
this.fetchFn = fetchFn;
|
|
}
|
|
|
|
private async ensureReady(): Promise<void> {
|
|
if (!this.initPromise) {
|
|
this.initPromise = this.init();
|
|
}
|
|
await this.initPromise;
|
|
}
|
|
|
|
private async init(): Promise<void> {
|
|
const configuredIssuers =
|
|
this.config.accessTokenIssuers ?? this.config.authorizationServers ?? [];
|
|
if (configuredIssuers.length === 0) {
|
|
throw new Error(
|
|
"External access token validation requires authorizationServers or accessTokenIssuers",
|
|
);
|
|
}
|
|
|
|
for (const issuer of configuredIssuers) {
|
|
this.allowedIssuers.add(normalizeIssuer(issuer));
|
|
}
|
|
|
|
let jwksUri = this.config.jwksUri;
|
|
const primaryAs = this.config.authorizationServers?.[0];
|
|
if (!jwksUri && primaryAs) {
|
|
const metadata = await discoverAuthorizationServerMetadata(
|
|
new URL(primaryAs),
|
|
{ fetchFn: this.fetchFn },
|
|
);
|
|
if (metadata?.issuer) {
|
|
this.allowedIssuers.add(normalizeIssuer(metadata.issuer));
|
|
}
|
|
const discoveredJwks = metadata?.jwks_uri;
|
|
if (typeof discoveredJwks === "string") {
|
|
jwksUri = discoveredJwks;
|
|
}
|
|
}
|
|
|
|
if (!jwksUri) {
|
|
throw new Error(
|
|
"Could not resolve jwks_uri for external authorization server (set oauth.jwksUri in config)",
|
|
);
|
|
}
|
|
|
|
this.jwks = createRemoteJWKSet(new URL(jwksUri), {
|
|
[customFetch]: this.fetchFn,
|
|
});
|
|
}
|
|
|
|
async validateAccessTokenWithScopes(
|
|
token: string,
|
|
): Promise<ValidatedAccessToken> {
|
|
if (!this.jwks) {
|
|
await this.ensureReady();
|
|
}
|
|
if (!this.jwks) {
|
|
return { valid: false, scopes: [] };
|
|
}
|
|
|
|
try {
|
|
const { payload } = await jwtVerify(token, this.jwks, {
|
|
issuer: [...this.allowedIssuers],
|
|
});
|
|
|
|
if (this.config.resourceAudience) {
|
|
const aud = payload.aud;
|
|
if (!audienceMatches(aud, this.config.resourceAudience)) {
|
|
return { valid: false, scopes: [] };
|
|
}
|
|
}
|
|
|
|
return {
|
|
valid: true,
|
|
scopes: extractScopesFromJwtPayload(payload as Record<string, unknown>),
|
|
};
|
|
} catch {
|
|
return { valid: false, scopes: [] };
|
|
}
|
|
}
|
|
|
|
async validateAccessToken(token: string): Promise<boolean> {
|
|
return (await this.validateAccessTokenWithScopes(token)).valid;
|
|
}
|
|
}
|