* feat(auth): enforce session idle and absolute timeouts Hosted browser sessions now carry an HMAC-signed, HttpOnly cookie holding session start, last activity and sign-in method, bound to the Supabase session. Middleware enforces a 30 min idle and 12 h absolute limit (reason-coded redirects to /login), a heartbeat route advances idle activity from real user input, and a client controller warns 2 minutes before expiry. BankID users are routed back to BankID on re-auth via a short-lived method hint. API-key and MCP bearer surfaces are exempt; self-hosted installs default off and can opt in via env vars. Fixes #362 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(auth): derive session-timeout signing key via HKDF The HMAC key is now HKDF-derived with a purpose-bound info string, so the SUPABASE_SERVICE_ROLE_KEY fallback never uses the privileged credential directly as a signing key. Addresses the security review finding on PR #1387. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(auth): back signature bytes with a plain ArrayBuffer crypto.subtle.verify requires a BufferSource; Uint8Array.from is typed over ArrayBufferLike, which the Vercel TypeScript build rejects. Decode base64url into a Uint8Array constructed over a fresh ArrayBuffer. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(auth): address session-timeout review findings - signSessionTimeoutState returns null on signing failure instead of throwing, so a missing secret degrades the timeout feature in line with verifySessionTimeoutState rather than crashing authenticated requests; middleware and heartbeat skip the cookie write when null - heartbeat initializes a fresh signed state for a missing or session-mismatched cookie, mirroring middleware, instead of returning SESSION_EXPIRED during normal initialization - sessionStateMatchesUser treats an unresolved current session id as a mismatch for session-bound state so another session's cookie is never accepted on the userId fallback alone - drop aria-live from the countdown DialogDescription so screen readers are not interrupted every second Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
132 lines
3.7 KiB
TypeScript
132 lines
3.7 KiB
TypeScript
import { cookies } from 'next/headers'
|
|
import { NextResponse } from 'next/server'
|
|
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import { requireAuth } from '@/lib/auth/require-auth'
|
|
import {
|
|
createSessionTimeoutState,
|
|
evaluateSessionTimeout,
|
|
getSessionTimeoutConfig,
|
|
sessionStateMatchesUser,
|
|
sessionTimeoutCookieOptions,
|
|
signSessionTimeoutState,
|
|
toSessionTimeoutClientState,
|
|
verifySessionTimeoutState,
|
|
} from '@/lib/auth/session-timeout'
|
|
import {
|
|
SESSION_AUTH_METHOD_HINT_COOKIE,
|
|
SESSION_TIMEOUT_COOKIE,
|
|
isSessionAuthMethod,
|
|
type SessionTimeoutReason,
|
|
} from '@/lib/auth/session-timeout-shared'
|
|
|
|
export const dynamic = 'force-dynamic'
|
|
|
|
async function getSessionId(supabase: SupabaseClient): Promise<string | null> {
|
|
if (typeof supabase.auth.getClaims !== 'function') return null
|
|
|
|
try {
|
|
const { data } = await supabase.auth.getClaims()
|
|
return typeof data?.claims?.session_id === 'string'
|
|
? data.claims.session_id
|
|
: null
|
|
} catch {
|
|
return null
|
|
}
|
|
}
|
|
|
|
function expiredResponse(reason: SessionTimeoutReason): NextResponse {
|
|
const response = NextResponse.json(
|
|
{ error: { code: 'SESSION_EXPIRED', reason } },
|
|
{ status: 401 },
|
|
)
|
|
response.headers.set('X-Session-Timeout-Reason', reason)
|
|
response.headers.set('Cache-Control', 'no-store')
|
|
return response
|
|
}
|
|
|
|
async function heartbeat(updateActivity: boolean): Promise<NextResponse> {
|
|
const auth = await requireAuth()
|
|
if (auth.error) return auth.error
|
|
|
|
const config = getSessionTimeoutConfig()
|
|
const now = Date.now()
|
|
|
|
if (!config.enabled) {
|
|
return NextResponse.json({
|
|
data: {
|
|
enabled: false,
|
|
idleTimeoutMs: 0,
|
|
absoluteTimeoutMs: 0,
|
|
warningMs: 0,
|
|
serverNow: now,
|
|
startedAt: now,
|
|
lastActivityAt: now,
|
|
method: 'password',
|
|
},
|
|
})
|
|
}
|
|
|
|
const cookieStore = await cookies()
|
|
const encodedState = cookieStore.get(SESSION_TIMEOUT_COOKIE)?.value
|
|
const state = await verifySessionTimeoutState(encodedState)
|
|
const sessionId = await getSessionId(auth.supabase)
|
|
|
|
if (!state || !sessionStateMatchesUser(state, auth.user.id, sessionId)) {
|
|
// Mirror middleware initialization: a missing or session-mismatched
|
|
// cookie means the timeout state has not been established for this
|
|
// session yet, not that the session expired.
|
|
const hintedMethod = cookieStore.get(SESSION_AUTH_METHOD_HINT_COOKIE)?.value
|
|
const freshState = createSessionTimeoutState({
|
|
userId: auth.user.id,
|
|
sessionId,
|
|
method: isSessionAuthMethod(hintedMethod) ? hintedMethod : 'password',
|
|
now,
|
|
})
|
|
const response = NextResponse.json({
|
|
data: toSessionTimeoutClientState(freshState, config, now),
|
|
})
|
|
response.headers.set('Cache-Control', 'no-store')
|
|
const signedFresh = await signSessionTimeoutState(freshState)
|
|
if (signedFresh) {
|
|
response.cookies.set(
|
|
SESSION_TIMEOUT_COOKIE,
|
|
signedFresh,
|
|
sessionTimeoutCookieOptions(),
|
|
)
|
|
}
|
|
return response
|
|
}
|
|
|
|
const reason = evaluateSessionTimeout(state, config, now)
|
|
if (reason) return expiredResponse(reason)
|
|
|
|
const nextState = updateActivity
|
|
? { ...state, lastActivityAt: now }
|
|
: state
|
|
const response = NextResponse.json({
|
|
data: toSessionTimeoutClientState(nextState, config, now),
|
|
})
|
|
response.headers.set('Cache-Control', 'no-store')
|
|
|
|
if (updateActivity) {
|
|
const signedNext = await signSessionTimeoutState(nextState)
|
|
if (signedNext) {
|
|
response.cookies.set(
|
|
SESSION_TIMEOUT_COOKIE,
|
|
signedNext,
|
|
sessionTimeoutCookieOptions(),
|
|
)
|
|
}
|
|
}
|
|
|
|
return response
|
|
}
|
|
|
|
export async function GET(): Promise<NextResponse> {
|
|
return heartbeat(false)
|
|
}
|
|
|
|
export async function POST(): Promise<NextResponse> {
|
|
return heartbeat(true)
|
|
}
|