diff --git a/app/src/magic/admin.ts b/app/src/magic/admin.ts index 82600c5..70fa7f5 100644 --- a/app/src/magic/admin.ts +++ b/app/src/magic/admin.ts @@ -184,7 +184,7 @@ export function registerAdminRoutes (app: Express) { } loginFailures.delete(ip) res.cookie(ADMIN_COOKIE, sign(Date.now() + ADMIN_SESSION_MS), { - httpOnly: true, sameSite: 'strict', secure: secureCookies(), path: '/admin', maxAge: ADMIN_SESSION_MS + httpOnly: true, sameSite: 'strict', secure: secureCookies(req), path: '/admin', maxAge: ADMIN_SESSION_MS }) res.redirect(303, '/admin') }) diff --git a/app/src/magic/session.ts b/app/src/magic/session.ts index 798042c..174f2cf 100644 --- a/app/src/magic/session.ts +++ b/app/src/magic/session.ts @@ -34,24 +34,37 @@ export function readCookie (req: Request, name: string): string | undefined { return undefined } -/** Whether cookies should be `Secure`: true when the public URL is https. */ -export function secureCookies (): boolean { - return (process.env.PUBLIC_BASE_URL || '').toLowerCase().startsWith('https://') +/** + * Whether cookies set on this response should be `Secure`: when the request + * came over https (directly, or per X-Forwarded-Proto from a trusted proxy), + * or was addressed to the https public host. A request straight to the + * container over plain http (e.g. http://:3000/admin) gets a + * non-Secure cookie, since browsers drop Secure cookies set over http. + */ +export function secureCookies (req: Request): boolean { + if (req.secure) return true + let publicUrl: URL + try { + publicUrl = new URL(process.env.PUBLIC_BASE_URL || '') + } catch { + return false + } + return publicUrl.protocol === 'https:' && req.hostname === publicUrl.hostname } -function sessionCookieOptions (): CookieOptions { - return { httpOnly: true, sameSite: 'lax', secure: secureCookies(), path: '/', maxAge: SESSION_MAX_AGE_MS } +function sessionCookieOptions (req: Request): CookieOptions { + return { httpOnly: true, sameSite: 'lax', secure: secureCookies(req), path: '/', maxAge: SESSION_MAX_AGE_MS } } /** Sign a recipient in on this browser with a long-lived cookie. */ export function startSession (res: Response, recipient: Recipient) { const token = getStore().createSession(recipient.id, nowIso()) - res.cookie(SESSION_COOKIE, token, sessionCookieOptions()) + res.cookie(SESSION_COOKIE, token, sessionCookieOptions(res.req)) } export function endSession (req: Request, res: Response) { if (req.sessionToken) getStore().deleteSession(req.sessionToken) - res.clearCookie(SESSION_COOKIE, { ...sessionCookieOptions(), maxAge: undefined }) + res.clearCookie(SESSION_COOKIE, { ...sessionCookieOptions(req), maxAge: undefined }) } /** Attach `req.recipient` from the session cookie, if it is valid. Never blocks. */ @@ -65,7 +78,7 @@ export function loadRecipient (req: Request, res: Response, next: NextFunction) req.sessionToken = token if (Date.now() - Date.parse(session.lastSeenAt) > SESSION_REFRESH_MS) { store.touchSession(token, nowIso()) - res.cookie(SESSION_COOKIE, token, sessionCookieOptions()) + res.cookie(SESSION_COOKIE, token, sessionCookieOptions(res.req)) } } }