merge: testing → main (reconcile 2-week divergence)

decnet/web/router/auth/api_change_pass.py

@@ -2,9 +2,10 @@ from typing import Any, Optional
 
 from fastapi import APIRouter, Depends, HTTPException, status
 
-from decnet.web.auth import get_password_hash, verify_password
-from decnet.web.dependencies import get_current_user_unchecked, repo
-from decnet.web.db.models import ChangePasswordRequest
+from decnet.telemetry import traced as _traced
+from decnet.web.auth import ahash_password, averify_password
+from decnet.web.dependencies import get_current_user_unchecked, invalidate_user_cache, repo
+from decnet.web.db.models import ChangePasswordRequest, MessageResponse
 
 router = APIRouter()
 
@@ -12,20 +13,23 @@ router = APIRouter()
 @router.post(
     "/auth/change-password",
     tags=["Authentication"],
+    response_model=MessageResponse,
     responses={
         400: {"description": "Bad Request (e.g. malformed JSON)"},
         401: {"description": "Could not validate credentials"},
         422: {"description": "Validation error"}
     },
 )
+@_traced("api.change_password")
 async def change_password(request: ChangePasswordRequest, current_user: str = Depends(get_current_user_unchecked)) -> dict[str, str]:
     _user: Optional[dict[str, Any]] = await repo.get_user_by_uuid(current_user)
-    if not _user or not verify_password(request.old_password, _user["password_hash"]):
+    if not _user or not await averify_password(request.old_password, _user["password_hash"]):
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Incorrect old password",
         )
 
-    _new_hash: str = get_password_hash(request.new_password)
+    _new_hash: str = await ahash_password(request.new_password)
     await repo.update_user_password(current_user, _new_hash, must_change_password=False)
+    invalidate_user_cache(current_user)
     return {"message": "Password updated successfully"}

decnet/web/router/auth/api_login.py

@@ -1,19 +1,32 @@
 from datetime import timedelta
 from typing import Any, Optional
 
-from fastapi import APIRouter, HTTPException, status
+from fastapi import APIRouter, HTTPException, Request, status
 
+from decnet.telemetry import traced as _traced
 from decnet.web.auth import (
     ACCESS_TOKEN_EXPIRE_MINUTES,
+    averify_password,
     create_access_token,
-    verify_password,
 )
-from decnet.web.dependencies import repo
+from decnet.web.dependencies import get_user_by_username_cached
 from decnet.web.db.models import LoginRequest, Token
+from decnet.web.limiter import limiter, login_ip_key, login_username_key
 
 router = APIRouter()
 
 
+# Two independent buckets, tripping either → 429:
+#
+#   - per-IP   (login_ip_key):       catches a botnet hitting one account.
+#   - per-user (login_username_key): catches distributed credential
+#                                    stuffing against one account.
+#
+# Limits: 10 attempts per 5 minutes per bucket. Buckets are process-local
+# (memory://); see decnet/web/limiter.py for the rationale. Buckets do
+# NOT reset on successful login — a legitimate user tripping the limit
+# via fat-fingering will need to wait the window out. 10 tries is
+# generous; a rolling window naturally drains.
 @router.post(
     "/auth/login",
     response_model=Token,
@@ -21,12 +34,16 @@ router = APIRouter()
     responses={
         400: {"description": "Bad Request (e.g. malformed JSON)"},
         401: {"description": "Incorrect username or password"},
-        422: {"description": "Validation error"}
+        422: {"description": "Validation error"},
+        429: {"description": "Too many login attempts — retry after the window resets"},
     },
 )
-async def login(request: LoginRequest) -> dict[str, Any]:
-    _user: Optional[dict[str, Any]] = await repo.get_user_by_username(request.username)
-    if not _user or not verify_password(request.password, _user["password_hash"]):
+@limiter.limit("10/5 minutes", key_func=login_ip_key)
+@limiter.limit("10/5 minutes", key_func=login_username_key)
+@_traced("api.login")
+async def login(request: Request, payload: LoginRequest) -> dict[str, Any]:
+    _user: Optional[dict[str, Any]] = await get_user_by_username_cached(payload.username)
+    if not _user or not await averify_password(payload.password, _user["password_hash"]):
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Incorrect username or password",
@@ -40,6 +57,6 @@ async def login(request: LoginRequest) -> dict[str, Any]:
     )
     return {
         "access_token": _access_token,
-        "token_type": "bearer",  # nosec B105
+        "token_type": "bearer",  # nosec B105 — OAuth2 token type, not a password
         "must_change_password": bool(_user.get("must_change_password", False))
     }