Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: cross-site post form submissions are forbidden when using load balancer in front #61

Merged
merged 4 commits into from
Oct 2, 2024
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.DS_Store
node_modules
/files
/files
.idea/
Binary file modified bun.lockb
Binary file not shown.
1 change: 1 addition & 0 deletions src/env.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const expected = new Set([
"ADDRESS_HEADER",
"PROTOCOL_HEADER",
"HOST_HEADER",
"PORT_HEADER",
"SERVERDEV",
]);
export const build_options = BUILD_OPTIONS;
Expand Down
48 changes: 27 additions & 21 deletions src/handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const origin = env("ORIGIN", undefined);
const address_header = env("ADDRESS_HEADER", "").toLowerCase();
const protocol_header = env("PROTOCOL_HEADER", "").toLowerCase();
const host_header = env("HOST_HEADER", "host").toLowerCase();
const port_header = env("PORT_HEADER", "").toLowerCase();

/** @param {boolean} assets */
export default function (assets) {
Expand Down Expand Up @@ -94,26 +95,26 @@ function serve(path, client = false) {

/**@param {Request} request */
function ssr(request) {
if (origin) {
const requestOrigin = get_origin(request.headers);
if (origin !== requestOrigin) {
const url = request.url.slice(request.url.split("/", 3).join("/").length);
request = new Request(origin + url, {
method: request.method,
headers: request.headers,
body: request.body,
referrer: request.referrer,
referrerPolicy: request.referrerPolicy,
mode: request.mode,
credentials: request.credentials,
cache: request.cache,
redirect: request.redirect,
integrity: request.integrity,
});
}
}
const baseOrigin = origin || get_origin(request.headers);
const url = request.url.slice(request.url.split("/", 3).join("/").length);
request = new Request(baseOrigin + url, {
method: request.method,
headers: request.headers,
body: request.body,
referrer: request.referrer,
referrerPolicy: request.referrerPolicy,
mode: request.mode,
credentials: request.credentials,
cache: request.cache,
redirect: request.redirect,
integrity: request.integrity,
});

if (address_header && !request.headers.has(address_header)) {
if (
address_header &&
request.headers.get(host_header) !== "127.0.0.1" &&
!request.headers.has(address_header)
) {
throw new Error(
`Address header was specified with ${
ENV_PREFIX + "ADDRESS_HEADER"
Expand All @@ -123,7 +124,7 @@ function ssr(request) {

return server.respond(request, {
getClientAddress() {
if (address_header) {
if (address_header && request.headers.get(host_header) !== "127.0.0.1") {
const value = /** @type {string} */ (request.headers.get(address_header)) || "";

if (address_header === "x-forwarded-for") {
Expand Down Expand Up @@ -162,5 +163,10 @@ function ssr(request) {
function get_origin(headers) {
const protocol = (protocol_header && headers.get(protocol_header)) || "https";
const host = headers.get(host_header);
return `${protocol}://${host}`;
const port = port_header && headers[port_header];
if (port) {
return `${protocol}://${host}:${port}`;
} else {
return `${protocol}://${host}`;
}
}
4 changes: 2 additions & 2 deletions src/sirv.js
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ export default function (dir, opts = {}) {
data = {
...data,
// clone a new headers to prevent the cached one getting modified
headers: new Headers(data.headers)
}
headers: new Headers(data.headers),
};

if (gzips || brots) {
data.headers.append("Vary", "Accept-Encoding");
Expand Down