Flowdeck 7.85.7 — cohérence d'identité au changement de compte : la session locale s'aligne sur le cookie draco (middleware pages, marqueurs de session draco_sub/secours)
FlowDeck CI / lint (push) Failing after 0s
FlowDeck CI / test (push) Failing after 1s
FlowDeck CI / docker (push) Skipped
FlowDeck CI / lint (pull_request) Failing after 1s
FlowDeck CI / test (pull_request) Failing after 1s
FlowDeck CI / docker (pull_request) Skipped
FlowDeck CI / lint (push) Failing after 0s
FlowDeck CI / test (push) Failing after 1s
FlowDeck CI / docker (push) Skipped
FlowDeck CI / lint (pull_request) Failing after 1s
FlowDeck CI / test (pull_request) Failing after 1s
FlowDeck CI / docker (pull_request) Skipped
This commit is contained in:
+43
-5
@@ -36,16 +36,28 @@ class SessionManager:
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
def create_session(user_data: dict, request=None) -> str:
|
||||
def create_session(user_data: dict, request=None, draco_sub: str | None = None,
|
||||
secours: bool = False) -> str:
|
||||
"""Create a signed session cookie value.
|
||||
|
||||
``request`` is optional — when provided the session is recorded in the
|
||||
``user_sessions`` table (ip + user agent) and becomes revocable.
|
||||
|
||||
Cohérence d'identité (7.85.7) : ``draco_sub`` inscrit dans le
|
||||
payload signé le sub draco que la session sert (posé par le
|
||||
pont) — c'est la base de comparaison du contrôle de
|
||||
cohérence, insensible au repli mono-utilisateur de la
|
||||
résolution ; ``secours=True`` marque une session de la porte
|
||||
de secours, exemptée de ce contrôle.
|
||||
"""
|
||||
payload = {
|
||||
"user": public_user(user_data),
|
||||
"created_at": datetime.now(UTC).replace(tzinfo=None).isoformat(),
|
||||
}
|
||||
if draco_sub:
|
||||
payload["draco_sub"] = str(draco_sub)
|
||||
if secours:
|
||||
payload["secours"] = True
|
||||
user_id = user_data.get("id")
|
||||
if user_id:
|
||||
sid = str(uuid4())
|
||||
@@ -54,17 +66,31 @@ class SessionManager:
|
||||
return _serializer.dumps(payload)
|
||||
|
||||
@staticmethod
|
||||
def decode_session(cookie: str) -> dict | None:
|
||||
"""Decode and validate a session cookie. Returns user data or None."""
|
||||
def decode_payload(cookie: str) -> dict | None:
|
||||
"""Decode the full session payload (user, sid, markers), or None.
|
||||
|
||||
Same validity checks as ``decode_session`` (signature,
|
||||
expiration, server-side revocation) but no ``last_seen``
|
||||
touch and no unwrapping — the coherence middleware reads
|
||||
the identity markers from here.
|
||||
"""
|
||||
try:
|
||||
payload = _serializer.loads(cookie, max_age=86400 * 7) # 7 days
|
||||
except (BadSignature, SignatureExpired):
|
||||
return None
|
||||
|
||||
sid = payload.get("sid") or ""
|
||||
if sid and not _session_active(sid):
|
||||
# Revoked or deleted session → treat as logged out.
|
||||
return None
|
||||
return payload
|
||||
|
||||
@staticmethod
|
||||
def decode_session(cookie: str) -> dict | None:
|
||||
"""Decode and validate a session cookie. Returns user data or None."""
|
||||
payload = SessionManager.decode_payload(cookie)
|
||||
if payload is None:
|
||||
return None
|
||||
sid = payload.get("sid") or ""
|
||||
if sid:
|
||||
_touch_session(sid)
|
||||
return payload.get("user")
|
||||
@@ -103,12 +129,24 @@ class SessionManager:
|
||||
|
||||
@staticmethod
|
||||
def refresh_session(cookie: str, user_data: dict, request=None) -> str:
|
||||
"""Re-sign a cookie keeping its session id (used after profile edits)."""
|
||||
"""Re-sign a cookie keeping its session id (used after profile edits).
|
||||
|
||||
Les marqueurs de cohérence (``draco_sub``, ``secours`` —
|
||||
7.85.7) de l'ancien payload sont préservés : un rafraîchi
|
||||
de profil ne doit ni perdre l'identité servie ni l'exemption
|
||||
de secours.
|
||||
"""
|
||||
sid = SessionManager.session_id(cookie) if cookie else None
|
||||
payload = {
|
||||
"user": public_user(user_data),
|
||||
"created_at": datetime.now(UTC).replace(tzinfo=None).isoformat(),
|
||||
}
|
||||
if cookie:
|
||||
ancien = SessionManager.decode_payload(cookie)
|
||||
if ancien:
|
||||
for marqueur in ("draco_sub", "secours"):
|
||||
if ancien.get(marqueur):
|
||||
payload[marqueur] = ancien[marqueur]
|
||||
user_id = user_data.get("id")
|
||||
if user_id:
|
||||
if sid is None:
|
||||
|
||||
Reference in New Issue
Block a user