From efb080704114e580590279baaabca5dde3431f3f Mon Sep 17 00:00:00 2001 From: WonderAliceUwU Date: Wed, 21 Oct 2026 19:07:32 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20only=20mark=20session=20c?= =?UTF-8?q?ookie=20secure=20over=20https?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Detect HTTPS from TLS or X-Forwarded-Proto instead of forcing Secure in production, so plain HTTP LAN access works. --- server/index.ts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/server/index.ts b/server/index.ts index c75c87a..d4cbcd2 100644 --- a/server/index.ts +++ b/server/index.ts @@ -534,8 +534,20 @@ function getSessionToken(request: IncomingMessage): string | null { return null; } +// Mark the cookie Secure only when the browser reached us over HTTPS, so plain +// HTTP access on a LAN still works. +function isSecureRequest(request: IncomingMessage): boolean { + if ('encrypted' in request.socket && request.socket.encrypted) { + return true; + } + + const forwardedProto = request.headers['x-forwarded-proto']; + const proto = (Array.isArray(forwardedProto) ? forwardedProto[0] : forwardedProto)?.split(',')[0].trim().toLowerCase(); + return proto === 'https'; +} + function setSessionCookie(request: IncomingMessage, response: ServerResponse, token: string): void { - const isSecure = request.headers['x-forwarded-proto'] === 'https' || process.env.NODE_ENV === 'production'; + const isSecure = isSecureRequest(request); response.setHeader( 'Set-Cookie', `${SESSION_COOKIE}=${token}; HttpOnly; Path=/; SameSite=Strict; Max-Age=${Math.floor(SESSION_TTL_MS / 1000)}${isSecure ? '; Secure' : ''}` @@ -543,7 +555,7 @@ function setSessionCookie(request: IncomingMessage, response: ServerResponse, to } function clearSessionCookie(request: IncomingMessage, response: ServerResponse): void { - const isSecure = request.headers['x-forwarded-proto'] === 'https' || process.env.NODE_ENV === 'production'; + const isSecure = isSecureRequest(request); response.setHeader( 'Set-Cookie', `${SESSION_COOKIE}=; HttpOnly; Path=/; SameSite=Strict; Max-Age=0${isSecure ? '; Secure' : ''}`