Исправление securitySchemes
This commit is contained in:
+21
-8
@@ -2,6 +2,7 @@ import uuid
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi import Depends, Request
|
||||
from fastapi.security import HTTPAuthorizationCredentials, HTTPBasic, HTTPBearer
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
@@ -10,6 +11,11 @@ from .errors import ApiError
|
||||
from .models import SessionRow, User
|
||||
from .security import token_hash
|
||||
|
||||
# Схемы безопасности для Swagger UI и /openapi.json.
|
||||
# auto_error=False — 401 формирует current_user в едином формате ошибки.
|
||||
bearer_scheme = HTTPBearer(auto_error=False, scheme_name="bearerAuth", description="Bearer <token>")
|
||||
basic_scheme = HTTPBasic(auto_error=False, scheme_name="basicAuth")
|
||||
|
||||
|
||||
def get_db():
|
||||
s = SessionLocal()
|
||||
@@ -19,16 +25,23 @@ def get_db():
|
||||
s.close()
|
||||
|
||||
|
||||
def current_user(request: Request, db: Session = Depends(get_db)) -> User:
|
||||
auth = request.headers.get("authorization", "").strip()
|
||||
if not auth:
|
||||
raise ApiError(401, "unauthorized", "Требуется Bearer-токен")
|
||||
# Swagger UI для bearerAuth подставляет токен без префикса "Bearer ".
|
||||
# Принимаем оба варианта: "Bearer <token>" и "<token>".
|
||||
if auth.lower().startswith("bearer "):
|
||||
token = auth[7:].strip()
|
||||
def current_user(
|
||||
request: Request,
|
||||
credentials: HTTPAuthorizationCredentials | None = Depends(bearer_scheme),
|
||||
db: Session = Depends(get_db),
|
||||
) -> User:
|
||||
# Swagger UI для bearerAuth подставляет токен без префикса "Bearer ",
|
||||
# но HTTPBearer уже нормализует заголовок. Fallback на сырой заголовок
|
||||
# нужен для клиентов, присылающих токен без схемы.
|
||||
if credentials is not None and credentials.scheme.lower() == "bearer":
|
||||
token = credentials.credentials.strip()
|
||||
else:
|
||||
auth = request.headers.get("authorization", "").strip()
|
||||
if not auth:
|
||||
raise ApiError(401, "unauthorized", "Требуется Bearer-токен")
|
||||
token = auth
|
||||
while token.lower().startswith("bearer "):
|
||||
token = token[7:].strip()
|
||||
if not token:
|
||||
raise ApiError(401, "unauthorized", "Пустой токен")
|
||||
row = db.get(SessionRow, token_hash(token))
|
||||
|
||||
+9
-4
@@ -2,12 +2,13 @@ import base64
|
||||
import binascii
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi import APIRouter, Depends, Request
|
||||
from fastapi import APIRouter, Depends, Request, Security
|
||||
from fastapi.security import HTTPBasicCredentials
|
||||
from sqlalchemy import delete, select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from ..config import settings
|
||||
from ..deps import current_user, get_db
|
||||
from ..deps import basic_scheme, current_user, get_db
|
||||
from ..errors import ApiError
|
||||
from ..models import SessionRow, User
|
||||
from ..schemas import SessionOut, UserOut
|
||||
@@ -30,7 +31,11 @@ def _parse_basic(header: str):
|
||||
|
||||
|
||||
@router.post("/api/v1/auth/sessions", response_model=SessionOut, status_code=201)
|
||||
def login(request: Request, db: Session = Depends(get_db)):
|
||||
def login(
|
||||
request: Request,
|
||||
_basic: HTTPBasicCredentials | None = Security(basic_scheme),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
username, password = _parse_basic(request.headers.get("authorization", ""))
|
||||
user = db.scalar(select(User).where(User.username == username))
|
||||
if user is None or not verify_password(password, user.password_hash):
|
||||
@@ -43,7 +48,7 @@ def login(request: Request, db: Session = Depends(get_db)):
|
||||
|
||||
|
||||
@router.delete("/api/v1/auth/sessions/current", status_code=204)
|
||||
def logout(request: Request, user: User = Depends(current_user), db: Session = Depends(get_db)):
|
||||
def logout(request: Request, user: User = Security(current_user), db: Session = Depends(get_db)):
|
||||
db.execute(delete(SessionRow).where(SessionRow.token_hash == request.state.token_hash))
|
||||
db.commit()
|
||||
return None
|
||||
|
||||
@@ -3,7 +3,7 @@ import json
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
|
||||
from fastapi import APIRouter, Depends, Query
|
||||
from fastapi import APIRouter, Depends, Query, Security
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
@@ -47,7 +47,7 @@ def _decode_cursor(cursor: str):
|
||||
|
||||
|
||||
@router.post("/api/v1/chats", response_model=ChatOut, status_code=201)
|
||||
def create_chat(body: CreateChat, user: User = Depends(current_user), db: Session = Depends(get_db)):
|
||||
def create_chat(body: CreateChat, user: User = Security(current_user), db: Session = Depends(get_db)):
|
||||
if not body.title.strip():
|
||||
raise ApiError(400, "invalid_request", "title не может быть пустым")
|
||||
ids = list(dict.fromkeys(body.member_ids))
|
||||
@@ -70,7 +70,7 @@ def create_chat(body: CreateChat, user: User = Depends(current_user), db: Sessio
|
||||
def list_chats(
|
||||
limit: int = Query(50, ge=1, le=100),
|
||||
cursor: str | None = Query(None),
|
||||
user: User = Depends(current_user),
|
||||
user: User = Security(current_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
stmt = (
|
||||
@@ -94,7 +94,7 @@ def list_chats(
|
||||
|
||||
|
||||
@router.get("/api/v1/chats/{chat_id}", response_model=ChatOut)
|
||||
def get_chat(chat_id: str, user: User = Depends(current_user), db: Session = Depends(get_db)):
|
||||
def get_chat(chat_id: str, user: User = Security(current_user), db: Session = Depends(get_db)):
|
||||
cid = parse_uuid(chat_id)
|
||||
chat = _require_member(db, cid, user.id)
|
||||
return _chat_out(chat, _member_ids(db, cid))
|
||||
|
||||
@@ -4,7 +4,7 @@ import re
|
||||
import uuid
|
||||
from datetime import datetime, timedelta, timezone
|
||||
|
||||
from fastapi import APIRouter, Depends, Header, Query, Request
|
||||
from fastapi import APIRouter, Depends, Header, Query, Request, Security
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.orm import Session
|
||||
@@ -32,7 +32,7 @@ def create_message(
|
||||
body: CreateMessage,
|
||||
request: Request,
|
||||
idempotency_key: str | None = Header(default=None, alias="Idempotency-Key"),
|
||||
user: User = Depends(current_user),
|
||||
user: User = Security(current_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
cid = parse_uuid(chat_id)
|
||||
@@ -75,7 +75,7 @@ def list_messages(
|
||||
chat_id: str,
|
||||
limit: int = Query(50, ge=1, le=100),
|
||||
cursor: str | None = Query(None),
|
||||
user: User = Depends(current_user),
|
||||
user: User = Security(current_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
cid = parse_uuid(chat_id)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from fastapi import APIRouter, Depends
|
||||
from fastapi import APIRouter, Depends, Security
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.orm import Session
|
||||
@@ -28,5 +28,5 @@ def register(body: CreateUser, db: Session = Depends(get_db)):
|
||||
|
||||
|
||||
@router.get("/api/v1/users/me", response_model=UserOut)
|
||||
def me(user: User = Depends(current_user)):
|
||||
def me(user: User = Security(current_user)):
|
||||
return user
|
||||
|
||||
Reference in New Issue
Block a user