-
Notifications
You must be signed in to change notification settings - Fork 316
fix: guard Streamable HTTP host headers #555
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
zereight
wants to merge
2
commits into
main
Choose a base branch
from
fix/dns-rebinding
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| import assert from "node:assert/strict"; | ||
| import { spawn } from "node:child_process"; | ||
| import http from "node:http"; | ||
| import { afterEach, describe, test } from "node:test"; | ||
| import * as path from "node:path"; | ||
| import { findAvailablePort } from "./utils/server-launcher.js"; | ||
|
|
||
| const HOST = process.env.HOST || "127.0.0.1"; | ||
| const SERVER_PATH = path.resolve(process.cwd(), "build/index.js"); | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| const TEST_TOKEN = "glpat-12345678901234567890"; | ||
|
|
||
| const running = new Set<ReturnType<typeof spawn>>(); | ||
|
|
||
| function startServer(env: Record<string, string>, port: number) { | ||
| const child = spawn("node", [SERVER_PATH], { | ||
| env: { | ||
| ...process.env, | ||
| GITLAB_API_URL: "https://gitlab.example.com", | ||
| HOST, | ||
| PORT: String(port), | ||
| STREAMABLE_HTTP: "true", | ||
| REMOTE_AUTHORIZATION: "true", | ||
| GITLAB_MCP_OAUTH: "false", | ||
| GITLAB_USE_OAUTH: "false", | ||
| GITLAB_PERSONAL_ACCESS_TOKEN: "", | ||
| GITLAB_JOB_TOKEN: "", | ||
| GITLAB_AUTH_COOKIE_PATH: "", | ||
| MCP_SERVER_URL: "", | ||
| GITLAB_OAUTH_APP_ID: "", | ||
| ...env, | ||
| }, | ||
| stdio: ["ignore", "pipe", "pipe"], | ||
| }); | ||
|
|
||
| running.add(child); | ||
| child.once("exit", () => running.delete(child)); | ||
| return child; | ||
| } | ||
|
|
||
| async function waitForHealth(port: number, timeoutMs = 5000) { | ||
| const deadline = Date.now() + timeoutMs; | ||
| let lastError: unknown; | ||
|
|
||
| while (Date.now() < deadline) { | ||
| try { | ||
| const response = await fetch(`http://${HOST}:${port}/health`); | ||
| if (response.ok) return; | ||
| } catch (error) { | ||
| lastError = error; | ||
| } | ||
| await new Promise(resolve => setTimeout(resolve, 100)); | ||
| } | ||
|
|
||
| throw new Error(`server did not become healthy: ${String(lastError)}`); | ||
| } | ||
|
|
||
| function postMcp( | ||
| port: number, | ||
| headers: Record<string, string> | ||
| ): Promise<{ status: number; body: string }> { | ||
| const body = JSON.stringify({ | ||
| jsonrpc: "2.0", | ||
| id: 1, | ||
| method: "initialize", | ||
| params: { | ||
| protocolVersion: "2025-03-26", | ||
| capabilities: {}, | ||
| clientInfo: { name: "dns-rebinding-test", version: "1.0.0" }, | ||
| }, | ||
| }); | ||
|
coderabbitai[bot] marked this conversation as resolved.
Outdated
|
||
|
|
||
| return new Promise((resolve, reject) => { | ||
| const req = http.request( | ||
| { | ||
| host: HOST, | ||
| port, | ||
| path: "/mcp", | ||
| method: "POST", | ||
| headers: { | ||
| Host: `${HOST}:${port}`, | ||
| "Content-Type": "application/json", | ||
| Accept: "application/json, text/event-stream", | ||
| "Private-Token": TEST_TOKEN, | ||
| "Content-Length": Buffer.byteLength(body).toString(), | ||
| ...headers, | ||
| }, | ||
| }, | ||
| res => { | ||
| let responseBody = ""; | ||
| res.setEncoding("utf8"); | ||
| res.on("data", chunk => { | ||
| responseBody += chunk; | ||
| }); | ||
| res.on("end", () => resolve({ status: res.statusCode ?? 0, body: responseBody })); | ||
| } | ||
| ); | ||
| req.on("error", reject); | ||
| req.end(body); | ||
| }); | ||
| } | ||
|
|
||
| afterEach(() => { | ||
| for (const child of running) { | ||
| if (!child.killed) child.kill("SIGTERM"); | ||
| } | ||
| running.clear(); | ||
| }); | ||
|
|
||
| describe("Streamable HTTP DNS rebinding protection", () => { | ||
| test("rejects forged Host and Origin headers before handling /mcp", async () => { | ||
| const port = await findAvailablePort(4700); | ||
| startServer({}, port); | ||
| await waitForHealth(port); | ||
|
|
||
| const validHost = `${HOST}:${port}`; | ||
|
|
||
| const badHost = await postMcp(port, { | ||
| Host: "attacker.example.test", | ||
| Origin: `http://${validHost}`, | ||
| }); | ||
| assert.equal(badHost.status, 403); | ||
| assert.match(badHost.body, /Host header is not allowed/); | ||
|
|
||
| const badOrigin = await postMcp(port, { | ||
| Host: validHost, | ||
| Origin: "https://attacker.example.test", | ||
| }); | ||
| assert.equal(badOrigin.status, 403); | ||
| assert.match(badOrigin.body, /Origin header is not allowed/); | ||
|
|
||
| const ok = await postMcp(port, { Host: validHost }); | ||
| assert.equal(ok.status, 200); | ||
| }); | ||
|
|
||
| test("allows the configured MCP_SERVER_URL host and origin", async () => { | ||
| const port = await findAvailablePort(4710); | ||
| startServer({ MCP_SERVER_URL: "https://mcp.example.test" }, port); | ||
| await waitForHealth(port); | ||
|
|
||
| const ok = await postMcp(port, { | ||
| Host: "mcp.example.test", | ||
| Origin: "https://mcp.example.test", | ||
| }); | ||
| assert.equal(ok.status, 200); | ||
| }); | ||
| }); | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.