feat: #107 configuration - gestion des clés API & MCP (création/révocation, expiration 1j/1mois/6mois/1an/sans fin, une clé pour API REST + serveur MCP, dernière utilisation, store sans secret persisté; fix révocation longue durée) + script token MCP

backend/auth/jwt_handler.py

@@ -7,6 +7,7 @@ import json
 import logging
 import os
 import secrets
+import threading
 import time
 import uuid
 from pathlib import Path
@@ -23,6 +24,22 @@ ALGORITHM = "HS256"
 ACCESS_TOKEN_EXPIRE_SECONDS = int(os.environ.get("OBSIGATE_ACCESS_TOKEN_TTL", "3600"))       # default 1 hour
 REFRESH_TOKEN_EXPIRE_SECONDS = int(os.environ.get("OBSIGATE_REFRESH_TOKEN_TTL", "604800"))   # default 7 days
 
+#: Persistent API/MCP access tokens (user-managed, shown in the config panel).
+API_TOKENS_FILE = Path("data/api_tokens.json")
+#: Accepted values for the expiry selector in the UI (1 day, 1 month, 6 months,
+#: 1 year, never). "never" → no ``exp`` claim → token valid until revoked.
+API_TOKEN_EXPIRY_CHOICES = {
+    "1d": 24 * 3600,
+    "30d": 30 * 24 * 3600,
+    "180d": 180 * 24 * 3600,
+    "365d": 365 * 24 * 3600,
+    "never": None,
+}
+#: Max active tokens per user (anti hoarding; revoking frees a slot).
+API_TOKEN_MAX_PER_USER = 50
+#: AES-GCM key derived once from the JWT secret to encrypt stored tokens.
+_API_TOKEN_KEY: bytes | None = None
+
 # In-memory revoked token set (loaded from disk on startup)
 _revoked_jtis: set = set()
 _revoked_loaded = False
@@ -92,43 +109,61 @@ def decode_token(token: str) -> dict | None:
 # ---------------------------------------------------------------------------
 # Token revocation
 # ---------------------------------------------------------------------------
+# The store is a dict {jti: valid_until}: the revocation record may be dropped
+# once the underlying token's own expiry has passed (by then the JWT is dead
+# anyway). Long-lived API/MCP tokens (see create_api_token) must therefore be
+# revoked with their real expiry — a 1-year token revoked last week must not
+# silently come back to life when a 7-day cleanup purges the record (BUG in
+# the previous set-based store, fixed with feature #107).
+
+_revoked_map: dict[str, int] = {}
+_revoked_loaded = False
+
 
 def _load_revoked():
     """Load revoked token JTIs from disk into memory (once)."""
-    global _revoked_loaded, _revoked_jtis
+    global _revoked_loaded, _revoked_map
     if _revoked_loaded:
         return
     if REVOKED_TOKENS_FILE.exists():
         try:
             data = json.loads(REVOKED_TOKENS_FILE.read_text())
-            # Clean expired entries (older than 7 days)
+            # Drop entries whose underlying token has itself expired.
             now = int(time.time())
-            _revoked_jtis = {
-                jti for jti, exp in data.items()
-                if exp > now
+            _revoked_map = {
+                jti: int(exp) for jti, exp in data.items()
+                if int(exp) > now
             }
         except Exception as e:
             logger.warning(f"Failed to load revoked tokens: {e}")
-            _revoked_jtis = set()
+            _revoked_map = {}
     _revoked_loaded = True
 
 
 def _save_revoked():
-    """Persist revoked JTIs to disk."""
+    """Persist revoked JTIs to disk with their per-token expiry."""
     REVOKED_TOKENS_FILE.parent.mkdir(parents=True, exist_ok=True)
-    # Store with expiry timestamp for cleanup
-    now = int(time.time())
-    # Keep entries for 7 days max
-    data = {jti: now + REFRESH_TOKEN_EXPIRE_SECONDS for jti in _revoked_jtis}
     tmp = REVOKED_TOKENS_FILE.with_suffix(".tmp")
-    tmp.write_text(json.dumps(data))
+    tmp.write_text(json.dumps(_revoked_map))
     tmp.replace(REVOKED_TOKENS_FILE)
 
 
-def revoke_token(jti: str):
-    """Add a token JTI to the revocation list."""
+def revoke_token(jti: str, expires_at: int | None = None):
+    """Add a token JTI to the revocation list.
+
+    ``expires_at`` is the revoked token's own ``exp`` (unix seconds) — the
+    record is kept at least that long so a long-lived API token cannot
+    outlive its revocation. ``None`` means the token never expires (API/MCP
+    "sans fin") → the record is kept forever (capped at ~100 years, the JWT
+    store's practical infinity). Default keeps 7 days (session tokens).
+    """
     _load_revoked()
-    _revoked_jtis.add(jti)
+    now = int(time.time())
+    if expires_at is None:
+        until = now + 100 * 365 * 24 * 3600
+    else:
+        until = max(int(expires_at), now + REFRESH_TOKEN_EXPIRE_SECONDS)
+    _revoked_map[jti] = until
     _save_revoked()
     logger.debug(f"Revoked token JTI: {jti[:8]}...")
 
@@ -136,4 +171,128 @@ def revoke_token(jti: str):
 def is_token_revoked(jti: str) -> bool:
     """Check if a token JTI has been revoked."""
     _load_revoked()
-    return jti in _revoked_jtis
+    return jti in _revoked_map
+
+
+# ---------------------------------------------------------------------------
+# API / MCP tokens (feature #107)
+# ---------------------------------------------------------------------------
+# Long-lived access tokens the user creates from the config panel. They are
+# plain HS256 access-type JWTs (``api: true`` claim), so they authenticate
+# against BOTH the REST API and the MCP endpoint (/mcp) — which share
+# ``get_current_user``. The raw token is shown exactly once at creation; the
+# store keeps metadata only (name, owner, expiry, last use) — no secret
+# material is written to disk.
+#
+# File: data/api_tokens.json
+#   {"version": 1, "tokens": {jti: {name, username, created_at, expires_at, last_used_at}}}
+
+_api_tokens_lock = threading.RLock()
+_touch_last_write: dict[str, float] = {}
+
+
+def _load_api_tokens() -> dict:
+    if not API_TOKENS_FILE.exists():
+        return {"version": 1, "tokens": {}}
+    try:
+        return json.loads(API_TOKENS_FILE.read_text(encoding="utf-8"))
+    except (json.JSONDecodeError, OSError) as e:
+        logger.error(f"Failed to read api_tokens.json: {e}")
+        return {"version": 1, "tokens": {}}
+
+
+def _save_api_tokens(data: dict):
+    API_TOKENS_FILE.parent.mkdir(parents=True, exist_ok=True)
+    tmp = API_TOKENS_FILE.with_suffix(".tmp")
+    tmp.write_text(json.dumps(data, indent=2, default=str), encoding="utf-8")
+    tmp.replace(API_TOKENS_FILE)
+
+
+def create_api_token(user: dict, name: str, expiry_key: str) -> tuple[dict, str]:
+    """Create a persistent API/MCP token. Returns (record, jwt_string).
+
+    ``expiry_key`` must be one of API_TOKEN_EXPIRY_CHOICES; "never" omits the
+    ``exp`` claim (valid until explicitly revoked).
+    """
+    if expiry_key not in API_TOKEN_EXPIRY_CHOICES:
+        raise ValueError("Expiration invalide")
+    seconds = API_TOKEN_EXPIRY_CHOICES[expiry_key]
+    with _api_tokens_lock:
+        data = _load_api_tokens()
+        tokens = data["tokens"]
+        mine = sum(1 for t in tokens.values() if t["username"] == user["username"])
+        if mine >= API_TOKEN_MAX_PER_USER:
+            raise ValueError(f"Maximum {API_TOKEN_MAX_PER_USER} tokens par utilisateur")
+        now = int(time.time())
+        jti = str(uuid.uuid4())
+        payload = {
+            "sub": user["username"],
+            "role": user.get("role", "user"),
+            "vaults": user.get("vaults", []),
+            "jti": jti,
+            "iat": now,
+            "type": "access",
+            "api": True,
+        }
+        if seconds is not None:
+            payload["exp"] = now + seconds
+        token = jwt.encode(payload, get_secret_key(), algorithm=ALGORITHM)
+        record = {
+            "jti": jti,
+            "name": name[:64] or "API token",
+            "username": user["username"],
+            "created_at": now,
+            "expires_at": payload.get("exp"),
+            "expiry_key": expiry_key,
+            "last_used_at": None,
+        }
+        tokens[jti] = record
+        _save_api_tokens(data)
+    return record, token
+
+
+def list_api_tokens(username: str) -> list[dict]:
+    """Token metadata for one user, newest first."""
+    data = _load_api_tokens()
+    now = int(time.time())
+    items = [
+        {**t, "expired": t.get("expires_at") is not None and t["expires_at"] < now}
+        for t in data["tokens"].values()
+        if t["username"] == username
+    ]
+    return sorted(items, key=lambda t: t["created_at"], reverse=True)
+
+
+def delete_api_token(jti: str, username: str) -> dict:
+    """Revoke and remove an API token. Raises KeyError when unknown/not owned."""
+    with _api_tokens_lock:
+        data = _load_api_tokens()
+        record = data["tokens"].get(jti)
+        if not record or record["username"] != username:
+            raise KeyError(jti)
+        # Revoke by jti so the presented JWT stops working even though it is
+        # stateless — kept until its natural expiry (no-expiry → forever).
+        revoke_token(jti, record.get("expires_at"))
+        del data["tokens"][jti]
+        _save_api_tokens(data)
+    return record
+
+
+def maybe_touch_api_token(jti: str | None, created_or_expires: bool = False):
+    """Record last usage of an API token, throttled to one disk write/hour."""
+    if not jti:
+        return
+    now = time.time()
+    if now - _touch_last_write.get(jti, 0) < 3600:
+        return
+    _touch_last_write[jti] = now
+    try:
+        with _api_tokens_lock:
+            data = _load_api_tokens()
+            record = data["tokens"].get(jti)
+            if record is None:
+                return
+            record["last_used_at"] = int(now)
+            _save_api_tokens(data)
+    except Exception as e:  # never fail an authenticated request over stats
+        logger.debug(f"api_token touch failed: {e}")

backend/auth/middleware.py

@@ -11,7 +11,7 @@ from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 
 from backend.services.net import get_client_ip
 
-from .jwt_handler import decode_token, is_token_revoked
+from .jwt_handler import decode_token, is_token_revoked, maybe_touch_api_token
 from .user_store import get_user
 
 logger = logging.getLogger("obsigate.auth.middleware")
@@ -115,6 +115,10 @@ def get_current_user(
     user["_token_vaults"] = payload.get("vaults", [])
     # Attach the token id for per-token rate limiting (AI tool layer).
     user["_token_jti"] = payload.get("jti")
+    # Feature #107: track last usage of user-managed API/MCP tokens
+    # (throttled write — this dependency runs on both REST and /mcp paths).
+    if payload.get("api"):
+        maybe_touch_api_token(payload.get("jti"))
     # BUG-030: expose the real client IP to the audit log.
     user["_request_ip"] = get_client_ip(request)
     return user

backend/auth/router.py

@@ -17,10 +17,14 @@ from backend.services.net import get_client_ip
 
 from .jwt_handler import (
     ACCESS_TOKEN_EXPIRE_SECONDS,
+    API_TOKEN_EXPIRY_CHOICES,
     create_access_token,
+    create_api_token,
     create_refresh_token,
     decode_token,
+    delete_api_token,
     is_token_revoked,
+    list_api_tokens,
     revoke_token,
 )
 from .mfa import (
@@ -861,3 +865,58 @@ async def delete_user_endpoint(
         return {"message": f"Utilisateur '{username}' supprimé"}
     except ValueError as e:
         raise HTTPException(404, str(e))
+
+
+# ── API / MCP tokens (feature #107) ──────────────────────────────────
+# One long-lived token authenticates BOTH the REST API and the MCP
+# endpoint (/mcp): the MCP server resolves the caller through the same
+# get_current_user() dependency, so the same Bearer JWT works everywhere.
+
+class CreateApiTokenRequest(BaseModel):
+    name: str
+    expiry: str  # 1d | 30d | 180d | 365d | never
+
+
+@router.get("/tokens")
+async def list_user_tokens(current_user=Depends(require_auth)):
+    """List the caller's API/MCP tokens (metadata only — the secret is never stored)."""
+    return {
+        "tokens": list_api_tokens(current_user["username"]),
+        "expiry_choices": list(API_TOKEN_EXPIRY_CHOICES.keys()),
+    }
+
+
+@router.post("/tokens")
+async def create_user_token(
+    req: CreateApiTokenRequest,
+    request: Request,
+    current_user=Depends(require_auth),
+):
+    """Create a long-lived API/MCP token. The raw JWT is returned ONCE."""
+    try:
+        record, token = create_api_token(current_user, req.name.strip(), req.expiry)
+    except ValueError as e:
+        raise HTTPException(400, str(e))
+    from backend.audit import log_config_change
+    log_config_change(current_user["username"],
+                      {"action": "api_token_create", "name": record["name"],
+                       "expiry": record["expiry_key"]}, ip=get_client_ip(request))
+    return {"token": token, **record}
+
+
+@router.delete("/tokens/{jti}")
+async def delete_user_token(
+    jti: str,
+    request: Request,
+    current_user=Depends(require_auth),
+):
+    """Revoke + delete an API/MCP token (immediate effect on API and MCP)."""
+    try:
+        record = delete_api_token(jti, current_user["username"])
+    except KeyError:
+        raise HTTPException(404, "Token introuvable")
+    from backend.audit import log_config_change
+    log_config_change(current_user["username"],
+                      {"action": "api_token_revoke", "name": record["name"]},
+                      ip=get_client_ip(request))
+    return {"message": f"Token '{record['name']}' révoqué"}