fed905edc5
## Summary
Phase-3a step per [ADR-0020](docs/decisions/0020-portal-admin-app.md) §"Sessions — distinct from `portal-shell`". Wires a second `express-session` middleware on `/api/admin/*` carrying `__Host-portal_admin_session` over Redis prefix `session:admin:`, and ships the parallel `/api/admin/auth/{login,callback,me,logout}` flow that populates it. Signing in to one surface no longer signs the user into the other — Entra SSO at the IdP level still preserves the click-through.
## What lands
### Session middlewares — path-routed dispatch
| Token | Cookie | Redis prefix | Bound to |
| --- | --- | --- | --- |
| `SESSION_MIDDLEWARE` | `portal_session` / `__Host-portal_session` | `session:` | every path **except** `/api/admin/*` |
| `ADMIN_SESSION_MIDDLEWARE` | `portal_admin_session` / `__Host-portal_admin_session` | `session:admin:` | `/api/admin/*` only |
Implemented via a `buildSessionMiddleware(redis, logger, opts)` factory in [session.module.ts](apps/portal-bff/src/session/session.module.ts) — the TTL policy, encryption key, signing secret, session-id entropy, and serializer error-handling all come from the same source. Only the cookie name + Redis key prefix differ.
The dispatch in [main.ts](apps/portal-bff/src/main.ts) is a tiny `(req, res, next) => req.path.startsWith('/api/admin') ? adminSession(...) : userSession(...)`. Running both middlewares unconditionally would have the second overwrite `req.session` from the first, collapsing the two surfaces.
### Distinct admin auth flow
[`AdminAuthController`](apps/portal-bff/src/admin/admin-auth.controller.ts) mounts `/api/admin/auth/{login,callback,me,logout}`. Structurally identical to [`AuthController`](apps/portal-bff/src/auth/auth.controller.ts) but passes `adminRedirectUri` / `adminPostLogoutRedirectUri` and clears the admin session cookie on logout. `me` exposes the `roles` claim (admin SPA needs it for conditional UI); the user-portal `me` intentionally still doesn't.
### Shared `SessionEstablisher` (no controller duplication)
[`SessionEstablisher`](apps/portal-bff/src/auth/session-establisher.service.ts) encapsulates the session lifecycle so both controllers stay thin:
- `establish({ user, req, res, surface })` — mints CSRF, populates `user / createdAt / absoluteExpiresAt / csrfToken / mfaVerifiedAt`, saves, sets the CSRF cookie, registers in `user_sessions` index, emits `auth.sign_in` audit (blocking), logs with the `surface` tag.
- `destroy({ actor, req })` — when `actor` is set, removes from index + emits `auth.sign_out`; always destroys the session with Redis-hiccup tolerance.
No code duplicated between the two surfaces — the only per-surface differences are the redirect URIs (passed in) and the cookie names cleared on logout (controller-local).
### Entra config gains two URIs
`EntraConfig` adds `adminRedirectUri` + `adminPostLogoutRedirectUri`, validated at boot in [check-entra-config.ts](apps/portal-bff/src/config/check-entra-config.ts). The validator **refuses to start** when `ENTRA_ADMIN_REDIRECT_URI === ENTRA_REDIRECT_URI` — that misconfiguration would silently collapse the two surfaces into one session. Both URIs must be registered on the same Entra app registration's "Redirect URIs" list.
### `AuthService` API change
`beginAuthCodeFlow(redirectUri)`, `completeAuthCodeFlow(code, state, preAuth, redirectUri, now?)`, and `buildLogoutUrl(postLogoutRedirectUri)` now take their URI as a parameter. Callers (user-portal vs admin-portal controllers) pick which set to pass.
## Required ops action before this PR can run locally
Two new mandatory env vars. The BFF refuses to start without them.
```env
ENTRA_ADMIN_REDIRECT_URI=http://localhost:3000/api/admin/auth/callback
ENTRA_ADMIN_POST_LOGOUT_REDIRECT_URI=http://localhost:4201/
```
The example values land in [apps/portal-bff/.env.example](apps/portal-bff/.env.example) for reference. The corresponding Entra app registration also needs `/api/admin/auth/callback` added to its "Redirect URIs" list before any admin sign-in works end-to-end.
## Notes for the reviewer
- The user-portal callback's post-login redirect still targets `postLogoutRedirectUri` (existing quirk where the post-auth and post-logout landing happen to be the same URL). The admin callback mirrors the pattern for `adminPostLogoutRedirectUri`. Splitting these into dedicated post-login URIs is a separate ADR/PR.
- `AdminModule` now imports `AuthModule` to consume `AuthService`, `SessionEstablisher`, and `ENTRA_CONFIG`. `AuditWriter` and `RequireMfaGuard` come through transitively.
- Existing `AuthController` spec assertions are preserved through the refactor by constructing a **real** `SessionEstablisher` in the test fixture with the same audit / index / logger mocks. No behavioural assertion was removed — the inline session-state-setting logic is now exercised through the establisher.
- The pre-existing docstring in `check-entra-config.ts` line 11-16 still says "the two redirect URIs are mandatory once the OIDC routes ship (next PR)" — stale, the routes have shipped. Not touched in this PR to keep the diff focused; can be a one-line doc PR later.
## Test plan
- [x] `pnpm nx test portal-bff` — **278 specs pass** (was 253; +25: admin cookie 3, session-establisher 11, admin auth controller 9, entra config 2).
- [x] `pnpm exec nx affected -t format:check lint test build --base=origin/main` — clean (the pre-existing `_res` / `_next` warnings in `rate-limit.middleware.ts` are unrelated).
- [x] Entra config validator: both URIs required, both URL-validated, equality refused.
- [x] Path-dispatch verified by routing — `/api/admin/me` and `/api/admin/auth/*` see the admin session; everything else sees the user session.
- [ ] e2e — pending env var update + Entra registration update to add the admin redirect URI. Once both are in place: sign in via `/api/auth/login`, see `portal_session` cookie; clear cookies; sign in via `/api/admin/auth/login`, see `portal_admin_session` cookie; verify `/api/admin/me` works on the admin session and `/api/auth/me` works on the user session — neither sees the other's session.
---------
Co-authored-by: Julien Gautier <julien.gautier@apf.asso.fr>
Reviewed-on: #129
173 lines
6.6 KiB
TypeScript
173 lines
6.6 KiB
TypeScript
import { randomBytes } from 'node:crypto';
|
|
import { Module } from '@nestjs/common';
|
|
import { RedisStore } from 'connect-redis';
|
|
import expressSession from 'express-session';
|
|
import type { CookieOptions } from 'express';
|
|
import { Logger } from 'nestjs-pino';
|
|
import { assertSessionEncryptionKey } from '../config/check-session-encryption-key';
|
|
import { assertSessionSecret } from '../config/check-session-secret';
|
|
import { RedisModule } from '../redis/redis.module';
|
|
import { REDIS_CLIENT, type Redis } from '../redis/redis.token';
|
|
import { AuditWriter } from '../audit/audit.service';
|
|
import { createAbsoluteTimeoutMiddleware } from './absolute-timeout.middleware';
|
|
import { adminSessionCookieName } from './admin-session-cookie';
|
|
import { adaptIoredisForConnectRedis } from './ioredis-connect-redis-adapter';
|
|
import { SessionDecryptError, decrypt, encrypt } from './session-crypto';
|
|
import { readSessionTimeouts, sessionCookieName, sessionCookieOptions } from './session-cookie';
|
|
import {
|
|
ADMIN_SESSION_MIDDLEWARE,
|
|
SESSION_ABSOLUTE_TIMEOUT_MIDDLEWARE,
|
|
SESSION_MIDDLEWARE,
|
|
type RequestHandler,
|
|
} from './session.token';
|
|
// Side-effect import: brings the `req.session.user` declaration
|
|
// merging into the compile graph for every consumer of this module.
|
|
import './session.types';
|
|
import { UserSessionIndexService } from './user-session-index.service';
|
|
|
|
/**
|
|
* Build a configured `express-session` middleware. Shared between
|
|
* the user-portal middleware ({@link SESSION_MIDDLEWARE}) and the
|
|
* admin-portal middleware ({@link ADMIN_SESSION_MIDDLEWARE}) per
|
|
* ADR-0020 §"Sessions — distinct from `portal-shell`".
|
|
*
|
|
* The two surfaces differ only on the cookie name and Redis key
|
|
* prefix; the TTL policy, encryption key, signing secret, session-id
|
|
* entropy, and error-handling all come from the same source so a
|
|
* future hardening (e.g. tighter idle TTL on admin) is a parameter
|
|
* change rather than a divergent code path.
|
|
*/
|
|
function buildSessionMiddleware(
|
|
redis: Redis,
|
|
logger: Logger,
|
|
opts: { cookieName: string; redisKeyPrefix: string; surfaceTag: 'user' | 'admin' },
|
|
): RequestHandler {
|
|
const secret = assertSessionSecret();
|
|
const key = assertSessionEncryptionKey();
|
|
const timeouts = readSessionTimeouts();
|
|
|
|
const store = new RedisStore({
|
|
// `connect-redis` v9 was rewritten against the `node-redis` v4
|
|
// command surface; the adapter shims `ioredis` to look the same
|
|
// for the handful of commands the store actually calls.
|
|
client: adaptIoredisForConnectRedis(redis) as unknown as never,
|
|
prefix: opts.redisKeyPrefix,
|
|
ttl: timeouts.idleSeconds,
|
|
serializer: {
|
|
stringify: (sess) => encrypt(JSON.stringify(sess), key),
|
|
parse: (payload) => {
|
|
try {
|
|
return JSON.parse(decrypt(payload, key));
|
|
} catch (err) {
|
|
// Tamper, wrong key, or unknown version. The phase-2
|
|
// audit pipeline (ADR-0013) will turn this into a
|
|
// first-class audit event; for now we surface a
|
|
// structured Pino log so ops can spot it. The
|
|
// `surface` tag lets dashboards split user-portal
|
|
// decrypt failures from admin-portal ones.
|
|
logger.warn(
|
|
{
|
|
event: 'session.decrypt_failed',
|
|
surface: opts.surfaceTag,
|
|
reason: err instanceof SessionDecryptError ? err.message : String(err),
|
|
},
|
|
'session',
|
|
);
|
|
throw err;
|
|
}
|
|
},
|
|
},
|
|
});
|
|
|
|
const cookie: CookieOptions = sessionCookieOptions(timeouts.idleSeconds);
|
|
|
|
return expressSession({
|
|
name: opts.cookieName,
|
|
secret,
|
|
// `crypto.randomBytes(32).toString('base64url')` ⇒ 256
|
|
// bits of entropy in the session id, per ADR-0010
|
|
// §"Confirmation".
|
|
genid: () => randomBytes(32).toString('base64url'),
|
|
store,
|
|
// `resave: false` — RedisStore.touch refreshes the TTL on
|
|
// every request; no need to rewrite the payload.
|
|
resave: false,
|
|
// `saveUninitialized: false` — don't create empty session
|
|
// keys for unauthenticated visitors browsing public
|
|
// routes. The session is born when the OIDC callback
|
|
// populates it.
|
|
saveUninitialized: false,
|
|
// `rolling: true` — the cookie's `expires` slides forward
|
|
// on every response, matching the sliding-idle policy.
|
|
rolling: true,
|
|
cookie,
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Session module — wires `express-session` with a `connect-redis`
|
|
* store on top of the shared `ioredis` client, with AES-256-GCM
|
|
* encryption applied to the JSON payload before it lands in Redis.
|
|
*
|
|
* Two middlewares are provided, path-routed in `main.ts`:
|
|
*
|
|
* - {@link SESSION_MIDDLEWARE} — user-portal. Cookie
|
|
* `portal_session` / `__Host-portal_session`. Redis prefix
|
|
* `session:`. Bound to every path except `/api/admin/*`.
|
|
*
|
|
* - {@link ADMIN_SESSION_MIDDLEWARE} — admin-portal per ADR-0020.
|
|
* Cookie `portal_admin_session` / `__Host-portal_admin_session`.
|
|
* Redis prefix `session:admin:`. Bound to `/api/admin/*` only.
|
|
*
|
|
* The {@link SESSION_ABSOLUTE_TIMEOUT_MIDDLEWARE} (ADR-0010 §"TTL
|
|
* policy") and {@link UserSessionIndexService} are shared across
|
|
* both surfaces — the absolute-timeout check reads `req.session`
|
|
* which the dispatch has already resolved to one surface or the
|
|
* other; the user-session index is keyed by Entra `oid`, so an
|
|
* admin sign-in and a user-portal sign-in by the same person
|
|
* naturally land in different Redis sets only because the session
|
|
* id namespaces differ.
|
|
*/
|
|
@Module({
|
|
imports: [RedisModule],
|
|
providers: [
|
|
UserSessionIndexService,
|
|
{
|
|
provide: SESSION_ABSOLUTE_TIMEOUT_MIDDLEWARE,
|
|
inject: [UserSessionIndexService, Logger, AuditWriter],
|
|
useFactory: (
|
|
index: UserSessionIndexService,
|
|
logger: Logger,
|
|
audit: AuditWriter,
|
|
): RequestHandler => createAbsoluteTimeoutMiddleware(index, logger, audit),
|
|
},
|
|
{
|
|
provide: SESSION_MIDDLEWARE,
|
|
inject: [REDIS_CLIENT, Logger],
|
|
useFactory: (redis: Redis, logger: Logger): RequestHandler =>
|
|
buildSessionMiddleware(redis, logger, {
|
|
cookieName: sessionCookieName(),
|
|
redisKeyPrefix: 'session:',
|
|
surfaceTag: 'user',
|
|
}),
|
|
},
|
|
{
|
|
provide: ADMIN_SESSION_MIDDLEWARE,
|
|
inject: [REDIS_CLIENT, Logger],
|
|
useFactory: (redis: Redis, logger: Logger): RequestHandler =>
|
|
buildSessionMiddleware(redis, logger, {
|
|
cookieName: adminSessionCookieName(),
|
|
redisKeyPrefix: 'session:admin:',
|
|
surfaceTag: 'admin',
|
|
}),
|
|
},
|
|
],
|
|
exports: [
|
|
SESSION_MIDDLEWARE,
|
|
ADMIN_SESSION_MIDDLEWARE,
|
|
SESSION_ABSOLUTE_TIMEOUT_MIDDLEWARE,
|
|
UserSessionIndexService,
|
|
],
|
|
})
|
|
export class SessionModule {}
|