Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/fixes/generated-relay-header-sanitization.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Harden generated Cloudflare, Vercel, and Deno relays by stripping hop-by-hop, framing, and proxy authentication headers before forwarding requests upstream.
6 changes: 5 additions & 1 deletion src/app/api/settings/proxy/deno-deploy/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,11 @@ Deno.serve(async (request) => {
return new Response(resolved.reason, { status: resolved.status });
}
const headers = new Headers(request.headers);
["x-relay-target", "x-relay-path", "x-relay-auth", "host"].forEach(h => headers.delete(h));
[
"host", "connection", "content-length", "keep-alive", "proxy-connection",
"proxy-authenticate", "proxy-authorization", "transfer-encoding", "te", "trailer", "upgrade",
"x-relay-target", "x-relay-path", "x-relay-auth",
].forEach(h => headers.delete(h));
const init = { method: request.method, headers };
if (request.method !== "GET" && request.method !== "HEAD") {
init.body = request.body;
Expand Down
6 changes: 5 additions & 1 deletion src/app/api/settings/proxy/vercel-deploy/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ export default async function handler(req) {
return new Response(resolved.reason, { status: resolved.status });
}
const headers = new Headers(req.headers);
["x-relay-target", "x-relay-path", "x-relay-auth", "host"].forEach(h => headers.delete(h));
[
"host", "connection", "content-length", "keep-alive", "proxy-connection",
"proxy-authenticate", "proxy-authorization", "transfer-encoding", "te", "trailer", "upgrade",
"x-relay-target", "x-relay-path", "x-relay-auth",
].forEach(h => headers.delete(h));
const upstream = await fetch(resolved.url, {
method: req.method,
headers,
Expand Down
6 changes: 5 additions & 1 deletion src/lib/proxyRelay/cloudflareWorkerScript.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,11 @@ async function handleRelay(request) {
}
const relayPath = request.headers.get("x-relay-path") || "/";
const headers = new Headers(request.headers);
["x-relay-target", "x-relay-path", "x-relay-auth", "host"].forEach((h) => headers.delete(h));
[
"host", "connection", "content-length", "keep-alive", "proxy-connection",
"proxy-authenticate", "proxy-authorization", "transfer-encoding", "te", "trailer", "upgrade",
"x-relay-target", "x-relay-path", "x-relay-auth",
].forEach((h) => headers.delete(h));
const init = {
method: request.method,
headers,
Expand Down
45 changes: 45 additions & 0 deletions tests/unit/generated-relay-header-denylist.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import assert from "node:assert/strict";
import { describe, it } from "node:test";

import { __buildRelayWorkerForTest } from "../../src/app/api/settings/proxy/deno-deploy/route";
import { __buildRelayFunctionForTest } from "../../src/app/api/settings/proxy/vercel-deploy/route";
import { buildCloudflareWorkerScript } from "../../src/lib/proxyRelay/cloudflareWorkerScript";

const FORBIDDEN_RELAY_HEADERS = [
"host",
"connection",
"content-length",
"keep-alive",
"proxy-connection",
"proxy-authenticate",
"proxy-authorization",
"transfer-encoding",
"te",
"trailer",
"upgrade",
"x-relay-target",
"x-relay-path",
"x-relay-auth",
];

const relays = {
Cloudflare: buildCloudflareWorkerScript("relay-secret"),
Vercel: __buildRelayFunctionForTest("relay-secret"),
Deno: __buildRelayWorkerForTest("relay-secret"),
};

describe("generated relay request header sanitization", () => {
for (const [runtime, source] of Object.entries(relays)) {
it(`${runtime} strips relay controls, framing, and hop-by-hop headers`, () => {
const deletionBlock = source.match(
/const headers = new Headers\([^;]+\);\s*\[([\s\S]*?)\]\.forEach\(\(?h\)?\s*=>\s*headers\.delete\(h\)\);/
);
assert.ok(deletionBlock, `${runtime} generated source must sanitize forwarded headers`);

const deletedHeaders = [...deletionBlock[1].matchAll(/["']([^"']+)["']/g)].map(
(match) => match[1]
);
assert.deepEqual(deletedHeaders, FORBIDDEN_RELAY_HEADERS);
});
}
});
Loading