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>
143 lines
4.5 KiB
TypeScript
143 lines
4.5 KiB
TypeScript
/**
|
|
* Install-level client config loading and InspectorClient auth option wiring
|
|
* for Node runners (TUI, CLI).
|
|
*/
|
|
|
|
import type { SecretStore } from "../auth/node/secret-store.js";
|
|
import { defaultSecretStore } from "../auth/node/secret-store-selection.js";
|
|
import type {
|
|
InspectorClientOptions,
|
|
InspectorServerSettings,
|
|
} from "../mcp/types.js";
|
|
import {
|
|
oauthAuthorizationParamsFromSettings,
|
|
oauthEndpointOverridesFromSettings,
|
|
} from "../mcp/serverList.js";
|
|
import { loadClientConfig } from "./config.js";
|
|
import type { ClientConfig } from "./types.js";
|
|
import {
|
|
getActiveCimdClientMetadataUrl,
|
|
getActiveEnterpriseManagedAuthIdp,
|
|
} from "./types.js";
|
|
|
|
export interface LoadRunnerClientConfigOptions {
|
|
/** Explicit path from `--client-config` (or MCP_CLIENT_CONFIG_PATH when unset). */
|
|
clientConfigPath?: string;
|
|
/** Secret store for the IdP clientSecret; defaults to the store selected for
|
|
* this host (OS keychain, or its file/memory fallback). Tests inject an
|
|
* in-memory store for determinism. */
|
|
secretStore?: SecretStore;
|
|
}
|
|
|
|
/** Load install-level client.json with keychain-backed IdP secrets. */
|
|
export async function loadRunnerClientConfig(
|
|
options?: LoadRunnerClientConfigOptions,
|
|
): Promise<ClientConfig> {
|
|
const customPath =
|
|
options?.clientConfigPath?.trim() ||
|
|
process.env.MCP_CLIENT_CONFIG_PATH?.trim() ||
|
|
undefined;
|
|
const secretStore = options?.secretStore ?? defaultSecretStore();
|
|
return loadClientConfig({ filePath: customPath, secretStore });
|
|
}
|
|
|
|
export interface RunnerClientConfigOverrides {
|
|
clientId?: string;
|
|
clientSecret?: string;
|
|
clientMetadataUrl?: string;
|
|
}
|
|
|
|
/** HTTP transports (SSE, streamable-http) can use OAuth. */
|
|
export function isOAuthCapableServerConfig(
|
|
config: { type?: string } | null | undefined,
|
|
): boolean {
|
|
if (!config) return false;
|
|
return config.type === "sse" || config.type === "streamable-http";
|
|
}
|
|
|
|
/**
|
|
* Derive OAuth / EMA / CIMD InspectorClient options from install client.json,
|
|
* per-server settings, and CLI flag overrides (flags win over client.json).
|
|
*/
|
|
export function buildRunnerClientAuthOptions(
|
|
clientConfig: ClientConfig,
|
|
savedSettings?: InspectorServerSettings,
|
|
cliOverrides?: RunnerClientConfigOverrides,
|
|
): Pick<
|
|
InspectorClientOptions,
|
|
| "oauth"
|
|
| "enterpriseManagedAuth"
|
|
| "installEnterpriseManagedAuth"
|
|
| "directAuthRecovery"
|
|
> {
|
|
const activeIdp = getActiveEnterpriseManagedAuthIdp(clientConfig);
|
|
const activeCimdUrl = getActiveCimdClientMetadataUrl(clientConfig);
|
|
|
|
const serverAuthorizationParams = savedSettings
|
|
? oauthAuthorizationParamsFromSettings(savedSettings)
|
|
: undefined;
|
|
const serverEndpointOverrides = savedSettings
|
|
? oauthEndpointOverridesFromSettings(savedSettings)
|
|
: undefined;
|
|
|
|
const oauthFromServer =
|
|
savedSettings &&
|
|
(savedSettings.oauthClientId ||
|
|
savedSettings.oauthClientSecret ||
|
|
savedSettings.oauthScopes ||
|
|
serverAuthorizationParams ||
|
|
serverEndpointOverrides ||
|
|
savedSettings.enterpriseManaged)
|
|
? {
|
|
...(savedSettings.oauthClientId && {
|
|
clientId: savedSettings.oauthClientId,
|
|
}),
|
|
...(savedSettings.oauthClientSecret && {
|
|
clientSecret: savedSettings.oauthClientSecret,
|
|
}),
|
|
...(savedSettings.oauthScopes && {
|
|
scope: savedSettings.oauthScopes,
|
|
}),
|
|
...(serverAuthorizationParams && {
|
|
authorizationParams: serverAuthorizationParams,
|
|
}),
|
|
...serverEndpointOverrides,
|
|
...(savedSettings.enterpriseManaged && {
|
|
enterpriseManaged: true,
|
|
}),
|
|
}
|
|
: undefined;
|
|
|
|
const clientMetadataUrl =
|
|
cliOverrides?.clientMetadataUrl?.trim() || activeCimdUrl;
|
|
|
|
const oauthFromCli =
|
|
cliOverrides?.clientId || cliOverrides?.clientSecret || clientMetadataUrl
|
|
? {
|
|
...(cliOverrides?.clientId && { clientId: cliOverrides.clientId }),
|
|
...(cliOverrides?.clientSecret && {
|
|
clientSecret: cliOverrides.clientSecret,
|
|
}),
|
|
...(clientMetadataUrl && { clientMetadataUrl }),
|
|
}
|
|
: undefined;
|
|
|
|
const oauth =
|
|
oauthFromServer || oauthFromCli
|
|
? {
|
|
...(oauthFromServer ?? {}),
|
|
...(oauthFromCli ?? {}),
|
|
}
|
|
: undefined;
|
|
|
|
return {
|
|
...(oauth && { oauth }),
|
|
...(activeIdp && {
|
|
enterpriseManagedAuth: { idp: activeIdp },
|
|
}),
|
|
...(clientConfig.enterpriseManagedAuth && {
|
|
installEnterpriseManagedAuth: clientConfig.enterpriseManagedAuth,
|
|
}),
|
|
...(oauth && { directAuthRecovery: true }),
|
|
};
|
|
}
|