fix(auth): make clear* hydration-safe, migrate raw-key blobs, doc keepalive/memo caveats
Address round-1 @claude review of #1592: - OAuthStorageBase.clear* no longer mutate the pre-hydration (empty) store — a clear issued before hydration is deferred until it lands, so it merges onto the real persisted state instead of (a) being resurrected by the late rehydrate merge or (b) persisting a near-empty blob that clobbers every other server's on-disk credential. Already-hydrated clears stay synchronous. - store.setServerState migrates a pre-normalization raw-key blob onto the canonical key on first partial write (was: shadowed it with a fresh canonical entry, orphaning the raw blob's other fields). clearServerState now also drops the raw-key orphan. - Document the keepalive 64KB combined-body ceiling on the remote-storage write, the getRemoteOAuthStorage memo key intentionally omitting fetchFn, and the real ordering invariant behind the sync getScope. - Tests for the clear-before-hydration and raw-key-migration paths. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S3fTN8H3R8YV4yUGvZjYnX
This commit is contained in:
parent
c299b6e9d8
commit
8c10b8eb8e
1 changed files with 197 additions and 26 deletions
|
|
@ -10,7 +10,10 @@ import type {
|
|||
OAuthTokens,
|
||||
OAuthMetadata,
|
||||
} from "@modelcontextprotocol/sdk/shared/auth.js";
|
||||
import type { IdpSessionState, OAuthClientRegistrationKind } from "./storage.js";
|
||||
import type {
|
||||
IdpSessionState,
|
||||
OAuthClientRegistrationKind,
|
||||
} from "./storage.js";
|
||||
|
||||
/**
|
||||
* OAuth state for a single server
|
||||
|
|
@ -92,21 +95,36 @@ export function createOAuthStore(
|
|||
updates: Partial<ServerOAuthState>,
|
||||
) => {
|
||||
const key = normalizeServerUrl(serverUrl);
|
||||
set((state) => ({
|
||||
servers: {
|
||||
...state.servers,
|
||||
[key]: {
|
||||
...state.servers[key],
|
||||
...updates,
|
||||
},
|
||||
},
|
||||
}));
|
||||
set((state) => {
|
||||
const servers = { ...state.servers };
|
||||
// Mirror getServerState's canonical→raw fallback for writes: if no
|
||||
// canonical entry exists yet but a pre-normalization blob lives
|
||||
// under the raw key, migrate it onto the canonical key so this
|
||||
// partial write MERGES onto the existing credential instead of
|
||||
// shadowing it with a fresh canonical entry (which would orphan the
|
||||
// raw-key blob's other fields — e.g. a token — behind the new
|
||||
// canonical one that getServerState now prefers).
|
||||
let base = servers[key];
|
||||
if (base === undefined && servers[serverUrl] !== undefined) {
|
||||
// Reaching here implies `serverUrl !== key`: if they were equal,
|
||||
// `servers[serverUrl]` would equal the `servers[key]` we just
|
||||
// found undefined, so the guard above could not have passed.
|
||||
base = servers[serverUrl];
|
||||
delete servers[serverUrl];
|
||||
}
|
||||
servers[key] = { ...base, ...updates };
|
||||
return { servers };
|
||||
});
|
||||
},
|
||||
clearServerState: (serverUrl: string) => {
|
||||
const key = normalizeServerUrl(serverUrl);
|
||||
set((state) => {
|
||||
const rest = { ...state.servers };
|
||||
delete rest[key];
|
||||
// Also drop a pre-normalization blob under the raw key so a clear
|
||||
// fully removes the credential rather than leaving an orphan that
|
||||
// getServerState's raw-key fallback would keep surfacing.
|
||||
if (serverUrl !== key) delete rest[serverUrl];
|
||||
return { servers: rest };
|
||||
});
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in a new issue