feat(auth): logout endpoint revokes the presented token
POST /auth/logout adds the caller's jti to the denylist and drops the local negative-cache entry, so the token 401s on its very next use. Single-session semantics: only this token dies, other sessions for the same user keep working. Reachable for must_change_password users (it runs the revocation checks but skips the must_change gate via get_token_claims) so a session can always be ended; an already-revoked token is rejected.
This commit is contained in:
@@ -219,13 +219,15 @@ async def _resolve_request(request: Request) -> tuple[str, dict[str, Any]]:
|
||||
return await _resolve_token(token)
|
||||
|
||||
|
||||
def get_token_claims(request: Request) -> dict[str, Any]:
|
||||
async def get_token_claims(request: Request) -> dict[str, Any]:
|
||||
"""Return the validated claims of the presented Bearer token (decode +
|
||||
signature + revocation checks). Used by logout, which needs the token's own
|
||||
``jti``/``exp`` to denylist *this* session even for must_change users."""
|
||||
signature + user-exists + revocation checks, but NOT must_change). Used by
|
||||
logout, which needs the token's own ``jti``/``exp`` to denylist *this*
|
||||
session — and must still reject an already-revoked token."""
|
||||
token = _bearer_from_header(request)
|
||||
if not token:
|
||||
raise _CREDENTIALS_EXCEPTION
|
||||
await _resolve_token(token) # enforce user-exists + revocation; raises 401
|
||||
return _decode_payload(token)
|
||||
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ from fastapi import APIRouter
|
||||
|
||||
from .auth.api_login import router as login_router
|
||||
from .auth.api_change_pass import router as change_pass_router
|
||||
from .auth.api_logout import router as logout_router
|
||||
from .logs.api_get_logs import router as logs_router
|
||||
from .logs.api_get_histogram import router as histogram_router
|
||||
from .bounty.api_get_bounties import router as bounty_router
|
||||
@@ -89,6 +90,7 @@ api_router = APIRouter(
|
||||
# Authentication
|
||||
api_router.include_router(login_router)
|
||||
api_router.include_router(change_pass_router)
|
||||
api_router.include_router(logout_router)
|
||||
|
||||
# Logs & Analytics
|
||||
api_router.include_router(logs_router)
|
||||
|
||||
36
decnet/web/router/auth/api_logout.py
Normal file
36
decnet/web/router/auth/api_logout.py
Normal file
@@ -0,0 +1,36 @@
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
from fastapi import APIRouter, Depends
|
||||
|
||||
from decnet.telemetry import traced as _traced
|
||||
from decnet.web.dependencies import get_token_claims, invalidate_token_cache, repo
|
||||
from decnet.web.db.models import MessageResponse
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@router.post(
|
||||
"/auth/logout",
|
||||
tags=["Authentication"],
|
||||
response_model=MessageResponse,
|
||||
responses={
|
||||
401: {"description": "Missing, invalid, or already-revoked token"},
|
||||
},
|
||||
)
|
||||
@_traced("api.logout")
|
||||
async def logout(claims: dict[str, Any] = Depends(get_token_claims)) -> dict[str, str]:
|
||||
"""Revoke the presented token by adding its ``jti`` to the denylist.
|
||||
|
||||
Single-session logout: only *this* token dies. "Log out everywhere" is a
|
||||
separate lever (``tokens_valid_from``) driven by password/role changes.
|
||||
Reachable for must_change_password users so they can always end a session.
|
||||
"""
|
||||
# exp is always present (create_access_token stamps it); jti is guaranteed
|
||||
# by get_token_claims, which rejects tokens without one.
|
||||
expires_at = datetime.fromtimestamp(claims["exp"], tz=timezone.utc)
|
||||
await repo.revoke_token(claims["jti"], claims["uuid"], expires_at)
|
||||
# Drop the local negative-cache entry so reuse 401s immediately, not after TTL.
|
||||
invalidate_token_cache(claims["jti"])
|
||||
return {"message": "Logged out"}
|
||||
Reference in New Issue
Block a user