- схема и миграции (migrations/0001_init.sql, python -m messenger.migrate); - регистрация с паролем (Argon2id), вход по Basic, opaque Bearer, logout, expiry; - сессии: SESSION_STORE=valkey (AOF, appendfsync always) или postgres; - пул соединений, statement/lock timeout и клиентский дедлайн: отказ БД = 503; - keyset-пагинация по индексу (chat_id, created_at, id), два запроса без OR; - compose.yaml с закреплёнными образами, secrets, restart.sh. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
118 lines
5.1 KiB
Python
118 lines
5.1 KiB
Python
"""Strict request validation according to contracts/openapi.json + contracts/README.md.
|
|
|
|
Written by hand instead of a schema library so that every rule is visible:
|
|
extra fields, wrong JSON types, whitespace-only strings and lengths counted in
|
|
Unicode code points all produce 400 invalid_request.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import re
|
|
from typing import Any
|
|
|
|
from .errors import InvalidRequest
|
|
|
|
USERNAME_RE = re.compile(r"[a-z0-9_]{3,32}")
|
|
# Canonical textual UUID (8-4-4-4-12 hex). Case-insensitive, normalised to lower case.
|
|
UUID_RE = re.compile(r"[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}")
|
|
LIMIT_RE = re.compile(r"[0-9]{1,3}")
|
|
SURROGATES_RE = re.compile("[\ud800-\udfff]")
|
|
|
|
DEFAULT_LIMIT = 50
|
|
MAX_LIMIT = 100
|
|
|
|
|
|
def _reject_constant(name: str) -> Any:
|
|
# Python's json accepts NaN/Infinity, which are not valid JSON.
|
|
raise ValueError(f"invalid JSON constant {name}")
|
|
|
|
|
|
def parse_json_object(body: bytes) -> dict[str, Any]:
|
|
"""Decode a UTF-8 JSON object or raise InvalidRequest (malformed JSON -> 400)."""
|
|
try:
|
|
text = body.decode("utf-8")
|
|
value = json.loads(text, parse_constant=_reject_constant)
|
|
except (UnicodeDecodeError, ValueError):
|
|
raise InvalidRequest("Тело запроса должно быть корректным JSON в UTF-8") from None
|
|
if not isinstance(value, dict):
|
|
raise InvalidRequest("Тело запроса должно быть JSON-объектом")
|
|
return value
|
|
|
|
|
|
def check_fields(data: dict[str, Any], required: set[str], optional: frozenset[str] = frozenset()) -> None:
|
|
extra = set(data) - required - optional
|
|
if extra:
|
|
raise InvalidRequest("Неизвестные поля: " + ", ".join(sorted(extra)))
|
|
missing = required - set(data)
|
|
if missing:
|
|
raise InvalidRequest("Отсутствуют обязательные поля: " + ", ".join(sorted(missing)))
|
|
|
|
|
|
def text_field(data: dict[str, Any], name: str, max_len: int, *, min_len: int = 1) -> str:
|
|
value = data[name]
|
|
if not isinstance(value, str):
|
|
raise InvalidRequest(f"Поле {name} должно быть строкой")
|
|
if SURROGATES_RE.search(value):
|
|
# "\ud800" escapes decode to lone surrogates that cannot be encoded as UTF-8.
|
|
raise InvalidRequest(f"Поле {name} содержит недопустимые символы")
|
|
# len() of a Python str is the number of Unicode code points, as the contract requires.
|
|
if not min_len <= len(value) <= max_len:
|
|
raise InvalidRequest(f"Длина поля {name} должна быть от {min_len} до {max_len} символов")
|
|
if value.strip() == "":
|
|
raise InvalidRequest(f"Поле {name} не может состоять только из пробелов")
|
|
return value
|
|
|
|
|
|
def username_field(data: dict[str, Any]) -> str:
|
|
value = data["username"]
|
|
if not isinstance(value, str) or USERNAME_RE.fullmatch(value) is None:
|
|
raise InvalidRequest("username должен соответствовать [a-z0-9_]{3,32}")
|
|
return value
|
|
|
|
|
|
def password_field(data: dict[str, Any]) -> str:
|
|
"""12-128 Unicode code points, not whitespace-only; any other character (':' too) is allowed."""
|
|
value = data["password"]
|
|
if not isinstance(value, str):
|
|
raise InvalidRequest("Поле password должно быть строкой")
|
|
if SURROGATES_RE.search(value):
|
|
raise InvalidRequest("Поле password содержит недопустимые символы")
|
|
if not 12 <= len(value) <= 128:
|
|
raise InvalidRequest("Длина пароля должна быть от 12 до 128 символов")
|
|
if value.strip() == "":
|
|
raise InvalidRequest("Пароль не может состоять только из пробелов")
|
|
return value
|
|
|
|
|
|
def parse_uuid(value: Any, what: str = "UUID") -> str:
|
|
if not isinstance(value, str) or UUID_RE.fullmatch(value) is None:
|
|
raise InvalidRequest(f"Неверный {what}")
|
|
return value.lower()
|
|
|
|
|
|
def member_ids_field(data: dict[str, Any]) -> list[str]:
|
|
value = data["member_ids"]
|
|
if not isinstance(value, list):
|
|
raise InvalidRequest("member_ids должен быть массивом")
|
|
if not 1 <= len(value) <= 100:
|
|
raise InvalidRequest("member_ids должен содержать от 1 до 100 элементов")
|
|
ids = [parse_uuid(item, "UUID участника") for item in value]
|
|
if len(set(ids)) != len(ids):
|
|
raise InvalidRequest("member_ids содержит дубликаты")
|
|
return ids
|
|
|
|
|
|
def single_query_param(query: list[tuple[str, str]], name: str) -> str | None:
|
|
values = [v for k, v in query if k == name]
|
|
if len(values) > 1:
|
|
raise InvalidRequest(f"Параметр {name} указан несколько раз")
|
|
return values[0] if values else None
|
|
|
|
|
|
def parse_limit(raw: str | None) -> int:
|
|
if raw is None:
|
|
return DEFAULT_LIMIT
|
|
if LIMIT_RE.fullmatch(raw) is None or not 1 <= int(raw) <= MAX_LIMIT:
|
|
raise InvalidRequest(f"limit должен быть целым числом от 1 до {MAX_LIMIT}")
|
|
return int(raw)
|