feat(auth): revoke OAuth tokens at the authorization server on clear (#2144)

Clearing the Inspector's OAuth state deleted the local copy of the tokens
and stopped there. The access token — and the refresh token, which is
long-lived by design — stayed valid at the authorization server until they
expired on their own, so a day of connect/disconnect iteration left it
holding grants for sessions that ended hours ago. RFC 7009 §1 describes
exactly that case, and nothing in the repo constructed a revocation
request, so a server author implementing `revocation_endpoint` had no way
to exercise it with the tool that exists to exercise this.

core/auth/revocation.ts builds and sends the request; the three clear paths
call it, so the behavior is written once — web's "Clear OAuth state and
disconnect" (both the active and stored-only paths), the TUI's Auth tab,
and the CLI's --relogin. It runs BEFORE the local clear, because the token,
the client credentials and the discovered `revocation_endpoint` all live in
the store the clear is about to empty. The request names the refresh token
when there is one: §2.1 asks the AS to also invalidate the access tokens
issued under the same grant, so one request covers both halves.

Best-effort by construction. Every path returns a TokenRevocationOutcome
rather than throwing: no advertised endpoint means nothing is sent and that
authorization server behaves exactly as before, and a network error, a
non-2xx, a 5s timeout or an unreadable store is reported and nothing more.
Forgetting the tokens is what the user asked for. `lost_authorization_state`
recovery deliberately skips it — it clears a half-finished flow to retry it,
and an authorization that never completed has no grant to revoke.

Client authentication resolves the preregistered slot first, mirroring
BaseOAuthClientProvider.clientInformation; reading only the dynamic slot
would send no authentication for a server configured with `oauth.clientId`.
The Basic credential is byte-identical to the SDK's applyBasicAuth so this
request and the token request cannot present the same secret differently.

Opt out per server with `oauth.revokeOnClear` (default on, only `false`
written to disk) or per CLI run with --no-revoke. Read at clear time rather
than connect time, so toggling needs no reconnect. Turning it off is a
testing affordance: a client that walks away still holding live tokens is a
case a server author may want to reproduce.

test-servers now advertises `revocation_endpoint` and serves POST
/oauth/revoke, faithful on §2.2 (an unknown token is a success) and §2.1
(revoking a refresh token invalidates the access tokens under the same
grant), with oauth-revocation-http.json / oauth-no-revocation-http.json as
showcase configs.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0177mPHAdECD18nLLCTwR5rh
Signed-off-by: cliffhall <cliff@futurescale.com>
This commit is contained in:
cliffhall 2026-08-28 00:48:57 -04:00
commit 65fd2b9e35
2 changed files with 2159 additions and 46 deletions

View file

@ -5447,8 +5447,12 @@ describe("InspectorClient", () => {
expect(c.getOAuthFlowStep()).toBeUndefined();
expect(c.getOAuthFlowState()).toBeUndefined();
await expect(c.getOAuthState()).resolves.toBeUndefined();
// clearOAuthTokens is a no-op when there is no manager
await expect(c.clearOAuthTokens()).resolves.toBeUndefined();
// clearOAuthTokens is a no-op when there is no manager; it still
// reports an outcome so callers have one shape to read (#2144).
await expect(c.clearOAuthTokens()).resolves.toEqual({
status: "skipped",
reason: "no_tokens",
});
});
it("setOAuthConfig throws when oauthManager is unset", () => {

View file

@ -639,6 +639,11 @@ describe("server.ts supplemental coverage", () => {
expect((await res.json()).error).toMatch(/oauthRequestRefreshToken/);
});
it("rejects a non-boolean oauthRevokeOnClear (#2144)", async () => {
const res = await postSettings({ ...base, oauthRevokeOnClear: "no" });
expect((await res.json()).error).toMatch(/oauthRevokeOnClear/);
});
it("rejects malformed roots", async () => {
const res = await postSettings({ ...base, roots: [{ uri: 1 }] });
expect((await res.json()).error).toMatch(/roots/);
@ -708,6 +713,32 @@ describe("server.ts supplemental coverage", () => {
expect(body.mcpServers.srv?.oauth?.requestRefreshToken).toBeUndefined();
});
// #2144 — same reasoning as the refresh-token pair above: a 200 only proves
// the payload validated, not that the field survived the write-through.
it("persists the revoke-on-clear opt-out through a save", async () => {
expect(
(await postSettings({ ...base, oauthRevokeOnClear: false })).status,
).toBe(200);
const res = await fetch(`${h.baseUrl}/api/servers`);
const body = (await res.json()) as {
mcpServers: Record<string, { oauth?: { revokeOnClear?: boolean } }>;
};
expect(body.mcpServers.srv?.oauth?.revokeOnClear).toBe(false);
});
it("writes no revoke-on-clear field when the setting is on", async () => {
expect(
(await postSettings({ ...base, oauthRevokeOnClear: true })).status,
).toBe(200);
const res = await fetch(`${h.baseUrl}/api/servers`);
const body = (await res.json()) as {
mcpServers: Record<string, { oauth?: Record<string, unknown> }>;
};
expect(body.mcpServers.srv?.oauth?.revokeOnClear).toBeUndefined();
});
it("accepts a fully-populated valid settings payload", async () => {
const res = await postSettings({
...base,
@ -724,6 +755,7 @@ describe("server.ts supplemental coverage", () => {
oauthScopes: "a b",
enterpriseManaged: true,
oauthRequestRefreshToken: false,
oauthRevokeOnClear: false,
roots: [{ uri: "file:///x", name: "x" }],
});
expect(res.status).toBe(200);
@ -892,6 +924,30 @@ describe("server.ts supplemental coverage", () => {
}
});
// #2144 — same all-or-nothing rule for the revocation opt-out.
it("drops oauth whose revokeOnClear is not a boolean", async () => {
const h = await start({
seedConfig: JSON.stringify({
mcpServers: {
srv: {
type: "streamable-http",
url: "https://x.test/mcp",
oauth: { revokeOnClear: "no" },
},
},
}),
});
try {
const res = await fetch(`${h.baseUrl}/api/servers`);
const body = (await res.json()) as {
mcpServers: Record<string, Record<string, unknown>>;
};
expect(body.mcpServers.srv).not.toHaveProperty("oauth");
} finally {
await stop(h);
}
});
it("keeps a well-formed requestRefreshToken opt-out on read (#2068)", async () => {
const h = await start({
seedConfig: JSON.stringify({