Add MCP_SANDBOX_FULL_ADDRESS and MCP_APP_ORIGIN_FULL_ADDRESS so a reverse proxy or ingress deployment can advertise the sandbox proxy URL and the _meta.ui.domain app origin the browser actually reaches, instead of the bind-derived http://localhost:<port> ones. The process still listens on MCP_SANDBOX_PORT / MCP_APP_ORIGIN_PORT. Both values are validated in public-address.ts and refused (warned, bind- derived address kept) when malformed or when their origin collapses onto the Inspector UI's (or, for the app origin, the sandbox's) — the MCP Apps spec requires host != sandbox origin, and the single-hostname proxy layout is exactly the one that breaks it. Plain http under an https UI is warned. The sandbox proxy page's referrer check was a hardcoded http://localhost|127.0.0.1 pattern no https embedder could match. It now compares the referrer's parsed origin against an exact list injected by the controller, derived from the same filtered allow-list as its frame-ancestors header, with the old loopback check kept only as the no-list fallback. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HzuzRPJv7M8wGe3wyw5sSg Signed-off-by: cliffhall <cliff@futurescale.com>
190 lines
6.8 KiB
TypeScript
190 lines
6.8 KiB
TypeScript
/**
|
|
* Hono production server. Export startHonoServer(config) for in-process use by
|
|
* the runner. The server is started programmatically via `runWeb` (in
|
|
* `run-web.ts`), which is the bundled `build/index.js` entry the `mcp-inspector`
|
|
* bin invokes — there is no separate standalone server entry.
|
|
*/
|
|
|
|
import { readFileSync } from "node:fs";
|
|
import { join, dirname } from "node:path";
|
|
import { fileURLToPath } from "node:url";
|
|
import { randomBytes } from "node:crypto";
|
|
import { serve } from "@hono/node-server";
|
|
import { serveStatic } from "@hono/node-server/serve-static";
|
|
import { Hono } from "hono";
|
|
import type { Context } from "hono";
|
|
import { createRemoteApp } from "../../../core/mcp/remote/node/server.ts";
|
|
import { formatHostForUrl } from "../../../core/node/hostUrl.ts";
|
|
import { createSandboxController } from "./sandbox-controller.js";
|
|
import {
|
|
createAppOriginController,
|
|
appDocumentEmbedders,
|
|
} from "./app-origin-controller.js";
|
|
import { injectAuthToken } from "./inject-auth-token.js";
|
|
import type { WebServerConfig } from "./web-server-config.js";
|
|
import { getSecretStorageInfo } from "../../../core/auth/node/secret-store-selection.ts";
|
|
import {
|
|
webServerConfigToInitialPayload,
|
|
printServerBanner,
|
|
openBrowser,
|
|
} from "./web-server-config.js";
|
|
import type { WebServerHandle } from "./types.js";
|
|
|
|
export type { WebServerHandle };
|
|
|
|
const __filename = fileURLToPath(import.meta.url);
|
|
const __dirname = dirname(__filename);
|
|
|
|
/**
|
|
* Start the Hono production server in-process. Returns a handle that closes sandbox then HTTP server.
|
|
* Caller owns SIGINT/SIGTERM; do not register signal handlers here.
|
|
*/
|
|
export async function startHonoServer(
|
|
config: WebServerConfig,
|
|
): Promise<WebServerHandle> {
|
|
const sandboxController = createSandboxController({
|
|
port: config.sandboxPort,
|
|
host: config.sandboxHost,
|
|
allowedOrigins: config.allowedOrigins,
|
|
publicUrl: config.sandboxPublicUrl,
|
|
});
|
|
await sandboxController.start();
|
|
// The dedicated origin apps declaring `_meta.ui.domain` are served from
|
|
// (#2056). Started after the sandbox because its `frame-ancestors` names the
|
|
// sandbox proxy's origin — the proxy is what embeds the app frame.
|
|
const appOriginController = createAppOriginController({
|
|
port: config.appOriginPort,
|
|
host: config.sandboxHost,
|
|
publicOrigin: config.appOriginPublicOrigin,
|
|
embedderOrigins: appDocumentEmbedders(
|
|
sandboxController.getUrl(),
|
|
config.allowedOrigins,
|
|
),
|
|
});
|
|
await appOriginController.start();
|
|
|
|
const resolvedAuthToken =
|
|
config.authToken ||
|
|
(config.dangerouslyOmitAuth ? "" : randomBytes(32).toString("hex"));
|
|
|
|
const rootPath = config.staticRoot ?? __dirname;
|
|
// Resolve the secret store before the API is built so the descriptor the
|
|
// browser reads (`/api/config`) and the one the banner prints come from the
|
|
// same resolution — the selection is cached, so this is also the only place
|
|
// the keychain probe actually runs.
|
|
const secretStorage = await getSecretStorageInfo();
|
|
|
|
const { app: apiApp, close: closeApi } = createRemoteApp({
|
|
authToken: config.dangerouslyOmitAuth ? undefined : resolvedAuthToken,
|
|
dangerouslyOmitAuth: config.dangerouslyOmitAuth,
|
|
storageDir: config.storageDir,
|
|
mcpConfigPath: config.mcpConfigPath,
|
|
writable: config.writable,
|
|
initialServers: config.initialServers ?? undefined,
|
|
allowedOrigins: config.allowedOrigins,
|
|
sandboxUrl: sandboxController.getUrl() ?? undefined,
|
|
publishAppDocument: (doc) => appOriginController.publish(doc),
|
|
logger: config.logger,
|
|
initialConfig: webServerConfigToInitialPayload(config, secretStorage),
|
|
// The startup value above is what the banner printed; the route
|
|
// re-resolves per request, because the first write under a newly-set
|
|
// passphrase encrypts a pre-existing plaintext file and a captured
|
|
// descriptor would keep reporting the old state until a restart.
|
|
secretStorageResolver: getSecretStorageInfo,
|
|
});
|
|
|
|
const app = new Hono();
|
|
app.use("/api/*", async (c) => {
|
|
return apiApp.fetch(c.req.raw);
|
|
});
|
|
|
|
// Serve index.html with the API token injected so a reload at any bare URL
|
|
// (no `?MCP_INSPECTOR_API_TOKEN=…`) still authenticates against /api/*.
|
|
// No-op when auth is dangerously omitted (empty token). The dev Vite plugin
|
|
// applies the same injection via `transformIndexHtml`. `Cache-Control:
|
|
// no-store` keeps a browser/proxy from serving a page that carries a stale
|
|
// token after a server restart regenerates it (randomBytes per start).
|
|
const serveIndexHtml = (c: Context) => {
|
|
const indexPath = join(rootPath, "index.html");
|
|
const html = readFileSync(indexPath, "utf-8");
|
|
c.header("Cache-Control", "no-store");
|
|
return c.html(injectAuthToken(html, resolvedAuthToken));
|
|
};
|
|
|
|
app.get("/", async (c) => {
|
|
try {
|
|
return serveIndexHtml(c);
|
|
} catch (error) {
|
|
console.error("Error serving index.html:", error);
|
|
return c.notFound();
|
|
}
|
|
});
|
|
|
|
// Real static assets (paths with a file extension). Missing files fall
|
|
// through to the SPA fallback below via `next()`.
|
|
app.use("/*", serveStatic({ root: rootPath }));
|
|
|
|
// SPA deep-link fallback: any non-/api route that didn't resolve to a static
|
|
// asset (e.g. `/oauth/callback`, the OAuth landing URL) serves the *injected*
|
|
// index.html — not the raw file — so bookmarks and hand-typed reloads at
|
|
// those paths get the token global too, matching the `/` route.
|
|
app.get("*", async (c) => {
|
|
if (c.req.path.startsWith("/api")) {
|
|
return c.notFound();
|
|
}
|
|
try {
|
|
return serveIndexHtml(c);
|
|
} catch (error) {
|
|
console.error("Error serving index.html:", error);
|
|
return c.notFound();
|
|
}
|
|
});
|
|
|
|
const httpServer = serve(
|
|
{
|
|
fetch: app.fetch,
|
|
port: config.port,
|
|
hostname: config.hostname,
|
|
},
|
|
(info) => {
|
|
const sandboxUrl = sandboxController.getUrl();
|
|
const url = printServerBanner(
|
|
config,
|
|
info.port,
|
|
resolvedAuthToken,
|
|
sandboxUrl ?? undefined,
|
|
secretStorage,
|
|
);
|
|
if (config.autoOpen) {
|
|
// Never a bare `open(url)`: this callback is synchronous, so a
|
|
// rejection would escape it. See openBrowser.
|
|
openBrowser(url);
|
|
}
|
|
},
|
|
);
|
|
|
|
httpServer.on("error", (err: Error) => {
|
|
if (err.message.includes("EADDRINUSE")) {
|
|
console.error(
|
|
`MCP Inspector PORT IS IN USE at http://${formatHostForUrl(config.hostname)}:${config.port}`,
|
|
);
|
|
process.exit(1);
|
|
} else {
|
|
throw err;
|
|
}
|
|
});
|
|
|
|
return {
|
|
async close(): Promise<void> {
|
|
await closeApi();
|
|
await sandboxController.close();
|
|
await appOriginController.close();
|
|
if ("closeAllConnections" in httpServer) {
|
|
httpServer.closeAllConnections();
|
|
}
|
|
await new Promise<void>((resolve, reject) => {
|
|
httpServer.close((err) => (err ? reject(err) : resolve()));
|
|
});
|
|
},
|
|
};
|
|
}
|