b92055eb01
US-007: rute web proprii /cont/roteste-cheie + /cont/rar-creds scoped pe sesiune (C13), sectiune "Contul meu" cu cheie afisata o data. US-010: rol admin (users.is_admin) + require_admin->403 + CLI set-admin + bootstrap primul cont=admin (count_admins in BEGIN IMMEDIATE, anti-race). US-011: panou /admin (activare/dezactivare conturi, CSRF + PRG), link admin + logout pe dashboard. US-012: app/email.py notify_signup best-effort degradat fara SMTP + config smtp_*. Fix: migrare defensiva users.is_admin/email_verified in _migrate. VERIFY x2 context curat (PASS) + /code-review high. 393 teste pass. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
100 lines
3.2 KiB
Python
100 lines
3.2 KiB
Python
"""Helper-e sesiune web. US-002 PRD 3.3.
|
|
|
|
Mecanism require_login (C11): NU un dependency FastAPI care intoarce RedirectResponse
|
|
(acela nu scurtcircuiteaza handler-ul — FastAPI continua executia). In schimb:
|
|
- require_login() RIDICA LoginRequired
|
|
- app.main inregistreaza @app.exception_handler(LoginRequired) care intoarce
|
|
RedirectResponse('/login', 303)
|
|
Astfel handler-ul e intrerupt imediat la raise, independent de logica FastAPI.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from starlette.requests import Request
|
|
|
|
from ..config import get_settings
|
|
from ..mapping import DEFAULT_ACCOUNT_ID
|
|
|
|
|
|
class LoginRequired(Exception):
|
|
"""Ridica pentru a redirectiona la /login (prinsa de exception_handler in main.py)."""
|
|
|
|
|
|
class AdminRequired(Exception):
|
|
"""Ridica cand contul sesiunii nu are rol admin (prinsa de exception_handler in main.py)."""
|
|
|
|
|
|
def current_account(request: Request) -> int | None:
|
|
"""account_id din sesiune sau None daca nu e logat."""
|
|
val = request.session.get("account_id")
|
|
return int(val) if val is not None else None
|
|
|
|
|
|
def current_user_id(request: Request) -> int | None:
|
|
"""user_id din sesiune sau None (C19: leaga import_attestations.confirmed_by)."""
|
|
val = request.session.get("user_id")
|
|
return int(val) if val is not None else None
|
|
|
|
|
|
def web_account(request: Request) -> int | None:
|
|
"""account_id pentru rutele web de CITIRE.
|
|
|
|
- sesiune activa -> contul sesiunii
|
|
- fara sesiune + web_auth_required=False (dev) -> DEFAULT_ACCOUNT_ID (cont 1, back-compat)
|
|
- fara sesiune + web_auth_required=True (prod) -> None
|
|
|
|
Rutele de SCRIERE trebuie sa foloseasca require_login() direct, nu web_account(),
|
|
ca sa nu cada niciodata tacit pe contul 1 in prod.
|
|
"""
|
|
aid = current_account(request)
|
|
if aid is not None:
|
|
return aid
|
|
settings = get_settings()
|
|
if not settings.web_auth_required:
|
|
return DEFAULT_ACCOUNT_ID
|
|
return None
|
|
|
|
|
|
def require_login(request: Request) -> int:
|
|
"""Verifica sesiunea activa; ridica LoginRequired daca nu.
|
|
|
|
Intoarce account_id la succes. Aruncatorul (exception_handler din main.py)
|
|
intercepteaza LoginRequired si intoarce RedirectResponse('/login', 303).
|
|
"""
|
|
aid = web_account(request)
|
|
if aid is None:
|
|
raise LoginRequired()
|
|
return aid
|
|
|
|
|
|
def require_admin(request: Request) -> int:
|
|
"""Verifica ca userul logat are rol admin pe contul sesiunii.
|
|
|
|
Intai cheama require_login (nelogat -> LoginRequired -> /login redirect).
|
|
Daca e logat dar nu e admin -> ridica AdminRequired.
|
|
Intoarce account_id la succes.
|
|
"""
|
|
account_id = require_login(request)
|
|
from ..db import get_connection
|
|
from ..users import is_account_admin
|
|
conn = get_connection()
|
|
try:
|
|
admin = is_account_admin(conn, account_id)
|
|
finally:
|
|
conn.close()
|
|
if not admin:
|
|
raise AdminRequired()
|
|
return account_id
|
|
|
|
|
|
def set_session(request: Request, account_id: int, user_id: int) -> None:
|
|
"""Seteaza sesiunea dupa login. Curata mai intai (C3 anti-fixare sesiune)."""
|
|
request.session.clear()
|
|
request.session["account_id"] = account_id
|
|
request.session["user_id"] = user_id
|
|
|
|
|
|
def clear_session(request: Request) -> None:
|
|
"""Sterge sesiunea (logout)."""
|
|
request.session.clear()
|