Skip to content

Fix: Fix MCP_PROXY_FULL_ADDRESS base path handling for SSE message endpoint #707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions server/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,25 @@ const sessionToken =
process.env.MCP_PROXY_AUTH_TOKEN || randomBytes(32).toString("hex");
const authDisabled = !!process.env.DANGEROUSLY_OMIT_AUTH;

// Extract base path from MCP_PROXY_FULL_ADDRESS for SSE message endpoint
const getMessagePath = (): string => {
const proxyFullAddress = process.env.MCP_PROXY_FULL_ADDRESS;
if (!proxyFullAddress) {
return "/message";
}
try {
const url = new URL(proxyFullAddress);
// Remove trailing slash and add /message to the pathname
const basePath =
url.pathname === "/" ? "" : url.pathname.replace(/\/$/, "");
return `${basePath}/message`;
} catch {
return "/message";
}
};

const MESSAGE_PATH = getMessagePath();

// Origin validation middleware to prevent DNS rebinding attacks
const originValidationMiddleware = (
req: express.Request,
Expand Down Expand Up @@ -391,7 +410,7 @@ app.get(
throw error;
}

const webAppTransport = new SSEServerTransport("/message", res);
const webAppTransport = new SSEServerTransport(MESSAGE_PATH, res);
console.log("Created client transport");

webAppTransports.set(webAppTransport.sessionId, webAppTransport);
Expand Down Expand Up @@ -469,7 +488,7 @@ app.get(
}

if (serverTransport) {
const webAppTransport = new SSEServerTransport("/message", res);
const webAppTransport = new SSEServerTransport(MESSAGE_PATH, res);
webAppTransports.set(webAppTransport.sessionId, webAppTransport);
console.log("Created client transport");
serverTransports.set(webAppTransport.sessionId, serverTransport!);
Expand Down