diff --git a/services/site/src/lib/server-action.ts b/services/site/src/lib/server-action.ts index 1d82b569782..db5729630f8 100644 --- a/services/site/src/lib/server-action.ts +++ b/services/site/src/lib/server-action.ts @@ -5,7 +5,17 @@ export function sanitizeServerActionRequest(request: Request) { const referer = request.headers.get("referer") if (referer && URL.canParse(referer) && new URL(referer).origin === requestUrl.origin) return request - const sanitized = new Request(request) - sanitized.headers.set("referer", requestUrl.origin) - return sanitized + // Built from its parts: the dev server hands over its own Request class, which Node's + // `new Request(request)` can't copy. + const headers = new Headers(request.headers) + headers.set("referer", requestUrl.origin) + // Workers can hand over a GET or HEAD with a body, which a new Request refuses. + const body = /^(GET|HEAD)$/i.test(request.method) ? null : request.body + return new Request(request.url, { + method: request.method, + headers, + body, + signal: request.signal, + ...(body ? { duplex: "half" } : {}), + } as RequestInit) } diff --git a/services/site/test/serverAction.test.ts b/services/site/test/serverAction.test.ts index 6c9d9681281..e43e0d69854 100644 --- a/services/site/test/serverAction.test.ts +++ b/services/site/test/serverAction.test.ts @@ -24,6 +24,33 @@ describe("server action referer", () => { ).toEqual(["https://dev.opencode.ai", "https://dev.opencode.ai", "https://dev.opencode.ai"]) }) + test("keeps the method and body when it replaces the referer", async () => { + const sanitized = sanitizeServerActionRequest( + new Request("https://dev.opencode.ai/_server?id=action", { + method: "POST", + headers: { referer: "https://evil.example/phishing-login" }, + body: "[1]", + }), + ) + + expect([sanitized.method, sanitized.headers.get("referer"), await sanitized.text()]).toEqual([ + "POST", + "https://dev.opencode.ai", + "[1]", + ]) + }) + + test("drops the body of a GET it rebuilds", () => { + const request = { + url: "https://dev.opencode.ai/_server?id=action", + method: "GET", + headers: new Headers({ referer: "https://evil.example/phishing-login" }), + body: new Response("[1]").body, + } as unknown as Request + + expect(sanitizeServerActionRequest(request).body).toBeNull() + }) + test("does not change other routes", () => { const request = new Request("https://dev.opencode.ai/auth", { headers: { referer: "https://evil.example/phishing-login" },