diff --git a/src/upstream-proxy.ts b/src/upstream-proxy.ts index e4031dae8a..fed6ddc4f3 100644 --- a/src/upstream-proxy.ts +++ b/src/upstream-proxy.ts @@ -108,7 +108,7 @@ export function parseHttpProxy(proxy?: string, biliPort?: number): ParsedHttpPro } return { url: url.href, - host: url.hostname, + host: url.hostname.replace(/^\[|\]$/g, ""), port, protocol: url.protocol, ...(proxyAuthorization(url) ? { authorization: proxyAuthorization(url) } : {}), @@ -457,7 +457,7 @@ export function _setConnectFactoryForTest(factory: ((port: number, host: string) * branch's 10s handshake timeout (see #78). */ export function connectDirect(host: string, port: number, timeoutMs: number = CONNECT_TIMEOUT_MS): Promise { return new Promise((resolve, reject) => { - const socket = connectFactory(port, host); + const socket = connectFactory(port, host.replace(/^\[|\]$/g, "")); let settled = false; const finishError = (error: Error) => { if (settled) return; @@ -497,9 +497,10 @@ export function connectThroughProxy(host: string, port: number, proxyUrl: string socket.once("error", finishError); const connectedEvent = proxy.protocol === "https:" ? "secureConnect" : "connect"; socket.once(connectedEvent, () => { + const authority = `${net.isIP(host) === 6 ? `[${host}]` : host}:${port}`; const headers = [ - `CONNECT ${host}:${port} HTTP/1.1`, - `Host: ${host}:${port}`, + `CONNECT ${authority} HTTP/1.1`, + `Host: ${authority}`, "Proxy-Connection: Keep-Alive", ...(proxy.authorization ? [`Proxy-Authorization: ${proxy.authorization}`] : []), "", diff --git a/tests/fix-78-connect-timeout.test.ts b/tests/fix-78-connect-timeout.test.ts index 0bd27fd57c..335821e11a 100644 --- a/tests/fix-78-connect-timeout.test.ts +++ b/tests/fix-78-connect-timeout.test.ts @@ -2,7 +2,7 @@ import assert from "node:assert"; import net from "node:net"; import test from "node:test"; -import { connectDirect, connectThroughProxy, _setConnectFactoryForTest } from "../src/upstream-proxy.ts"; +import { connectDirect, connectThroughProxy, parseHttpProxy, _setConnectFactoryForTest } from "../src/upstream-proxy.ts"; function listen(server: net.Server): Promise { if (server.listening) return Promise.resolve(); @@ -69,3 +69,67 @@ test("direct connect: immediate errors (connection refused) still surface right await assert.rejects(connectDirect("127.0.0.1", port), /ECONNREFUSED/); assert.ok(Date.now() - t0 < 2_000, "refusal is immediate, not a timeout"); }); + +test("IPv6 proxy URLs expose an unbracketed socket hostname", () => { + for (const scheme of ["http", "https"]) { + const proxy = parseHttpProxy(`${scheme}://[::1]:8080`); + assert.equal(proxy?.host, "::1"); + assert.equal(proxy?.url, `${scheme}://[::1]:8080/`, "the URL retains authority brackets"); + } +}); + +for (const proxied of [false, true]) { + test(`IPv6 loopback ${proxied ? "proxy" : "direct"} connection accepts bracketed authorities`, async (t) => { + const peers: net.Socket[] = []; + const server = net.createServer((socket) => { + peers.push(socket); + if (proxied) socket.once("data", () => socket.write("HTTP/1.1 200 Connection Established\r\n\r\n")); + }); + try { + await new Promise((resolve, reject) => { + server.once("error", reject); + server.listen(0, "::1", resolve); + }); + } catch (error) { + if (["EAFNOSUPPORT", "EADDRNOTAVAIL"].includes((error as NodeJS.ErrnoException).code ?? "")) { + t.skip("IPv6 loopback is unavailable on this host"); + return; + } + throw error; + } + try { + const port = (server.address() as net.AddressInfo).port; + const socket = proxied + ? await connectThroughProxy("upstream.example", 443, `http://[::1]:${port}`) + : await connectDirect("[::1]", port); + socket.destroy(); + } finally { + for (const peer of peers) peer.destroy(); + await new Promise((resolve) => server.close(() => resolve())); + } + }); +} + +test("CONNECT uses a bracketed authority for a bare IPv6 target", async () => { + let request = ""; + const peers: net.Socket[] = []; + const server = net.createServer((socket) => { + peers.push(socket); + socket.once("data", (data) => { + request = data.toString(); + socket.write("HTTP/1.1 200 Connection Established\r\n\r\n"); + }); + }); + server.listen(0, "127.0.0.1"); + await listen(server); + try { + const port = (server.address() as net.AddressInfo).port; + const socket = await connectThroughProxy("2001:db8::1", 443, `http://127.0.0.1:${port}`); + socket.destroy(); + assert.match(request, /^CONNECT \[2001:db8::1\]:443 HTTP\/1\.1\r\n/); + assert.match(request, /\r\nHost: \[2001:db8::1\]:443\r\n/); + } finally { + for (const peer of peers) peer.destroy(); + await new Promise((resolve) => server.close(() => resolve())); + } +});