diff --git a/app/api/dependencies.py b/app/api/dependencies.py index 5cbbbba1..79777b4e 100644 --- a/app/api/dependencies.py +++ b/app/api/dependencies.py @@ -26,6 +26,12 @@ basic_scheme = RawBasicHeader(scheme_name="basicAuth", auto_error=False) bearer_scheme = RawBearerHeader(scheme_name="bearerAuth", auto_error=False) +async def require_empty_body(request: Request) -> None: + # Контракт задаёт вход без тела: лишний JSON не игнорируем молча, а отклоняем. + if await request.body(): + raise HTTPException(status_code=400, detail="Тело запроса не допускается") + + def unauthorized() -> HTTPException: return HTTPException(status_code=401, detail="Нужен действительный Bearer-токен", headers=BEARER_CHALLENGE) diff --git a/app/api/v1/auth_rout.py b/app/api/v1/auth_rout.py index bce0828e..89e1abbc 100644 --- a/app/api/v1/auth_rout.py +++ b/app/api/v1/auth_rout.py @@ -4,7 +4,7 @@ import binascii from fastapi import APIRouter, Depends, HTTPException, Response, Security from sqlalchemy.orm import Session -from api.dependencies import basic_scheme, get_current_session +from api.dependencies import basic_scheme, get_current_session, require_empty_body from core.config import settings from core.db import get_db from core.logger import logger @@ -43,7 +43,8 @@ def parse_basic(authorization: str | None) -> tuple[str, str]: return username, password -@roter.post("/sessions", status_code=201, response_model=SessionResponse) +# Тело проверяется до пароля: зависимости маршрута выполняются раньше параметров. +@roter.post("/sessions", status_code=201, response_model=SessionResponse, dependencies=[Depends(require_empty_body)]) def create_session_api(authorization: str | None = Security(basic_scheme), db: Session = Depends(get_db)): username, password = parse_basic(authorization) diff --git a/student-tests/test_auth_api.py b/student-tests/test_auth_api.py index a3c7fda1..1c91a857 100644 --- a/student-tests/test_auth_api.py +++ b/student-tests/test_auth_api.py @@ -1,9 +1,11 @@ import time import jwt +from sqlalchemy import text from conftest import PASSWORD, assert_error, basic, bearer, login from core.config import settings +from core.db import engine def assert_challenge(response, scheme): @@ -44,6 +46,18 @@ def test_malformed_basic_returns_401(client): assert_challenge(response, "Basic") +def test_login_with_body_returns_400_and_creates_no_session(client, alice): + with engine.connect() as connection: + before = connection.scalar(text("SELECT count(*) FROM sessions")) + for kwargs in ({"json": {"unexpected": True}}, {"json": {}}, {"content": b"x"}): + response = client.post("/api/v1/auth/sessions", headers=basic("alice", PASSWORD), **kwargs) + assert_error(response, 400, "invalid_request") + with engine.connect() as connection: + assert connection.scalar(text("SELECT count(*) FROM sessions")) == before + # Без тела вход по-прежнему работает. + assert login(client, "alice")["user"]["id"] == alice["id"] + + def test_password_with_colon_and_unicode(client): password = "пароль:с:двоеточиями 👋" client.post("/api/v1/users", json={"username": "colon", "display_name": "C", "password": password})