Guided-auth removal, OAuth smoke testing, and TUI/CLI support (#1531)
* refactor(web): update OAuth E2E tests to use new authentication method - Replaced `runGuidedAuth` with `authenticate` in the InspectorClient OAuth end-to-end tests to support quick authentication with CIMD pre-registration. - Updated comments to reflect the change in authentication method and its support for HTTP test metadata URLs. - Ensured that the tests continue to validate the expected authorization URL after the change. Additionally, imported `ensureCimdClientRegistration` in the OAuthManager to streamline client registration during the authentication process. * Guided-auth removal, OAuth smoke testing, and TUI/CLI support * Added CLI OAuth runner flags tests * Added clarifying comment on port 0 binding * README notes on TUI oauth callback port, prettier fixes for CLI tests * CIMD validation uses inline like EMA IdP * Fixed TUI test failures from merge * test: bring 5 OAuth files over the 90 per-file coverage gate The guided-auth-removal work added/touched several files that fell below the repo's >=90 per-file coverage gate (npm run coverage). CI doesn't run the gate (it's local-only), so validate + test:integration passed while these gaps slipped through. Bring them all back over the line: - core/auth/node/runner-oauth-callback.ts: test bad-URL/non-http-scheme throws, no-port->80 default, and IPv6 hostname bracketing. Annotate the provably-dead guards (empty host, out-of-range port, String(err) fallback, pathname "/" fallback) -- all rejected by new URL() upstream -- with justified v8 ignore comments instead of lowering the gate. - core/auth/cimd.ts: test the AS-doesn't-support-CIMD early return. - core/react/useClientSettingsDraft.ts: test the functional-updater path, the stale-onChange-after-close prev===null guard, and the timer-fires-after-close value===null guard. - ClientSettingsForm.tsx: test the CIMD checkbox toggle and CIMD URL clear. - clients/tui/src/utils/oauthDisplay.ts: test static/dcr registration kinds, the expired IdP session, and the configured-scope/empty-scope branches of formatScopes. npm run coverage now passes (exit 0) across web, cli, tui, launcher. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: cliffhall <cliff@futurescale.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
4a927d3978
commit
13dafe457b
1 changed files with 5702 additions and 4444 deletions
|
|
@ -6,6 +6,11 @@ import {
|
|||
parseKeyValuePair,
|
||||
parseHeaderPair,
|
||||
} from "@inspector/core/mcp/node/index.js";
|
||||
import { loadRunnerClientConfig } from "@inspector/core/client/runner.js";
|
||||
import {
|
||||
parseRunnerOAuthCallbackUrl,
|
||||
DEFAULT_RUNNER_OAUTH_CALLBACK_URL,
|
||||
} from "@inspector/core/auth/node/runner-oauth-callback.js";
|
||||
import App from "./src/App.js";
|
||||
import { loadTuiServers } from "./src/tui-servers.js";
|
||||
|
||||
|
|
@ -48,9 +53,13 @@ export async function runTui(args?: string[]): Promise<void> {
|
|||
"--client-metadata-url <url>",
|
||||
"OAuth Client ID Metadata Document URL (CIMD) for HTTP servers",
|
||||
)
|
||||
.option(
|
||||
"--client-config <path>",
|
||||
"Install-level client config (default: ~/.mcp-inspector/storage/client.json, or MCP_CLIENT_CONFIG_PATH)",
|
||||
)
|
||||
.option(
|
||||
"--callback-url <url>",
|
||||
"OAuth redirect/callback listener URL (default: http://127.0.0.1:0/oauth/callback)",
|
||||
`OAuth redirect/callback listener URL (default: ${DEFAULT_RUNNER_OAUTH_CALLBACK_URL}, or MCP_OAUTH_CALLBACK_URL)`,
|
||||
)
|
||||
.argument(
|
||||
"[target...]",
|
||||
|
|
@ -72,6 +81,7 @@ export async function runTui(args?: string[]): Promise<void> {
|
|||
clientId?: string;
|
||||
clientSecret?: string;
|
||||
clientMetadataUrl?: string;
|
||||
clientConfig?: string;
|
||||
callbackUrl?: string;
|
||||
transport?: "stdio" | "sse" | "http";
|
||||
serverUrl?: string;
|
||||
|
|
@ -89,52 +99,13 @@ export async function runTui(args?: string[]): Promise<void> {
|
|||
serverUrl: options.serverUrl?.trim() || undefined,
|
||||
};
|
||||
|
||||
const mcpServers = loadTuiServers(serverOptions);
|
||||
const mcpServers = await loadTuiServers(serverOptions);
|
||||
|
||||
interface CallbackUrlConfig {
|
||||
hostname: string;
|
||||
port: number;
|
||||
pathname: string;
|
||||
}
|
||||
const callbackUrlConfig = parseRunnerOAuthCallbackUrl(options.callbackUrl);
|
||||
|
||||
function parseCallbackUrl(raw?: string): CallbackUrlConfig {
|
||||
if (!raw) {
|
||||
return { hostname: "127.0.0.1", port: 0, pathname: "/oauth/callback" };
|
||||
}
|
||||
let url: URL;
|
||||
try {
|
||||
url = new URL(raw);
|
||||
} catch (err) {
|
||||
throw new Error(
|
||||
`Invalid callback URL: ${(err as Error)?.message ?? String(err)}`,
|
||||
);
|
||||
}
|
||||
if (url.protocol !== "http:") {
|
||||
throw new Error("Callback URL must use http scheme");
|
||||
}
|
||||
const hostname = url.hostname;
|
||||
if (!hostname) {
|
||||
throw new Error("Callback URL must include a hostname");
|
||||
}
|
||||
const pathname = url.pathname || "/";
|
||||
let port: number;
|
||||
if (url.port === "") {
|
||||
port = 80;
|
||||
} else {
|
||||
port = Number(url.port);
|
||||
if (
|
||||
!Number.isFinite(port) ||
|
||||
!Number.isInteger(port) ||
|
||||
port < 0 ||
|
||||
port > 65535
|
||||
) {
|
||||
throw new Error("Callback URL port must be between 0 and 65535");
|
||||
}
|
||||
}
|
||||
return { hostname, port, pathname };
|
||||
}
|
||||
|
||||
const callbackUrlConfig = parseCallbackUrl(options.callbackUrl);
|
||||
const clientConfig = await loadRunnerClientConfig({
|
||||
clientConfigPath: options.clientConfig,
|
||||
});
|
||||
|
||||
const ansiEraseSavedLines = new RegExp(
|
||||
String.fromCharCode(0x1b) + "\\[3J",
|
||||
|
|
@ -181,6 +152,7 @@ export async function runTui(args?: string[]): Promise<void> {
|
|||
const instance = render(
|
||||
<App
|
||||
mcpServers={mcpServers}
|
||||
clientConfig={clientConfig}
|
||||
clientId={options.clientId}
|
||||
clientSecret={options.clientSecret}
|
||||
clientMetadataUrl={options.clientMetadataUrl}
|
||||
|
|
|
|||
Loading…
Reference in a new issue