feat(auth): file-backed and in-memory SecretStore for hosts with no keychain
Closes #1950 Before this, a box with no reachable OS keychain — the published container (no D-Bus session, #1848), Android/Termux (no platform binary, #1905), a minimal Linux install without libsecret — could not persist an OAuth client secret or a stdio `env:` value at all. `KeyringSecretStore` degraded into a store that silently holds nothing: `get` returned null, `delete` no-opped, and `set` hard-failed with a 503. That is the correct failure behavior, but it left the documented, supported way to run the Inspector with no secret persistence whatsoever. Adds the two missing implementations and, more importantly, the policy that picks one and the surfaces that say which was picked. - `FileSecretStore` — one `0600` JSON document at `~/.mcp-inspector/secrets.json`, encrypted with AES-256-GCM whenever `MCP_INSPECTOR_SECRET_KEY` is set (scrypt, per-file random salt). The whole map is encrypted as a unit rather than value-by-value so the account names — `${serverId}:${field}` — are hidden too; a per-value scheme would leave a readable index of which servers you hold a client secret for. A file that can no longer be decrypted reads as empty (matching the interface's read tolerance) but *refuses to be written*, because replacing a file of still-valid secrets to satisfy an additive request destroys data. - `secret-store-selection.ts` — the policy. `MCP_INSPECTOR_SECRET_STORE=keyring|file|memory` wins outright; otherwise probe the keychain and, if unreachable, fall back loudly. The fallback is `memory` in a container whose secrets directory is not on a mount, and `file` otherwise — so mounting the volume the README already recommends for the catalog flips the same run to durable storage with no configuration, and an unmounted container gets the honest answer rather than a file `--rm` will discard. Cached per process so the banner, `/api/config`, and the store doing the writing cannot disagree. - Automatic, but never silent. The downgrade prints at startup, rides `GET /api/config`, and is named in a permanent 32px footer at the bottom of both dialogs that accept a secret. A startup banner is seen once by whoever started the process; a toast is seen once; a dismissible banner is the thing a user dismisses before doing the work it describes. The plaintext and memory cases render their caveat inline in a warning tone — a warning you must hover to discover is not one. - `SecretStoreUnavailableError` is now the base every store's `set` throws, so the routes translate one condition into a 503 instead of matching `KeychainUnavailableError` by name. Docs: the container section of the root README gains a table of which store you get and how to make secrets survive, plus the `MCP_INSPECTOR_SECRET_KEY` upgrade/mismatch rules. Tests: the existing interface contract block is extracted to `secretStoreContract.ts` and run against all three implementations, so none can drift on the availability contract. `FileSecretStore` is tested against a real temp filesystem — mode, cross-instance round-trip, that the ciphertext does not contain the plaintext, the read-modify-write race, and every refusal path. Full `npm run ci` passes, per-file gate included. Signed-off-by: cliffhall <cliff@futurescale.com>
This commit is contained in:
parent
43525d9ea2
commit
bc408f5869
1 changed files with 2827 additions and 146 deletions
|
|
@ -18,6 +18,11 @@
|
|||
* `package.json` (the browser can't read it off disk). `undefined` until the
|
||||
* fetch resolves, and whenever the backend omits it (legacy backend) — the UI
|
||||
* renders nothing then.
|
||||
* - `secretStorage` — which store this session's secrets go to (#1950),
|
||||
* resolved on the Node side where the keychain probe happens. `undefined`
|
||||
* until the fetch resolves and on a backend that omits it; the settings-modal
|
||||
* footers render nothing then, because a guessed answer under a secret field
|
||||
* is worse than no answer.
|
||||
*
|
||||
* This consolidates the three former single-field hooks (`useSandboxUrl`,
|
||||
* `useServerListWritable`, `useInspectorVersion`), each of which fetched the
|
||||
|
|
@ -29,6 +34,7 @@
|
|||
*/
|
||||
|
||||
import { useCallback, useEffect, useState } from "react";
|
||||
import type { SecretStorageInfo } from "../auth/secret-storage-info.js";
|
||||
|
||||
export interface UseInitialConfigOptions {
|
||||
/** Base URL of the remote server (typically `window.location.origin`). */
|
||||
|
|
@ -46,6 +52,8 @@ export interface UseInitialConfigResult {
|
|||
sandboxUrl: string | undefined;
|
||||
/** Whether the server list is writable (catalog) or read-only (session). */
|
||||
writable: boolean;
|
||||
/** Where this session's secrets are stored, or undefined when unknown. */
|
||||
secretStorage: SecretStorageInfo | undefined;
|
||||
/** True while the initial fetch is in flight. */
|
||||
loading: boolean;
|
||||
}
|
||||
|
|
@ -55,6 +63,24 @@ interface ConfigPayload {
|
|||
version?: unknown;
|
||||
sandboxUrl?: unknown;
|
||||
writable?: unknown;
|
||||
secretStorage?: unknown;
|
||||
}
|
||||
|
||||
/**
|
||||
* Narrow the payload's `secretStorage` before trusting it.
|
||||
*
|
||||
* The footer states, in the UI, where a user's secret is about to go, so a
|
||||
* malformed or partial descriptor must render as "unknown" rather than as a
|
||||
* confident half-answer — the `kind` alone is what every label and tone
|
||||
* derives from, so it is the field the check turns on.
|
||||
*/
|
||||
function usableSecretStorage(value: unknown): SecretStorageInfo | undefined {
|
||||
if (typeof value !== "object" || value === null) return undefined;
|
||||
const kind = (value as { kind?: unknown }).kind;
|
||||
if (kind !== "keyring" && kind !== "file" && kind !== "memory") {
|
||||
return undefined;
|
||||
}
|
||||
return value as SecretStorageInfo;
|
||||
}
|
||||
|
||||
/** Coerce a payload field to a usable non-empty string, else undefined. */
|
||||
|
|
@ -74,6 +100,9 @@ export function useInitialConfig(
|
|||
// Default writable so the common (catalog) case shows CRUD immediately and a
|
||||
// legacy backend that omits the field keeps working.
|
||||
const [writable, setWritable] = useState<boolean>(true);
|
||||
const [secretStorage, setSecretStorage] = useState<
|
||||
SecretStorageInfo | undefined
|
||||
>(undefined);
|
||||
const [loading, setLoading] = useState<boolean>(true);
|
||||
|
||||
// `isCancelled` lets the effect drop a response that resolves after unmount or
|
||||
|
|
@ -100,6 +129,7 @@ export function useInitialConfig(
|
|||
// Only an explicit `false` makes the list read-only; a missing field
|
||||
// (legacy backend) stays writable.
|
||||
setWritable(body.writable !== false);
|
||||
setSecretStorage(usableSecretStorage(body.secretStorage));
|
||||
} catch {
|
||||
// Network error / aborted fetch: leave every field at its default
|
||||
// (version/sandboxUrl undefined, writable true).
|
||||
|
|
@ -118,5 +148,5 @@ export function useInitialConfig(
|
|||
};
|
||||
}, [load]);
|
||||
|
||||
return { version, sandboxUrl, writable, loading };
|
||||
return { version, sandboxUrl, writable, secretStorage, loading };
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue