From 29a834c1d9e3d9d22e142705598bb263ec7910af Mon Sep 17 00:00:00 2001 From: vasyukova Date: Sat, 10 Oct 2026 11:54:32 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=84=D0=B8=D0=BA=D1=81=D0=B8?= =?UTF-8?q?=D0=BB=D0=B0=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BF=D1=80=D0=BE=20=D0=B1=D0=B0=D0=B3=20=D1=81=20?= =?UTF-8?q?=D1=80=D1=83=D1=81=D1=81=D0=BA=D0=BE=D1=8F=D0=B7=D1=8B=D1=87?= =?UTF-8?q?=D0=BD=D1=8B=D0=BC=D0=B8=20=D0=BF=D0=B0=D1=80=D0=BE=D0=BB=D1=8F?= =?UTF-8?q?=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/api/auth.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/app/api/auth.py b/src/app/api/auth.py index 9c29e100..03c57a6b 100644 --- a/src/app/api/auth.py +++ b/src/app/api/auth.py @@ -11,8 +11,6 @@ from ..storage.postgres import storage router = APIRouter(prefix="/api/v1/auth", tags=["auth"]) -basic_scheme = HTTPBasic(auto_error=False) - DEFAULT_TTL_SECONDS = 3600 @@ -23,15 +21,23 @@ def _ttl_seconds() -> int: return DEFAULT_TTL_SECONDS -def _parse_basic(credentials: HTTPBasicCredentials | None) -> tuple[str, str] | None: - """HTTPBasic уже разобрал заголовок; сюда попадают username/password. +def _parse_basic_header(request: Request) -> tuple[str, str] | None: + """Ручной разбор Basic: base64 -> UTF-8 -> split по первому ':'. - Дополнительно валидируем кодировку: username — ASCII, пароль — UTF-8. + HTTPBasic из Starlette декодирует latin-1 и ломает кириллицу. + Здесь пароль читается как UTF-8 (RFC 7617 разрешает UTF-8 charset). + Username остаётся ASCII по контракту. """ - if credentials is None: + raw = request.headers.get("Authorization", "") + if not raw.lower().startswith("basic "): return None - username = credentials.username - password = credentials.password + try: + decoded = base64.b64decode(raw[6:].strip(), validate=True).decode("utf-8") + except (binascii.Error, UnicodeDecodeError): + return None + if ":" not in decoded: + return None + username, password = decoded.split(":", 1) if not username or not password: return None try: @@ -47,10 +53,8 @@ def _parse_basic(credentials: HTTPBasicCredentials | None) -> tuple[str, str] | response_model=Session, status_code=201, ) -def create_session( - credentials: HTTPBasicCredentials | None = Depends(basic_scheme), -) -> Session: - parsed = _parse_basic(credentials) +def create_session(request: Request) -> Session: + parsed = _parse_basic_header(request) if parsed is None: raise HTTPException(status_code=401, detail="unauthorized") username, password = parsed