mirror/fosrl.pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-07-01 01:24:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

forward headers from server component and make trust_proxy config a number

Browse source
This commit is contained in:
miloschwartz 2025-06-19 11:22:29 -04:00
parent c043912f94
commit 97ae76e4e7
No known key found for this signature in database
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
server/apiServer.ts
View file

@ -20,8 +20,9 @@ const externalPort = config.getRawConfig().server.external_port;
export function createApiServer() {
const apiServer = express();
if (config.getRawConfig().server.trust_proxy) {
apiServer.set("trust proxy", 1);
const trustProxy = config.getRawConfig().server.trust_proxy;
if (trustProxy) {
apiServer.set("trust proxy", trustProxy);
}
const corsConfig = config.getRawConfig().server.cors;

2
server/lib/readConfigFile.ts
View file

@ -112,7 +112,7 @@ export const configSchema = z.object({
credentials: z.boolean().optional()
})
.optional(),
trust_proxy: z.boolean().optional().default(true),
trust_proxy: z.number().int().gte(0).optional().default(1),
secret: z
.string()
.optional()

9
src/lib/api/cookies.ts
View file

@ -1,4 +1,4 @@
import { cookies } from "next/headers";
import { cookies, headers } from "next/headers";
import { pullEnv } from "../pullEnv";
export async function authCookieHeader() {
@ -7,9 +7,16 @@ export async function authCookieHeader() {
const allCookies = await cookies();
const cookieName = env.server.sessionCookieName;
const sessionId = allCookies.get(cookieName)?.value ?? null;
// all other headers
// this is needed to pass through x-forwarded-for, x-forwarded-proto, etc.
const otherHeaders = await headers();
const otherHeadersObject = Object.fromEntries(otherHeaders.entries());
return {
headers: {
Cookie: `${cookieName}=${sessionId}`,
...otherHeadersObject
},
};
}