From 7540e60869b3d7aa097f0e49fd4614b85cd246ff Mon Sep 17 00:00:00 2001 From: Sisyphus Date: Thu, 13 Aug 2026 21:17:44 +0800 Subject: [PATCH] fix(server): DNS-rebinding + Sec-Fetch-Site hardening for admin endpoints Rework of PR #81 onto current master. The original PR also hardened codex-takeover.ts (PID-recycling defense + fsync perf), but that file was removed from master, so only the server.ts CSRF defense survives here. - isTrustedAdminOrigin: pin Host hostname to loopback (127.0.0.1/localhost/::1) so a rebinding domain (evil.com -> 127.0.0.1) can no longer pass Origin===Host. - reject Sec-Fetch-Site other than same-origin (fetch metadata, unforgeable by browser JS); non-browser clients send neither header and are unaffected. - test: admin endpoints return 403 for non-loopback Host and cross-site Sec-Fetch-Site. 371/371 tests pass, typecheck clean, build OK. --- src/server.ts | 13 ++++++++++-- tests/web-routing.test.ts | 43 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/src/server.ts b/src/server.ts index 04792f7776..cd4c5ad044 100644 --- a/src/server.ts +++ b/src/server.ts @@ -274,7 +274,16 @@ function isLoopback(addr: string | undefined): boolean { return addr === "::1" || addr === "127.0.0.1" || addr.startsWith("127.") || addr.startsWith("::ffff:127."); } -function isTrustedAdminOrigin(origin: string | undefined, host: string | undefined): boolean { +function isTrustedAdminOrigin(origin: string | undefined, host: string | undefined, secFetchSite: string | undefined): boolean { + // DNS-rebinding defense: the Host header must point at loopback. Without + // this, a rebinding domain (evil.com -> 127.0.0.1) passes the Origin===Host + // check below because both carry the attacker domain. + if (host) { + const hostname = host.replace(/^\[|\]$/g, "").split(":")[0].toLowerCase(); + if (hostname !== "127.0.0.1" && hostname !== "localhost" && hostname !== "::1") return false; + } + // Sec-Fetch-Site is a fetch metadata header that browser JS cannot forge. + if (secFetchSite !== undefined && secFetchSite !== "same-origin") return false; if (!origin) return true; if (!host) return false; try { @@ -306,7 +315,7 @@ async function handle( res.end(JSON.stringify({ error: "management endpoints are loopback-only; access denied for " + (req.socket.remoteAddress ?? "unknown") })); return; } - if (isAdminPath && !isTrustedAdminOrigin(req.headers.origin, req.headers.host)) { + if (isAdminPath && !isTrustedAdminOrigin(req.headers.origin, req.headers.host, req.headers["sec-fetch-site"] as string | undefined)) { res.writeHead(403, { "content-type": "application/json" }); res.end(JSON.stringify({ error: "management request origin does not match the local bili UI" })); return; diff --git a/tests/web-routing.test.ts b/tests/web-routing.test.ts index 2ef722f70e..2a315908e3 100644 --- a/tests/web-routing.test.ts +++ b/tests/web-routing.test.ts @@ -141,3 +141,46 @@ test("PUT /__bili/config with providers takes effect without a separate reload c rmSync(root, { recursive: true, force: true }); } }); + +test("admin endpoints reject non-loopback Host and cross-site Sec-Fetch-Site (DNS rebinding defense)", async () => { + _setStoreForTest(new SessionStore({ enabled: false })); + setRegistryForTest({}); + const port = await freePort(); + const opts: ProxyOptions = { + port, + host: "127.0.0.1", + upstream: "http://127.0.0.1:1", + routes: {}, + proxy: "", + proxyMode: "direct", + proxySource: "direct", + modelContextLimit: 400_000, + kernelConfig: defaultConfig(400_000), + compress: { injectTool: true, injectNudge: true }, + promptCache: { routing: "auto" }, + sessionHeader: "x-acp-session", + log: false, + debug: false, + passthrough: false, + autoUpdate: false, + mitm: { enabled: false, domains: [] }, + }; + const proxy = await startServer(opts); + if (!proxy.listening) await once(proxy, "listening"); + try { + const evilHostStatus = await new Promise((resolve, reject) => { + const req = http.request(`http://127.0.0.1:${port}/__bili/stats`, { headers: { host: "evil.example" } }, (res) => { + res.resume(); + resolve(res.statusCode ?? 0); + }); + req.on("error", reject); + req.end(); + }); + assert.equal(evilHostStatus, 403, "non-loopback Host header must be rejected"); + + const crossSiteStatus = (await fetch(`http://127.0.0.1:${port}/__bili/stats`, { headers: { "sec-fetch-site": "cross-site" } })).status; + assert.equal(crossSiteStatus, 403, "cross-site Sec-Fetch-Site must be rejected"); + } finally { + await close(proxy); + } +});