Skip to content

Commit af31e97

Browse files
authored
fix(mcp): bind oauth callback to IPv4 loopback (anomalyco#30022)
1 parent 5303ab0 commit af31e97

2 files changed

Lines changed: 45 additions & 1 deletion

File tree

‎packages/opencode/src/mcp/oauth-callback.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import { createServer } from "http"
33
import { escapeHtml } from "@/util/html"
44
import { OAUTH_CALLBACK_PORT, OAUTH_CALLBACK_PATH, parseRedirectUri } from "./oauth-provider"
55

6+
const OAUTH_CALLBACK_HOST = "127.0.0.1"
7+
68
// Current callback server configuration (may differ from defaults if custom redirectUri is used)
79
let currentPort = OAUTH_CALLBACK_PORT
810
let currentPath = OAUTH_CALLBACK_PATH
@@ -162,7 +164,7 @@ export async function ensureRunning(redirectUri?: string): Promise<void> {
162164

163165
server = createServer(handleRequest)
164166
await new Promise<void>((resolve, reject) => {
165-
server!.listen(currentPort, () => {
167+
server!.listen(currentPort, OAUTH_CALLBACK_HOST, () => {
166168
resolve()
167169
})
168170
server!.on("error", reject)

‎packages/opencode/test/mcp/oauth-callback.test.ts‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,41 @@
11
import { test, expect, describe, afterEach } from "bun:test"
2+
import { createConnection, createServer as createNetServer } from "net"
23
import { McpOAuthCallback } from "../../src/mcp/oauth-callback"
34
import { parseRedirectUri } from "../../src/mcp/oauth-provider"
45

6+
async function getFreeLoopbackPort(): Promise<number> {
7+
return new Promise((resolve, reject) => {
8+
const probe = createNetServer()
9+
probe.once("error", reject)
10+
probe.listen(0, "127.0.0.1", () => {
11+
const address = probe.address()
12+
probe.close(() => {
13+
if (typeof address === "object" && address) {
14+
resolve(address.port)
15+
return
16+
}
17+
reject(new Error("Could not allocate a loopback port"))
18+
})
19+
})
20+
})
21+
}
22+
23+
async function canConnect(host: string, port: number): Promise<boolean> {
24+
return new Promise((resolve) => {
25+
const socket = createConnection({ host, port })
26+
const done = (ok: boolean) => {
27+
socket.removeAllListeners()
28+
socket.destroy()
29+
resolve(ok)
30+
}
31+
32+
socket.setTimeout(500)
33+
socket.once("connect", () => done(true))
34+
socket.once("error", () => done(false))
35+
socket.once("timeout", () => done(false))
36+
})
37+
}
38+
539
describe("parseRedirectUri", () => {
640
test("returns defaults when no URI provided", () => {
741
const result = parseRedirectUri()
@@ -69,4 +103,12 @@ describe("McpOAuthCallback.ensureRunning", () => {
69103

70104
expect(await response.text()).toContain('<div class="error">The user denied access</div>')
71105
})
106+
107+
test("binds the callback server to IPv4 loopback", async () => {
108+
const port = await getFreeLoopbackPort()
109+
await McpOAuthCallback.ensureRunning(`http://127.0.0.1:${port}/custom/callback`)
110+
111+
expect(await canConnect("127.0.0.1", port)).toBe(true)
112+
expect(await canConnect("::1", port)).toBe(false)
113+
})
72114
})

0 commit comments

Comments
 (0)