Upload 30 files

routes.py

@@ -5,7 +5,7 @@ import json
 import logging
 import asyncio
 from datetime import datetime, timedelta
-from typing import Optional
+from typing import Optional, Any
 
 from fastapi import APIRouter, Depends, File, Form, Query, Request, HTTPException, status
 from fastapi.responses import HTMLResponse, RedirectResponse, JSONResponse, Response
@@ -178,15 +178,22 @@ def _clear_session(response: RedirectResponse) -> None:
 async def _audit(
     db: AsyncSession,
     action: str,
-    user: Optional[User] = None,
+    user: Optional[Any] = None,
     target_type: Optional[str] = None,
     target_id: Optional[int] = None,
     details: Optional[dict] = None,
     ip: Optional[str] = None,
     ua: Optional[str] = None,
 ) -> None:
+    # `user` may be either a ``models.User`` (with ``.id``) or a
+    # ``SessionUser`` dataclass (with ``.user_id``) depending on which
+    # auth path the caller went through.  Resolve both transparently
+    # so callers don't have to care.
+    user_id = None
+    if user is not None:
+        user_id = getattr(user, "id", None) or getattr(user, "user_id", None)
     log_entry = AuditLog(
-        user_id=user.id if user else None,
+        user_id=user_id,
         action=action,
         target_type=target_type,
         target_id=target_id,
@@ -1461,7 +1468,7 @@ async def admin_control_delete_user(
 
 @router.get("/admin/users", response_class=HTMLResponse)
 async def admin_users(request: Request, db: AsyncSession = Depends(get_db)):
-    require_role(UserRole.ADMIN)(request)
+    user = require_role(UserRole.ADMIN)(request)
     result = await db.execute(select(User).order_by(User.created_at.desc()))
     users = result.scalars().all()
     # Per-user usage — for the % utilisation columns.  We do this as
@@ -1474,6 +1481,7 @@ async def admin_users(request: Request, db: AsyncSession = Depends(get_db)):
     resp = templates.TemplateResponse(request, "admin_users.html", {
         "request": request,
         "title": "Users",
+        "user": user,
         "users": users,
         "usage": usage,
         "presets": {
@@ -1496,7 +1504,7 @@ async def admin_users(request: Request, db: AsyncSession = Depends(get_db)):
 
 @router.get("/admin/invites", response_class=HTMLResponse)
 async def admin_invites(request: Request, db: AsyncSession = Depends(get_db)):
-    require_role(UserRole.ADMIN)(request)
+    user = require_role(UserRole.ADMIN)(request)
     result = await db.execute(select(InviteCode).order_by(InviteCode.created_at.desc()))
     invites = list(result.scalars().all())
 
@@ -1519,6 +1527,7 @@ async def admin_invites(request: Request, db: AsyncSession = Depends(get_db)):
     resp = templates.TemplateResponse(request, "admin_invites.html", {
         "request": request,
         "title": "Invite codes",
+        "user": user,
         "invites": invites,
         "redemptions_by_code": redemptions_by_code,
         "invite_required": PANEL_CONFIG.require_invite,
@@ -1628,7 +1637,7 @@ async def admin_invites_delete(
 
 @router.get("/admin/stats", response_class=HTMLResponse)
 async def admin_stats(request: Request, db: AsyncSession = Depends(get_db)):
-    require_role(UserRole.ADMIN)(request)
+    user = require_role(UserRole.ADMIN)(request)
 
     snapshot = await collect_admin_stats(db)
 
@@ -1652,6 +1661,7 @@ async def admin_stats(request: Request, db: AsyncSession = Depends(get_db)):
     resp = templates.TemplateResponse(request, "admin_stats.html", {
         "request": request,
         "title": gettext("System stats"),
+        "user": user,
         "host": snapshot["host"],
         "rows": rows,
         "totals": snapshot["totals"],
@@ -1904,6 +1914,7 @@ async def admin_secrets(
     resp = templates.TemplateResponse(request, "admin_secrets.html", {
         "request": request,
         "title": "Admin control panel — magic secrets",
+        "user": user,
         "rows": rows_decrypted,
         "q": q,
     })
@@ -2046,7 +2057,7 @@ async def admin_audit(
     q: Optional[str] = Query(None),
     db: AsyncSession = Depends(get_db),
 ):
-    require_role(UserRole.ADMIN)(request)
+    user = require_role(UserRole.ADMIN)(request)
 
     base = select(AuditLog)
     if user_id:
@@ -2087,6 +2098,7 @@ async def admin_audit(
     resp = templates.TemplateResponse(request, "admin_audit.html", {
         "request": request,
         "title": gettext("Audit Log"),
+        "user": user,
         "logs": logs,
         "actions_list": actions_list,
         "targets_list": targets_list,
@@ -3293,7 +3305,7 @@ async def admin_metrics(
     db: AsyncSession = Depends(get_db),
 ):
     """Analytics dashboard — proxy traffic and bot upload/download per hour."""
-    require_role(UserRole.ADMIN)(request)
+    user = require_role(UserRole.ADMIN)(request)
 
     # Resolve the bot filter (admin-only — they see everything).
     bots = (await db.execute(
@@ -3306,6 +3318,7 @@ async def admin_metrics(
     resp = templates.TemplateResponse(request, "admin_metrics.html", {
         "request": request,
         "title": gettext("Metrics"),
+        "user": user,
         "hours": hours,
         "bot_id": bot_id,
         "bots": bots,
@@ -3449,7 +3462,7 @@ def _serialize_event(event: AlertEvent) -> dict[str, Any]:
 @router.get("/admin/alerts", response_class=HTMLResponse)
 async def admin_alerts(request: Request, db: AsyncSession = Depends(get_db)):
     """Alert rules management page."""
-    require_role(UserRole.ADMIN)(request)
+    user = require_role(UserRole.ADMIN)(request)
 
     rules = (await db.execute(
         select(AlertRule).order_by(AlertRule.created_at.desc())
@@ -3468,6 +3481,7 @@ async def admin_alerts(request: Request, db: AsyncSession = Depends(get_db)):
     resp = templates.TemplateResponse(request, "admin_alerts.html", {
         "request": request,
         "title": gettext("Alerts"),
+        "user": user,
         "rules": [_serialize_rule(r) for r in rules],
         "events": [_serialize_event(e) for e in events],
         "bots": bots,

templates_setup.py

@@ -109,3 +109,4 @@ templates.env.globals["csrf_token"] = _csrf_token
 templates.env.globals["_"] = _gettext_context
 templates.env.globals["ngettext"] = _ngettext_context
 templates.env.globals["available_languages"] = available_languages
+templates.env.globals["_detect_lang"] = _detect_lang