mirror of
https://github.com/WonderAliceUwU/OmniArr.git
synced 2026-11-19 19:35:56 +00:00
🐛 fix: only mark session cookie secure over https
Detect HTTPS from TLS or X-Forwarded-Proto instead of forcing Secure in production, so plain HTTP LAN access works.
This commit is contained in:
1 parent
e4295a70f8
commit
efb0807041
1 file changed
+14
-2
+14
-2
@@ -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' : ''}`
|
||||
|
||||
Reference in new issue
Block a user