* исправила main.py

This commit is contained in:
vasyukova
2026-09-30 23:44:17 +03:00
parent 313d2c23fe
commit d20190a693
+14 -7
View File
@@ -87,13 +87,20 @@ _ERROR_CODES = {
}
def _error_response(status_code: int, message: str, request_id: str) -> JSONResponse:
def _unauthorized_challenge(path: str) -> str:
"""Basic — только для POST /api/v1/auth/sessions; остальное — Bearer."""
if path == "/api/v1/auth/sessions":
return 'Basic realm="messenger", charset="UTF-8"'
return 'Bearer realm="messenger"'
def _error_response(
status_code: int, message: str, request_id: str, path: str = ""
) -> JSONResponse:
code = _ERROR_CODES.get(status_code, "internal_error")
headers = {}
if status_code == 401:
# Basic — только для /auth/sessions; для остальных endpoint — Bearer.
# Клиент получает корректный challenge.
headers["WWW-Authenticate"] = 'Bearer realm="messenger"'
headers["WWW-Authenticate"] = _unauthorized_challenge(path)
return JSONResponse(
status_code=status_code,
content={"error": {"code": code, "message": message, "request_id": request_id}},
@@ -105,13 +112,13 @@ def _error_response(status_code: int, message: str, request_id: str) -> JSONResp
async def http_exception_handler(request: Request, exc: StarletteHTTPException):
request_id = getattr(request.state, "request_id", uuid.uuid4().hex)
message = exc.detail if isinstance(exc.detail, str) else "Ошибка"
return _error_response(exc.status_code, message, request_id)
return _error_response(exc.status_code, message, request_id, request.url.path)
@app.exception_handler(RequestValidationError)
async def validation_exception_handler(request: Request, exc: RequestValidationError):
request_id = getattr(request.state, "request_id", uuid.uuid4().hex)
return _error_response(400, "Неверный запрос", request_id)
return _error_response(400, "Неверный запрос", request_id, request.url.path)
@app.exception_handler(Exception)
@@ -119,7 +126,7 @@ async def unhandled_exception_handler(request: Request, exc: Exception):
request_id = getattr(request.state, "request_id", uuid.uuid4().hex)
# Внутренние детали не раскрываем; пишем в лог без секретов
logger.error("event=unhandled_exception type=%s request_id=%s", type(exc).__name__, request_id)
return _error_response(500, "Внутренняя ошибка", request_id)
return _error_response(500, "Внутренняя ошибка", request_id, request.url.path)
app.include_router(health.router)