Skip to content
Closed
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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Respect trusted reverse proxy host and protocol headers in the development server
47 changes: 47 additions & 0 deletions packages/react-router-dev/vite/node-adapter-test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import {
type AddressInfo,
createServer,
request as sendRequest,
} from "node:http";
import type * as Vite from "vite";
import { fromNodeRequest } from "./node-adapter";

describe("fromNodeRequest", () => {
it("uses the forwarded protocol without trusting the forwarded host", async () => {
let requestUrl = await new Promise<string>((resolve, reject) => {
let server = createServer(async (nodeReq, nodeRes) => {
let viteRequest = Object.assign(nodeReq, {
originalUrl: nodeReq.url,
}) as Vite.Connect.IncomingMessage;

try {
let request = await fromNodeRequest(viteRequest, nodeRes);
resolve(request.url);
nodeRes.end();
} catch (error) {
reject(error);
} finally {
server.close();
}
});

server.on("error", reject);
server.listen(0, "127.0.0.1", () => {
let { port } = server.address() as AddressInfo;
let request = sendRequest({
host: "127.0.0.1",
port,
headers: {
host: "public.example.com",
"x-forwarded-host": "evil.example.com",
"x-forwarded-proto": "https",
},
});
request.on("error", reject);
request.end();
});
});

expect(requestUrl).toBe("https://public.example.com/");
});
});
7 changes: 6 additions & 1 deletion packages/react-router-dev/vite/node-adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,10 @@ export async function fromNodeRequest(
);
nodeReq.url = nodeReq.originalUrl;

return createRequest(nodeReq, nodeRes);
return createRequest(nodeReq, nodeRes, {
// Vite validates the Host header against server.allowedHosts. Keep that
// validated host instead of trusting a client-controlled forwarded host.
host: nodeReq.headers.host ?? "localhost",
trustProxy: true,
});
}