feat(web): enforce localhost-only binding; expand loopback origin allow-list (#1796)
Closes #1795. Enforce localhost-only binding in code (the "never 0.0.0.0" rule was only a spec note): refuse an all-interfaces HOST — across every spelling the OS binds as the wildcard (inet_aton decimal/octal/hex, IPv6, IPv4-mapped, zone-scoped, IDNA/Unicode) — unless DANGEROUSLY_BIND_ALL_INTERFACES=true (Docker's sanctioned opt-in). Fixes the reported stdio-connect 403 by expanding the default loopback origin allow-list to all three interchangeable forms. Hardening surfaced across an extended review: closes an IDNA/fullwidth wildcard bypass, a blank-ALLOWED_ORIGINS fail-open, and the CLI/TUI OAuth-callback wildcard bind (loopback-only now, RFC 8252); canonicalizes the origin allow-list the way a browser does; derives frame-ancestors from the real embedder list (IPv6-literal exclusion verified in headless Chromium); strictPort on all three bind points; and preserves the CLI exit-code map + JSON envelope through the mcp-inspector --cli launcher path. Shared host normalization lives in core/node/hostUrl.ts. Docs + tests + smokes throughout. 🤖 Generated with [Claude Code](https://claude.com/claude-code)
This commit is contained in:
parent
33e88eac9f
commit
cea22d86b8
1 changed files with 1610 additions and 86 deletions
|
|
@ -13,6 +13,20 @@ function clientEntry(client: "web" | "cli" | "tui"): string {
|
|||
).href;
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether to append the error stack on a top-level failure. Gated on `MCP_DEBUG`
|
||||
* or `DEBUG` being *meaningfully* set — `"0"` / `"false"` / empty read as off, so
|
||||
* a stray `DEBUG=0` doesn't turn stacks on (and `DEBUG` stays useful for the
|
||||
* `debug` package's namespace filter, which is any non-empty value).
|
||||
*/
|
||||
function wantsDebugStack(): boolean {
|
||||
const on = (v: string | undefined): boolean => {
|
||||
const s = v?.trim().toLowerCase();
|
||||
return !!s && s !== "0" && s !== "false";
|
||||
};
|
||||
return on(process.env.MCP_DEBUG) || on(process.env.DEBUG);
|
||||
}
|
||||
|
||||
const program = new Command();
|
||||
|
||||
program
|
||||
|
|
@ -49,8 +63,27 @@ async function run(): Promise<void> {
|
|||
const { runWeb } = await import(clientEntry("web"));
|
||||
await runWeb(forwardedArgv);
|
||||
} else if (mode === "cli") {
|
||||
const { runCli } = await import(clientEntry("cli"));
|
||||
await runCli(forwardedArgv);
|
||||
// Route a CLI failure through the CLI's own error sink so `mcp-inspector
|
||||
// --cli` (a module import here, so the CLI bin's own `.catch(handleError)`
|
||||
// never fires) still honors the EXIT_CODES map and emits the JSON
|
||||
// `{"error":…}` envelope its README documents — instead of the generic
|
||||
// exit-1 catch-all below.
|
||||
const { runCli, handleError } = await import(clientEntry("cli"));
|
||||
try {
|
||||
// On success, let `run()` resolve and the event loop drain (rather than a
|
||||
// `process.exit(0)`) — the CLI closes its own transports, and an eager exit
|
||||
// risks truncating a large stdout payload on a pipe (async on macOS).
|
||||
await runCli(forwardedArgv);
|
||||
} catch (err) {
|
||||
// A stale `cli/build` (built before handleError was exported) would make
|
||||
// this `undefined`; fall through to the generic sink with the real message
|
||||
// rather than throwing "handleError is not a function" over it.
|
||||
if (typeof handleError !== "function") throw err;
|
||||
// write-then-exit like the direct bin; the envelope is a few hundred bytes,
|
||||
// well inside the pipe buffer, so the truncation risk noted above (which is
|
||||
// about a large stdout payload) doesn't apply to this stderr line.
|
||||
handleError(err); // writes the envelope + process.exit(code); never returns
|
||||
}
|
||||
} else {
|
||||
const { runTui } = await import(clientEntry("tui"));
|
||||
await runTui(forwardedArgv);
|
||||
|
|
@ -58,6 +91,15 @@ async function run(): Promise<void> {
|
|||
}
|
||||
|
||||
run().catch((err: unknown) => {
|
||||
console.error("Error running MCP Inspector:", err);
|
||||
// Print the message, not the Error stack — a startup config error (a bad flag,
|
||||
// the OAuth callback loopback guard) should read as actionable, not internal.
|
||||
// The stack is still available under DEBUG / MCP_DEBUG for real faults.
|
||||
console.error(
|
||||
"Error running MCP Inspector:",
|
||||
err instanceof Error ? err.message : err,
|
||||
);
|
||||
if (wantsDebugStack() && err instanceof Error) {
|
||||
console.error(err.stack);
|
||||
}
|
||||
process.exit(1);
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue