feat(saas): Phase 3 — plan/seats/active model, ToS consent, signed expiring export
P3a: org carries plan/seats/active/created_at; create_user enforces seats + rejects inactive org; verify blocks login for inactive orgs; PATCH /api/admin/orgs (super_admin) updates plan/seats/active with audit. Fixed verify swallowing its AuthError. P3b: export/token issues a 5-min HMAC one-time CSV link; export accepts ?token=. P3c: setup requires accepted_terms (consent stored); Setup.vue consent checkbox. All 8 backend suites pass. Rebuilt dist.
This commit is contained in:
@@ -43,6 +43,54 @@ def _log_audit(action: str, subject: str, *, detail: dict | None = None) -> None
|
||||
pass
|
||||
|
||||
|
||||
# Short-lived signed link for CSV export (HMAC-SHA256, expiring). Not the long-lived JWT.
|
||||
import hmac
|
||||
import hashlib
|
||||
import time as _t
|
||||
|
||||
_EXPORT_TTL = 300 # 5 minutes
|
||||
|
||||
|
||||
def _sign_export_token(actor: dict) -> str:
|
||||
from ..config import Config
|
||||
|
||||
payload = "{}:{}:{}".format(actor.get("org_id") or "", actor.get("role") or "", int(_t.time()) + _EXPORT_TTL)
|
||||
sig = hmac.new(Config.SECRET_KEY.encode(), payload.encode(), hashlib.sha256).hexdigest()
|
||||
return "{}.{}".format(sig, payload)
|
||||
|
||||
|
||||
def _verify_export_token(token: str) -> dict | None:
|
||||
from ..config import Config
|
||||
|
||||
try:
|
||||
sig, payload = token.split(".", 1)
|
||||
except (ValueError, AttributeError):
|
||||
return None
|
||||
expected = hmac.new(Config.SECRET_KEY.encode(), payload.encode(), hashlib.sha256).hexdigest()
|
||||
if not hmac.compare_digest(sig, expected):
|
||||
return None
|
||||
parts = payload.split(":")
|
||||
if len(parts) != 3:
|
||||
return None
|
||||
org_id, role, exp_s = parts
|
||||
try:
|
||||
if int(exp_s) < _t.time():
|
||||
return None # expired
|
||||
except ValueError:
|
||||
return None
|
||||
return {"org_id": org_id or None, "role": role, "active": True}
|
||||
|
||||
|
||||
@analytics_bp.get("/export/token")
|
||||
@require_auth
|
||||
@require_roles("admin")
|
||||
def export_token():
|
||||
"""Issue a short-lived signed download link for the CSV export."""
|
||||
actor = current_user()
|
||||
token = _sign_export_token(actor)
|
||||
return jsonify({"token": token, "expires_in": _EXPORT_TTL, "url": f"/api/analytics/export?token={token}"})
|
||||
|
||||
|
||||
def _parse_date_iso(value: str | None, *, end: bool = False) -> str | None:
|
||||
"""Parse a YYYY-MM-DD into an ISO datetime bound for created_at filtering."""
|
||||
if not value:
|
||||
@@ -148,7 +196,11 @@ def export_csv():
|
||||
from flask import Response, current_app
|
||||
|
||||
s = _stores()
|
||||
actor = current_user()
|
||||
# Support a short-lived signed link (?token=) OR the normal Bearer JWT.
|
||||
q_token = request.args.get("token")
|
||||
actor = _verify_export_token(q_token) if q_token else current_user()
|
||||
if actor is None:
|
||||
raise ApiError("invalid or expired export link", 403)
|
||||
# Tenant: an admin exports only their own org's sessions; super_admin sees all.
|
||||
export_org = actor.get("org_id") if actor.get("role") != "super_admin" else None
|
||||
users = {}
|
||||
|
||||
Reference in New Issue
Block a user