Some checks failed
Run install, format, lint, build, and test on every push / build (push) Has been cancelled
Run install, format, lint, build, and test on every push / publish (push) Has been cancelled
Run install, format, lint, build, and test on every push / publish-github-container-registry (push) Has been cancelled
* OAuth: re-key store to (server, issuer) + SEP-837/2350/2352 auth UX (#1625) Re-key the persisted OAuth store to (server, issuer) and add the SEP-837/2350/2352 authorization-hardening UX. The SDK v2 auth() drives the SEP-2352 flow off the provider's ctx.issuer; the Inspector's job is to honor it and round-trip the issuer stamp. SEP-2352 — issuer-bound credentials - ServerOAuthState nests issuer-bound credentials under byIssuer[issuer] = { clientInformation, clientRegistrationKind, tokens }, with an activeIssuer pointer answering the transport's ctx-less per-request bearer read. - Fix a latent bug: OAuthStorageBase re-parsed tokens/client-info through OAuthTokensSchema/OAuthClientInformationSchema, which strip the non-RFC `issuer` field and silently defeat the SDK's discardIfIssuerMismatch. The store re-attaches the stamp from the byIssuer key. - BaseOAuthClientProvider threads ctx.issuer and implements discoveryState()/saveDiscoveryState() (activates the SDK's callback-leg AuthorizationServerMismatchError binding check) and invalidateCredentials(). - Lazy, migration-free upgrade: a legacy pre-1625 blob's top-level clientInformation/tokens are returned as an unkeyed fallback until the first issuer-stamped save promotes them into byIssuer. SEP-837 — application_type - DCR declares application_type: "native" (localhost Inspector). - ClientSettingsForm renders RegistrationRejectedError detail and reflects DCR's deprecated-in-favor-of-CIMD (SEP-991) status. SEP-2350 — step-up scope union - Per-server onInsufficientScope (reauthorize | throw) setting wired ServerSettingsForm -> StoredMCPServer.oauth -> StreamableHTTPClientTransport. - StepUpAuthModal visualizes the prior-union-challenged scope set, tagging each scope `new` vs `already granted`. mcpAuth simplification - Delete the hand-rolled authorizeWithoutRefresh (mishandled issuer stamping); forward forceReauthorization/skipIssuerMetadataValidation to native SDK auth() so both the initial and step-up paths get SEP-2352 stamping. Vocabulary + docs - OAuthStep gains cimd_fetch / issuer_comparison / scope_step_up (recorded on a step-up redirect); the Network tab labels auth requests by OAuth phase. - v2_auth_hardening.md gains an as-built status section. Deferred to the era-aware card: the SdkError(EraNegotiationFailed) -> UnauthorizedError unwrap and finishAuth(URLSearchParams) form (only fire under non-legacy negotiation). Closes #1625 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * Address @claude review: issuer-stamp source gating + clear/activeIssuer + phase over-match - SEP-2352: stamp the issuer only when the credential actually came from the byIssuer slot (`fromSlot`), not merely when a slot exists. A partially-populated slot alongside a surviving legacy field would otherwise stamp a legacy (possibly cross-AS) credential with the current issuer, defeating discardIfIssuerMismatch. - Issuer-scoped clears no longer promote the cleared issuer to `activeIssuer` (updateIssuerSlot gains a `setActive` flag; save paths keep the promotion). - oauthNetworkPhase matches register/token/authorize as the final path segment (trailing slash tolerated) so `/token/refresh` or `/api/register/foo` no longer over-match. - Tests for all three. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
73 lines
2.5 KiB
TypeScript
73 lines
2.5 KiB
TypeScript
import { describe, it, expect } from "vitest";
|
|
import { oauthNetworkPhase, oauthNetworkPhaseLabel } from "./oauthNetworkPhase";
|
|
|
|
describe("oauthNetworkPhase", () => {
|
|
it("classifies RFC 9728/8414 discovery requests", () => {
|
|
expect(
|
|
oauthNetworkPhase(
|
|
"https://mcp.example.com/.well-known/oauth-protected-resource",
|
|
),
|
|
).toBe("discovery");
|
|
expect(
|
|
oauthNetworkPhase(
|
|
"https://as.example.com/.well-known/oauth-authorization-server",
|
|
),
|
|
).toBe("discovery");
|
|
expect(
|
|
oauthNetworkPhase(
|
|
"https://as.example.com/.well-known/openid-configuration",
|
|
),
|
|
).toBe("discovery");
|
|
});
|
|
|
|
it("classifies registration, token, and authorize endpoints", () => {
|
|
expect(oauthNetworkPhase("https://as.example.com/register")).toBe(
|
|
"registration",
|
|
);
|
|
expect(oauthNetworkPhase("https://as.example.com/oauth/token")).toBe(
|
|
"token",
|
|
);
|
|
expect(
|
|
oauthNetworkPhase("https://as.example.com/authorize?state=abc"),
|
|
).toBe("authorize");
|
|
});
|
|
|
|
it("matches on the path, ignoring misleading query params", () => {
|
|
// A `/token` substring in the query must not classify an authorize request.
|
|
expect(
|
|
oauthNetworkPhase(
|
|
"https://as.example.com/authorize?redirect_uri=https://app/token",
|
|
),
|
|
).toBe("authorize");
|
|
});
|
|
|
|
it("returns undefined for unrelated URLs", () => {
|
|
expect(oauthNetworkPhase("https://mcp.example.com/mcp")).toBeUndefined();
|
|
});
|
|
|
|
it("matches the endpoint as the final path segment, not a nested one", () => {
|
|
// A nested segment must not classify as the OAuth endpoint...
|
|
expect(
|
|
oauthNetworkPhase("https://as.example.com/oauth/token/refresh"),
|
|
).toBeUndefined();
|
|
expect(
|
|
oauthNetworkPhase("https://gw.example.com/api/register/foo"),
|
|
).toBeUndefined();
|
|
// ...but a trailing slash on the real endpoint is tolerated.
|
|
expect(oauthNetworkPhase("https://as.example.com/oauth/token/")).toBe(
|
|
"token",
|
|
);
|
|
});
|
|
|
|
it("tolerates a non-absolute URL by stripping the query", () => {
|
|
expect(oauthNetworkPhase("/register?foo=bar")).toBe("registration");
|
|
expect(oauthNetworkPhase("not a url")).toBeUndefined();
|
|
});
|
|
|
|
it("maps phases to human-readable labels", () => {
|
|
expect(oauthNetworkPhaseLabel("discovery")).toBe("Discovery");
|
|
expect(oauthNetworkPhaseLabel("registration")).toBe("Registration");
|
|
expect(oauthNetworkPhaseLabel("authorize")).toBe("Authorize");
|
|
expect(oauthNetworkPhaseLabel("token")).toBe("Token");
|
|
});
|
|
});
|