From 87f2a65448a541afba43013411ac65c22de21036 Mon Sep 17 00:00:00 2001 From: yulianpoludnev Date: Fri, 6 Nov 2026 20:26:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=203=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=BD=D0=BE=D0=B9=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 7 + .env.example | 37 ++- .gitattributes | 1 + .gitignore | 8 + Dockerfile | 34 ++ REPORT.md | 179 ++++++++++- compose.yaml | 172 ++++++++++ dotnet-tools.json | 13 + evidence/level3/failover-1.txt | 17 + evidence/level3/failover-2.txt | 17 + evidence/level3/idempotency-race.json | 14 + evidence/level3/persistence.txt | 15 + evidence/level3/smoke.txt | 1 + evidence/level3/topology.txt | 26 ++ evidence/level4/detection-hung-backend.txt | 5 + evidence/level4/rolling-update.csv | 88 +++++ evidence/level4/rolling-update.json | 120 +++++++ evidence/level4/sequential-kill.csv | 68 ++++ evidence/level4/sequential-kill.json | 189 +++++++++++ evidence/level4/sequential-pause.csv | 50 +++ evidence/level4/sequential-pause.json | 197 ++++++++++++ evidence/level4/sequential-stop.csv | 75 +++++ evidence/level4/sequential-stop.json | 189 +++++++++++ evidence/track1/diag.jsonl | 9 + evidence/track1/fig-a-fixed-budget.png | Bin 0 -> 30819 bytes evidence/track1/fig-b-scale-out.png | Bin 0 -> 76011 bytes evidence/track1/fig-c-bottleneck.png | Bin 0 -> 29170 bytes evidence/track1/results.jsonl | 33 ++ evidence/track1/summary.md | 53 +++ infra/haproxy/haproxy.cfg | 63 ++++ mtusi2026lab3-fork.sln | 36 +++ scr/Messenger.Api.Tests/ApiFixture.cs | 101 ++++++ scr/Messenger.Api.Tests/ApiHelpers.cs | 104 ++++++ scr/Messenger.Api.Tests/ApiTests.cs | 303 ++++++++++++++++++ scr/Messenger.Api.Tests/AuthTests.cs | 252 +++++++++++++++ scr/Messenger.Api.Tests/CacheTests.cs | 150 +++++++++ scr/Messenger.Api.Tests/ConcurencyTests.cs | 79 +++++ .../DependencyFailureTests.cs | 192 +++++++++++ scr/Messenger.Api.Tests/HealthTests.cs | 28 ++ scr/Messenger.Api.Tests/IdempotencyTests.cs | 261 +++++++++++++++ .../Messenger.Api.Tests.csproj | 27 ++ .../PasswordHasherTests.cs | 69 ++++ .../Data/DesignTimeDbContextFactory.cs | 20 ++ scr/Messenger.Api/Data/Entities.cs | 68 ++++ scr/Messenger.Api/Data/MessengerDbContext.cs | 116 +++++++ .../20261023140810_InitialSchema.Designer.cs | 251 +++++++++++++++ .../20261023140810_InitialSchema.cs | 179 +++++++++++ ...023170730_AddChatLastMessageAt.Designer.cs | 255 +++++++++++++++ .../20261023170730_AddChatLastMessageAt.cs | 29 ++ ...61106145724_AddIdempotencyKeys.Designer.cs | 301 +++++++++++++++++ .../20261106145724_AddIdempotencyKeys.cs | 57 ++++ .../MessengerDbContextModelSnapshot.cs | 298 +++++++++++++++++ scr/Messenger.Api/Endpoints/AuthEndpoints.cs | 146 +++++++++ scr/Messenger.Api/Endpoints/ChatEndpoints.cs | 158 +++++++++ .../Endpoints/MessageEndpoints.cs | 226 +++++++++++++ scr/Messenger.Api/Endpoints/UserEndpoints.cs | 125 ++++++++ scr/Messenger.Api/Messenger.Api.csproj | 25 ++ scr/Messenger.Api/Models/Chat.cs | 14 + scr/Messenger.Api/Models/CreateChatRequest.cs | 6 + .../Models/CreateMessageRequest.cs | 3 + scr/Messenger.Api/Models/CreateUserRequest.cs | 12 + scr/Messenger.Api/Models/Message.cs | 16 + scr/Messenger.Api/Models/SessionResponse.cs | 7 + scr/Messenger.Api/Models/User.cs | 14 + scr/Messenger.Api/Program.cs | 250 +++++++++++++++ .../Properties/launchSettings.json | 23 ++ scr/Messenger.Api/Services/ApiErrors.cs | 37 +++ .../Services/Argon2PasswordHasher.cs | 68 ++++ scr/Messenger.Api/Services/BearerAuth.cs | 91 ++++++ scr/Messenger.Api/Services/Cursors.cs | 56 ++++ scr/Messenger.Api/Services/Diagnostics.cs | 90 ++++++ scr/Messenger.Api/Services/IPasswordHasher.cs | 18 ++ scr/Messenger.Api/Services/IdempotencyKeys.cs | 145 +++++++++ .../Services/MessageHistoryCache.cs | 102 ++++++ scr/Messenger.Api/Services/SessionTokens.cs | 16 + scr/Messenger.Api/Services/Settings.cs | 136 ++++++++ scr/Messenger.Api/Services/Timestamps.cs | 13 + .../UtcDateTimeOffsetJsonConverter.cs | 28 ++ .../appsettings.Development.json | 8 + scr/Messenger.Api/appsettings.json | 9 + scripts/collect-evidence.sh | 53 +++ scripts/init-secrets.sh | 30 ++ scripts/restart.sh | 12 + scripts/restore-replicas.sh | 24 ++ scripts/rolling-update.sh | 48 +++ scripts/stop-one.sh | 32 ++ tools/LoadTest/Helpers.cs | 62 ++++ tools/LoadTest/LoadTest.csproj | 10 + tools/LoadTest/Phases.cs | 143 +++++++++ tools/LoadTest/Program.cs | 91 ++++++ tools/LoadTest/Rss.cs | 45 +++ tools/LoadTest/run-matrix.ps1 | 88 +++++ tools/LoadTest/summarize.py | 76 +++++ tools/ScaleLoad/Program.cs | 209 ++++++++++++ tools/ScaleLoad/ScaleLoad.csproj | 10 + tools/ScaleLoad/compose.cpuset.yaml | 6 + tools/ScaleLoad/run-config.sh | 30 ++ tools/ScaleLoad/summarize.py | 143 +++++++++ tools/ScaleLoad/track1-experiment-a.sh | 16 + tools/ScaleLoad/track1-experiment-b.sh | 16 + tools/ScaleLoad/track1-experiment-c.sh | 27 ++ tools/lab3/chaos_load.py | 290 +++++++++++++++++ tools/lab3/common.py | 100 ++++++ tools/lab3/idempotency_race.py | 96 ++++++ tools/lab3/measure-detection.sh | 29 ++ 105 files changed, 8359 insertions(+), 25 deletions(-) create mode 100644 .gitattributes create mode 100644 Dockerfile create mode 100644 compose.yaml create mode 100644 dotnet-tools.json create mode 100644 evidence/level3/failover-1.txt create mode 100644 evidence/level3/failover-2.txt create mode 100644 evidence/level3/idempotency-race.json create mode 100644 evidence/level3/persistence.txt create mode 100644 evidence/level3/smoke.txt create mode 100644 evidence/level3/topology.txt create mode 100644 evidence/level4/detection-hung-backend.txt create mode 100644 evidence/level4/rolling-update.csv create mode 100644 evidence/level4/rolling-update.json create mode 100644 evidence/level4/sequential-kill.csv create mode 100644 evidence/level4/sequential-kill.json create mode 100644 evidence/level4/sequential-pause.csv create mode 100644 evidence/level4/sequential-pause.json create mode 100644 evidence/level4/sequential-stop.csv create mode 100644 evidence/level4/sequential-stop.json create mode 100644 evidence/track1/diag.jsonl create mode 100644 evidence/track1/fig-a-fixed-budget.png create mode 100644 evidence/track1/fig-b-scale-out.png create mode 100644 evidence/track1/fig-c-bottleneck.png create mode 100644 evidence/track1/results.jsonl create mode 100644 evidence/track1/summary.md create mode 100644 infra/haproxy/haproxy.cfg create mode 100644 mtusi2026lab3-fork.sln create mode 100644 scr/Messenger.Api.Tests/ApiFixture.cs create mode 100644 scr/Messenger.Api.Tests/ApiHelpers.cs create mode 100644 scr/Messenger.Api.Tests/ApiTests.cs create mode 100644 scr/Messenger.Api.Tests/AuthTests.cs create mode 100644 scr/Messenger.Api.Tests/CacheTests.cs create mode 100644 scr/Messenger.Api.Tests/ConcurencyTests.cs create mode 100644 scr/Messenger.Api.Tests/DependencyFailureTests.cs create mode 100644 scr/Messenger.Api.Tests/HealthTests.cs create mode 100644 scr/Messenger.Api.Tests/IdempotencyTests.cs create mode 100644 scr/Messenger.Api.Tests/Messenger.Api.Tests.csproj create mode 100644 scr/Messenger.Api.Tests/PasswordHasherTests.cs create mode 100644 scr/Messenger.Api/Data/DesignTimeDbContextFactory.cs create mode 100644 scr/Messenger.Api/Data/Entities.cs create mode 100644 scr/Messenger.Api/Data/MessengerDbContext.cs create mode 100644 scr/Messenger.Api/Data/Migrations/20261023140810_InitialSchema.Designer.cs create mode 100644 scr/Messenger.Api/Data/Migrations/20261023140810_InitialSchema.cs create mode 100644 scr/Messenger.Api/Data/Migrations/20261023170730_AddChatLastMessageAt.Designer.cs create mode 100644 scr/Messenger.Api/Data/Migrations/20261023170730_AddChatLastMessageAt.cs create mode 100644 scr/Messenger.Api/Data/Migrations/20261106145724_AddIdempotencyKeys.Designer.cs create mode 100644 scr/Messenger.Api/Data/Migrations/20261106145724_AddIdempotencyKeys.cs create mode 100644 scr/Messenger.Api/Data/Migrations/MessengerDbContextModelSnapshot.cs create mode 100644 scr/Messenger.Api/Endpoints/AuthEndpoints.cs create mode 100644 scr/Messenger.Api/Endpoints/ChatEndpoints.cs create mode 100644 scr/Messenger.Api/Endpoints/MessageEndpoints.cs create mode 100644 scr/Messenger.Api/Endpoints/UserEndpoints.cs create mode 100644 scr/Messenger.Api/Messenger.Api.csproj create mode 100644 scr/Messenger.Api/Models/Chat.cs create mode 100644 scr/Messenger.Api/Models/CreateChatRequest.cs create mode 100644 scr/Messenger.Api/Models/CreateMessageRequest.cs create mode 100644 scr/Messenger.Api/Models/CreateUserRequest.cs create mode 100644 scr/Messenger.Api/Models/Message.cs create mode 100644 scr/Messenger.Api/Models/SessionResponse.cs create mode 100644 scr/Messenger.Api/Models/User.cs create mode 100644 scr/Messenger.Api/Program.cs create mode 100644 scr/Messenger.Api/Properties/launchSettings.json create mode 100644 scr/Messenger.Api/Services/ApiErrors.cs create mode 100644 scr/Messenger.Api/Services/Argon2PasswordHasher.cs create mode 100644 scr/Messenger.Api/Services/BearerAuth.cs create mode 100644 scr/Messenger.Api/Services/Cursors.cs create mode 100644 scr/Messenger.Api/Services/Diagnostics.cs create mode 100644 scr/Messenger.Api/Services/IPasswordHasher.cs create mode 100644 scr/Messenger.Api/Services/IdempotencyKeys.cs create mode 100644 scr/Messenger.Api/Services/MessageHistoryCache.cs create mode 100644 scr/Messenger.Api/Services/SessionTokens.cs create mode 100644 scr/Messenger.Api/Services/Settings.cs create mode 100644 scr/Messenger.Api/Services/Timestamps.cs create mode 100644 scr/Messenger.Api/Services/UtcDateTimeOffsetJsonConverter.cs create mode 100644 scr/Messenger.Api/appsettings.Development.json create mode 100644 scr/Messenger.Api/appsettings.json create mode 100755 scripts/collect-evidence.sh create mode 100755 scripts/init-secrets.sh create mode 100755 scripts/restart.sh create mode 100755 scripts/restore-replicas.sh create mode 100755 scripts/rolling-update.sh create mode 100755 scripts/stop-one.sh create mode 100644 tools/LoadTest/Helpers.cs create mode 100644 tools/LoadTest/LoadTest.csproj create mode 100644 tools/LoadTest/Phases.cs create mode 100644 tools/LoadTest/Program.cs create mode 100644 tools/LoadTest/Rss.cs create mode 100644 tools/LoadTest/run-matrix.ps1 create mode 100644 tools/LoadTest/summarize.py create mode 100644 tools/ScaleLoad/Program.cs create mode 100644 tools/ScaleLoad/ScaleLoad.csproj create mode 100644 tools/ScaleLoad/compose.cpuset.yaml create mode 100644 tools/ScaleLoad/run-config.sh create mode 100644 tools/ScaleLoad/summarize.py create mode 100644 tools/ScaleLoad/track1-experiment-a.sh create mode 100644 tools/ScaleLoad/track1-experiment-b.sh create mode 100644 tools/ScaleLoad/track1-experiment-c.sh create mode 100644 tools/lab3/chaos_load.py create mode 100644 tools/lab3/common.py create mode 100644 tools/lab3/idempotency_race.py create mode 100644 tools/lab3/measure-detection.sh diff --git a/.dockerignore b/.dockerignore index bc16e556..0749a3b9 100644 --- a/.dockerignore +++ b/.dockerignore @@ -18,3 +18,10 @@ __pycache__ node_modules evidence .DS_Store + +# Артефакты сборки хоста: содержат абсолютные пути Windows и ломают restore в контейнере. +**/bin +**/obj +.vs +tools +scr/Messenger.Api.Tests diff --git a/.env.example b/.env.example index d32b9be0..4d60eb77 100644 --- a/.env.example +++ b/.env.example @@ -1,13 +1,28 @@ -# Copy to .env for your LOCAL synthetic test environment; never commit .env. -# These are logical interface suggestions; map actual framework names in REPORT.md. -APP_HOST=0.0.0.0 -APP_PORT=8080 -APP_ENV=lab -SESSION_TTL_SECONDS=3600 -# Choose credentials locally. File paths contain no secret values. -DATABASE_URL_FILE=/run/secrets/database_url -# Optional on 3, required use on 4 in lab2; Redis OR Valkey: -SESSION_STORE=postgres -CACHE_URL_FILE=/run/secrets/cache_url +# Скопируйте в .env для ЛОКАЛЬНОГО учебного стенда (cp .env.example .env); .env не коммитится. +# Секретов здесь нет: пароли создаёт scripts/init-secrets.sh в каталоге secrets/ (тоже вне Git). +# Все переменные необязательны: значения ниже совпадают с умолчаниями compose.yaml. + +# --- Публичные порты --- +# Единственная публичная точка входа (HAProxy). Порты API-реплик наружу не публикуются. +LB_PUBLISHED_PORT=8080 +# Статистика HAProxy, только 127.0.0.1. +LB_STATS_PORT=8404 + +# --- Масштабирование и ресурсы (лимиты НА ОДИН контейнер) --- API_REPLICAS=2 +API_CPUS=1 +API_MEMORY=512m +DB_CPUS=2 +DB_MEMORY=1g +LB_CPUS=1 + +# --- Приложение (соответствие переменных приложению описано в REPORT.md) --- +SESSION_TTL_SECONDS=3600 IDEMPOTENCY_TTL_SECONDS=86400 +SHUTDOWN_DRAIN_SECONDS=3 +DB_MAX_POOL_SIZE=20 +CACHE_TTL_SECONDS=300 +# X-Cache / X-Db-Queries в ответах: только для экспериментов. +DIAGNOSTIC_HEADERS=false +# Версия сборки; меняется при rolling update (scripts/rolling-update.sh). +APP_VERSION=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..dfdb8b77 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.sh text eol=lf diff --git a/.gitignore b/.gitignore index b5a71896..f696f2dd 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,11 @@ coverage/ .vscode/ # Keep small, sanitized evidence summaries in evidence/ under version control. # Inspect git diff --cached: ignore rules are not a secret scanner. + +# Local IDE/user files +*.csproj.user +.vs/ +scr/Messenger.Api/Test/ +secrets/ + +!scr/Messenger.Api/Data/ diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..dc1afe3a --- /dev/null +++ b/Dockerfile @@ -0,0 +1,34 @@ +# Версии закреплены тегом и digest (SDK 10.0.401, runtime 10.0.12), сборка воспроизводима. +FROM mcr.microsoft.com/dotnet/sdk:10.0.401@sha256:e70cdb7f80b0348f5cb85f19a8f670fca061f033d57eed12fa003d58b0e06317 AS build +WORKDIR /src + +COPY scr/Messenger.Api/Messenger.Api.csproj scr/Messenger.Api/ +RUN dotnet restore scr/Messenger.Api/Messenger.Api.csproj + +COPY scr/Messenger.Api/ scr/Messenger.Api/ +RUN dotnet publish scr/Messenger.Api/Messenger.Api.csproj \ + --configuration Release \ + --output /app/publish \ + --no-restore + +FROM mcr.microsoft.com/dotnet/aspnet:10.0.12@sha256:222759b391a1aaf241166672c8f99b2d4ada452e7b5319f3c6e8f265a37b5ad4 AS runtime +WORKDIR /app + +COPY --from=build /app/publish . + +# Версия сборки (видна в логе старта; отличает старую реплику от новой при rolling update). +# ARG стоит после COPY: смена версии пересобирает только этот слой, а не всю сборку. +ARG APP_VERSION=dev +ENV APP_VERSION=${APP_VERSION} +LABEL org.opencontainers.image.version=${APP_VERSION} + +ENV ASPNETCORE_URLS=http://0.0.0.0:8080 +EXPOSE 8080 + +# Непривилегированный пользователь (APP_UID задан в базовом образе aspnet). +USER $APP_UID + +# curl в образе нет, поэтому проверку выполняет само приложение (/health/live). +HEALTHCHECK --interval=10s --timeout=3s --start-period=5s --retries=3 CMD ["dotnet", "Messenger.Api.dll", "--healthcheck"] + +ENTRYPOINT ["dotnet", "Messenger.Api.dll"] \ No newline at end of file diff --git a/REPORT.md b/REPORT.md index c2679005..7bbc7b13 100644 --- a/REPORT.md +++ b/REPORT.md @@ -1,37 +1,188 @@ # Отчёт — лабораторная 3 -- Автор, группа: TODO -- Целевая оценка; выбранный трек 5, если нужен: TODO +- Автор, группа: Полуднев Юлиан - БВТ2303 +- Целевая оценка; выбранный трек 5: **5, трек 1 «Цена масштабирования»** - Commit/PR: TODO после публикации -- Использованные источники, библиотеки и помощь ИИ: TODO +- Использованные источники, библиотеки и помощь ИИ: + - Документация: Compose services, HAProxy 3.0 (resolvers, server-template, health checks, retry-on), PostgreSQL (`INSERT … ON CONFLICT`, блокировки уникального индекса), документация .NET/ASP.NET Core (graceful shutdown, `IHostApplicationLifetime`). + - Библиотеки: ASP.NET Core 10, EF Core 10 + Npgsql, StackExchange.Redis (клиент Valkey), Isopoh.Cryptography.Argon2 (перенесено из lab2); образы PostgreSQL 17, Valkey 8.1, HAProxy 3.0 (закреплены digest'ами). + - **ИИ:** в работе использовался ИИ-ассистент Claude Code (Anthropic). Использовался для помощи конфишгурации лабораторной (идемпотентность, миграция, drain при SIGTERM, `compose.yaml`, конфигурация HAProxy), помощь с составлением отчета. Код lab2 (PostgreSQL, сессии, кэш, Argon2) перенесён из моей предыдущей работы. ## Запуск из чистого clone -TODO: версии runtime/образов, prerequisites, команды создания локальных secrets/.env, build, миграций, запуска, ожидания готовности, тестов и остановки. Указать необходимые действия оператора. Не вставлять секреты. Отдельно указать безопасную остановку и команду намеренного удаления учебных данных. +**Требования.** Docker с Compose v2 (проверено: Docker Engine 29.4.1, Compose 5.1.3; для `start_interval` в healthcheck нужен Docker ≥ 25), Python 3.9+ для тестов. Для сборки образа .NET SDK на хосте не нужен — сборка идёт в Docker. Команды ниже — POSIX shell (Linux, macOS, WSL2 или Git Bash). Тесты `tests/resilience.py` запускают хук-скрипт напрямую, поэтому на Windows их нужно выполнять в WSL; `make` в Windows-окружении автора не установлен, поэтому ниже приведены команды, которые `make` вызывает. + +```sh +sh scripts/init-secrets.sh # secrets/: случайные пароли БД и кэша (вне Git); повторный запуск ничего не перезаписывает +cp .env.example .env # настройки без секретов (порты, число реплик, лимиты) +docker compose --env-file .env config --quiet +docker compose --env-file .env up -d --build --wait +``` + +Порядок старта задан зависимостями Compose: `db` (healthy) → `migrate` (one-shot, завершается с кодом 0) → `api` × N (healthy) → `lb` (healthy). `--wait` возвращает управление, когда всё готово. Публичная точка входа — `http://localhost:8080` (порт задаётся `LB_PUBLISHED_PORT`; при разработке я использовал 8081, потому что 8080 занимал старый стенд lab2). + +```sh +python3 tests/smoke.py --base-url http://localhost:8080 # make test +python3 tests/resilience.py --mode persistence --action-script scripts/restart.sh --base-url http://localhost:8080 # make test-persistence ACTION_SCRIPT=scripts/restart.sh +python3 tests/resilience.py --mode failover --action-script scripts/stop-one.sh --base-url http://localhost:8080 # make test-failover ACTION_SCRIPT=scripts/stop-one.sh +scripts/restore-replicas.sh # вернуть остановленную реплику (ждёт, пока LB видит все реплики UP) +python3 tools/lab3/idempotency_race.py --base-url http://localhost:8080 # параллельные POST с одним ключом +BASE_URL=http://localhost:8080 scripts/collect-evidence.sh # всё вместе → evidence/level3/ +dotnet test scr/Messenger.Api.Tests # 78 интеграционных тестов, из них 15 — на идемпотентность и `X-Instance-Id` (нужен Docker; Testcontainers поднимает свои PostgreSQL/Valkey) +``` + +Масштабирование: `API_REPLICAS=4 docker compose --env-file .env up -d --wait api` (LB подхватывает реплики через DNS, правки конфига не нужны, максимум 8 слотов). +**Безопасная остановка:** `docker compose stop` (тома сохраняются). **Намеренное удаление учебных данных:** `docker compose down -v` (удаляет том `messenger-lab3_pgdata`). Действий оператора, кроме перечисленных, не требуется. ## Архитектура и решения -TODO: схема процессов/хранилищ, источник истины, транзакционные границы, ограничения. Что перенесено из lab2, что изменено в этой работе. Соответствие переменных из .env.example реальной конфигурации. +``` +клиент ──► HAProxy (lb:8080, единственный публичный порт) + │ DNS-обнаружение api:8080, проверка GET /health/ready раз в 1 с + ├──► api (реплика 1) ─┐ + ├──► api (реплика 2) ─┼──► PostgreSQL (пользователи, чаты, сообщения, СЕССИИ, ключи идемпотентности; volume) + └──► api (реплика N) ─┴──► Valkey (кэш страниц истории; без persistence, необязателен) +migrate (one-shot, тот же образ, `--migrate`) ──► PostgreSQL (до старта api) +``` + +Роли и параметры: + +| Роль | Сервис | Версия / digest | Готовность | Хранилище | Сеть / порт | Секреты | +| --- | --- | --- | --- | --- | --- | --- | +| API | `api` (N реплик, без `container_name`) | `messenger-api:lab3`, собирается из `Dockerfile` (SDK 10.0.401 / aspnet 10.0.12 с digest) | Docker: `/health/live`; LB: `/health/ready` | нет локального состояния | только внутри сети `backend`, порт наружу не публикуется | `database_url`, `cache_url` (Compose secrets, файлы) | +| PostgreSQL | `db` | `postgres:17@sha256:b8fa…08fe` | `pg_isready` | именованный том `pgdata` | не публикуется | `db_password` | +| Сессии | таблица `sessions` в PostgreSQL | — | — | тот же том | — | хеш SHA-256 токена, сам токен не хранится | +| Кэш | `cache` | `valkey/valkey:8.1@sha256:640c…2f91` | `valkey-cli ping` | нет (LRU 64 MiB) | не публикуется | `cache_password` | +| Миграции | `migrate` | образ api | завершается кодом 0 | — | — | `database_url` | +| LB | `lb` | `haproxy:3.0-alpine@sha256:1c15…1d8f` (через зеркало `mirror.gcr.io`, тот же digest) | `/healthz` на служебном порту | — | `8080` публично; статистика `127.0.0.1:8404` | нет | + +**Что перенесено из lab2:** PostgreSQL как источник истины, сессии в PostgreSQL (это уже общее хранилище для всех реплик), Valkey-кэш с версией истории в ключе, Argon2id, keyset-пагинация, ограниченные пулы и ответ 503 при недоступности БД. +**Что добавлено в lab3:** + +1. **`X-Instance-Id`** в каждом ответе API (включая ошибки и health) — hostname контейнера (первые 12 символов ID контейнера). Заголовок ставится через `Response.OnStarting`, потому что `UseExceptionHandler` очищает заголовки. +2. **Общая идемпотентность** (`Services/IdempotencyKeys.cs`, таблица `idempotency_keys`, миграция `AddIdempotencyKeys`). Область уникальности — `(user_id, chat_id, key)` (метод и путь у эндпоинта один). В транзакции отправки первым шагом выполняется `INSERT … ON CONFLICT (user_id, chat_id, key) DO UPDATE … WHERE expires_at <= now RETURNING 1`: + - ключа нет → строка вставлена, ключ наш, дальше резервирование слота и вставка сообщения; **ключ и сообщение коммитятся одной транзакцией**; + - ключ вставила другая незавершённая транзакция (в том числе на другой реплике) → наш `INSERT` **ждёт на уникальном индексе**; после её `COMMIT` вставки нет, мы читаем сохранённый хеш: тот же → повтор (201 и то же сообщение), другой → 409; после её `ROLLBACK` (5xx) ключ достаётся нам; + - ключ истёк (24 ч, `IDEMPOTENCY_TTL_SECONDS`) → перезахватывается. + Хеш запроса считается от разобранных полей, поэтому порядок ключей JSON не важен. Транзиентная ошибка откатывает и ключ, и сообщение — клиент безопасно повторяет запрос с тем же ключом. Сессия и членство в чате проверяются при каждом запросе, включая повтор. FK `message_id → messages(id)` объявлен `DEFERRABLE INITIALLY DEFERRED`: ключ вставляется раньше сообщения, проверка выполняется при COMMIT. Фоновый `IdempotencyCleaner` удаляет истёкшие ключи. +3. **Миграции отдельно:** API не мигрирует схему (`MIGRATE_ON_START=false`), миграции выполняет one-shot контейнер `migrate` (`Messenger.Api.dll --migrate`), от которого зависит `api` (`service_completed_successfully`). Новая миграция только добавляет таблицу (expand), поэтому предыдущая версия API продолжает работать (нужно для rolling update). `MIGRATE_ON_START=true` используют только интеграционные тесты. +4. **Graceful shutdown и readiness:** SIGTERM → `/health/ready` сразу отвечает 503 («draining»), слушатель ещё открыт `SHUTDOWN_DRAIN_SECONDS=3`, затем Kestrel закрывает слушатель и дорабатывает активные запросы до 5 с. +5. **Балансировщик:** HAProxy. Адреса реплик — DNS-обнаружение (`resolvers docker`, `server-template api 1-8 api:8080`, обновление раз в секунду), поэтому добавление/замена контейнеров не требует правки конфигурации. Sticky-сессий нет. При обрыве соединения/пустом ответе запрос повторяется на другой реплике (`retries 3`, `option redispatch`, `retry-on conn-failure empty-response`); повтор POST безопасен благодаря `Idempotency-Key`. + +**Согласованность таймаутов** (`infra/haproxy/haproxy.cfg`, `compose.yaml`, `Program.cs`): + +| Параметр | Значение | Почему | +| --- | --- | --- | +| Проверка LB | `GET /health/ready`, `inter 1s`, `fall 2`, `rise 2`, `timeout check 2s` | период проверок 1 с | +| Таймаут readiness в приложении | 1 с | меньше `timeout check`: зависшая БД даёт явный 503 | +| `SHUTDOWN_DRAIN_SECONDS` | 3 с | ≥ `fall × inter` = 2 с (+≤1 с джиттера): LB успевает убрать реплику до закрытия слушателя | +| Kestrel graceful timeout | 5 с | итого остановка < 8 с < 10 с лимита хука | +| `stop_grace_period` | 15 с | запас до SIGKILL | +| БД: connect / command | 5 с / 5 с | `timeout server` в LB 20 с покрывает несколько команд запроса | + +**Максимальное время обнаружения отказа:** реплика остановлена штатно (SIGTERM) — LB узнаёт заранее по 503 readiness, клиенты ошибок не видят; процесс убит (RST/отказ соединения) — мгновенно через `retry-on`/redispatch, статус DOWN ≤ ≈2–3 с; **зависший backend** (порт открыт, ответов нет) — расчётно `fall × (timeout check + inter) = 6 с`, **измерено 5.66 / 5.86 / 5.82 с** (`evidence/level4/detection-hung-backend.txt`). + +**Соответствие `.env.example` реальной конфигурации.** `APP_HOST`/`APP_PORT`/`APP_ENV` из исходного шаблона заменены переменными Compose: `ASPNETCORE_URLS`/`APP_PORT` (задаются в `compose.yaml`), `SESSION_TTL_SECONDS`, `IDEMPOTENCY_TTL_SECONDS`, `DATABASE_URL_FILE`/`CACHE_URL_FILE` (пути к файлам секретов), `API_REPLICAS` (число реплик). `SESSION_STORE=postgres` — не переменная: сессии всегда в PostgreSQL (таблица `sessions`). Новые: `LB_PUBLISHED_PORT`, `LB_STATS_PORT`, `API_CPUS`/`API_MEMORY`, `DB_CPUS`/`DB_MEMORY`, `LB_CPUS`, `SHUTDOWN_DRAIN_SECONDS`, `DB_MAX_POOL_SIZE`, `CACHE_TTL_SECONDS`, `DIAGNOSTIC_HEADERS`, `APP_VERSION`. ## Доказательства критериев +Все файлы — в `evidence/` (даты, commit и команды внутри файлов). Окружение измерений: Windows 11, Docker Desktop 29.4.1 (WSL2, 16 логических CPU, ≈8 GiB), все контейнеры и генератор нагрузки на одном хосте. + | Критерий README | Команда/сценарий | Наблюдаемый результат | Файл доказательства | | --- | --- | --- | --- | -| Публичный smoke | make test | TODO | TODO | -| Остальные пункты уровня 3 | TODO | TODO | TODO | -| Все пункты уровня 4, если заявлен | TODO | TODO | TODO | -| Выбранный трек 5, если заявлен | TODO | TODO | TODO | - -TODO: добавить отдельную строку для каждого заявленного критерия. PASS без команды и наблюдения не является доказательством. Проверка инфраструктурного hook требует подтверждения, какие реальные процессы/хранилища перезапущены. +| Публичный smoke | `python3 tests/smoke.py` (= `make test`) через LB | `PASS: lab3 public API scenario` | `evidence/level3/smoke.txt` | +| Стенд в compose.yaml, ≥2 API, одна точка входа, общая БД и сессии | `docker compose up -d --build --wait` | 2 реплики `api`, опубликован только `lb`, один `db`; сессии в таблице `sessions` | `evidence/level3/topology.txt` | +| Разные реплики обслуживают одну сессию без повторного входа | тест failover до отказа опрашивает `/users/me` с одним токеном; `idempotency_race.py` | `observed_instances_before: 2`; запросы разошлись по 2 репликам поровну (400/400) | `evidence/level3/failover-1.txt`, `idempotency-race.json` | +| Отказ одной реплики: чтение/запись ≤ 10 с, подтверждённые сообщения целы | `tests/resilience.py --mode failover … stop-one.sh`, дважды | PASS оба раза; 125 и 136 успешных записей, 0 неудачных попыток; остановленная реплика — `Exited (0)` | `evidence/level3/failover-1.txt`, `failover-2.txt` | +| Повтор POST с тем же ключом не создаёт дубль, в т.ч. конкурентный, через разные реплики | `idempotency_race.py`: 20 раундов × 40 параллельных POST с одним ключом + раунд с 40 разными телами | 840 запросов → ровно 21 сообщение; все ответы 201 с идентичным телом; в раунде с разными телами 1×201 и 39×409; 78 C#-тестов, из них 15 на идемпотентность (в т.ч. конкурентные через 3 «реплики» с общей БД) | `evidence/level3/idempotency-race.json`; `scr/Messenger.Api.Tests/IdempotencyTests.cs` | +| Persistence | `tests/resilience.py --mode persistence … restart.sh` | PASS с прежним токеном; время старта `db`/`cache`/`api`/`lb` изменилось, том `messenger-lab3_pgdata` прежний | `evidence/level3/persistence.txt` | +| Health/readiness, timeouts, SIGTERM согласованы; период и время обнаружения | раздел «Архитектура», таблица таймаутов; замер обнаружения | период 1 с; штатно 0 ошибок; зависший backend 5.7–5.9 с | `evidence/level4/detection-hung-backend.txt` | +| Поочерёдная остановка каждой реплики: RPS, ошибки, время восстановления | `tools/lab3/chaos_load.py --scenario sequential-stop` (3 варианта: SIGTERM, SIGKILL, freeze) | см. таблицу «Эксперименты и отказы» | `evidence/level4/sequential-{stop,kill,pause}.{json,csv}` | +| Общая идемпотентность параллельными запросами | см. выше; плюс 16 повторов с тем же ключом в эксперименте с freeze | 0 потерянных, 0 задублированных | `evidence/level4/sequential-pause.json` | +| CPU/RAM-лимиты, нет published портов у API, секреты, нет `container_name` | `docker inspect`, `docker compose ps` | api: 1 CPU / 512 MiB; db 2 CPU / 1 GiB; cache 0.5 / 128 MiB; lb 1 / 128 MiB; порты только у `lb`; секреты — Compose secrets из `secrets/` (вне Git) | `evidence/level3/topology.txt` | +| Rolling update под нагрузкой, миграции однократно | `chaos_load.py --scenario rolling-update` (`scripts/rolling-update.sh`) | 19 263 запроса, 0 ошибок, 10 294 POST без потерь и дублей; версия 1 → новая на обеих репликах | `evidence/level4/rolling-update.json` | +| Трек 1 | `tools/ScaleLoad/track1-experiment-{a,b,c}.sh`, `summarize.py` | см. ниже | `evidence/track1/` | ## Эксперименты и отказы -TODO: гипотеза, hardware/лимиты, версии, объём данных, профиль нагрузки, concurrency/arrival rate, длительность/прогрев, повторы, успешные RPS, ошибки, p50/p95/p99, CPU/RAM. Сохранить raw summary без tokens и объяснить ограничения измерения. +### Отказы под нагрузкой (уровень 4) + +Нагрузка: 8 потоков, замкнутый цикл, 50% GET истории / 50% POST с уникальным ключом; неопределённый POST повторяется с **тем же** ключом. Затем проверяется вся история: подтверждённые сообщения на месте, дублей нет. Воздействие по очереди на каждую реплику (остановка → 10 с наблюдения → восстановление → 10 с наблюдения). | Воздействие | Что ожидаем | Что наблюдали | Время восстановления / потеря данных | | --- | --- | --- | --- | -| TODO | TODO | TODO | TODO | +| `docker stop` реплики (SIGTERM, drain 3 с), обе реплики по очереди | без ошибок: LB выводит реплику по 503 readiness до закрытия слушателя | 15 327 запросов, **0 ошибок**; RPS 254 → 253 (одна реплика) → 208; хук вернулся за 3.7–3.8 с | восстановление 0 с; потерь и дублей нет (8 277 POST подтверждены) | +| `docker kill` (SIGKILL, без drain) | оборванные запросы повторяет LB на другой реплике | 12 284 запроса, **0 ошибок клиента**; счётчики HAProxy: 7 оборванных ответов (`eresp`) = 7 повторов (`wretr`) | 0 с; потерь и дублей нет (6 757 POST) | +| `docker pause` (зависший backend, худший случай) | ошибки/простой до обнаружения ≈ 6 с | 10 626 запросов, 21 ошибка (клиентский таймаут 5 с); в 10-секундном окне заморозки пропускная способность упала до ≈7–8 RPS (посекундный CSV: успешных ответов нет в секундах 21–24 и 26–29 после начала заморозки) | ошибки приходят через ≈5.2 с (таймаут клиента), нормальный RPS (≈280) возвращается только после разморозки, то есть простой ≈10 с — дольше изолированного замера обнаружения (5.7–5.9 с); причину различия под нагрузкой отдельно не исследовал; 16 повторов с тем же ключом, потерь и дублей нет | +| Rolling update (surge +1, unavailable 0), 2 реплики → 2 новые | без потерь | за 60 с заменены обе реплики; 19 263 запроса, **0 ошибок**; RPS 269 → 215 во время замены → 228 | потерь и дублей нет (10 294 POST) | +| Рестарт всего стенда (`restart.sh`: lb, api, db, cache) | сессии и данные сохраняются | PASS persistence с прежним токеном | данные целы (volume `pgdata`); кэш после рестарта пуст — это только ускорение | + +Вывод: штатная остановка и аварийное убийство процесса клиент не замечает благодаря drain и ретраям LB; **зависший процесс — слабое место** (изолированно LB исключает его за ≈6 с, а под нагрузкой простой составил ≈10 с; клиенты с таймаутом 5 с получают ошибки); данные при этом всегда сохранны благодаря идемпотентности. + +### Трек 1. Цена масштабирования + +**Гипотезы.** H1: при *фиксированном* суммарном CPU/RAM число реплик не увеличивает пропускную способность (реплики нужны для отказоустойчивости, а не для скорости). H2: при *росте* ресурсов RPS растёт, пока не упрётся в общий ресурс — вероятнее всего CPU PostgreSQL (все реплики ходят в одну БД: аутентификация, проверка членства, история, запись). H3: часть потерь в точке насыщения — накладные расходы на число соединений к БД (реплики × пул). + +**Методика (одинакова для всех серий).** Генератор `tools/ScaleLoad` (C#, замкнутый цикл, на том же хосте), профиль: 32 пользователя, у каждого свой чат с 200 сообщений заранее; **80% GET истории (limit=50) / 20% POST с уникальным Idempotency-Key**; прогрев 5 с, замер 20 с; 3 повтора, порядок конфигураций в повторах случайный (`shuf`); между конфигурациями реплики пересоздаются; CPU контейнеров — среднее `docker stats` за время замера (100% = одно ядро). Лимиты CPU/RAM заданы на контейнер. Сырые данные — `evidence/track1/results.jsonl` (и `diag.jsonl`), сводка — `summary.md`, графики — `fig-*.png`. Токены в данные не попадают. + +**A. Фиксированный бюджет API: 2 CPU / 1 GiB суммарно** (БД 4 CPU, LB 2 CPU — с запасом; 64 клиента): + +| Конфигурация | RPS (среднее, мин–макс) | p95, мс | CPU API на запрос, мс | CPU БД, % | +| --- | --- | --- | --- | --- | +| 1 × 2.0 CPU | 713 (693–748) | 157 | 2.86 | 131 | +| 2 × 1.0 CPU | 433 (378–488) | 372 | 4.59 | 85 | +| 4 × 0.5 CPU | 320 (306–328) | 609 | 6.27 | 71 | + +![A](evidence/track1/fig-a-fixed-budget.png) + +H1 подтверждена, причём сильнее ожидаемого: больше реплик на тот же бюджет — *хуже* (−39% и −55%), а API везде загружен на ≈200%, то есть растёт цена запроса. Проверки причин (`diag.jsonl`, по 2 запуска, меньше уверенности): + - **квота CFS стоит дорого:** тот же бюджет 2 ядра, но закреплением за ядрами (`cpuset: 0-1`, без квоты) для 1 реплики даёт **929 RPS против 693–793 с квотой** (по 5 запускам квоты: серия A и диагностика; ≈ +17…+34%); + - **накладные расходы на реплику есть и без квоты:** 4 реплики на тех же закреплённых 2 ядрах — 573 RPS против 929 у одной (CPU на запрос 2.16 → 3.64 мс); + - память не главный фактор: 4×0.5 CPU с 1 GiB вместо 256 MiB — 344 против 308–349 RPS (в пределах разброса повторов). + Что именно тратит CPU (GC, пулы потоков, переключения контекста) я не профилировал — это гипотезы, не доказательства. + +**B. Рост ресурсов:** реплики по 1 CPU / 512 MiB, БД 2 CPU, LB 1 CPU, 128 клиентов: + +| Реплик API | RPS (среднее, мин–макс) | p95, мс | CPU API, % | CPU БД, % (лимит 200) | CPU БД на запрос, мс | +| --- | --- | --- | --- | --- | --- | +| 1 | 377 (326–408) | 499 | 101 | 64 | 1.69 | +| 2 | 557 (466–624) | 588 | 201 | 102 | 1.84 | +| 4 | 725 (609–883) | 591 | 409 | 172 | 2.37 | +| 8 | 795 (791–802) | 525 | 697 | **210** | 2.64 | + +![B](evidence/track1/fig-b-scale-out.png) + +**Точка насыщения — CPU PostgreSQL при лимите 2 CPU, около 800 RPS.** Рост 1→2→4 реплик даёт +48% и +30%, а 4→8 — всего +10%; идеальный линейный рост дал бы ≈3000 RPS. На 8 репликах БД работает на лимите (210% из 200%), а API-реплики — на 87% своего CPU: они ждут ответов БД. Добавление реплик не добавляет БД ресурсов, зато увеличивает число одновременных соединений и цену запроса (в БД 1.69 → 2.64 мс CPU/запрос). LB не упёрся в лимит (в сериях B/C в среднем 34% / 54% своего CPU, максимум 64%), но к 8 репликам его загрузка заметна. Пул соединений как предел не наблюдался: после замера открыто 161 соединение при `max_connections=300`. + +**C. Проверка гипотез в точке насыщения** (8 × 1 CPU, 128 клиентов): + +| Вариант | RPS (среднее, мин–макс) | p95, мс | CPU БД, % | Соединений к БД | +| --- | --- | --- | --- | --- | +| контроль: пул 20, БД 2 CPU | 816 (812–820) | 489 | 212 (из 200) | 161 | +| пул 4 (до 32 соединений) | 793 (758–814) | 525 | 200 (из 200) | 33 | +| пул 8 (до 64 соединений) | 844 (832–860) | 429 | 209 (из 200) | 65 | +| **БД 4 CPU, пул 20** | **1005 (963–1054)** | **392** | 251 (из 400) | 161 | + +![C](evidence/track1/fig-c-bottleneck.png) + +- **H3 не подтверждена:** уменьшение числа соединений в 5 раз не освободило БД (793 против 816, диапазоны перекрываются); пул 8 даёт +3% — на уровне шума. Это честный отрицательный результат. +- **Подтверждённое улучшение: поднять лимит CPU БД с 2 до 4** — **+23% RPS (816 → 1005), p95 −20% (489 → 392 мс)**, диапазоны повторов не пересекаются. Гипотеза «узкое место — CPU БД» этим же и доказана: после улучшения БД загружена на 63% лимита, узкое место переехало в CPU API (751% из 800%) и в ресурсы самого хоста. Рост меньше ×2 не случаен: сумма лимитов (API 8 + БД 4 + LB 1 + кэш 0.5 CPU) плюс генератор нагрузки уже приближаются к 16 логическим ядрам хоста. +- Дополнительно подтверждено (серия A + диагностика): **для фиксированного бюджета лучше меньше крупных реплик, а закрепление за ядрами вместо квоты CFS даёт ≈ +17…+34%** (диагностика, n=2 на конфигурацию). + +**Почему рост реплик перестаёт помогать (итог для защиты).** Реплики масштабируют только stateless-часть (CPU приложения). Состояние и вся работа с данными — в одной PostgreSQL; когда её CPU исчерпан, лишние реплики лишь стоят в очереди к БД (p95 не падает, RPS растёт на 10%). Поэтому после точки насыщения нужно ускорять БД (ресурсы, меньше запросов на запрос API, кэш, репликация чтения), а не добавлять реплики; реплики же оправданы отказоустойчивостью (см. уровень 4). + +**Ограничения измерений.** Один хост (генератор нагрузки, API, БД и LB делят CPU; нагрузка и хост-ОС искажают результаты при больших суммарных лимитах); замкнутый генератор страдает coordinated omission, p95/p99 — только успешные запросы (ошибок в сериях не было: ≈446 тыс. успешных запросов основных серий и ≈112 тыс. диагностики); 3 повтора на точку — разброс виден в диапазонах, статистические тесты не проводились; диагностика cpuset — по 2 запуска; Docker Desktop (WSL2) не равен «чистому» Linux-серверу; абсолютные RPS нельзя переносить на другое железо. Утверждения о причинах роста цены запроса (GC, пулы потоков) — гипотезы. ## Ограничения и следующие шаги -TODO: какие отказы выдерживаются и какие нет; что не реализовано; где учебное упрощение; какое улучшение подтверждено, а какое пока гипотеза. +- **Выдерживается:** остановка/гибель одной API-реплики и rolling update без потерь подтверждённых данных и без дублей; рестарт всего стенда с сохранением данных и сессий; конкурентный повтор POST через разные реплики. +- **Не выдерживается (SPOF):** отказ PostgreSQL, LB, Valkey (кэш необязателен — API продолжит работать без него), потеря самого хоста. БД не реплицирована — выживание её отказа не заявляется. Зависший backend даёт ≈6–10 с деградации (замеры выше). +- **Учебные упрощения:** один хост; HTTP без TLS; Docker Hub был недоступен — образ HAProxy взят через `mirror.gcr.io` с тем же digest (на машине с доступом к Docker Hub можно заменить на `haproxy:3.0-alpine@sha256:1c15…`); ключ идемпотентности привязан к чату (метод и путь у эндпоинта один); запрос с ключом и вложениями — lab4. +- **Возможные улучшения:** сократить обнаружение зависшего backend (`timeout check 1s`), общий retry-бюджет на клиенте, меньше запросов к БД на запрос API (объединить проверку членства и версии истории), репликация чтения PostgreSQL, профилирование цены запроса при многих малых репликах. + +## Краткие ответы к вопросам защиты + +- *Отказ процесса и отказ узла:* процесс умирает, ОС/сеть узла живы — быстрые RST, LB мгновенно повторяет запрос; при потере узла пропадают и процессы, и сеть — приходится ждать проверок/таймаутов (как в эксперименте с `pause`), а локальные данные узла теряются (у нас БД одна — это SPOF). +- *`depends_on`/`healthcheck` не балансировщик:* они работают только при старте/мониторинге контейнеров и ничего не распределяют; запросы между репликами делит HAProxy и сам убирает неготовые (readiness каждую секунду). +- *Какие POST повторять после таймаута:* только защищённые `Idempotency-Key` (отправка сообщения); создание чата/пользователя повторять нельзя без расширения контракта. Ключ даёт «ровно один эффект»: одна транзакция «ключ + сообщение», конкурентные запросы ждут на уникальном индексе. +- *Что сломается при локальных сессиях:* запрос, попавший на другую реплику, не найдёт сессию (401), а sticky-сессии не лечат причину и не переживают отказ реплики; поэтому сессии в PostgreSQL. diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 00000000..dd4d1383 --- /dev/null +++ b/compose.yaml @@ -0,0 +1,172 @@ +# Lab 3: PostgreSQL + Valkey + N взаимозаменяемых API-реплик за HAProxy. +# Имя проекта задаёт префикс томов и сетей (messenger-lab3_pgdata): не пересекается со стендом lab2. +# Запуск (одна последовательность): +# sh scripts/init-secrets.sh && cp .env.example .env && docker compose --env-file .env up -d --build --wait +name: messenger-lab3 + +# Один образ и для API, и для миграций: схема всегда соответствует коду. build продублирован намеренно, +# чтобы `up --build` собрал образ раньше, чем стартует migrate (второй build берётся из кэша). +x-api-image: &api-image + image: messenger-api:lab3 + build: + context: . + dockerfile: Dockerfile + args: + APP_VERSION: ${APP_VERSION:-1} + +services: + db: + # PostgreSQL 17.11; тег закреплён digest'ом, сборка воспроизводима. + image: postgres:17@sha256:b8faeff7712663c2773a190181e1246e37e364b887611c04658c28b44e2408fe + restart: unless-stopped + # max_connections с запасом: до 8 реплик x пул DB_MAX_POOL_SIZE (по умолчанию 20) + миграции + служебные. + command: ["postgres", "-c", "max_connections=300"] + environment: + POSTGRES_DB: messenger + POSTGRES_USER: messenger + POSTGRES_PASSWORD_FILE: /run/secrets/db_password + secrets: + - db_password + volumes: + # Именованный volume: переживает restart/down; удаляется только явным `docker compose down -v`. + - pgdata:/var/lib/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready -U messenger -d messenger"] + interval: 5s + timeout: 3s + retries: 20 + start_period: 10s + deploy: + resources: + limits: + cpus: "${DB_CPUS:-2}" + memory: ${DB_MEMORY:-1g} + networks: [backend] + + cache: + # Valkey 8.1: кэш страниц истории сообщений. Источник истины — PostgreSQL, потеря содержимого кэша ничего не ломает, + # поэтому persistence выключена (--save "" --appendonly no). Память ограничена, вытеснение LRU. + # Кэш общий для всех реплик: ключ содержит версию истории чата, поэтому реплики не отдают друг другу устаревшие страницы. + image: valkey/valkey:8.1@sha256:640c5e62cea04b6d6f2084232651d0cc70362d31f4f805e7be94dbed6855e8f2 + restart: unless-stopped + command: + - sh + - -c + - exec valkey-server --requirepass "$$(cat /run/secrets/cache_password)" --save "" --appendonly no --maxmemory 64mb --maxmemory-policy allkeys-lru + secrets: + - cache_password + healthcheck: + test: ["CMD-SHELL", "REDISCLI_AUTH=\"$$(cat /run/secrets/cache_password)\" valkey-cli ping | grep -q PONG"] + interval: 5s + timeout: 3s + retries: 10 + deploy: + resources: + limits: + cpus: "0.5" + memory: 128m + networks: [backend] + + # One-shot: применяет миграции и завершается. API-реплики схему не меняют (MIGRATE_ON_START выключен), + # поэтому одновременный старт N реплик не создаёт гонку. Миграции только добавляют объекты (expand), что + # совместимо с ещё работающей предыдущей версией API при rolling update. + migrate: + <<: *api-image + command: ["--migrate"] + restart: "no" + depends_on: + db: + condition: service_healthy + environment: + DATABASE_URL_FILE: /run/secrets/database_url + secrets: + - database_url + networks: [backend] + + api: + <<: *api-image + restart: unless-stopped + # Без container_name и без published ports: сервис масштабируется (--scale api=N / API_REPLICAS), а снаружи + # реплики доступны только через lb. Кэш не входит в depends_on: API обязан работать без него. + depends_on: + migrate: + condition: service_completed_successfully + db: + condition: service_healthy + environment: + ASPNETCORE_URLS: http://0.0.0.0:8080 + APP_PORT: "8080" + SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-3600} + DATABASE_URL_FILE: /run/secrets/database_url + CACHE_URL_FILE: /run/secrets/cache_url + CACHE_TTL_SECONDS: ${CACHE_TTL_SECONDS:-300} + DIAGNOSTIC_HEADERS: ${DIAGNOSTIC_HEADERS:-false} + DB_MAX_POOL_SIZE: ${DB_MAX_POOL_SIZE:-20} + IDEMPOTENCY_TTL_SECONDS: ${IDEMPOTENCY_TTL_SECONDS:-86400} + SHUTDOWN_DRAIN_SECONDS: ${SHUTDOWN_DRAIN_SECONDS:-3} + MIGRATE_ON_START: "false" + secrets: + - database_url + - cache_url + expose: + - "8080" + healthcheck: + # Живость процесса (готовность проверяет LB). start_interval ускоряет первый успех для `up --wait`. + test: ["CMD", "dotnet", "Messenger.Api.dll", "--healthcheck"] + interval: 10s + timeout: 3s + retries: 3 + start_period: 20s + start_interval: 2s + # SIGTERM -> drain 3 с + до 5 с на активные запросы = < 10 с; 15 с — запас до SIGKILL. + stop_grace_period: 15s + deploy: + replicas: ${API_REPLICAS:-2} + resources: + limits: + cpus: "${API_CPUS:-1}" + memory: ${API_MEMORY:-512m} + networks: [backend] + + lb: + # HAProxy 3.0 LTS; digest закреплён. Образ получен через mirror.gcr.io (зеркало официального образа Docker Hub, + # тот же digest), потому что Docker Hub был недоступен при разработке. + image: mirror.gcr.io/library/haproxy:3.0-alpine@sha256:1c15903c50d5510dcc01de755049e7015a6dd3f35bb2dc4582e888116cb71d8f + restart: unless-stopped + depends_on: + api: + condition: service_healthy + volumes: + - ./infra/haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro + ports: + # Единственная публичная точка входа. + - "${LB_PUBLISHED_PORT:-8080}:8080" + # Статистика LB (состояние backend'ов): только с этого компьютера. + - "127.0.0.1:${LB_STATS_PORT:-8404}:8404" + healthcheck: + test: ["CMD-SHELL", "wget -q --spider http://127.0.0.1:8404/healthz"] + interval: 5s + timeout: 3s + retries: 5 + deploy: + resources: + limits: + cpus: "${LB_CPUS:-1}" + memory: 128m + networks: [backend] + +volumes: + pgdata: + +networks: + backend: + +secrets: + db_password: + file: ./secrets/db_password + database_url: + file: ./secrets/database_url.compose + cache_password: + file: ./secrets/cache_password + cache_url: + file: ./secrets/cache_url diff --git a/dotnet-tools.json b/dotnet-tools.json new file mode 100644 index 00000000..39007e02 --- /dev/null +++ b/dotnet-tools.json @@ -0,0 +1,13 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "10.0.13", + "commands": [ + "dotnet-ef" + ], + "rollForward": false + } + } +} \ No newline at end of file diff --git a/evidence/level3/failover-1.txt b/evidence/level3/failover-1.txt new file mode 100644 index 00000000..e3e1bef8 --- /dev/null +++ b/evidence/level3/failover-1.txt @@ -0,0 +1,17 @@ +## failover #1: контейнеры до +messenger-lab3-api-12 Up 29 seconds (healthy) +messenger-lab3-api-9 Up 30 seconds (healthy) +Executing explicit failover hook; hook output suppressed to avoid leaking secrets. +{"observed_instances_before": 2, "successful_writes": 125, "failed_attempts": 0, "first_recovery_seconds": 3.691} +PASS: failover preserved confirmed data and existing session. Hook scope needs operator evidence. +## контейнеры после (остановленная реплика должна быть Exited) +messenger-lab3-api-12 Up 49 seconds (healthy) +messenger-lab3-api-9 Exited (0) 12 seconds ago + Container messenger-lab3-api-12 Running + Container messenger-lab3-api-9 Starting + Container messenger-lab3-api-9 Started + Container messenger-lab3-api-9 Waiting + Container messenger-lab3-api-12 Waiting + Container messenger-lab3-api-9 Healthy + Container messenger-lab3-api-12 Healthy +LB sees 2/2 api replicas UP diff --git a/evidence/level3/failover-2.txt b/evidence/level3/failover-2.txt new file mode 100644 index 00000000..4124dad6 --- /dev/null +++ b/evidence/level3/failover-2.txt @@ -0,0 +1,17 @@ +## failover #2: контейнеры до +messenger-lab3-api-12 Up 52 seconds (healthy) +messenger-lab3-api-9 Up 3 seconds (healthy) +Executing explicit failover hook; hook output suppressed to avoid leaking secrets. +{"observed_instances_before": 2, "successful_writes": 136, "failed_attempts": 0, "first_recovery_seconds": 3.687} +PASS: failover preserved confirmed data and existing session. Hook scope needs operator evidence. +## контейнеры после (остановленная реплика должна быть Exited) +messenger-lab3-api-12 Up About a minute (healthy) +messenger-lab3-api-9 Exited (0) 11 seconds ago + Container messenger-lab3-api-12 Running + Container messenger-lab3-api-9 Starting + Container messenger-lab3-api-9 Started + Container messenger-lab3-api-9 Waiting + Container messenger-lab3-api-12 Waiting + Container messenger-lab3-api-9 Healthy + Container messenger-lab3-api-12 Healthy +LB sees 2/2 api replicas UP diff --git a/evidence/level3/idempotency-race.json b/evidence/level3/idempotency-race.json new file mode 100644 index 00000000..62888ff1 --- /dev/null +++ b/evidence/level3/idempotency-race.json @@ -0,0 +1,14 @@ +{ + "rounds": 20, + "parallel_requests_per_round": 40, + "requests_total": 840, + "messages_in_history": 21, + "messages_expected": 21, + "replicas_that_served_requests": 2, + "requests_per_replica": { + "13b0fc8945bc": 400, + "65e3ad44afc9": 400 + }, + "result": "PASS", + "failures": [] +} \ No newline at end of file diff --git a/evidence/level3/persistence.txt b/evidence/level3/persistence.txt new file mode 100644 index 00000000..bbc5e6a2 --- /dev/null +++ b/evidence/level3/persistence.txt @@ -0,0 +1,15 @@ +## persistence: старт контейнеров ДО +/messenger-lab3-api-12 65e3ad44afc9 started=2026-11-06T16:56:21.3113159Z +/messenger-lab3-api-9 13b0fc8945bc started=2026-11-06T16:57:34.953569522Z +/messenger-lab3-cache-1 e014a8d18926 started=2026-11-06T16:56:12.606839975Z +/messenger-lab3-db-1 a902ccd96269 started=2026-11-06T16:56:12.448360493Z +/messenger-lab3-lb-1 d99ad9b80ef3 started=2026-11-06T16:56:24.157711719Z +Executing explicit persistence hook; hook output suppressed to avoid leaking secrets. +PASS: persistence preserved confirmed data and existing session. Hook scope needs operator evidence. +## старт контейнеров ПОСЛЕ (время старта db/cache/api/lb должно измениться; volume pgdata прежний) +/messenger-lab3-api-12 65e3ad44afc9 started=2026-11-06T16:57:56.21787969Z +/messenger-lab3-api-9 13b0fc8945bc started=2026-11-06T16:57:55.931156961Z +/messenger-lab3-cache-1 e014a8d18926 started=2026-11-06T16:57:47.861880861Z +/messenger-lab3-db-1 a902ccd96269 started=2026-11-06T16:57:47.558274049Z +/messenger-lab3-lb-1 d99ad9b80ef3 started=2026-11-06T16:57:59.030347367Z +messenger-lab3_pgdata diff --git a/evidence/level3/smoke.txt b/evidence/level3/smoke.txt new file mode 100644 index 00000000..fc20f9dd --- /dev/null +++ b/evidence/level3/smoke.txt @@ -0,0 +1 @@ +PASS: lab3 public API scenario; infrastructure and grading evidence remain separate. diff --git a/evidence/level3/topology.txt b/evidence/level3/topology.txt new file mode 100644 index 00000000..9f87fdd5 --- /dev/null +++ b/evidence/level3/topology.txt @@ -0,0 +1,26 @@ +# 2026-11-06T16:56:37Z commit=0ab3a34 +## docker compose ps (публикуется только lb; у api порт только внутри сети) +NAME SERVICE STATUS PORTS +messenger-lab3-api-12 api Up 16 seconds (healthy) 8080/tcp +messenger-lab3-api-9 api Up 16 seconds (healthy) 8080/tcp +messenger-lab3-cache-1 cache Up 24 seconds (healthy) 6379/tcp +messenger-lab3-db-1 db Up 25 seconds (healthy) 5432/tcp +messenger-lab3-lb-1 lb Up 13 seconds (healthy) 127.0.0.1:8404->8404/tcp, 0.0.0.0:8081->8080/tcp, [::]:8081->8080/tcp +## лимиты ресурсов (NanoCpus / Memory) и образы +/messenger-lab3-api-12 nanocpus=1000000000 mem_bytes=536870912 image=messenger-api:lab3 +/messenger-lab3-api-9 nanocpus=1000000000 mem_bytes=536870912 image=messenger-api:lab3 +/messenger-lab3-cache-1 nanocpus=500000000 mem_bytes=134217728 image=valkey/valkey:8.1@sha256:640c5e62cea04b6d6f2084232651d0cc70362d31f4f805e7be94dbed6855e8f2 +/messenger-lab3-db-1 nanocpus=2000000000 mem_bytes=1073741824 image=postgres:17@sha256:b8faeff7712663c2773a190181e1246e37e364b887611c04658c28b44e2408fe +/messenger-lab3-lb-1 nanocpus=1000000000 mem_bytes=134217728 image=mirror.gcr.io/library/haproxy:3.0-alpine@sha256:1c15903c50d5510dcc01de755049e7015a6dd3f35bb2dc4582e888116cb71d8f +## container_name не задан; число реплик api: +2 +## состояние backend'ов в HAProxy +api api1 UP +api api2 UP +api api3 MAINT (resolution) +api api4 MAINT (resolution) +api api5 MAINT (resolution) +api api6 MAINT (resolution) +api api7 MAINT (resolution) +api api8 MAINT (resolution) +api BACKEND UP diff --git a/evidence/level4/detection-hung-backend.txt b/evidence/level4/detection-hung-backend.txt new file mode 100644 index 00000000..70b5ea9e --- /dev/null +++ b/evidence/level4/detection-hung-backend.txt @@ -0,0 +1,5 @@ +# Время обнаружения зависшего backend (docker pause) в HAProxy; 2026-11-06T17:01:52Z +# inter 1s, fall 2, timeout check 2s -> расчёт fall*(timeout check + inter) = 6 s +замер 1: DOWN detected after 5.66 s +замер 2: DOWN detected after 5.86 s +замер 3: DOWN detected after 5.82 s diff --git a/evidence/level4/rolling-update.csv b/evidence/level4/rolling-update.csv new file mode 100644 index 00000000..fdced091 --- /dev/null +++ b/evidence/level4/rolling-update.csv @@ -0,0 +1,88 @@ +second,ok,errors +0,268,0 +1,222,0 +2,280,0 +3,275,0 +4,286,0 +5,240,0 +6,280,0 +7,239,0 +8,254,0 +9,286,0 +10,264,0 +11,278,0 +12,282,0 +13,247,0 +14,303,0 +15,248,0 +16,298,0 +17,270,0 +18,260,0 +19,296,0 +20,276,0 +21,266,0 +22,258,0 +23,288,0 +24,274,0 +25,226,0 +26,230,0 +27,277,0 +28,185,0 +29,184,0 +30,166,0 +31,191,0 +32,185,0 +33,232,0 +34,182,0 +35,192,0 +36,180,0 +37,243,0 +38,246,0 +39,256,0 +40,271,0 +41,269,0 +42,263,0 +43,231,0 +44,276,0 +45,225,0 +46,289,0 +47,264,0 +48,277,0 +49,255,0 +50,265,0 +51,264,0 +52,290,0 +53,249,0 +54,267,0 +55,251,0 +56,278,0 +57,238,0 +58,243,0 +59,272,0 +60,266,0 +61,288,0 +62,36,0 +64,18,0 +65,280,0 +66,286,0 +67,242,0 +68,259,0 +69,238,0 +70,225,0 +71,41,0 +74,112,0 +75,265,0 +76,88,0 +78,275,0 +79,220,0 +80,172,0 +81,236,0 +82,236,0 +83,202,0 +84,214,0 +85,211,0 +86,263,0 +87,255,0 +88,243,0 +89,229,0 +90,44,0 diff --git a/evidence/level4/rolling-update.json b/evidence/level4/rolling-update.json new file mode 100644 index 00000000..88289e0b --- /dev/null +++ b/evidence/level4/rolling-update.json @@ -0,0 +1,120 @@ +{ + "scenario": "rolling-update", + "base_url": "http://localhost:8081", + "workers": 8, + "users_and_chats": 4, + "think_time_s": 0.02, + "replicas_before": [ + "6a5a3da59476", + "73c5482d0d13" + ], + "total_seconds": 90.2, + "overall": { + "from_s": 5, + "to_s": 90.2, + "requests": 19263, + "errors": 0, + "rps_ok": 226.1, + "error_rate_pct": 0.0, + "p50_ms": 8.8, + "p95_ms": 39.5, + "p99_ms": 70.4, + "instances": { + "73c5482d0d13": 7431, + "6a5a3da59476": 8169, + "358f63ce0276": 2236, + "ce29e4c7dcab": 1427 + } + }, + "phases": [ + { + "from_s": 5.0, + "to_s": 20.0, + "requests": 4040, + "errors": 0, + "rps_ok": 269.3, + "error_rate_pct": 0.0, + "p50_ms": 7.3, + "p95_ms": 27.0, + "p99_ms": 58.1, + "instances": { + "6a5a3da59476": 2020, + "73c5482d0d13": 2020 + }, + "name": "baseline" + }, + { + "from_s": 20.0, + "to_s": 80.2, + "requests": 12936, + "errors": 0, + "rps_ok": 215.1, + "error_rate_pct": 0.0, + "p50_ms": 9.1, + "p95_ms": 39.4, + "p99_ms": 71.2, + "instances": { + "6a5a3da59476": 6149, + "73c5482d0d13": 5406, + "358f63ce0276": 1095, + "ce29e4c7dcab": 286 + }, + "name": "rolling update", + "errors_after_action": 0, + "recovery_seconds": 0.0 + }, + { + "from_s": 80.2, + "to_s": 90.2, + "requests": 2279, + "errors": 0, + "rps_ok": 227.9, + "error_rate_pct": 0.0, + "p50_ms": 10.8, + "p95_ms": 45.5, + "p99_ms": 73.2, + "instances": { + "ce29e4c7dcab": 1140, + "358f63ce0276": 1139 + }, + "name": "after update" + } + ], + "actions": [ + { + "action": "rolling-update", + "exit_code": 0, + "seconds": 60.14, + "at_s": 20.0, + "log": [ + "18:39:51 replicas before: 2; building version 1793979591", + "18:40:32 migrations applied once", + "18:40:38 new replica is UP in LB; stopping old 73c5482d0d13 (version 1)", + "18:40:48 new replica is UP in LB; stopping old 6a5a3da59476 (version 1)", + "18:40:51 replicas after:", + "18:40:52 358f63ce0276 version 1793979591", + "18:40:52 ce29e4c7dcab version 1793979591" + ] + } + ], + "events": [ + { + "t_s": 20.0, + "event": "ROLLING UPDATE start" + }, + { + "t_s": 80.2, + "event": "rolling-update.sh exit=0 in 60.1s" + } + ], + "data_check": { + "post_keys_used": 10294, + "post_confirmed": 10294, + "post_retries_with_same_key": 0, + "confirmed_missing_or_duplicated": 0, + "keys_with_duplicate_messages": 0, + "unconfirmed_but_written_once": 0, + "result": "PASS", + "problems": [] + } +} \ No newline at end of file diff --git a/evidence/level4/sequential-kill.csv b/evidence/level4/sequential-kill.csv new file mode 100644 index 00000000..353f1aef --- /dev/null +++ b/evidence/level4/sequential-kill.csv @@ -0,0 +1,68 @@ +second,ok,errors +0,231,0 +1,221,0 +2,273,0 +3,239,0 +4,270,0 +5,228,0 +6,214,0 +7,210,0 +8,191,0 +9,268,0 +10,219,0 +11,205,0 +12,247,0 +13,288,0 +14,264,0 +15,270,0 +16,280,0 +17,262,0 +18,223,0 +19,286,0 +20,84,0 +22,90,0 +23,226,0 +24,233,0 +25,235,0 +26,219,0 +27,238,0 +28,181,0 +29,217,0 +30,231,0 +31,218,0 +32,16,0 +35,125,0 +36,266,0 +37,254,0 +38,268,0 +39,222,0 +40,226,0 +41,227,0 +42,210,0 +43,205,0 +44,152,0 +46,39,0 +47,152,0 +48,165,0 +49,176,0 +50,170,0 +51,170,0 +52,158,0 +53,170,0 +54,140,0 +55,138,0 +56,24,0 +58,3,0 +59,152,0 +60,175,0 +61,242,0 +62,228,0 +63,250,0 +64,219,0 +65,194,0 +66,219,0 +67,230,0 +68,243,0 +69,182,0 +70,234,0 +71,213,0 diff --git a/evidence/level4/sequential-kill.json b/evidence/level4/sequential-kill.json new file mode 100644 index 00000000..0c77a633 --- /dev/null +++ b/evidence/level4/sequential-kill.json @@ -0,0 +1,189 @@ +{ + "scenario": "sequential-stop", + "base_url": "http://localhost:8081", + "workers": 8, + "users_and_chats": 4, + "think_time_s": 0.02, + "replicas_before": [ + "6a5a3da59476", + "73c5482d0d13" + ], + "total_seconds": 71.9, + "overall": { + "from_s": 5, + "to_s": 71.9, + "requests": 12284, + "errors": 0, + "rps_ok": 183.7, + "error_rate_pct": 0.0, + "p50_ms": 10.2, + "p95_ms": 55.0, + "p99_ms": 75.8, + "instances": { + "6a5a3da59476": 5980, + "73c5482d0d13": 6304 + } + }, + "phases": [ + { + "from_s": 5.0, + "to_s": 20.0, + "requests": 3652, + "errors": 0, + "rps_ok": 243.5, + "error_rate_pct": 0.0, + "p50_ms": 8.8, + "p95_ms": 49.6, + "p99_ms": 71.0, + "instances": { + "73c5482d0d13": 1827, + "6a5a3da59476": 1825 + }, + "name": "baseline" + }, + { + "from_s": 20.0, + "to_s": 30.7, + "requests": 1880, + "errors": 0, + "rps_ok": 176.6, + "error_rate_pct": 0.0, + "p50_ms": 11.2, + "p95_ms": 53.3, + "p99_ms": 75.0, + "instances": { + "6a5a3da59476": 28, + "73c5482d0d13": 1852 + }, + "name": "replica 6a5a3da59476 stopped", + "errors_after_action": 0, + "recovery_seconds": 0.0 + }, + { + "from_s": 30.7, + "to_s": 44.4, + "requests": 2391, + "errors": 0, + "rps_ok": 173.4, + "error_rate_pct": 0.0, + "p50_ms": 9.4, + "p95_ms": 50.2, + "p99_ms": 75.8, + "instances": { + "73c5482d0d13": 1346, + "6a5a3da59476": 1045 + }, + "name": "after restore of 6a5a3da59476", + "errors_after_action": 0, + "recovery_seconds": 0.0 + }, + { + "from_s": 44.4, + "to_s": 55.1, + "requests": 1426, + "errors": 0, + "rps_ok": 134.2, + "error_rate_pct": 0.0, + "p50_ms": 18.1, + "p95_ms": 71.7, + "p99_ms": 79.5, + "instances": { + "6a5a3da59476": 1404, + "73c5482d0d13": 22 + }, + "name": "replica 73c5482d0d13 stopped", + "errors_after_action": 0, + "recovery_seconds": 0.0 + }, + { + "from_s": 55.1, + "to_s": 71.8, + "requests": 2930, + "errors": 0, + "rps_ok": 174.7, + "error_rate_pct": 0.0, + "p50_ms": 10.7, + "p95_ms": 54.8, + "p99_ms": 76.3, + "instances": { + "6a5a3da59476": 1675, + "73c5482d0d13": 1255 + }, + "name": "after restore of 73c5482d0d13", + "errors_after_action": 0, + "recovery_seconds": 0.0 + } + ], + "actions": [ + { + "action": "stop", + "target": "6a5a3da59476", + "exit_code": 0, + "hook_seconds": 0.64, + "at_s": 20.0 + }, + { + "action": "restore", + "exit_code": 0, + "restore_seconds": 3.79, + "at_s": 30.7 + }, + { + "action": "stop", + "target": "73c5482d0d13", + "exit_code": 0, + "hook_seconds": 0.63, + "at_s": 44.4 + }, + { + "action": "restore", + "exit_code": 0, + "restore_seconds": 6.77, + "at_s": 55.1 + } + ], + "events": [ + { + "t_s": 20.0, + "event": "STOP replica 6a5a3da59476" + }, + { + "t_s": 20.7, + "event": "stop-one.sh exit=0 in 0.6s" + }, + { + "t_s": 30.7, + "event": "RESTORE replicas" + }, + { + "t_s": 34.4, + "event": "restore-replicas.sh exit=0 in 3.8s: ['LB sees 2/2 api replicas UP']" + }, + { + "t_s": 44.4, + "event": "STOP replica 73c5482d0d13" + }, + { + "t_s": 45.1, + "event": "stop-one.sh exit=0 in 0.6s" + }, + { + "t_s": 55.1, + "event": "RESTORE replicas" + }, + { + "t_s": 61.8, + "event": "restore-replicas.sh exit=0 in 6.8s: ['LB sees 2/2 api replicas UP']" + } + ], + "data_check": { + "post_keys_used": 6757, + "post_confirmed": 6757, + "post_retries_with_same_key": 0, + "confirmed_missing_or_duplicated": 0, + "keys_with_duplicate_messages": 0, + "unconfirmed_but_written_once": 0, + "result": "PASS", + "problems": [] + } +} \ No newline at end of file diff --git a/evidence/level4/sequential-pause.csv b/evidence/level4/sequential-pause.csv new file mode 100644 index 00000000..c71ce02c --- /dev/null +++ b/evidence/level4/sequential-pause.csv @@ -0,0 +1,50 @@ +second,ok,errors +0,241,0 +1,289,0 +2,275,0 +3,279,0 +4,204,0 +5,267,0 +6,275,0 +7,273,0 +8,285,0 +9,224,0 +10,217,0 +11,276,0 +12,276,0 +13,275,0 +14,206,0 +15,196,0 +16,218,0 +17,292,0 +18,274,0 +19,273,0 +20,72,0 +25,8,3 +30,135,6 +31,268,0 +32,293,0 +33,291,0 +34,295,0 +35,273,0 +36,281,0 +37,295,0 +38,290,0 +39,289,0 +40,275,0 +41,294,0 +42,104,0 +47,8,5 +52,125,7 +53,267,0 +54,280,0 +55,280,0 +56,292,0 +57,272,0 +58,286,0 +59,291,0 +60,291,0 +61,270,0 +62,275,0 +63,293,0 +64,85,0 diff --git a/evidence/level4/sequential-pause.json b/evidence/level4/sequential-pause.json new file mode 100644 index 00000000..aa60b578 --- /dev/null +++ b/evidence/level4/sequential-pause.json @@ -0,0 +1,197 @@ +{ + "scenario": "sequential-stop", + "base_url": "http://localhost:8081", + "workers": 8, + "users_and_chats": 4, + "think_time_s": 0.02, + "replicas_before": [ + "13b0fc8945bc", + "65e3ad44afc9" + ], + "total_seconds": 64.3, + "overall": { + "from_s": 5, + "to_s": 64.3, + "requests": 10626, + "errors": 21, + "rps_ok": 178.8, + "error_rate_pct": 0.2, + "p50_ms": 8.3, + "p95_ms": 19.8, + "p99_ms": 52.9, + "instances": { + "13b0fc8945bc": 5312, + "65e3ad44afc9": 5293 + } + }, + "phases": [ + { + "from_s": 5.0, + "to_s": 20.0, + "requests": 3827, + "errors": 0, + "rps_ok": 255.1, + "error_rate_pct": 0.0, + "p50_ms": 8.6, + "p95_ms": 44.9, + "p99_ms": 59.5, + "instances": { + "65e3ad44afc9": 1914, + "13b0fc8945bc": 1913 + }, + "name": "baseline" + }, + { + "from_s": 20.0, + "to_s": 30.3, + "requests": 82, + "errors": 3, + "rps_ok": 7.7, + "error_rate_pct": 3.66, + "p50_ms": 9.1, + "p95_ms": 15.9, + "p99_ms": 5011.2, + "instances": { + "65e3ad44afc9": 47, + "13b0fc8945bc": 32 + }, + "name": "replica 13b0fc8945bc stopped", + "errors_after_action": 21, + "errors_in_first_cluster": 3, + "first_error_after_s": 5.23, + "recovery_seconds": 5.26 + }, + { + "from_s": 30.3, + "to_s": 42.2, + "requests": 3327, + "errors": 6, + "rps_ok": 279.1, + "error_rate_pct": 0.18, + "p50_ms": 8.0, + "p95_ms": 14.4, + "p99_ms": 45.2, + "instances": { + "65e3ad44afc9": 1780, + "13b0fc8945bc": 1541 + }, + "name": "after restore of 13b0fc8945bc", + "errors_after_action": 18, + "errors_in_first_cluster": 6, + "first_error_after_s": 0.0, + "recovery_seconds": 0.15 + }, + { + "from_s": 42.2, + "to_s": 52.4, + "requests": 75, + "errors": 5, + "rps_ok": 6.9, + "error_rate_pct": 6.67, + "p50_ms": 7.9, + "p95_ms": 12.9, + "p99_ms": 5009.7, + "instances": { + "65e3ad44afc9": 27, + "13b0fc8945bc": 43 + }, + "name": "replica 65e3ad44afc9 stopped", + "errors_after_action": 12, + "errors_in_first_cluster": 5, + "first_error_after_s": 5.2, + "recovery_seconds": 5.3 + }, + { + "from_s": 52.4, + "to_s": 64.3, + "requests": 3313, + "errors": 7, + "rps_ok": 277.4, + "error_rate_pct": 0.21, + "p50_ms": 8.2, + "p95_ms": 15.0, + "p99_ms": 33.4, + "instances": { + "13b0fc8945bc": 1782, + "65e3ad44afc9": 1524 + }, + "name": "after restore of 65e3ad44afc9", + "errors_after_action": 7, + "errors_in_first_cluster": 7, + "first_error_after_s": 0.03, + "recovery_seconds": 0.15 + } + ], + "actions": [ + { + "action": "stop", + "target": "13b0fc8945bc", + "exit_code": 0, + "hook_seconds": 0.24, + "at_s": 20.0 + }, + { + "action": "restore", + "exit_code": 0, + "restore_seconds": 1.9, + "at_s": 30.3 + }, + { + "action": "stop", + "target": "65e3ad44afc9", + "exit_code": 0, + "hook_seconds": 0.21, + "at_s": 42.2 + }, + { + "action": "restore", + "exit_code": 0, + "restore_seconds": 1.92, + "at_s": 52.4 + } + ], + "events": [ + { + "t_s": 20.0, + "event": "STOP replica 13b0fc8945bc" + }, + { + "t_s": 20.3, + "event": "stop-one.sh exit=0 in 0.2s" + }, + { + "t_s": 30.3, + "event": "RESTORE replicas" + }, + { + "t_s": 32.2, + "event": "restore-replicas.sh exit=0 in 1.9s: ['LB sees 2/2 api replicas UP']" + }, + { + "t_s": 42.2, + "event": "STOP replica 65e3ad44afc9" + }, + { + "t_s": 42.4, + "event": "stop-one.sh exit=0 in 0.2s" + }, + { + "t_s": 52.4, + "event": "RESTORE replicas" + }, + { + "t_s": 54.3, + "event": "restore-replicas.sh exit=0 in 1.9s: ['LB sees 2/2 api replicas UP']" + } + ], + "data_check": { + "post_keys_used": 5948, + "post_confirmed": 5948, + "post_retries_with_same_key": 16, + "confirmed_missing_or_duplicated": 0, + "keys_with_duplicate_messages": 0, + "unconfirmed_but_written_once": 0, + "result": "PASS", + "problems": [] + } +} \ No newline at end of file diff --git a/evidence/level4/sequential-stop.csv b/evidence/level4/sequential-stop.csv new file mode 100644 index 00000000..9d1bbdb0 --- /dev/null +++ b/evidence/level4/sequential-stop.csv @@ -0,0 +1,75 @@ +second,ok,errors +0,271,0 +1,289,0 +2,196,0 +3,214,0 +4,260,0 +5,241,0 +6,196,0 +7,196,0 +8,285,0 +9,262,0 +10,254,0 +11,263,0 +12,273,0 +13,286,0 +14,280,0 +15,221,0 +16,275,0 +17,246,0 +18,239,0 +19,298,0 +20,242,0 +21,200,0 +22,262,0 +23,271,0 +24,267,0 +25,235,0 +26,239,0 +27,247,0 +28,261,0 +29,266,0 +30,257,0 +31,263,0 +32,259,0 +33,254,0 +34,186,0 +36,16,0 +37,237,0 +38,274,0 +39,266,0 +40,232,0 +41,233,0 +42,253,0 +43,265,0 +44,272,0 +45,250,0 +46,235,0 +47,239,0 +48,267,0 +49,182,0 +50,152,0 +51,172,0 +52,171,0 +53,160,0 +54,164,0 +55,162,0 +56,167,0 +57,135,0 +58,157,0 +59,163,0 +60,183,0 +61,118,0 +64,80,0 +65,182,0 +66,221,0 +67,215,0 +68,249,0 +69,226,0 +70,248,0 +71,242,0 +72,259,0 +73,254,0 +74,185,0 +75,254,0 +76,63,0 diff --git a/evidence/level4/sequential-stop.json b/evidence/level4/sequential-stop.json new file mode 100644 index 00000000..ec9568d0 --- /dev/null +++ b/evidence/level4/sequential-stop.json @@ -0,0 +1,189 @@ +{ + "scenario": "sequential-stop", + "base_url": "http://localhost:8081", + "workers": 8, + "users_and_chats": 4, + "think_time_s": 0.02, + "replicas_before": [ + "6a5a3da59476", + "73c5482d0d13" + ], + "total_seconds": 76.3, + "overall": { + "from_s": 5, + "to_s": 76.3, + "requests": 15327, + "errors": 0, + "rps_ok": 215.0, + "error_rate_pct": 0.0, + "p50_ms": 9.9, + "p95_ms": 48.3, + "p99_ms": 71.5, + "instances": { + "6a5a3da59476": 7181, + "73c5482d0d13": 8146 + } + }, + "phases": [ + { + "from_s": 5.0, + "to_s": 20.0, + "requests": 3815, + "errors": 0, + "rps_ok": 254.3, + "error_rate_pct": 0.0, + "p50_ms": 8.8, + "p95_ms": 42.7, + "p99_ms": 57.6, + "instances": { + "73c5482d0d13": 1907, + "6a5a3da59476": 1908 + }, + "name": "baseline" + }, + { + "from_s": 20.0, + "to_s": 33.8, + "requests": 3483, + "errors": 0, + "rps_ok": 252.6, + "error_rate_pct": 0.0, + "p50_ms": 8.9, + "p95_ms": 28.2, + "p99_ms": 51.3, + "instances": { + "6a5a3da59476": 200, + "73c5482d0d13": 3283 + }, + "name": "replica 6a5a3da59476 stopped", + "errors_after_action": 0, + "recovery_seconds": 0.0 + }, + { + "from_s": 33.8, + "to_s": 47.1, + "requests": 2764, + "errors": 0, + "rps_ok": 208.1, + "error_rate_pct": 0.0, + "p50_ms": 8.9, + "p95_ms": 36.0, + "p99_ms": 69.4, + "instances": { + "73c5482d0d13": 1493, + "6a5a3da59476": 1271 + }, + "name": "after restore of 6a5a3da59476", + "errors_after_action": 0, + "recovery_seconds": 0.0 + }, + { + "from_s": 47.1, + "to_s": 60.7, + "requests": 2429, + "errors": 0, + "rps_ok": 177.8, + "error_rate_pct": 0.0, + "p50_ms": 16.2, + "p95_ms": 66.4, + "p99_ms": 76.1, + "instances": { + "73c5482d0d13": 246, + "6a5a3da59476": 2183 + }, + "name": "replica 73c5482d0d13 stopped", + "errors_after_action": 0, + "recovery_seconds": 0.0 + }, + { + "from_s": 60.7, + "to_s": 76.3, + "requests": 2833, + "errors": 0, + "rps_ok": 182.5, + "error_rate_pct": 0.0, + "p50_ms": 11.8, + "p95_ms": 49.2, + "p99_ms": 78.1, + "instances": { + "6a5a3da59476": 1618, + "73c5482d0d13": 1215 + }, + "name": "after restore of 73c5482d0d13", + "errors_after_action": 0, + "recovery_seconds": 0.0 + } + ], + "actions": [ + { + "action": "stop", + "target": "6a5a3da59476", + "exit_code": 0, + "hook_seconds": 3.79, + "at_s": 20.0 + }, + { + "action": "restore", + "exit_code": 0, + "restore_seconds": 3.28, + "at_s": 33.8 + }, + { + "action": "stop", + "target": "73c5482d0d13", + "exit_code": 0, + "hook_seconds": 3.66, + "at_s": 47.1 + }, + { + "action": "restore", + "exit_code": 0, + "restore_seconds": 5.52, + "at_s": 60.7 + } + ], + "events": [ + { + "t_s": 20.0, + "event": "STOP replica 6a5a3da59476" + }, + { + "t_s": 23.8, + "event": "stop-one.sh exit=0 in 3.8s" + }, + { + "t_s": 33.8, + "event": "RESTORE replicas" + }, + { + "t_s": 37.1, + "event": "restore-replicas.sh exit=0 in 3.3s: ['LB sees 2/2 api replicas UP']" + }, + { + "t_s": 47.1, + "event": "STOP replica 73c5482d0d13" + }, + { + "t_s": 50.7, + "event": "stop-one.sh exit=0 in 3.7s" + }, + { + "t_s": 60.7, + "event": "RESTORE replicas" + }, + { + "t_s": 66.3, + "event": "restore-replicas.sh exit=0 in 5.5s: ['LB sees 2/2 api replicas UP']" + } + ], + "data_check": { + "post_keys_used": 8277, + "post_confirmed": 8277, + "post_retries_with_same_key": 0, + "confirmed_missing_or_duplicated": 0, + "keys_with_duplicate_messages": 0, + "unconfirmed_but_written_once": 0, + "result": "PASS", + "problems": [] + } +} \ No newline at end of file diff --git a/evidence/track1/diag.jsonl b/evidence/track1/diag.jsonl new file mode 100644 index 00000000..911ca82e --- /dev/null +++ b/evidence/track1/diag.jsonl @@ -0,0 +1,9 @@ +{"label":"D-diag-4x0.5-256m","timestamp":"2026-11-06T16:03:56.0006028\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.27,"ok":6239,"errors":0,"ok_get":4984,"ok_post":1255,"rps":307.7,"p50_ms":108.12,"p95_ms":711.22,"p99_ms":1034.71,"cpu_pct":{"api":200.8,"lb":15.5,"db":66.9,"cache":4.7}} +{"label":"D-diag-4x0.5-1024m","timestamp":"2026-11-06T16:06:22.2841093\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.26,"ok":6968,"errors":0,"ok_get":5600,"ok_post":1368,"rps":344,"p50_ms":110.25,"p95_ms":511.02,"p99_ms":711.37,"cpu_pct":{"api":204,"lb":17.5,"db":78.9,"cache":4.4}} +{"label":"D-diag-1x2.0-1024m","timestamp":"2026-11-06T16:07:31.6312009\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.04,"ok":15886,"errors":0,"ok_get":12701,"ok_post":3185,"rps":792.8,"p50_ms":80.73,"p95_ms":120.47,"p99_ms":161.79,"cpu_pct":{"api":200.9,"lb":28.4,"db":130.4,"cache":4.4}} +{"label":"D-diag2-4x0.5","timestamp":"2026-11-06T16:10:15.3681126\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.16,"ok":7033,"errors":0,"ok_get":5633,"ok_post":1400,"rps":348.8,"p50_ms":106.54,"p95_ms":511.74,"p99_ms":1019.47,"cpu_pct":{"api":199.2,"lb":17.3,"db":73.8,"cache":4.8}} +{"label":"D-diag2-1x2.0","timestamp":"2026-11-06T16:11:25.0375500\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.06,"ok":15610,"errors":0,"ok_get":12504,"ok_post":3106,"rps":778.1,"p50_ms":81.59,"p95_ms":123.69,"p99_ms":176.95,"cpu_pct":{"api":201.8,"lb":28.3,"db":129.9,"cache":4.1}} +{"label":"E-cpuset01-1x","timestamp":"2026-11-06T16:15:00.1444600\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.04,"ok":18580,"errors":0,"ok_get":14824,"ok_post":3756,"rps":927.1,"p50_ms":66.51,"p95_ms":104.05,"p99_ms":124.71,"cpu_pct":{"api":199.6,"lb":30.9,"db":133,"cache":4.4}} +{"label":"E-cpuset01-4x","timestamp":"2026-11-06T16:16:15.6164819\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.07,"ok":11329,"errors":0,"ok_get":9101,"ok_post":2228,"rps":564.5,"p50_ms":84.85,"p95_ms":312.72,"p99_ms":431.02,"cpu_pct":{"api":202.9,"lb":24.1,"db":89.9,"cache":5.9}} +{"label":"E-cpuset01-1x","timestamp":"2026-11-06T16:17:14.8661071\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.03,"ok":18634,"errors":0,"ok_get":14947,"ok_post":3687,"rps":930.2,"p50_ms":65.97,"p95_ms":105.52,"p99_ms":129.84,"cpu_pct":{"api":201.2,"lb":31.1,"db":131.1,"cache":3.9}} +{"label":"E-cpuset01-4x","timestamp":"2026-11-06T16:18:34.6884111\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.05,"ok":11672,"errors":0,"ok_get":9217,"ok_post":2455,"rps":582.1,"p50_ms":85.12,"p95_ms":294.25,"p99_ms":440.59,"cpu_pct":{"api":215,"lb":26.6,"db":99,"cache":6.3}} diff --git a/evidence/track1/fig-a-fixed-budget.png b/evidence/track1/fig-a-fixed-budget.png new file mode 100644 index 0000000000000000000000000000000000000000..265609cbd7af7b1e0239c676224eba19cab2f292 GIT binary patch literal 30819 zcmd43XH-;M*CmXihyfEuR6sxwNs=X_fKUVxP;!BRR6qfeb1+;*lu+a%DHJ&g6ge4C zaw!@XG=IHX!-jqu1p`)F(t)n&O5wo+Yy#vP9 zMv#~PIxjyrvxTFhor5?ZANGHKg4fpGoX^2_dkoHU&`wFufr^TL8~Ja~fiSV>R8%gl zDEXWBTw`Yj4@A*-t^EE&&0V=-MBrqpq`gWCpryUatTgwOnT15)dU}b#iI$bsIDTAy z|DF(DX6F0H39lE2>NjFHd^oDDMe5C5Le-oXwj^7FP0a)xLgV5}9VkN%^gY%hF>rC@ z2vIuMi##VBzAVA}{{EDETxsv$U+K`Y?b-e5BNs9R$npL3Uew>8ejoB<`}>pY3)z!@ zf2z2}eDLp2MwkC@p6;O^FO~1=+*DU)zWb78Z>2|Ztdxhg%|OZJvwTKjvxDW01+CH- zCPuy*lsnJhmZr&#?MaHwbKlpOrp>lD*A}SJLdb1DImLrx3E?xAMg=qbkvsAp*X~7| zFk48v{+9jc=%s7D1?G|LYWTX}KfajGkJbx#EL-bUd6s7B7hY>qcvBGXy^g8J3uhi| z5Zm|}Bt!6Ao7c=YK~44+q(#_ z?l)cx;(u7sI~rqK6+&r_iLr8eeTuUwOvcAsaIW9BT6mmU@qVWE+uwuiDiKW;sgG*| zQz}|2N~@*?tfUk-R^}q*{ZFFihAJN~>g}ni;H`F^(GQx|h&(_w*UnO};xyG6V%?ix zir)Tu*0{#f&9~&8({y*rQh@fz?KkHh+As>IJ&#&jpUyS?@(-PW^DkXgw18=eX@9Y; zsAyx~dYatJqbXfvdUeUms8Dt~T{pQn8p(^fCko7(aWL+R>s2SOC`UbbM>=C#y|Z2J zxzwe@?ke#3+YwAh%G-Ssbj)$$P7V89g-X)N?LOOUwZyxfvh(?-jV3LzVz}!MJL9e5 zB;82+Qj4+uW;UCz&+_q_Hbw~duWig#oBsIxf-)yRJ}KT3?>@!Jsr%vG+S=zAhuLqW z4yVWGM)0C78)gnGygn5Y!DG-sK!r99KZ37#<)dL8_~w5~s&HHATeQ+IFne3O5P3!t|hsP-9-fB`q4G(}^JZHJE*|AKHUQe^V# zjJT@7(hq0at9|?VN+Vx&RP_rO&fb&ksun6ZHvbv8Ase!7e^IucPtS*kKPbbc4z=A? zULFP9_cQJlEsVD+uE)z}Y9#$5c6Ok`O>kiI?FG?3&D1;C21%HjtJsBsQimc*xA~|Q z?OdZl=ilEy(N4$0m~|&99y9po$obFBxthtZ-G-Z@1-~>`yDw#A+YFYO>CFz5VpnDd z14v8gNWE#Xj`_*Wvqr9$l@sWFZSTU|4<}h&psHT|{_L2l)p@K`hzPb%_AJLxTMnjg z zsPJpym?z7yB9uRLXe;*FUvrxu{Xx;m($%0ja_)h5;FQas2Cm$?KR;{7qRrz&!nt(H ztj9uG6^}+=fB4jMWzfY4D+muf-)o)_ouD3j<469+14qmnG7AlfJn67*N5uD{yv@cQ zw|V#Wg~5|fQBw4|vb!?whZ=jYeVy?TzL_)RYEjHw`LMI%WZ%~ov^SkjDU+dEpqP;3 zhPb+eZb?$Q*%jHjTVR&usj+BCyZXpX`l?uZIY5zG|L<@ z1=e-Jmu;#g)WsBI9iDE&8cu0cpXn=Xc1d01Bc-a_+K3B@21&R(q<#t#Fl~q$4$7S4 z%~)Kp48$Xm;W(od$s2cyOIvlw^(S3N<(I^S_I^pjsvFvg>l<3+9JJtI2XS*5fnnj1hka+2Nxg<3)Hxwu9 zc`R^Ey&^j6akqOyM6FI%40=XnLe(}Se26%;5-e(KMDO`~dEm!pagpt?bf|}7anf)A zV>N^wzmMY1%I|Kk?=>AON&SwCbJaV_etY+`adS6~y{#^vySsp$%;!k(B*iNYgfKoU z%Z2#s33@pm@4@?d{7qH`zt}O0QX!q7Ds}2>-R8wlRWy=6>2cYOxE}Qn$g=Tpuln6> z?6YNBr7rwrL_XA^KC~g6%cBx2)gow8_dRk>+h+xzi)jeslpf^u?MWJc!6@Y(Ws|3$ z&~BC3?Qn)if0SP|v^-Wt+eTu1+HZDz&}CSd+;3QFA3Yt}tFcX^iAk)ZH0R@DV{jDQx@@PoFJmKUn7E;9>KoMe3CU+K34^DR;d&HFcv? zz%s5D?ZtX+NmCKeAiFT3H=Iq0>2Ξ(t8aoo&Ehl|XfCzZmY3zmdtJd=7_1Wr&#l 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 BLrwqy literal 0 HcmV?d00001 diff --git a/evidence/track1/fig-b-scale-out.png b/evidence/track1/fig-b-scale-out.png new file mode 100644 index 0000000000000000000000000000000000000000..39aaba04e46c404fa9371a4ce0ce061aa646c71d GIT binary patch literal 76011 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 z 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 literal 0 HcmV?d00001 diff --git a/evidence/track1/fig-c-bottleneck.png b/evidence/track1/fig-c-bottleneck.png new file mode 100644 index 0000000000000000000000000000000000000000..772df4889ee216bf549836c0d2ee2cd8c0dfb03e GIT binary patch literal 29170 zcmeFZ2T+t-*EQG%t`{*2s36D{Q8Je-855F`oI#NcP0rbffPiGlAkgI8G#NxeKm~** zH%Ua1&>)f&L}nkj@B4r6RLxZVHGln6-_&%KS1xuxeV+52v-jF-t$l)SDc?MNknSJ` zgE=fGdtD8K*-yk^_VoVw2mIz(ft@z|CF*iR$3@-V+{OKllNmy^F1t36qMOqMP#4$h)HJlKD~gWKN8g2&nZ_h+~YrGu=lGX`_=H~O>ZK(xq1 z493w&?)nuCk0kOaW!+P=?bfAK-|=8hvv#%qTkO|0WUuO7IM}WgbV23ljo63T=U;T_ zv9sS;xlYB#ay}P-Ts8J8i`l7Vf8XNmxfBcY&ZJM0bC)e77YA(KJ9Y`KkMOU@$B+Ls z99XR_qu6^dU=NG|UYB#{FWK+i{aIQT_s?%7BNX@T{?6xoJi2vw{kYC|c=xAoL8f%O zKTVu$7ufyj<)uig-Jb$fF2I!Syi)()yx;`!OGjd%cCnFGt{Tg`s7v9WyHdyVw2SSw zHwGGQyHX@dCB>WD^zG}-t_2>ch~?7PTbgX)(kIw1h;sRCZ>_s^Nv!LThbzcxk?bq2`|@-n&fgfZkelhr8eQy)QjxUs-&!4z zOTAlUP(9*1Ou*VKHf-7jcg46Lk^C|7KttjZM*7XhLha&w(}8n%S}r}Ep)xZr`?0!( z&Dr<-T`uE?c^ZF}C0}+t-yaxsdSi33(eRLJhRor2aXhIsTzb6;0#+u)4I9=k)|X6P zHFF1RVt%P~K1rH*Q^r1ygIj%LR30nd8y&*qgOMx>_v3Qavxjph-*Ob=)w1MSylPXH+gWcFz~dbx z82iJ!J*SgR&vn(WkIjvB$zScyRd1yeu)N*4{kyi%pt|Re!*r%R4L@GM^W_|(R8Ky@ z(p|Sd?u4tn7Y*yJmu?FqR_FYFq>C9*G^F~j#n(ziNB#(<6LgX~C+_i~;m0JE_i~5u zs9A50>cTn&=GZw}PMrx8jO$wir*;;t0-e&^fzKK;Rz|<|s;dn7Z*LkKk7u;$QFE}r z`2kPPu&$>-mw!Mv`-kJt@1GYI6DUt!yx`@(rL0+GAkws^S7DvC9I-E65%W^658jwo z`ObHJ^wed)UmgydzqdB`!I)htE9}Q5ajj1VtH=b>-tC`V{(BW-IVlVDD?7Kill(Sj za)+lG+((X&bmbQ}&|P+%ygo?28FrTP{c~RCTR6q|m%n~4KOk9jCe17iWXeVD-%R2& z3$9g)s~qVaoUV>yh^ z-Sp8GzxTs=)ODbG*}sKGd;jlW%Uu&|T~gcPw_aSQbSKf<*F{YD87V&3DrJ1u$J=r8 zGG(az&yBg_QCXT$y7rVUe|!2+_U^yEbt|kj4~3ry^86GkJP$XdP^QFm%t4}#Ext(1 zcf+L?_Rf4TN0Gy|uSApKuS69oGH$zm`}bylgRi$RUNRczs=Qc`sB8d98fCu&pz2?u)juZ$*A;mbCmTpIt3kXmhFc z+(~?&i?mclZlsr8dv)r%hnHP9t|r;JQ$*E97du+hhh0A*nJ%!UR2+)qWgVIruy5Ql zuN-kwcu|pcJ?IIegjdzX3;Xc~TARDAVXgzBvCExeJnaP0?G4|hIe23315#TnQDzhy zzL7~H{5X?)IN!G)Uk4gSjvn3ellb1oykNodX;o4s80VbFm~c)$$FntBvy%S!nslMxCJd?y8Bs!B90S-^0|HnL4)W+~&Ti_9(8{mCdwq z{$g5vz2#t%H|6AeWq)eZspX~n&Rm!@iobsS`2LQEJe}(A*5r__oZR#4dD*ZC1tv30 z)Tb`OD#9_*I?r{cr^PqW%CuH=h}zrI@oY;K)hTY5rR+$x_FVV8ADm9AnI9Ifv>4@? z<$0y$T`3q&P3TTnUCvv=>1B1Z7WGYv=k;YNn{xeun~FVQQEuMh#DHUDDZzhxwK`zD z$au}QDKf8}eQRUYd0o}1Tjfwr)io;W+$ilJu9mTMey!-7-WM90c^ZyE*E)1=S(KVM z8}?S?9=(fH2omUf+{fz1Lc6{&I%iZVwovt2a{HIF@ZOGc|7}0_WSyiF!#|5R^1DTU z;_Z`#lP}dj-k`rBr-(UjBGEs&s9!K}SJD)sA_8wo-S zgLnh%6P6qXn!>QyR{vj&UU)Dp8Xsw2LEPZb; z#a;?3+Cx6SmRj#cs~JWBC^_(bs{N$LTw&#X!R#8BnMuawy5&x)`JwVlEt}y!N7xGE zadfOTjbZA=-cBr<{N#zI2TgRk0C+l12oh^t=f12RCvU~|Bv{F*77CEdl@f&-7WuKm z0`95uG3;4ic~9oYU(B1+%DMHI`{v3F@c}6p;Na4=3dvQ5?rLWX?NoJM*^jRt?PHdC zDtpUWbG3KOXSt)~vZ{u5zGl8wkYBbJov_{6RqxlEV?iT+6EF8@b7)kCo|BR+SSYcM zNb&#uld|FU)%EOm4=GQ+vh)7<=+uZ?OQ4wBysX31Jhr(OH>3Iz%hH)|A776W0Ki-? zl$dV0Ip*AB^QG@R!b~sTSmkRMAIZNnt6Od!nje(FZ_)V@lEYb9yF+OTfkznj1|B_k zWNhtoobeyZVq^h#62y-Cq;cPM!%Ff~{>~>gT`*3HbrGwc%$zQf;m?yHJV$IH-mRDJ zTMDpB2{<}iuYNR6CMVZjRxnDyT9No?pSsITRvgZr<5oo!yft=5BXi(+#hdHf!}j5 ztJF68GyIAnrP&M5YGm;2!7NS3Xd5~5QwXrjn@MXtmM#r7m%JW3`9VOgQ1+ZI;}vz* z`aXuJy!<>>`}QD8!SBY*Klres@_SkO8>zdEt6rDnP?uEV~4%a z7v1+~3Bbm;zA9d=XXW|D1zgpNBV-zHR{)b_7WGTSV1xHq$c2N@m}ITs|3NukZbX-1*dF3)Z z!DMe=nn1SS-Q#EVC^ZC)>m%$j&%aRqc=6X~I-w#dJ;7*0T<8Qg?& z(*qoZf%~ZIC2XpHTJz>?> zc;ae;xntg+$?PvorvYG3&U&!sXg@2+r9Mn2@Wjj5UOs3xF!K^axb+FIJ^7KoXO#R| zZzO6JdIcR^SUqq8!}Oa~h?>QErCd})lY1&JzsPAkL!SG_rV&v?(zT2&rEk4h+uP>T zo6sQ1SZ#Hsb_S_Bieo3{zNudEaeZMWpB`zHM?uS8`u$INTQ)}H1|QE}l3146Y=hO8yAoDZ>SC^`%^#^2Hl0SE%=~GHQhk~nX|{n)1gE3GyIS5QIfujLB@YK) z6wdPB{(WbAz_Y)axFyJ<^O-yPiDJ8kCKCq~lSvP)GCVY@_o}w( z)BA9$VsG3O^|f%$SBu?oiN9t0kxRA%I34u-8{ z6`76zlvN%!x|e+aG1M5<+Z@Mgmfp~Faj{+*05p4>SC?TRH(GXiFH7I6TRfKXH?tr0 zw-O~?7N|?|ga!F#Cf!*SdD@iU#qi&_a(n8<$-I3y=c4Ngdv#Wy$$X-~1=WZ5yb>Pw z`7}1LvF|GLwF(_s`A#eA@hH9LX@GwhEPUU5UDuLWlRt6uV$EG&W}PsV=gw6ZFDo**z!Ihr_dbMDU{Z;><3)FlWBu6JT=WP$ zn4tP2fC(KlX6qhB)b+ijDP}FrQ?6=zm?_gX<9h3ApZ%70M_TuvS6Vvc`y&c`!$%SdxB3L`${F2m9IYQdWO&R z2}he3U&4{JfLrRi=e*~6D=l9>J;Q&W`GK0egai9*F$Al9v(E(twSq26Wqjtl|9F6- zG`*R;u{!sFL-1nUeM_anZ?ESJC5H|gjge=sDBB+##_K$av>Nx{u2*2c8TO_(M}UPP zhEuUK7}uU|nv4@*mDZfd8UHx-UF%lgVq%!Kx`+DJApCnDG|M;nX`%z5lnv3(lqVjo zKf>8k5&S>^K+<0<8Uj7?%sG(>kJ1)PAfON{G<O7qPXlIAygxK8z`9;lRglzUQJ zPSD;uOLV%oJxkSmmUW<)*w#XQo-G15pf1PinqnjHT&Dg8cTd`)MoUzJQSKue{N(`A zS1Szp%1%nf8i5A*J_TYzXN1Wgp)b{6-72k1sfF z!l+n#>iZ-ki(l`jY^Lk?WSl%C%p!X4e(4MO-tbL8twRC#b1OrX%Om4HFcT^Bo9y?} zZY%8>-C7@CoRgFfvt)mvrO@Nx#S$$rZ$NpSYdN{+dV-dr7rA0!#FDWvC-dX_L3ZlX zp7~NO30___QM&8F06gx6wp7($jdoa=3+sY*}^5)pNnvF^A#q|5}Q8eZ%3S)o&jON6oO~_sA z(%hakeOKVUa(N7|9BNAZDsZ@E;BOz6Gf@iDit2RK(s``;Dd7jn>^bW8$ucyvZlMpw zXmSR0s57nDuc!%x{>4%ueAQE(Q&Wt)>{#K=jGrrFMFUD#Tx9-K+JA#%te9;el2M@| z-!9QlYDH4LFuwU9^Jco#<+_<;>}~~gPvlg4)WTC~r!`hj)~oL6{yq3jhS!UD6@!U? z-7X`{wv>MQDnoR7a=Ovg<~bM2teJ4Rr3T?Tz7u{P*!l}bPAqPUvq_O{6fddsbM`4R z<28AdGqyAXvCU78FSxlTv8T}bHri+;;O<>q9RXtFWxRm+;-n@nHv#}?~X z+T9+laiv_#XK6F`nqhH&&uB05Ei=Gu9Q)((%-;5ZPq~1iE6Ccezm#o z1?>i(pCwqp!E!5?;lDF>^kQzdOd?^75_AS{>aINa;~oTj7R!uJecxyGihco%q0D@| zeiqN^YrQf*#9x(K?L2)^XV|Fm0TdDklRUq~-}|{ded$NNeCOf|0o%d9t9myf_%OJU z!liznzC4}eJVHJy{!RM+rq{Gswecmw(k$39k zjSw3l`?0f@{RQ!xPZxW#6b7*s)_qQ-o8gQMge~AOsNU3cH*_^_t&yaE|N3cIu(I4G zb*akG@g{!JrKK|XK)KmFT2!D+0Dz`k*aR|dzY%bTIh#bYo=mwrl^rP(B<#QvtND>W zK=bY-z@?0W7oYs%-kQly-TUYu%|U7&Bk>X_QcFm^Lc`8_r6xC+fLFT5XZCjg?;oGS zC)S`yu2~C?2cm7WL}w*TY~fGI)G41-Z{7gzWKq|Ho032m)rXvPCDnN@zgnn-(&;6D zqDUs%?(yTIr_A2PDt)WX82r?@y=6ZEGa+{@^$?@@phQ^8dYrM}%;t}K1!1Oi6Ayk* zXsF24kobrN*sT5^FhRuaq4HhD`fajjLNZKHl_(*x& zOr)^=*h`#JqFS;d2_|L&C}8K-?=7c{_y5{}Dc*O=z~Rb7qyjgkf{x6_x7SDap}OoT zogn)&1Lm7yF2(iSuCu+4U00fLl}d3_7dffF9XfmY?;m2?c^bLWbNz*eOj+Y0=Whg8 zkq=^k7$It0BCZU3QyOe38~d*I-AlA@5cz<&BHr$im+NlJe99XCSz<2D^_SY8WVUw7zJ)76VKU4IK`7-ku@hLA}+8SRJsahMhdC)Z-t8XXgvYo!j zD|LiHbZTw7UU;RU@k@e@!7F7-*TwMDEY;K_*%#x#P^Ryy+I*s+&@qa^%qJaclXs zp}SO_Qac&b;Jb;t9FMz@Zo2E2`1ON20Oy&S}06 zFK&v@CasD((b#zLW}i~{x`a2zY+vI${LQK_PxD@)T}`_$C9JS_TTA)JIpw|PhbuUA zH@`G9=m4Venzja={fc8DeL3@^YuRILtM{`m z#^a`X06~-2;xxX`nzrK)ob&m+dz0l-{6#2>@@nhNI}+p?gd%!vPKyk)Cw$lssGvzp z?G(i|w)8Q*P);=ybxHvi59(f42fwL^n+8s78uC$AFBs)lH8_rG7w4_($lF;_8<;TT z83Br|Kd<**S61cY`u<|QuX;L#z6zqjK6+uhryF9Cks;#~f_P!^Tm}5Za5#jqnutKJ zF!_nu^6QJf6mJfGW%k!rPf$GROJJQS21(;vseBwaIdTn{8^!LWeHfF)z;k{M3<27P zt}&aEn$uB}SGEc=iNKX6e)Sa;t#SPHrf6Al{ILA38E?tbD(=$7xn}NelVdF=!PvRJ z{OJ?U@Bh8Th+&WjmcyIE5Yyx_uiO=@J|hRFAyxyu^7rAC34$%b+)M1c)s#~3?* zfHpoX#NO(!u4zELhcuCcRaV7;O!yLZgTYijCpSt|U~Tjnt2v#+U~V^gz07Nw znHKBKAIjCs&rRR*0iKOuJ5)9y`6FmDVI=p$ViWiC!>3`RBr_?_y$d_3OA>rxLA z!zMI7+7BJYV9rm$0$W=gKR5RpemiqLKW~%#_p;W70|6e=Ah11SgNQo<>YWulE#-kt z3?^XP{qJXJ+DiS(nj~7K2&(EKS#{cY&y^dhnaq`U1nw*w1{0MP32r zTg%4ZW#W^Z7|bNG+=|*JLQ(8SZg#I&H{`0|)sJuoE_lB!uegz=hV6)kC*>H-6P`KZ z<^J>WZo%JiXIWp`d`P=eaP$BMV~W9@H9xd-CG~p(!4*0IXy)Mczg%&A5@(Bd_2Cepf}SbQU2S!u_Zg9|6mZTsVxh#ge=U=N zrBW;-=V|5_08j1qCEjAVErNNJ&>nS3ABuZ2NNlAb4N;JO13TZJqsmOG_pUsA`tO&W zqH~;y65fPSk58dOci$X>bfQ1lAm;M*HWe*r3CXUu0|{Ro+C}*EYk|X%#O5I?C}dl} z+JjfX)7ac7t3+XYw~U@l2t))Z)vuG*<_5Z)raQ54WA2oKs!j#)&2EeJ>%*|q>1~0I z(}C3&!evnP0jU!N*Tu0>mbZT#Ir~-SH4UfE2dpvPGD0DfZAQp$6SGkL21G*^eRz9 zi6`Qsh|^RF1os+M8~L+zci=Qc;4hgNLQ(I`g~peZ|J( zN}~p~ZiR-BMAv}u9}Hs|8}LEco75%}o%# zQdfQe;})AX3U#iEm(=c%Obe=HaSR|E8ro!a$a*e+IcyV^L>TMp9`+(%BV9D#SeX$r zY5p^{>mOOY^u(!lJg9TEbATK!RFMIx-N8l@`!_}O^oxBhNzImy4?t7qYih%f)qAI| zH0*v&+hxZHMRjsn+e|zRP52SN2)2F=eMg4UsnE;~>j=St-8VYSw)f_HZny%qS~CYR zJ}P_U3Ez*pAC5apmp@7Kg8cc=jqNS!pTd@_;=j3 z?}0zIg3ymwu2u)Mc+pc>_@GobvA*`N(=bD5?`dY5=>eS#%XweZ@+}y{=KDD@8#fA9(@VB@w%HVh_Tt6qP+LeqVUllak+I}ZS7cLL@!r#MLMV0L-Te|sxu zQ}fK>n6I~PW{du9)0=Y#L5VcqVrGaomO@Ps$Og3kYdZ1|LN0*R%JQ ziulrXhdsF|65hk0=-6l63@3n&S$!iLF3ER-C=NIM%v>NrF+})=Gbjc6RSxNbAVoZv zJ*h-N?#>9rj#PECbcvT+bP>>g*{_!aF#*+H^HBcDwOYVxJ;t!(N68EtF!JtTX+%NX zBFXVFy%H|LA_Z~MAQ?{5J_^=o^z(Hmvk;Y&F5iKoqq?t9f1ppE%C-B(sp@W#4;dI%Hz?ik*UY5x_D0<2&ScV< z*BsZnztSEWrPZe{U_2=ilB-x9_Qpo`)O))N^Kq|ypD*viP3rE!1bDQzA=gf32*_Hx z5D4c%BXr&#=sJP*!c}%8_Ujht@Iodq?j^{VSf#>t5SihP=F;ysgb(!`WJd0uXWRl_ zimPwsV>xGj8|Q0r31gihKu``B=~cWn9Dvkl2rR*9r_{C&tR%zx-AJV&NHZO?rGn2! z?B2SjAGmCCNFdT!Lp}_zup++MG7dTRb^55}kCzRJoh2}S`8RoFagbf@61RppLH**aM^s>JMMC)&u^=zo@*@| z5NzWOq2lYWv>(4s;=TK35Nhed8zHni9v{%Ju&@p6M6<2)p&sQLB*55(z?4J(_w4|r zeM21kvL@#L+Xux01QTSsPGd05{JYyA22$)W%%BY<^g8;iSmv8Ygx}783_Rx+^tXMM za;`yjS)oqpE95`{OjrTSzGfx~r2hb zrIP!Z{GzNj*B2`o<8UF&CmHb`eM6CLM;?257nS8bxg2TtF zHbCi+`XPQng>dii*~=e7mDQd8seR&&N1iHf&J{O~xIzefMc}Z~s`GHb_Hlo*LtQc1u1XdZH3B^ZDxPW@M0nHY^F5r#nT zdQG^|Z~o6%=3A8blr(A!0H*g7u=~NDjN)I1t+Toi z(sUg#N}R$gp+qryes>jME?1z7FxN**6DRjUl=61)Mp5*BA;dU>=d$^`RH;Ui-&9+~ z{>{riKT2xXhA(7e)$q5QAg9JpcmVU4{N92RZ4XSq3bimmrS9m7p7VRtqvvZjX7jO7 z@DPC0o7hXyjkE9~)v+bDTO~$AsaiwztbccpVfZ&aOtN*(?Vw4f(B_W4`;DCDek^^W zwA%#OaDM=dJ?WdCJNcs!@&|m_90<01oBm*QG%QmjWmLp?txmvlk15?>+w zW?=&=8!FOoxJZqcm0nsJ#QTL8`=4w5TA@9CY^wkZkEI%_F?QR899&?-&o7BhSouL% z?Cph&!w}RDdHU^K5F_jF7^R4oY_i+1m5}8Jrn!;oa*5^l{9u`~%-63h+5-2B5agA2 z5zK)$07I{9A1DOwL+H+{{qEgemz0xA;QtdR_NwZr85V*Pk2o+0<36hKE-f-*8o4J zHyA6qj{Rx+5>3DpVuF>tN1;*uFknk7K<{Yr4SoOo&H_=6lx1^8wcLYRR5U){nhpq= zwjFauEe)#5Qy9}Ch*&URhlQ_;psGwJvb_9>Af}|4$tijG7>)`teL2OQd0)uH| zh0V5uh*T=>#>`uTJUH0q-vxw*E#&upM5dlsI!McD3A|; zt^Y!i(-!*yMFQgt3!~>fvT4Y~DgnDRO9o;#CSNIE7lStaVo|+m!fc;)bfWc0o|aw? zn6cVIji{9B(2YH;O85dhCSV1z@0CnZvsr){ngHu2q=i=M)x0(RzX6It{{a-Ee!hos z{0`h5PBXc3d_n8m*}rc~N9Ox@wU@|_edRA!QiHF6Kj9gcVSUk~7Ze@qu~? zU#)hdojX*@v=kmP6}3tie+ig^bG( zWy&uqC0y{d1vKS)3T6WTYA;MHMwX^ekW_9FUccI}uLZT^#0?HNuZ;ecZ6H8&VI7U& zJ5Yf-*adrY#1-=4h$}oIGT7UYY`}6lnc%f*O|^e-69F!E=1~OVzGP!y=L~`q>ZGmq zedOT7Lup$x6FZ&ko`R?es0iJGwz*UK$ z;lvs^b9FkCL{K4jW`z?b5((z;Et$dAnWGM`4^tAn^F6g7fy}S{U!zEw%Kt!-!l4?Q z`C5euTzdGnFI}nj*B&2o%zwNW^GuHz>k_>BS93jMhq=D_l^yJHCJ$nm9exO<`1!$7 zR2K^;FT;Z;KoWRV(UB}xiI@_WPJ|vnbE#G6MDYwrg_GseFwn_UyW^z_rBgR7w-k6~ z3k77unmW)iiQ=ARweXf^I;wxz6U_e?Z2oXZ@cQ3`9seJ9HUx0mL4~mfoYY0HT00Ur z=N~gd)RH!j;qONoJ78t?<-VhXKr0o17f;pxoUmOI?1@fz`Y|6{fiikFv;$I^LN-Bt zBZD1Yab*qUph4Jt{43Al3Va+pTVHo%VYIeTBUdeG%sr?_na8sfn`e|}cd9gOmZH7<^u zZ~q4ans}w_PXNzW2rzXd3SaWt1o&m}9xzNmR7ie;6(V_{j_(D|+a7#emEb9E1)yVr z0xHzY%!77NU=@wVTclVa?TmC$CB+s3Gy!ar&ETVBVule0jjZN*M40gFtP4n z&o@uc0QFhJWf*m3;f*F!-{qq3xm^IuQiSTVZ0K#W!p6kwFbB1}^vGiVVFNJR#f=sm2MNtAnyE}SN7nG1gw5ysgia^}5+iw6$ zRN?KW`)9t*!*`xA4v^+>gE0)W@S)^O5}Y*(IhvEP1cG+>>KzE9rUxM_sR!}WjMsy` z+~7RAs2k8FImEO7XYzA(!b{*_A@nxf$-n!#E#mdY8hK8p5P}Blz7z&nA(PSK-k^;b zWWO-^i%TXg#81-iR~3g!Iv)*;r@w%$hi@Gn&%jD%Y#Q&Qk)i&l5!A6yV50M16`9XyBvnO<6 zCN3x^2SGDU$m$)qrl~dHtxaIVM=P}Qpx}wm54w1el|!rG>+C}p^046LReqHeamuyy zKB*SOp322b`qqS=<~>gX;`q+%%wHDbtIhHNWgi3yuxS-MuK>vxHpyq1V$|k?m2#Sr zz3+Qg(r3^RC=j9$n_h{utHSx4xYdPGG2O1?uwdz2&!#9sv1JSC;f#|wTsB^Jq*qaF zuAqFxb;{}6WZ`_Z`=SwtI!^Hgk-r{0M%@YES{{IfVJP8)0_3a6)nD+b6XmXRT8NyF z;W3u%4w-$6ix$0L-|*AC^1CN6Yz7u4u)eWi`!9N9i(gA%NK;noD*-O66g3y9uGd3j zM`cNr347?TV%3bt5k_H=WOn1!y{mk0`7(V746L=H`vHkAqCLR0#5$p{X6?+ zVC_B?_n#L(QV&{rU$Cd=xC{J_4xo4&GKl>y$-a<`Ye(HkSRmxP1xSr1Y%CosmuFwT z2WUrcCIuK35trl;o`yf)=+JGUj+_CR{2=z9LawtK!t(xr_h6xxPxxt$L$&Y)K#XYI zE%h>G>_XkLGO5BQ?(jKD@s1R<*^N>4SD%^}hl>$g2YqX#=;dOl@R&osmsXL%kYO~2 zcw%X6@4gqQ6=XouN9jj#Rv8Bm(xiFen|}f2Veo7RlKaHMlv39J-k7s<8CDV=H4T?o zdp>taBc9U!(f8h($zYC=wzBSwo3+=W^{3u|Qvi6HQ#KOoBhF0(uv-w2=?i*+7}m>& z{UMmyHT$PZ`o5A$f@s=N_!RbxhkN%`HNDUkfZxvHSuwJZaH z?d9X5EKcp4%MIw_-@*Dy>PIdrKA+&;_}LtE(r&fu7UG}PnMGY^O_8TVqGVQ8b0WJ{ zeJ?P*O#RUXbRtffTL4>-JOlhy6n%B^I}l@fKJ(Hrdu9nty}Y+?r@V#!mOiNE28$r1 z*vY(n6H0G*=yN>OsEK@e7k22)+L%FO&(AR~BEY)_WHxsQsHpNF5KfM`$yf@P)B}KI z=*vf89cSPqSCWil{5S0H?p4MT+wj2229lSdDWnq0j;hRIkdNSgvMwP696u5RM zg#`r{fqFIGV4UHR-5MJ_mj!HscubVZUxxmh0|7{X>U1rvQwNJa~wc3*Q1y_gQ zNGthoxhIz)98|&|sVe!Jo0S}r|A64=DtTNGj^e8m-@)(D)HQ39n!vvFii#(*34#C2 zRKPAIR2yi&G|qSlA;1bq`7)xi7?;vou~mE?_Dk-q^!s2UJpOw!=ED<$bW~-BezRQ0 zQ1nztzYqk6q6Y%Q=Wj*q=r86)v(@OL8Y3)-o16@lc_^{kt8ORI0PQ$?_HtcMGu74` z$mwHGp-aZy*e8&MAS%_E9|Ypte4LTO8}DtRH1vz>2QIP^vsEfVHqQKZ1}=DEr{j?+ zMBSIKkCC`{zwnqxhQjq+w*>BV?)sG;4T&(V@4YPw1%_a$LF`IRW*ja32i_+*FPWa+ zTTA~UZi8v{KFFs>FcU#JO`e}d5x3lQ7{K`GtTJ7KF%)>U(<$BsU}Z~!xD?>>;$bW; zJ0f2zzTgXLJEFS#jR-Cb01t(S-P%fdly03$%3gz_*?gUJOod^Qxgv_ zwn6v8IYgGCyhYQ{m#4Hm-Bk&tAn9(n#FrBe@NQZC*)~NL@RH@DdfZz42e2UekfBGn zfzY(X4&zH9x(q=jd&YppP_Q5GaRuHtvJ25`G>O@Y@h1o+P0%E8KR*)X)p*l{*lUXb z`v(coRPn)WaSRJC?YPyi-LJ9v;D*;iM%A3`#$&;RgR*1|%IU%N__5Wao0h$3Ncmhn|w6Zw0ev*ZYTVFTp3#s~O9uwA!OV zG(kq@4KUS|!vo~7F3x(qVbk^x$#pEQ9giH`eWI=5=N7fFYI}x(7TCpM8c04)Oq2OX z={zPZNJRQLNDGy)m0qKAGPuRaxkE4()anv9#2-LpM{XbD+&@}jfVx=xjuH&zzGS-) zh+u9|P-2?j098pYDDOm!Y0VEr3GzPw!Y1|W+k;gyX`rZPmVFM{=;B{O2Ec82y|AW(NVaY0O}X!P=8B5 zmBEq6>Pg(-gek$ImNsdo39WDFrr^bw=mJO{LT@aOaYG4qY}=I{{WezK0le97=mf1z zLBFejxG)H;?>tOcsU+000gB9q+RN{uN-iTn+GfI{^^S}TzZz*D^-SJE5)`zsS)kHW zzuGAa5kP3?)NZ49ziG!qT~RCDS(^lJvhxNK`88oqEmJmPMVuNgUR4GyRmd;!Z5!&` zQY5)Sm*O3FWV8IL^-aT9pQVox7Ta@19(Z@l=HC5rMqX^pA7J3h$BXN}2amcCm4IfQ zm>?itJR@Av8qq|x$(jQ&e{64FCJxLVO*|@Tf_Ee|NgQVLJwn z60G~!y@5o-0t*={vB?%O029#02hFr5sP(oeujn~v0z%EoP~jYs6ovbF&o;`ZGdo%b zdv~Y5Iqk|mF+e7x2i0ob7v1vZph#%vuAVvpj@I~1Phi()T!9qCI9fqeS{rfhst%!L z@PHJXK~NXhf}tOhl0;W!9hJeMDu4BH3e-PZ0OfZ;MNogX$~l19wTKJ^C~ga^MFncx z8n^=&ZO#G({fG5B*moP zuZL>$4ykV2rg?`wOSR78(kXcvLxO5H5g8&1XHg3-B9rp1Kn4s@Hx=vx|J02we~5uS z%Xi?(-8KhTa4EPxhQaFql;{3Wyo=Mov{dO?q38)}0sotuNJ13JwBf^os}|9Ke{2`0 z+@f#**FXiTQVR+RN>ZAv1L)s~JROxe(q`XNOu)>vk9TlnPKhWFqbiu`y`9;n z6-IQwUPT^KA%OTeJ2D2cOD*^x$j}z(hTXYpl7ZVfEPUo!5EgOwvu6@ym#Nv*nnwvR zhUaG?1WTKPr4+^-!U1y=S()#q2Ldnuya#-UZ&x$cO`6RD<2(^4k<&`&P8HQI$UAI4K1^Q#R#73>WO%H}q2uZRitynwcpKKLxY@o7?suL{ueN^qiWKxc@uhW85X;nIA4IENR6TA zHM!nPg4}EiJWuwH+th;PjpW8xW~k$zuFeoI**3%Z8$=`z3ZY_fW~e+HH%s+E|(@U$|BJCK8VV;@9$A>^^TZk z@gKI79YFyu7w{AzB?!hN4couHfs1wOB{go$a-f4V1VM3XLh0Roz=)5GO3Y||xM#yc z{4M0S&Tpkn@PIH3FX=Bd?(KLa)q>g7pdJqfm+RPa@SnIBw(LLeNkS525wtnmfT<#Q z7}ZH2iZ0zIHA7=Y2SCj;Zn}^?f>XfIDlJ3I@omwXb>UQf@enb6p$q=tXdQjBEz9{G zo*7?xm43hk9M0g*;c?{j-%RbAlJ%xK7wlK!2QKCkjJ%7LOmHfxDVAg*6v{^da?H11 zO2tD#HVn*zZMD;9*qgCK&;GhL55C+A$kDpc(_x@biyV>hh6a#@e3ov&0TJuSbIaYP z@N_mc2r4I0pC1l7iJ9PJs}~BI8LO|QV!CE!s<${+ud4OqoF{hqc#z zFTIS4zPrC+UR1LK9<%Ec3i7*Xy>j9962$FcCRVh7mMFQNkPXRr0lux#ZD40Q%kBe1 zms>Ohcx4^}l~aA@*o~$nVQZyr?V~v-bQ1`W7l6Fci`=IQ6}ta2rUo--Obq z5JGJc8SGMqWlD0w6psH@`DkMM6FhqRwU0K>#ek6ZGGImwP zNUiJjRj@-b2~L8&oz5z6`nVNfzl9n^SXPDu-b5$209#oC9{yH{o%6w;*e!`)g^FVX zEoYm6ZW>X?iRYWTE}1Kwn9oC<3URT%w7)08BK&wEaZfcx2F!oT!d8TSr{FlYR+ecK@VgJWlm)o(*lN%yWcJ2K=ChfA+o%vNlcjfhdNB zGhXbnIxJE=FU}M2MpL;^Yh99HB9*kS5fx?Om#+1?nj2{WBP=O=HW_vdng<60M&J&`z_LT8~WgC zj>vb=vcfr46}Ce?s3#={`!5}=oT~SyZn2RBI`KhN0))JPOk}sY5-0Qg#w=j$THvvZ zM=NkX++dwg5W>#l?s@%VLU177h!J0Y4-I(Vr@Iy-Ez>vF7wtjMaHbT4%M>g?NONc5 z1-)hJt?7ju{CiPJ0d-?3bQ=smInF$f8gtA9fqgjFzXrv13BaxD&bR1r6Lb#IWEq@` z)D3MU@tp`KF@qcZ%<3Y!eTsYpwYb+pK6 z=tDDtvszhvXXs)sf?W|0e#}e51nB6Cg&Rhmf_xDU`LJArH~%4<8TKe8Cqr@INUCvP zTrjBs6Glz9gM1O>Fw^L&Gx4+?&@4$#4`g(z=mrj*I!T7f==Q0%B*NX+BkuK}xj-|+ ztzLrX_o-5J$_nYC8LT`42;(IRrp27Fy>j0xWG25yGNVOC2(bG!;Zac*E%GtXK;xqK%*YSp~Q0;mE}k<_#^60L|wOq(LaboPPJZ$ z%j1~W3@DZCDQD1kwbNIm4sv4pZ~%G>H@DG=4x$(9hxSD5s%OtsC*2aJfk{VJsD7}} zSGEP*T2tZ@AAd%sW!`mCdOzy>3c2JFJ7-)0I->}KwPlD?8OYmHZBJ9FZNZCyJ3dom& zjY`;)Mu7yf9{ElW#Z0!eSx8Vw_~1HmED!KA_if@zmnDaaC&vSM;G{+;_dyDGZZH2J zZ4VxCyM+4#i21S-reZ3?nmmW6h3U})oK}}L0H+q%@|(YR0MCiuVR;I>ieDSR)mkAs zj#P0zCej{NfgG-0qHgn+Amf#QMYrl|RSMWCsvaGNGn<}WLBiccZ`|%(pEieU@8X`JaF`T+R3BvXZevJI)Pq_?hdiC&@ci?%2)BMBC-X~O!d2!eZ z=tCue9Ed`O8wULZHj zLpkUqwFu0!tBiHiB{s00ag=|IzwG$J5U30Y^q+3WA7W`m8yn1=RHR~2;TY4o-rT4} z%CrdU*_RqObLAbV*)>?Nr2;mRhOdK3c;<(<{sOV(Gyx0pP}3PqdOIGT&oII-GHY`$ za+8N~nep1i{mx)YJ794r$2M?w5J2jvk>5`3%|3cVL&TN&>wJy#jJ}%4ziD|8GMUfX$sj|4-pEg?-2>iHcwdN7j&sD*#3e zquc?-^^?_flpwsC^&nDcT;=0B42-A*+S~a?^)-n9MA;ddNFJh20SbTkdRY+@F0`uJ z!EoI+4+c;AQ@zma?TX601C?-+;}GOWsh!pw^=xHc2^m;+?}K$<2PIjbj*pc`WTQ0G zZOCdzNn>!LAFAK$A;I&Cp`!ME*zP-Jaalb;M{uIL3>ripVYMZ~A#GKWV7Sltc8B{~ zpi5)8+BusBnl~X2L`@Kovl+~~C&j#0av)NOb^D?koM1oBNa&zC1g-z6M{aIyhX)M; z$!=D&uw88ICp)n9srPc%tLm`u<+`7w@t!T-XZRS3o@sIK@pbB6l}(+H%N%}7TlD8H zcP-t!%pqBzn0=YU(4-KfmIdc<-h;`MsYl&Yd+M8k-coWphtz3ul>;~+!N;=X>j}I* zkq!^_7Nqmh3Xhyzu7F~~qAN@|d~?SP9h8zcZ^8ia^v11X{$ zympx%k6Rpm%MR})Axk$p<_mf^XC5w}-5J$#lE7*tIvD^?1)bA5Cm$P9@uWO5eBH)p zLcH}rr!)Lz;Ztw}z7R}zpYE5Urnl#QC6M`rx&F#!OHm`(>beK@0*xRbHC7;VZs*XX z)jLedjwzq^O^Zl6q(pR=(mHCrUGfV(nl%06rDquY_4M`L{kbm4;2w1Hk}Zss(o4P( zj_n-ygp8QcfAvE^&8CaA%I!_Rb^tYdDn0-EFWb%DTy+E<-QaM~*7-qLP<&!L3o7qU zf(6~7jCo>qIG8_&5I2NqYdDtEeGLq#I#Cyu3SdE%N?wPnD~9}gne17OhW4{2BoWxx zug2z&b_2eq2Qz?KSLa0IibKDy#SrQe7A)i5nF*K>ezgZW9C!coX5y3-yxvS8B?Ddo zih)JQoC2@^nX=+Br#s1cVQmlLPeS+XS#AE~aQV#ZbJwWB? zOx!bGBeLg0PVpeJy80b3-?VeDuh4BkmO?kIm421tU7~O?I9Q*z%>_wmsHwmX096G#1Yr%> zTmo`2146b&k)YjKdicXn)ND`y&WKV;>P%h=C*%_M1%_%Nyas^=J8;xG^ypaIj3|S zV--2!BfT00u2J{yyRzyS$v*&6)OfWB^neWOh^>M!NrWixlG$$1%i`mm$nvS2k=(EO zpq-f0_+}wZMYBIk3lV`LaIk(ok>Q$YcDsu0MnXb90r`)yG!vUMB8%sRFF-!y#h`Wt!kOtT>HLlU`JP<(t5fKJ*raG zC`E$3u?%zMu~?7n(rsA=SSy`uK*r@A4w|dMn4J#TntYhv(e7hCZtV@gYL{sd>5ApX zdI96$qBiXJ-Gum!E!fw;bB?jQ!Kuit;cxHa&lj9K#qafL5R(t<1-9-90yyRMq(a7T z1g{lxAk{80Q-}KAV)8^0tjWOvi-A|*RRdArCd(`%9?D%KoU9P^M0BV|?B5v+P)qq% zMpU9*aFTg}tbVtXzsD@_N$BjR3phP$wfrpTT6L9H89G_F)es^)p{H|J&1mPXF5A_c z7#XlmEKVBVt%YRKGhxw?^|(nNKQ=E77;05H9r8{#wpF>Pqc@bU;i2X8Bc*@FBOwT* zWv8!s9ZtATHawj7dMIsaQ(xU7J`JS&%*lIVI`u1h&Gy=Do~=E#J97KaSj;>Ce_eb+ zR!~HPu-l5~vLaeXwRI*-sp}BqJ=G{=DE3nRH43|p?rW5}um2YP8POfhPm^rcBQBK; z>YC6&wbqi;*~CX;KFw_?o6Z>UQLVHZ4Vb-@mpglA6M0yl&P}e#5nC)G-IuZN3wD+q zXheKP$_`~6C_@rpLR@STmeS7@mj0-0DdwQKA0SD&JkrTAI@R1`PrI~#{2UmHlKaXa zafKES-YBTe8Z>TKL`v=iwU{N>`9+=(_Sg=peRv)0tN5 zdwVr040cnjwsT!NWeLQ|4U1U8^EuG!wF3?nwW1veQ2j2t@2csHM&@8nR51mRiq=}d zvx{#HsU=~m5c99HeS`;}|BIK%%FvEv@z@#gEfgx&aX4*Ix1;aMR+E`lYW4~9444;E z24@9TO*y;j(O50sh`RZ*)Ov7(GtT zk)n?d1w-nedOy;5Qv!cJXjXNiD5#Q z9CDp6t@$wvRg14E_=9FR^jMSp``q}IR;J?fjVJ=PUyS|vwyh4$PVMNMHxdoR zr{jq5zJHr~Q*>xAjgl&9=yN`!DF_Z(JL8Om_h7VA-K6Y~P6Eblo-Sj^wnz@K4>gRep9!q=VKV-MjB+G+RU&sq4m{rK#q^!_A_$d9BeK7lwLXg?@ zVbSDfsW)BuTwaaAhsrG-%@*jf1DhJHU{!Kn_osUy$@IV5X8$_9yTWaQ1MGbw^rh7` zc&^s?S)7%w-5DU_QRSMYE6(lMi{e;+pZ#p-6Z=o%x_1a_-yp6k%mRVu)lGN4b zj`;y;r#SgC>R`;1z0{nod{~G=M}{18TQ~v^$_-_S{!!Psb9T%zd)QQ5`&jEC-_PXHPuvEoSTHp$A$#pUZ)GkRVVNYX^9J6raNV@ z{-hoWkaGDIpu~9ht@~A2RP+Lgu-Rtjx=&;4tk0U78XM9pB24ErJQ5Wm(0J}p0+e8< zxkxB=4&#Td@k9F;LA0;Q^4uic2`28m7bw>5&RZe|Q^rOv2Qrdqvqz#*l8ge(Rr&U6 zeih`zm_Y0&DKnc~y8tT?tTEDZ<_$J8Whu_LcZ6daAtGMX zCD$eJ2qG8tQ#(GuU78+McjU73YR7(ZR#up^%Nyb3<}K0!qZ?SxC*Hb1Sfht#>JG`2 zMMbQIwfqFwl5%MyR_UaD%XG4EI61$&@(ERlgz1N-KMw`XE|VIV!oYiy@9<`W`_Ax? zoGMM>B-8smZmY2AZx+n#X3nh7l;>V8pDb@~oolD4b$()_;vikB3~F=+T#*MCO{B^% zP*_NtIX|niRzF}DIplcT@jx%LD5b9_** zbM~KKp+ftb>n&X>mpQ1z->^!J?kT~#K}dS;*hNWqg!{T3TS=YP5cm*byx-9O(9w69YF+zcD@Yx z_<;WFWTkLz7@$~U8?AK08tJ4q{q~H|8x}35%1gQKEl7MddUZ?+crKmd_%ti}M8d!L zDE{`gyZsW8#NQjM*=d|o z;S9sT1TS5g)ca?R%E{`|iOh)`7i7)p+vUHi@3X^E-k!Go`L#ZrJb4(> zb};-~#^}G>y41muG#F}+jCoVx&aRksI*!>kCdAWudIoY6$6c7~#FUj3=lSiXs_7ci z-`6=utP8x+57+;CvLac_R_EK;?>RG!9HUKtypBOvhz)pd61^#eIMoxVxi4g7e7Jr4 zsvdo4L*xx66WGM{X4YEx76bOiNG`r^TWM8k#g$9x&D!QC<@)ssn;Vm4x;J1fVSr>m zv4}}yOF_i0Qhgf6xgL_&k13gh1!jmu5TV)>Z)c-l$`fT|g{QumOujLq5i;CqOzxs5 zq94G=ip2)IZ6D8Db<{JiRWNU0XL$t0pq1}NLV5!AJ%KR&7qsvm7wNv*5u#GFJsScT!XLTouaQ(x~vk$v#30UO`cg>h58X?Q)CWk&XqJnZ! zoQl(h=_|r)q!LP;&oPegeN<;2a^VBaokRySZ1y)1PM3S$Gn#gixKVabqo$-C>$!uO zq&1{zZxgb#2xf2dx4e60YGrD9uCtf9O8DJLJ0nwuH;m|*1~0%ZTi8y4XSOH=Pe(Y; z4PFvbsfOR-DAv!Si3S86S|(t95NxMFm@EoGGPB%^5LE3T8*U!e0vixeB&%1HVW8SI z3P-OBqB3QuImwUCv zvKFVP^@0T9vXb(%kY@EMrJZ@R-lzF02{bfpBR*gv!$8oHXz`Hv6!Sz>TQ&U!(EG6> zA(UN`*Pz_-njAuJ3|swzJ;b@2i~)a`ERP^R6oFzEg`mf8$EdOeW;s;zX*P2pN|}nv zEcrOvi6sw-U7R*kJ7zJGlMo|0>72R{Ud~gKcdaR_xE$G5Be7J9TC+C$Hx1J5Wx5=^ zUP4mHNiD4z4e_hC4GM=j-hy8Z&Rm{20-8g}W5t2&4>0&Pe))OM_`hpF>GHHX3ZT~h zaChA(cG1nP>;mI*#2q)EZG3VHdsYn_n1V-{e}za#n#?m&BU!T1!hgdKnaJ7$c+NWu zPOnu+k!!g2sa@<$jUauas@$QdG?l>}-_+^_uw`Cd&U;OAq(Jzo6AzcflvU!|C*M-E zlG2S5B|Fj*u?u>ErqQpbJWov2ZxA%K_O`DIF)!+i_pjAA?$b$@6;c&a&Nq-N-Ex+H zgQke<`3-nDMVGl+b-cA|I&@h_aPQ0QhN=WjYZA2uwM@l4&lIGO0DYNh(HP->)xHu_ zj>Q%-(w4DbO3ozhkc7i9`##u~_KzOj@TkR&(OOt&lR6-Bkx|g{^5k!E!dwzF_?nyw zHsXYS0nzz?$IQ;Pd1OB~kAL}A|KotG4{G?t zZF>?LA)0@S8h>&<#p2AObu=a{a4{n@JlfQ=^mJ#z2uh>b63eRNY5*}!3r5CFs~XHN zY7}rMP#&qJ8YDh#uqE%Kvi?x859-wI2RQeR>H6s^x_x{8eaDq??fBcLY=r&9&edE| z|IkaRmANMtY4)d%&K~v$sgI(Twx4OJOk!Agnj9TRw3XM#^666L^Cbw91tVEh!6IgH zOQw$ER+n2Cq1u`oz7M)KOE-+d%~R>sSZ}V}NPEo&_p`LHxvniun5$rPu;SpsCmw7i zW!=Q(UDvzoW&ipLh9DsG)ENY1bADzSZF%}VT{JVl?N*xPE!b%=6y8XBz;IF`wnCTz zdaWf7tQy>E)vaay&G?bgas&`siX}UMWJ;DPCIG`U8Yq_FGOy@(8*K1%tsYhSzgu3Z z1nyL$M&I>_rJ}2v;@#MPZDMaSD|`Xl;{+)0lGnAtI&PorMB~h71ldd7tJ9-4mcjcF zh5GxZhpt2moMdhp8*)L8{O+OTgX#Jsz#JQ(F(gvSeU9yV^^CnMO(~$ z&b7G%xD(T|&%0wN^}TgjZ*(w+boiC!osu%xRiE?t zEhz(BG?86*EabE;Bt&_Np0vt;cY!RwN~;`u!<9LsgrRcrbU+$4X3OVH7hjBztL5PT zXgxUq`qZfh%VN2mJW?M|-rMezU_(_0hr&uu9H>i_qNl-s6^?*&@r>R9_jiFK$u6t{7z+x$7QiZP z_$(SG0DjPzv4j5n=f;0!8NItXoB%yXfLPEd1Eh4JX960o0Os7b*C0CY^b~$k`XtG@ zw|aQFmsDFIvVwdNZ2HP#fepl33p^~F25`WHzsC19qOR3Gu*{XrikypifmH$Vw+-eh zcRq}4b^DZ?`oTR@#QS(kmm&M+7MsEvA^(p{%sh`|dSwV~$lWZ;1ul`we))tyhT)3& zX4f4F((7fAVR|(t|M6zNjo{+?=7&&V*EOz(w<=#d;g%-2DB($_hKsIs!9i2?h2OcH z-_&sctKJz1)T{ngL*jbg?yaw8+1W}`J?ke32Ewwt0zCA}PfV?`mw4Pe6xLL$GvxWs z)l67r%j78xKGiZKCDjad7d?ff%-bU2SFm75$ADd64kkSADsS|5zEbR4Hm!{n6k+0-e=<6EprR_Ny@jt=}h714z literal 0 HcmV?d00001 diff --git a/evidence/track1/results.jsonl b/evidence/track1/results.jsonl new file mode 100644 index 00000000..342e1156 --- /dev/null +++ b/evidence/track1/results.jsonl @@ -0,0 +1,33 @@ +{"label":"A-r1-4x0.5","timestamp":"2026-11-06T15:48:13.9897112\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.22,"ok":6190,"errors":0,"ok_get":4937,"ok_post":1253,"rps":306.1,"p50_ms":104.39,"p95_ms":716.41,"p99_ms":928.2,"cpu_pct":{"api":200.7,"lb":15,"db":66.8,"cache":4.4}} +{"label":"A-r1-1x2.0","timestamp":"2026-11-06T15:49:22.1092142\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.05,"ok":14992,"errors":0,"ok_get":11926,"ok_post":3066,"rps":747.8,"p50_ms":83.69,"p95_ms":139.83,"p99_ms":178.93,"cpu_pct":{"api":203.1,"lb":28.6,"db":132.4,"cache":4.8}} +{"label":"A-r1-2x1.0","timestamp":"2026-11-06T15:51:01.6047574\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.1,"ok":9812,"errors":0,"ok_get":7860,"ok_post":1952,"rps":488.1,"p50_ms":107,"p95_ms":318.48,"p99_ms":409.85,"cpu_pct":{"api":195.2,"lb":20.7,"db":92.8,"cache":4.6}} +{"label":"A-r2-4x0.5","timestamp":"2026-11-06T15:53:22.0589884\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.19,"ok":6612,"errors":0,"ok_get":5275,"ok_post":1337,"rps":327.5,"p50_ms":181.12,"p95_ms":513.29,"p99_ms":735.71,"cpu_pct":{"api":198.9,"lb":15.8,"db":69.4,"cache":4.4}} +{"label":"A-r2-1x2.0","timestamp":"2026-11-06T15:54:31.3678292\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.07,"ok":13912,"errors":0,"ok_get":11133,"ok_post":2779,"rps":693.1,"p50_ms":91.88,"p95_ms":166.48,"p99_ms":200.24,"cpu_pct":{"api":203.6,"lb":27.6,"db":127.3,"cache":4.6}} +{"label":"A-r2-2x1.0","timestamp":"2026-11-06T15:56:10.3256987\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.2,"ok":7629,"errors":0,"ok_get":6093,"ok_post":1536,"rps":377.8,"p50_ms":125.07,"p95_ms":410.94,"p99_ms":549.93,"cpu_pct":{"api":203.3,"lb":17.1,"db":81.6,"cache":4}} +{"label":"A-r3-4x0.5","timestamp":"2026-11-06T15:58:31.4805703\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.26,"ok":6603,"errors":0,"ok_get":5277,"ok_post":1326,"rps":326,"p50_ms":111.63,"p95_ms":596.34,"p99_ms":816.62,"cpu_pct":{"api":201.6,"lb":17.4,"db":76.8,"cache":4.4}} +{"label":"A-r3-2x1.0","timestamp":"2026-11-06T16:00:05.0176800\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.08,"ok":8705,"errors":0,"ok_get":6950,"ok_post":1755,"rps":433.6,"p50_ms":117.83,"p95_ms":387.88,"p99_ms":480.26,"cpu_pct":{"api":198.2,"lb":18.3,"db":81.4,"cache":4}} +{"label":"A-r3-1x2.0","timestamp":"2026-11-06T16:01:12.3742906\u002B00:00","clients":64,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.06,"ok":14030,"errors":0,"ok_get":11159,"ok_post":2871,"rps":699.5,"p50_ms":92.84,"p95_ms":163.52,"p99_ms":192.3,"cpu_pct":{"api":205.3,"lb":27.6,"db":133.4,"cache":4.5}} +{"label":"B-r1-4x1.0-db2","timestamp":"2026-11-06T16:20:50.2721570\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.14,"ok":12264,"errors":0,"ok_get":9826,"ok_post":2438,"rps":609,"p50_ms":99.71,"p95_ms":756.34,"p99_ms":1029.28,"cpu_pct":{"lb":36.4,"api":408.9,"db":153.5,"cache":9.5}} +{"label":"B-r1-2x1.0-db2","timestamp":"2026-11-06T16:21:55.0929565\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.13,"ok":11706,"errors":0,"ok_get":9353,"ok_post":2353,"rps":581.4,"p50_ms":208.66,"p95_ms":504.34,"p99_ms":609.43,"cpu_pct":{"lb":26.4,"api":203.8,"db":112.6,"cache":5.2}} +{"label":"B-r1-8x1.0-db2","timestamp":"2026-11-06T16:23:26.7718923\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.15,"ok":15944,"errors":0,"ok_get":12755,"ok_post":3189,"rps":791.3,"p50_ms":108.1,"p95_ms":482.66,"p99_ms":692.6,"cpu_pct":{"api":681,"lb":55.9,"db":211.5,"cache":14.5}} +{"label":"B-r1-1x1.0-db2","timestamp":"2026-11-06T16:24:52.6949390\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.14,"ok":7990,"errors":0,"ok_get":6400,"ok_post":1590,"rps":396.8,"p50_ms":321.11,"p95_ms":480.87,"p99_ms":570.37,"cpu_pct":{"lb":15.6,"api":100.2,"db":63.4,"cache":2.9}} +{"label":"B-r2-2x1.0-db2","timestamp":"2026-11-06T16:26:05.6541691\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.11,"ok":9367,"errors":0,"ok_get":7539,"ok_post":1828,"rps":465.9,"p50_ms":204.97,"p95_ms":780.67,"p99_ms":941.37,"cpu_pct":{"api":197.5,"lb":20.5,"db":81.9,"cache":4.5}} +{"label":"B-r2-1x1.0-db2","timestamp":"2026-11-06T16:27:28.9493157\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.33,"ok":6631,"errors":0,"ok_get":5296,"ok_post":1335,"rps":326.2,"p50_ms":408.08,"p95_ms":518.55,"p99_ms":607.08,"cpu_pct":{"lb":14.2,"api":103,"db":65.2,"cache":2.4}} +{"label":"B-r2-4x1.0-db2","timestamp":"2026-11-06T16:28:52.6844941\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.14,"ok":13758,"errors":0,"ok_get":10973,"ok_post":2785,"rps":683.3,"p50_ms":99.76,"p95_ms":619.03,"p99_ms":860.89,"cpu_pct":{"api":405.4,"lb":37.2,"db":159.5,"cache":8.9}} +{"label":"B-r2-8x1.0-db2","timestamp":"2026-11-06T16:30:08.2896985\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.1,"ok":16117,"errors":0,"ok_get":12900,"ok_post":3217,"rps":801.8,"p50_ms":83.5,"p95_ms":582.93,"p99_ms":869.16,"cpu_pct":{"api":698.8,"lb":55.5,"db":211.1,"cache":15.6}} +{"label":"B-r3-4x1.0-db2","timestamp":"2026-11-06T16:31:08.6339895\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.15,"ok":17792,"errors":0,"ok_get":14274,"ok_post":3518,"rps":882.8,"p50_ms":101.48,"p95_ms":398.55,"p99_ms":533.4,"cpu_pct":{"api":414,"lb":46.4,"db":202.9,"cache":11.5}} +{"label":"B-r3-1x1.0-db2","timestamp":"2026-11-06T16:32:22.3096975\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.17,"ok":8228,"errors":0,"ok_get":6573,"ok_post":1655,"rps":408,"p50_ms":302.54,"p95_ms":498.28,"p99_ms":609.43,"cpu_pct":{"lb":14.8,"api":100.8,"db":63.1,"cache":2.8}} +{"label":"B-r3-8x1.0-db2","timestamp":"2026-11-06T16:33:46.8007092\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.17,"ok":15974,"errors":0,"ok_get":12745,"ok_post":3229,"rps":792,"p50_ms":104.38,"p95_ms":509.25,"p99_ms":782.15,"cpu_pct":{"api":710.9,"lb":50.4,"db":207.3,"cache":13.7}} +{"label":"B-r3-2x1.0-db2","timestamp":"2026-11-06T16:34:54.6411416\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.1,"ok":12535,"errors":0,"ok_get":10000,"ok_post":2535,"rps":623.7,"p50_ms":188.95,"p95_ms":480.09,"p99_ms":610.62,"cpu_pct":{"api":201.8,"lb":28.7,"db":113,"cache":5.6}} +{"label":"C-r1-db4cpu","timestamp":"2026-11-06T16:37:03.0321098\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.16,"ok":20105,"errors":0,"ok_get":15993,"ok_post":4112,"rps":997.4,"p50_ms":71.2,"p95_ms":432.28,"p99_ms":706.84,"cpu_pct":{"api":743.1,"db":245.9,"lb":58.2,"cache":16}} +{"label":"C-r1-base","timestamp":"2026-11-06T16:38:05.4895102\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.16,"ok":16468,"errors":0,"ok_get":13143,"ok_post":3325,"rps":817,"p50_ms":101.4,"p95_ms":490.52,"p99_ms":726.87,"cpu_pct":{"db":213.6,"api":564.4,"lb":53.5,"cache":14}} +{"label":"C-r1-pool4","timestamp":"2026-11-06T16:39:46.7558272\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.12,"ok":16218,"errors":0,"ok_get":12986,"ok_post":3232,"rps":806.1,"p50_ms":83.41,"p95_ms":565.51,"p99_ms":843.6,"cpu_pct":{"api":726.8,"db":192.2,"lb":48.7,"cache":15.7}} +{"label":"C-r1-pool8","timestamp":"2026-11-06T16:41:25.3990791\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.21,"ok":16823,"errors":0,"ok_get":13441,"ok_post":3382,"rps":832.4,"p50_ms":103.38,"p95_ms":455.83,"p99_ms":684.87,"cpu_pct":{"api":720.2,"db":206.3,"lb":53,"cache":15}} +{"label":"C-r2-pool8","timestamp":"2026-11-06T16:42:22.5967168\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.11,"ok":17294,"errors":0,"ok_get":13841,"ok_post":3453,"rps":860.1,"p50_ms":107.65,"p95_ms":400.3,"p99_ms":624.14,"cpu_pct":{"api":640.9,"db":210.8,"lb":50.5,"cache":14.7}} +{"label":"C-r2-base","timestamp":"2026-11-06T16:44:01.5852594\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.15,"ok":16361,"errors":0,"ok_get":13100,"ok_post":3261,"rps":811.9,"p50_ms":106.11,"p95_ms":469.9,"p99_ms":691.81,"cpu_pct":{"api":699.6,"db":211.9,"lb":52.9,"cache":13.7}} +{"label":"C-r2-pool4","timestamp":"2026-11-06T16:45:44.1402446\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.23,"ok":16472,"errors":0,"ok_get":13124,"ok_post":3348,"rps":814.2,"p50_ms":99.17,"p95_ms":478.53,"p99_ms":684.43,"cpu_pct":{"api":748.8,"db":206.4,"lb":50.6,"cache":16.3}} +{"label":"C-r2-db4cpu","timestamp":"2026-11-06T16:47:33.2011395\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.19,"ok":21294,"errors":0,"ok_get":17024,"ok_post":4270,"rps":1054.4,"p50_ms":87.52,"p95_ms":334.61,"p99_ms":477.46,"cpu_pct":{"api":753.4,"db":262.8,"lb":63.9,"cache":15.2}} +{"label":"C-r3-pool8","timestamp":"2026-11-06T16:49:21.2263819\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.16,"ok":16905,"errors":0,"ok_get":13603,"ok_post":3302,"rps":838.5,"p50_ms":105.29,"p95_ms":430.51,"p99_ms":626.2,"cpu_pct":{"api":701.5,"db":210.7,"lb":53.3,"cache":15}} +{"label":"C-r3-db4cpu","timestamp":"2026-11-06T16:51:03.6195872\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.26,"ok":19508,"errors":0,"ok_get":15537,"ok_post":3971,"rps":962.9,"p50_ms":82.5,"p95_ms":409.2,"p99_ms":622.44,"cpu_pct":{"api":756.5,"db":244.7,"lb":58.1,"cache":14.7}} +{"label":"C-r3-base","timestamp":"2026-11-06T16:52:07.4058164\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.13,"ok":16501,"errors":0,"ok_get":13128,"ok_post":3373,"rps":819.7,"p50_ms":99.7,"p95_ms":505.98,"p99_ms":736.14,"cpu_pct":{"db":210.5,"api":610.9,"lb":53.2,"cache":14.7}} +{"label":"C-r3-pool4","timestamp":"2026-11-06T16:53:47.9345113\u002B00:00","clients":128,"users":32,"history":200,"write_ratio":0.2,"duration_s":20.28,"ok":15371,"errors":0,"ok_get":12334,"ok_post":3037,"rps":757.8,"p50_ms":97.36,"p95_ms":530.03,"p99_ms":870.31,"cpu_pct":{"api":736,"db":200.7,"lb":51.6,"cache":15.5}} diff --git a/evidence/track1/summary.md b/evidence/track1/summary.md new file mode 100644 index 00000000..165e8159 --- /dev/null +++ b/evidence/track1/summary.md @@ -0,0 +1,53 @@ +# Трек 1: сводка измерений + +Сгенерировано `tools/ScaleLoad/summarize.py` из `results.jsonl` (повторы в случайном порядке; среднее по повторам). + +### A. Фиксированный бюджет API: 2 CPU / 1 GiB суммарно (БД 4 CPU, LB 2 CPU, 64 клиента) + +| Конфигурация | повторов | RPS (среднее) | RPS мин–макс | p50, мс | p95, мс | p99, мс | ошибки | CPU API, % | CPU БД, % | CPU API мс/запрос | CPU БД мс/запрос | +|---|---|---|---|---|---|---|---|---|---|---|---| +| 1 × 2.0 CPU | 3 | 713 | 693–748 | 89 | 157 | 190 | 0 | 204 | 131 | 2.86 | 1.84 | +| 2 × 1.0 CPU | 3 | 433 | 378–488 | 117 | 372 | 480 | 0 | 199 | 85 | 4.59 | 1.97 | +| 4 × 0.5 CPU | 3 | 320 | 306–328 | 132 | 609 | 827 | 0 | 200 | 71 | 6.27 | 2.22 | + +### B. Рост ресурсов: реплики по 1 CPU / 512 MiB, БД 2 CPU, LB 1 CPU, 128 клиентов + +| Конфигурация | повторов | RPS (среднее) | RPS мин–макс | p50, мс | p95, мс | p99, мс | ошибки | CPU API, % | CPU БД, % | CPU API мс/запрос | CPU БД мс/запрос | +|---|---|---|---|---|---|---|---|---|---|---|---| +| 1 × 1.0 CPU | 3 | 377 | 326–408 | 344 | 499 | 596 | 0 | 101 | 64 | 2.69 | 1.69 | +| 2 × 1.0 CPU | 3 | 557 | 466–624 | 201 | 588 | 720 | 0 | 201 | 102 | 3.61 | 1.84 | +| 4 × 1.0 CPU | 3 | 725 | 609–883 | 100 | 591 | 808 | 0 | 409 | 172 | 5.65 | 2.37 | +| 8 × 1.0 CPU | 3 | 795 | 791–802 | 99 | 525 | 781 | 0 | 697 | 210 | 8.77 | 2.64 | + +### C. Проверка узкого места: 8 × 1 CPU, 128 клиентов + +| Конфигурация | повторов | RPS (среднее) | RPS мин–макс | p50, мс | p95, мс | p99, мс | ошибки | CPU API, % | CPU БД, % | CPU API мс/запрос | CPU БД мс/запрос | +|---|---|---|---|---|---|---|---|---|---|---|---| +| 8 реплик, пул 20, БД 2 CPU (контроль) | 3 | 816 | 812–820 | 102 | 489 | 718 | 0 | 625 | 212 | 7.66 | 2.60 | +| 8 реплик, пул 4, БД 2 CPU | 3 | 793 | 758–814 | 93 | 525 | 799 | 0 | 737 | 200 | 9.30 | 2.52 | +| 8 реплик, пул 8, БД 2 CPU | 3 | 844 | 832–860 | 105 | 429 | 645 | 0 | 688 | 209 | 8.15 | 2.48 | +| 8 реплик, пул 20, БД 4 CPU | 3 | 1005 | 963–1054 | 80 | 392 | 602 | 0 | 751 | 251 | 7.47 | 2.50 | + +### E. Диагностика: API закреплён за ядрами 0–1 (cpuset, без квоты CFS), 64 клиента + +| Конфигурация | повторов | RPS (среднее) | RPS мин–макс | p50, мс | p95, мс | p99, мс | ошибки | CPU API, % | CPU БД, % | CPU API мс/запрос | CPU БД мс/запрос | +|---|---|---|---|---|---|---|---|---|---|---|---| +| E-cpuset01-1x | 2 | 929 | 927–930 | 66 | 105 | 127 | 0 | 200 | 132 | 2.16 | 1.42 | +| E-cpuset01-4x | 2 | 573 | 564–582 | 85 | 303 | 436 | 0 | 209 | 94 | 3.64 | 1.65 | + +### Соединения с PostgreSQL после замера (эксперимент C) + +``` +C-r1-db4cpu db_connections_after_run=161 +C-r1-base db_connections_after_run=161 +C-r1-pool4 db_connections_after_run=33 +C-r1-pool8 db_connections_after_run=65 +C-r2-pool8 db_connections_after_run=65 +C-r2-base db_connections_after_run=161 +C-r2-pool4 db_connections_after_run=33 +C-r2-db4cpu db_connections_after_run=161 +C-r3-pool8 db_connections_after_run=65 +C-r3-db4cpu db_connections_after_run=161 +C-r3-base db_connections_after_run=161 +C-r3-pool4 db_connections_after_run=33 +``` diff --git a/infra/haproxy/haproxy.cfg b/infra/haproxy/haproxy.cfg new file mode 100644 index 00000000..353330b8 --- /dev/null +++ b/infra/haproxy/haproxy.cfg @@ -0,0 +1,63 @@ +# Единая публичная точка входа лабораторной 3: HAProxy распределяет запросы между API-репликами. +# +# Как LB узнаёт адреса реплик: `server-template` создаёт до 8 «слотов», а встроенный DNS-резолвер раз в секунду +# спрашивает у Docker (127.0.0.11) все A-записи имени `api`. Реплика добавилась/исчезла — слот получил/потерял адрес +# без перезапуска LB. Именно поэтому масштабирование (`--scale api=N`) и замена контейнеров не требуют правки конфига. +# +# Как LB исключает неработающий backend: активная проверка GET /health/ready каждую секунду; +# 2 неудачи подряд (fall 2) → слот DOWN, 2 успеха (rise 2) → снова UP. Расчёт времени обнаружения — в REPORT.md. +# Sticky-сессий нет: любой запрос может попасть на любую реплику, состояние (сессии, ключи идемпотентности) в PostgreSQL. + +global + log stdout format raw local0 info + maxconn 4096 + +resolvers docker + nameserver dns1 127.0.0.11:53 + accepted_payload_size 8192 + resolve_retries 3 + timeout resolve 1s + timeout retry 1s + hold valid 2s + hold other 1s + hold refused 1s + hold nx 1s + hold timeout 1s + hold obsolete 1s + +defaults + mode http + log global + option httplog + option dontlognull + timeout connect 2s + timeout client 20s + timeout server 20s + timeout http-request 10s + timeout http-keep-alive 5s + timeout check 2s + # Если выбранный backend не принял соединение или закрыл его, не ответив (реплика остановлена между проверками), + # запрос повторяется на другой реплике. Повтор POST безопасен: сообщение защищено Idempotency-Key. + retries 3 + option redispatch 1 + retry-on conn-failure empty-response + +frontend public + bind :8080 + default_backend api + +backend api + balance roundrobin + option httpchk + http-check send meth GET uri /health/ready ver HTTP/1.1 hdr Host api + http-check expect status 200 + default-server check inter 1s fall 2 rise 2 resolvers docker resolve-prefer ipv4 init-addr none + server-template api 1-8 api:8080 + +# Служебный порт внутри сети Compose (наружу публикуется только на 127.0.0.1): состояние backend'ов и healthcheck самого LB. +frontend ops + bind :8404 + monitor-uri /healthz + stats enable + stats uri /stats + stats refresh 2s diff --git a/mtusi2026lab3-fork.sln b/mtusi2026lab3-fork.sln new file mode 100644 index 00000000..1ef9e1c6 --- /dev/null +++ b/mtusi2026lab3-fork.sln @@ -0,0 +1,36 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.2.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scr", "scr", "{027FA04E-56EC-7B26-372C-A48CC532505F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Messenger.Api", "scr\Messenger.Api\Messenger.Api.csproj", "{630C0B6F-93DF-AAC7-9A7B-184D4E60B431}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Messenger.Api.Tests", "scr\Messenger.Api.Tests\Messenger.Api.Tests.csproj", "{4F2D7000-2CE0-BBF9-8937-6B7E8F80C7D2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {630C0B6F-93DF-AAC7-9A7B-184D4E60B431}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {630C0B6F-93DF-AAC7-9A7B-184D4E60B431}.Debug|Any CPU.Build.0 = Debug|Any CPU + {630C0B6F-93DF-AAC7-9A7B-184D4E60B431}.Release|Any CPU.ActiveCfg = Release|Any CPU + {630C0B6F-93DF-AAC7-9A7B-184D4E60B431}.Release|Any CPU.Build.0 = Release|Any CPU + {4F2D7000-2CE0-BBF9-8937-6B7E8F80C7D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4F2D7000-2CE0-BBF9-8937-6B7E8F80C7D2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4F2D7000-2CE0-BBF9-8937-6B7E8F80C7D2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4F2D7000-2CE0-BBF9-8937-6B7E8F80C7D2}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {630C0B6F-93DF-AAC7-9A7B-184D4E60B431} = {027FA04E-56EC-7B26-372C-A48CC532505F} + {4F2D7000-2CE0-BBF9-8937-6B7E8F80C7D2} = {027FA04E-56EC-7B26-372C-A48CC532505F} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {41A93240-9911-4469-8EAB-F192C6DC6640} + EndGlobalSection +EndGlobal diff --git a/scr/Messenger.Api.Tests/ApiFixture.cs b/scr/Messenger.Api.Tests/ApiFixture.cs new file mode 100644 index 00000000..41e2a5e8 --- /dev/null +++ b/scr/Messenger.Api.Tests/ApiFixture.cs @@ -0,0 +1,101 @@ +using DotNet.Testcontainers.Builders; +using DotNet.Testcontainers.Containers; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc.Testing; +using Npgsql; +using StackExchange.Redis; +using Testcontainers.PostgreSql; + +namespace Messenger.Api.Tests; + +// Один одноразовый контейнер PostgreSQL и один Valkey на весь тестовый прогон. Приложение поднимается в процессе теста +// и применяет миграции к пустой БД, как при настоящем старте. Нужен только запущенный Docker. +// Настройки передаются через UseSetting (а не переменные окружения), поэтому тест может поднять второй экземпляр +// приложения с другими настройками: fixture.WithWebHostBuilder(b => b.UseSetting("SESSION_TTL_SECONDS", "2")). +public sealed class ApiFixture : WebApplicationFactory, IAsyncLifetime +{ + public const string PostgresImage = "postgres:17@sha256:b8faeff7712663c2773a190181e1246e37e364b887611c04658c28b44e2408fe"; + private const string ValkeyImage = "valkey/valkey:8.1@sha256:640c5e62cea04b6d6f2084232651d0cc70362d31f4f805e7be94dbed6855e8f2"; + + private readonly PostgreSqlContainer _db = new PostgreSqlBuilder().WithImage(PostgresImage).Build(); + + private readonly IContainer _cache = new ContainerBuilder() + .WithImage(ValkeyImage) + .WithPortBinding(6379, true) + .WithWaitStrategy(Wait.ForUnixContainer().UntilMessageIsLogged("Ready to accept connections")) + .Build(); + + private string _connectionFile = string.Empty; + + public string ConnectionString => _db.GetConnectionString(); + public string CacheConnection => $"{_cache.Hostname}:{_cache.GetMappedPublicPort(6379)}"; + + public async Task InitializeAsync() + { + await Task.WhenAll(_db.StartAsync(), _cache.StartAsync()); + _connectionFile = WriteConnectionFile(_db.GetConnectionString()); + } + + async Task IAsyncLifetime.DisposeAsync() + { + await _db.DisposeAsync(); + await _cache.DisposeAsync(); + File.Delete(_connectionFile); + } + + protected override void ConfigureWebHost(IWebHostBuilder builder) + { + builder.UseSetting("DATABASE_URL_FILE", _connectionFile); + builder.UseSetting("CACHE_CONNECTION", CacheConnection); + builder.UseSetting("DIAGNOSTIC_HEADERS", "true"); + // В Compose схему применяет отдельный контейнер (--migrate); тестовый процесс мигрирует пустую БД сам. + builder.UseSetting("MIGRATE_ON_START", "true"); + builder.UseSetting("SHUTDOWN_DRAIN_SECONDS", "0"); + } + + public static string WriteConnectionFile(string connectionString) + { + var path = Path.Combine(Path.GetTempPath(), $"messenger-test-{Guid.NewGuid():N}.conn"); + File.WriteAllText(path, connectionString); + return path; + } + + // Прямой доступ к БД для проверок, которые нельзя выразить через API (например, состояние таблицы sessions). + public async Task OpenConnectionAsync() + { + var connection = new NpgsqlConnection(ConnectionString); + await connection.OpenAsync(); + return connection; + } + + public async Task ScalarAsync(string sql, params (string Name, object Value)[] parameters) + { + await using var db = await OpenConnectionAsync(); + await using var command = new NpgsqlCommand(sql, db); + foreach (var (name, value) in parameters) + { + command.Parameters.AddWithValue(name, value); + } + + var result = await command.ExecuteScalarAsync(); + return result is null or DBNull ? default : (T)result; + } + + public async Task ExecuteAsync(string sql) + { + await using var db = await OpenConnectionAsync(); + await using var command = new NpgsqlCommand(sql, db); + await command.ExecuteNonQueryAsync(); + } + + // Полная очистка содержимого кэша (эквивалент FLUSHALL / перезапуска Valkey без persistence). + public async Task FlushCacheAsync() + { + using var connection = await ConnectionMultiplexer.ConnectAsync( + new ConfigurationOptions { EndPoints = { CacheConnection }, AllowAdmin = true }); + await connection.GetServer(connection.GetEndPoints()[0]).FlushAllDatabasesAsync(); + } +} + +[CollectionDefinition("api")] +public sealed class ApiCollection : ICollectionFixture; diff --git a/scr/Messenger.Api.Tests/ApiHelpers.cs b/scr/Messenger.Api.Tests/ApiHelpers.cs new file mode 100644 index 00000000..2b73a4e7 --- /dev/null +++ b/scr/Messenger.Api.Tests/ApiHelpers.cs @@ -0,0 +1,104 @@ +using System.Net; +using System.Net.Http.Headers; +using System.Net.Http.Json; +using System.Text; +using System.Text.Json; + +namespace Messenger.Api.Tests; + +internal sealed record TestUser(Guid Id, string Username, string Password, string Token); + +internal static class ApiHelpers +{ + public const string DefaultPassword = "correct horse battery staple"; + + public static StringContent Json(string raw) => + new(raw, Encoding.UTF8, "application/json"); + + // user != null — запрос с Bearer-токеном этого пользователя. + public static HttpRequestMessage Request(HttpMethod method, string url, TestUser? user = null, HttpContent? content = null) + { + var request = new HttpRequestMessage(method, url) { Content = content }; + if (user is not null) + { + request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", user.Token); + } + + return request; + } + + public static async Task ReadJsonAsync(HttpResponseMessage response) + { + var body = await response.Content.ReadAsStringAsync(); + return JsonDocument.Parse(body).RootElement.Clone(); + } + + public static async Task ErrorCodeAsync(HttpResponseMessage response) + { + var json = await ReadJsonAsync(response); + return json.GetProperty("error").GetProperty("code").GetString()!; + } + + public static string BasicHeader(string username, string password) => + "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes($"{username}:{password}")); + + public static async Task LoginAsync(HttpClient client, string username, string password) + { + using var request = new HttpRequestMessage(HttpMethod.Post, "/api/v1/auth/sessions"); + request.Headers.TryAddWithoutValidation("Authorization", BasicHeader(username, password)); + return await client.SendAsync(request); + } + + // Регистрирует пользователя и входит: возвращает его с рабочим Bearer-токеном. + public static async Task CreateUserAsync(HttpClient client, string? username = null) + { + username ??= "u" + Guid.NewGuid().ToString("N")[..12]; + var response = await client.PostAsJsonAsync("/api/v1/users", + new { username, display_name = "Тест", password = DefaultPassword }); + Assert.Equal(HttpStatusCode.Created, response.StatusCode); + var id = (await ReadJsonAsync(response)).GetProperty("id").GetGuid(); + + var login = await LoginAsync(client, username, DefaultPassword); + Assert.Equal(HttpStatusCode.Created, login.StatusCode); + var token = (await ReadJsonAsync(login)).GetProperty("token").GetString()!; + return new TestUser(id, username, DefaultPassword, token); + } + + public static async Task CreateChatAsync(HttpClient client, TestUser owner, params TestUser[] others) + { + var members = others.Append(owner).Select(u => u.Id).ToArray(); + using var request = Request(HttpMethod.Post, "/api/v1/chats", owner, + JsonContent.Create(new { title = "Чат", member_ids = members })); + var response = await client.SendAsync(request); + Assert.Equal(HttpStatusCode.Created, response.StatusCode); + return (await ReadJsonAsync(response)).GetProperty("id").GetGuid(); + } + + // key == null — новый уникальный Idempotency-Key (каждое сообщение независимо); иначе повтор с заданным ключом. + public static async Task SendMessageAsync( + HttpClient client, TestUser sender, Guid chatId, string text, string? key = null) + { + using var request = Request(HttpMethod.Post, $"/api/v1/chats/{chatId}/messages", sender, + JsonContent.Create(new { text })); + request.Headers.Add("Idempotency-Key", key ?? Guid.NewGuid().ToString("N")); + return await client.SendAsync(request); + } + + public static async Task> ReadAllMessagesAsync(HttpClient client, Guid chatId, TestUser user, int limit) + { + string? cursor = null; + var received = new List(); + do + { + var url = $"/api/v1/chats/{chatId}/messages?limit={limit}" + + (cursor is null ? "" : "&cursor=" + Uri.EscapeDataString(cursor)); + using var request = Request(HttpMethod.Get, url, user); + var page = await ReadJsonAsync(await client.SendAsync(request)); + received.AddRange(page.GetProperty("items").EnumerateArray().Select(m => m.GetProperty("id").GetGuid())); + var next = page.GetProperty("next_cursor"); + cursor = next.ValueKind == JsonValueKind.Null ? null : next.GetString(); + } + while (cursor is not null); + return received; + } +} diff --git a/scr/Messenger.Api.Tests/ApiTests.cs b/scr/Messenger.Api.Tests/ApiTests.cs new file mode 100644 index 00000000..77c45a16 --- /dev/null +++ b/scr/Messenger.Api.Tests/ApiTests.cs @@ -0,0 +1,303 @@ +using System.Net; +using System.Text.Json; +using static Messenger.Api.Tests.ApiHelpers; + +namespace Messenger.Api.Tests; + +[Collection("api")] +public class ApiTests(ApiFixture fixture) +{ + private HttpClient NewClient() => fixture.CreateClient(); + + [Fact] + public async Task CreateUser_WithMalformedJson_ReturnsBadRequest() + { + using var client = NewClient(); + + var response = await client.PostAsync("/api/v1/users", Json("{bad")); + + Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); + Assert.Equal("invalid_request", await ErrorCodeAsync(response)); + Assert.True(response.Headers.Contains("X-Request-Id")); + } + + [Fact] + public async Task CreateUser_WithoutBody_ReturnsBadRequest() + { + using var client = NewClient(); + + var response = await client.PostAsync("/api/v1/users", null); + + Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); + Assert.Equal("invalid_request", await ErrorCodeAsync(response)); + } + + [Fact] + public async Task CreateUser_WithDuplicateUsername_ReturnsConflict() + { + using var client = NewClient(); + var user = await CreateUserAsync(client); + + var response = await client.PostAsync("/api/v1/users", + Json($$"""{"username":"{{user.Username}}","display_name":"Другой","password":"{{DefaultPassword}}"}""")); + + Assert.Equal(HttpStatusCode.Conflict, response.StatusCode); + Assert.Equal("conflict", await ErrorCodeAsync(response)); + } + + [Theory] + [InlineData("short")] + [InlineData("12345678901")] // 11 символов + public async Task CreateUser_WithShortPassword_ReturnsBadRequest(string password) + { + using var client = NewClient(); + + var response = await client.PostAsync("/api/v1/users", + Json($$"""{"username":"short_pw_probe","display_name":"A","password":"{{password}}"}""")); + + Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); + } + + [Fact] + public async Task CreateUser_Response_DoesNotExposePasswordOrHash() + { + using var client = NewClient(); + + var response = await client.PostAsync("/api/v1/users", + Json($$"""{"username":"no_leak_probe","display_name":"A","password":"{{DefaultPassword}}"}""")); + + Assert.Equal(HttpStatusCode.Created, response.StatusCode); + var body = await response.Content.ReadAsStringAsync(); + Assert.DoesNotContain("password", body, StringComparison.OrdinalIgnoreCase); + Assert.DoesNotContain("argon2", body, StringComparison.OrdinalIgnoreCase); + } + + [Fact] + public async Task GetChat_ByNonMember_ReturnsNotFound() + { + using var client = NewClient(); + var alice = await CreateUserAsync(client); + var bob = await CreateUserAsync(client); + var eve = await CreateUserAsync(client); + var chatId = await CreateChatAsync(client, alice, bob); + + using var request = Request(HttpMethod.Get, $"/api/v1/chats/{chatId}", eve); + var response = await client.SendAsync(request); + + Assert.Equal(HttpStatusCode.NotFound, response.StatusCode); + Assert.Equal("not_found", await ErrorCodeAsync(response)); + } + + [Fact] + public async Task ListChats_ShowsOnlyChatsOfCurrentUser() + { + using var client = NewClient(); + var alice = await CreateUserAsync(client); + var bob = await CreateUserAsync(client); + var eve = await CreateUserAsync(client); + var shared = await CreateChatAsync(client, alice, bob); + var other = await CreateChatAsync(client, eve); + + using var request = Request(HttpMethod.Get, "/api/v1/chats", bob); + var page = await ReadJsonAsync(await client.SendAsync(request)); + var ids = page.GetProperty("items").EnumerateArray().Select(c => c.GetProperty("id").GetGuid()).ToList(); + + Assert.Contains(shared, ids); + Assert.DoesNotContain(other, ids); + } + + [Fact] + public async Task CreateChat_WithUnknownMember_ReturnsBadRequestAndCreatesNothing() + { + using var client = NewClient(); + var alice = await CreateUserAsync(client); + + using var request = Request(HttpMethod.Post, "/api/v1/chats", alice, + Json($$"""{"title":"X","member_ids":["{{alice.Id}}","{{Guid.NewGuid()}}"]}""")); + var response = await client.SendAsync(request); + + Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); + using var list = Request(HttpMethod.Get, "/api/v1/chats", alice); + var page = await ReadJsonAsync(await client.SendAsync(list)); + Assert.Empty(page.GetProperty("items").EnumerateArray()); + } + + [Fact] + public async Task SendMessage_ToForeignChat_ReturnsNotFound() + { + using var client = NewClient(); + var alice = await CreateUserAsync(client); + var bob = await CreateUserAsync(client); + var eve = await CreateUserAsync(client); + var chatId = await CreateChatAsync(client, alice, bob); + + var response = await SendMessageAsync(client, eve, chatId, "чужое"); + + Assert.Equal(HttpStatusCode.NotFound, response.StatusCode); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + public async Task SendMessage_WithEmptyText_ReturnsBadRequest(string text) + { + using var client = NewClient(); + var alice = await CreateUserAsync(client); + var chatId = await CreateChatAsync(client, alice); + + var response = await SendMessageAsync(client, alice, chatId, text); + + Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); + Assert.Equal("invalid_request", await ErrorCodeAsync(response)); + } + + [Fact] + public async Task SendMessage_SenderIsTakenFromSession_NotFromRequest() + { + using var client = NewClient(); + var alice = await CreateUserAsync(client); + var bob = await CreateUserAsync(client); + var chatId = await CreateChatAsync(client, alice, bob); + + using var request = Request(HttpMethod.Post, $"/api/v1/chats/{chatId}/messages", alice, + Json($$"""{"text":"привет","sender_id":"{{bob.Id}}"}""")); + request.Headers.Add("Idempotency-Key", Guid.NewGuid().ToString("N")); + var withSender = await client.SendAsync(request); + var ok = await SendMessageAsync(client, alice, chatId, "привет"); + + Assert.Equal(HttpStatusCode.BadRequest, withSender.StatusCode); // sender_id в запросе не принимается + Assert.Equal(alice.Id, (await ReadJsonAsync(ok)).GetProperty("sender_id").GetGuid()); + } + + [Fact] + public async Task ListMessages_WalksAllPagesWithoutGapsOrDuplicates() + { + using var client = NewClient(); + var alice = await CreateUserAsync(client); + var bob = await CreateUserAsync(client); + var chatId = await CreateChatAsync(client, alice, bob); + const int total = 7; + var sent = new List(); + for (var i = 0; i < total; i++) + { + var response = await SendMessageAsync(client, i % 2 == 0 ? alice : bob, chatId, $"сообщение {i}"); + sent.Add((await ReadJsonAsync(response)).GetProperty("id").GetGuid()); + } + + var received = new List(); + string? cursor = null; + var pages = 0; + do + { + var url = $"/api/v1/chats/{chatId}/messages?limit=3" + + (cursor is null ? "" : "&cursor=" + Uri.EscapeDataString(cursor)); + using var request = Request(HttpMethod.Get, url, alice); + var page = await ReadJsonAsync(await client.SendAsync(request)); + received.AddRange(page.GetProperty("items").EnumerateArray().Select(m => m.GetProperty("id").GetGuid())); + var next = page.GetProperty("next_cursor"); + cursor = next.ValueKind == JsonValueKind.Null ? null : next.GetString(); + pages++; + } + while (cursor is not null && pages < 10); + + Assert.Equal(3, pages); + Assert.Equal(total, received.Count); + // Один автор в одном чате: порядок истории совпадает с порядком отправки. + Assert.Equal(sent, received); + } + + [Fact] + public async Task ListMessages_WithCursorFromAnotherChat_ReturnsBadRequest() + { + using var client = NewClient(); + var alice = await CreateUserAsync(client); + var chat1 = await CreateChatAsync(client, alice); + var chat2 = await CreateChatAsync(client, alice); + await SendMessageAsync(client, alice, chat1, "a"); + await SendMessageAsync(client, alice, chat1, "b"); + using var first = Request(HttpMethod.Get, $"/api/v1/chats/{chat1}/messages?limit=1", alice); + var cursor = (await ReadJsonAsync(await client.SendAsync(first))).GetProperty("next_cursor").GetString()!; + + using var request = Request(HttpMethod.Get, + $"/api/v1/chats/{chat2}/messages?cursor={Uri.EscapeDataString(cursor)}", alice); + var response = await client.SendAsync(request); + + Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); + } + + [Fact] + public async Task ListMessages_ReturnsSameOrderForAnyPageSize() + { + using var client = NewClient(); + var alice = await CreateUserAsync(client); + var chatId = await CreateChatAsync(client, alice); + var sent = new List(); + for (var i = 0; i < 120; i++) + { + var response = await SendMessageAsync(client, alice, chatId, $"m{i}"); + sent.Add((await ReadJsonAsync(response)).GetProperty("id").GetGuid()); + } + + var baseline = await ReadAllMessagesAsync(client, chatId, alice, 100); + Assert.Equal(sent, baseline); + foreach (var limit in new[] { 1, 7, 50 }) + { + var received = await ReadAllMessagesAsync(client, chatId, alice, limit); + Assert.Equal(baseline, received); + } + } + + [Fact] + public async Task ListMessages_AfterConcurrentSends_IsOrderedByTimeThenId() + { + using var client = NewClient(); + var users = new List(); + for (var i = 0; i < 10; i++) + { + users.Add(await CreateUserAsync(client)); + } + + var chatId = await CreateChatAsync(client, users[0], users.Skip(1).ToArray()); + + var sends = Enumerable.Range(0, 300).Select(i => SendMessageAsync(client, users[i % 10], chatId, $"m{i}")); + foreach (var response in await Task.WhenAll(sends)) + { + Assert.Equal(HttpStatusCode.Created, response.StatusCode); + } + + var items = new List<(string CreatedAt, Guid Id)>(); + string? cursor = null; + do + { + var url = $"/api/v1/chats/{chatId}/messages?limit=100" + + (cursor is null ? "" : "&cursor=" + Uri.EscapeDataString(cursor)); + using var request = Request(HttpMethod.Get, url, users[0]); + var page = await ReadJsonAsync(await client.SendAsync(request)); + items.AddRange(page.GetProperty("items").EnumerateArray() + .Select(m => (m.GetProperty("created_at").GetString()!, m.GetProperty("id").GetGuid()))); + var next = page.GetProperty("next_cursor"); + cursor = next.ValueKind == JsonValueKind.Null ? null : next.GetString(); + } + while (cursor is not null); + + Assert.Equal(300, items.Count); + Assert.Equal(300, items.Select(x => x.Id).Distinct().Count()); + // Серверное время строго возрастает внутри чата (см. last_message_at), поэтому порядок истории — порядок записи. + Assert.Equal(300, items.Select(x => x.CreatedAt).Distinct().Count()); + Assert.Equal(items.OrderBy(x => x.CreatedAt, StringComparer.Ordinal).ToList(), items); + } + + [Theory] + [InlineData("""{"USERNAME":"probe_case_a","display_name":"A","password":"correct horse battery staple"}""")] + [InlineData("""{"username":"probe_case_b","Display_Name":"A","password":"correct horse battery staple"}""")] + [InlineData("""{"Username":"probe_case_c","display_name":"A","password":"correct horse battery staple"}""")] + public async Task CreateUser_WithDifferentlyCasedFieldNames_ReturnsBadRequest(string body) + { + using var client = NewClient(); + + var response = await client.PostAsync("/api/v1/users", Json(body)); + + Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); + Assert.Equal("invalid_request", await ErrorCodeAsync(response)); + } +} diff --git a/scr/Messenger.Api.Tests/AuthTests.cs b/scr/Messenger.Api.Tests/AuthTests.cs new file mode 100644 index 00000000..e2cd91ef --- /dev/null +++ b/scr/Messenger.Api.Tests/AuthTests.cs @@ -0,0 +1,252 @@ +using System.Net; +using System.Net.Http.Headers; +using static Messenger.Api.Tests.ApiHelpers; + +namespace Messenger.Api.Tests; + +[Collection("api")] +public class AuthTests(ApiFixture fixture) +{ + private static readonly string[] ProtectedGets = + [ + "/api/v1/users/me", + "/api/v1/chats", + "/api/v1/chats/00000000-0000-0000-0000-000000000001", + "/api/v1/chats/00000000-0000-0000-0000-000000000001/messages" + ]; + + [Fact] + public async Task Login_WithValidCredentials_ReturnsOpaqueBearerSession() + { + using var client = fixture.CreateClient(); + var user = await CreateUserAsync(client); + + var response = await LoginAsync(client, user.Username, user.Password); + + Assert.Equal(HttpStatusCode.Created, response.StatusCode); + var json = await ReadJsonAsync(response); + Assert.Equal("Bearer", json.GetProperty("token_type").GetString()); + Assert.True(json.GetProperty("token").GetString()!.Length >= 43); // 256 бит в base64url + Assert.Equal(user.Id, json.GetProperty("user").GetProperty("id").GetGuid()); + Assert.DoesNotContain("password", await response.Content.ReadAsStringAsync(), StringComparison.OrdinalIgnoreCase); + } + + [Fact] + public async Task Login_AcceptsColonInPassword() + { + using var client = fixture.CreateClient(); + var username = "colon" + Guid.NewGuid().ToString("N")[..8]; + await client.PostAsync("/api/v1/users", + Json($$"""{"username":"{{username}}","display_name":"A","password":"pass:with:colons-123"}""")); + + var response = await LoginAsync(client, username, "pass:with:colons-123"); + + Assert.Equal(HttpStatusCode.Created, response.StatusCode); + } + + [Fact] + public async Task Login_WrongPasswordAndUnknownUser_GiveIdenticalUnauthorized() + { + using var client = fixture.CreateClient(); + var user = await CreateUserAsync(client); + + var wrongPassword = await LoginAsync(client, user.Username, "totally-wrong-password"); + var unknownUser = await LoginAsync(client, "nobody_" + Guid.NewGuid().ToString("N")[..8], DefaultPassword); + + foreach (var response in new[] { wrongPassword, unknownUser }) + { + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); + Assert.Equal("Basic realm=\"messenger\", charset=\"UTF-8\"", response.Headers.WwwAuthenticate.ToString()); + Assert.Equal("unauthorized", await ErrorCodeAsync(response)); + } + + var a = (await ReadJsonAsync(wrongPassword)).GetProperty("error").GetProperty("message").GetString(); + var b = (await ReadJsonAsync(unknownUser)).GetProperty("error").GetProperty("message").GetString(); + Assert.Equal(a, b); + } + + [Theory] + [InlineData("Basic !!!not-base64")] + [InlineData("Basic bm9jb2xvbg==")] // "nocolon" + [InlineData("Bearer sometoken")] + [InlineData("")] + public async Task Login_WithMalformedAuthorization_ReturnsUnauthorized(string header) + { + using var client = fixture.CreateClient(); + using var request = new HttpRequestMessage(HttpMethod.Post, "/api/v1/auth/sessions"); + if (header.Length > 0) + { + request.Headers.TryAddWithoutValidation("Authorization", header); + } + + var response = await client.SendAsync(request); + + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); + Assert.StartsWith("Basic", response.Headers.WwwAuthenticate.ToString()); + } + + [Theory] + [MemberData(nameof(ProtectedUrls))] + public async Task ProtectedEndpoints_WithoutToken_ReturnUnauthorizedWithBearerChallenge(string url) + { + using var client = fixture.CreateClient(); + + var response = await client.GetAsync(url); + + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); + Assert.Equal("Bearer realm=\"messenger\"", response.Headers.WwwAuthenticate.ToString()); + Assert.True(response.Headers.Contains("X-Request-Id")); + } + + public static IEnumerable ProtectedUrls() => ProtectedGets.Select(u => new object[] { u }); + + [Fact] + public async Task ProtectedEndpoint_WithBasicAuth_ReturnsUnauthorized() + { + using var client = fixture.CreateClient(); + var user = await CreateUserAsync(client); + using var request = new HttpRequestMessage(HttpMethod.Get, "/api/v1/users/me"); + request.Headers.TryAddWithoutValidation("Authorization", BasicHeader(user.Username, user.Password)); + + var response = await client.SendAsync(request); + + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); + } + + [Fact] + public async Task XUserIdHeader_IsIgnored() + { + using var client = fixture.CreateClient(); + var alice = await CreateUserAsync(client); + var eve = await CreateUserAsync(client); + + // Без токена X-User-Id не даёт доступа. + using var anonymous = new HttpRequestMessage(HttpMethod.Get, "/api/v1/users/me"); + anonymous.Headers.Add("X-User-Id", alice.Id.ToString()); + Assert.Equal(HttpStatusCode.Unauthorized, (await client.SendAsync(anonymous)).StatusCode); + + // С токеном — владелец сессии не подменяется. + using var spoofed = Request(HttpMethod.Get, "/api/v1/users/me", alice); + spoofed.Headers.Add("X-User-Id", eve.Id.ToString()); + var me = await ReadJsonAsync(await client.SendAsync(spoofed)); + Assert.Equal(alice.Id, me.GetProperty("id").GetGuid()); + } + + [Fact] + public async Task UnauthenticatedPostWithMalformedBody_ReturnsUnauthorizedNotBadRequest() + { + using var client = fixture.CreateClient(); + + var response = await client.PostAsync("/api/v1/chats", Json("{bad")); + + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); // сначала аутентификация + } + + [Fact] + public async Task Logout_RevokesTokenAndSecondLogoutIsUnauthorized() + { + using var client = fixture.CreateClient(); + var user = await CreateUserAsync(client); + + using var first = Request(HttpMethod.Delete, "/api/v1/auth/sessions/current", user); + var firstResponse = await client.SendAsync(first); + Assert.Equal(HttpStatusCode.NoContent, firstResponse.StatusCode); + Assert.Equal(0, firstResponse.Content.Headers.ContentLength ?? 0); + + using var again = Request(HttpMethod.Delete, "/api/v1/auth/sessions/current", user); + Assert.Equal(HttpStatusCode.Unauthorized, (await client.SendAsync(again)).StatusCode); + using var me = Request(HttpMethod.Get, "/api/v1/users/me", user); + Assert.Equal(HttpStatusCode.Unauthorized, (await client.SendAsync(me)).StatusCode); + } + + [Fact] + public async Task LogoutOfOneSession_DoesNotAffectAnotherSessionOfSameUser() + { + using var client = fixture.CreateClient(); + var user = await CreateUserAsync(client); + var secondLogin = await ReadJsonAsync(await LoginAsync(client, user.Username, user.Password)); + var second = user with { Token = secondLogin.GetProperty("token").GetString()! }; + + using var logout = Request(HttpMethod.Delete, "/api/v1/auth/sessions/current", user); + await client.SendAsync(logout); + + using var me = Request(HttpMethod.Get, "/api/v1/users/me", second); + Assert.Equal(HttpStatusCode.OK, (await client.SendAsync(me)).StatusCode); + } + + [Fact] + public async Task ExpiredSession_IsRejected() + { + using var client = fixture.CreateClient(); + var user = await CreateUserAsync(client); + using var before = Request(HttpMethod.Get, "/api/v1/users/me", user); + Assert.Equal(HttpStatusCode.OK, (await client.SendAsync(before)).StatusCode); + + // Состарим сессию в БД: created_at < expires_at < now (ограничение таблицы требует expires_at > created_at). + await using (var db = await fixture.OpenConnectionAsync()) + await using (var age = new Npgsql.NpgsqlCommand( + "update sessions set created_at = now() - interval '10 seconds', expires_at = now() - interval '5 seconds' where user_id = @u", db)) + { + age.Parameters.AddWithValue("u", user.Id); + Assert.Equal(1, await age.ExecuteNonQueryAsync()); + } + + using var after = Request(HttpMethod.Get, "/api/v1/users/me", user); + Assert.Equal(HttpStatusCode.Unauthorized, (await client.SendAsync(after)).StatusCode); + } + + [Fact] + public async Task ShortSessionTtl_ExpiresSessionByItself() + { + // Отдельный экземпляр приложения с SESSION_TTL_SECONDS=2 поверх той же БД: никаких подмен данных в таблице. + await using var app = fixture.WithWebHostBuilder(b => b.UseSetting("SESSION_TTL_SECONDS", "2")); + using var client = app.CreateClient(); + var user = await CreateUserAsync(client); + + using (var alive = Request(HttpMethod.Get, "/api/v1/users/me", user)) + { + Assert.Equal(HttpStatusCode.OK, (await client.SendAsync(alive)).StatusCode); + } + + await Task.Delay(TimeSpan.FromSeconds(3)); + + using var expired = Request(HttpMethod.Get, "/api/v1/users/me", user); + var response = await client.SendAsync(expired); + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); + Assert.Equal("Bearer realm=\"messenger\"", response.Headers.WwwAuthenticate.ToString()); + // Истёкшая сессия не продлевается: повторный вход выдаёт новую. + Assert.Equal(HttpStatusCode.Created, (await LoginAsync(client, user.Username, user.Password)).StatusCode); + } + + [Fact] + public async Task SessionsTable_StoresTokenHashNotToken() + { + using var client = fixture.CreateClient(); + var user = await CreateUserAsync(client); + + await using var db = await fixture.OpenConnectionAsync(); + await using var query = new Npgsql.NpgsqlCommand( + "select token_hash from sessions where user_id = @u", db); + query.Parameters.AddWithValue("u", user.Id); + var stored = (byte[])(await query.ExecuteScalarAsync())!; + + Assert.Equal(32, stored.Length); + Assert.NotEqual(System.Text.Encoding.UTF8.GetBytes(user.Token), stored); + Assert.Equal(System.Security.Cryptography.SHA256.HashData(System.Text.Encoding.UTF8.GetBytes(user.Token)), stored); + } + + [Fact] + public async Task PasswordsAreStoredAsArgon2id() + { + using var client = fixture.CreateClient(); + var user = await CreateUserAsync(client); + + await using var db = await fixture.OpenConnectionAsync(); + await using var query = new Npgsql.NpgsqlCommand("select password_hash from users where id = @u", db); + query.Parameters.AddWithValue("u", user.Id); + var hash = (string)(await query.ExecuteScalarAsync())!; + + Assert.StartsWith("$argon2id$", hash); + Assert.DoesNotContain(user.Password, hash); + } +} diff --git a/scr/Messenger.Api.Tests/CacheTests.cs b/scr/Messenger.Api.Tests/CacheTests.cs new file mode 100644 index 00000000..70b0e24b --- /dev/null +++ b/scr/Messenger.Api.Tests/CacheTests.cs @@ -0,0 +1,150 @@ +using System.Net; +using Microsoft.AspNetCore.Mvc.Testing; +using static Messenger.Api.Tests.ApiHelpers; + +namespace Messenger.Api.Tests; + +[Collection("api")] +public class CacheTests(ApiFixture fixture) +{ + private static string Header(HttpResponseMessage response, string name) => + response.Headers.TryGetValues(name, out var values) ? values.First() : ""; + + private static async Task GetPageAsync( + HttpClient client, TestUser user, Guid chatId, int limit = 50, string? cursor = null) + { + var url = $"/api/v1/chats/{chatId}/messages?limit={limit}" + + (cursor is null ? "" : "&cursor=" + Uri.EscapeDataString(cursor)); + using var request = Request(HttpMethod.Get, url, user); + return await client.SendAsync(request); + } + + private static async Task<(TestUser Alice, TestUser Bob, Guid Chat)> ChatWithMessagesAsync(HttpClient client, int messages) + { + var alice = await CreateUserAsync(client); + var bob = await CreateUserAsync(client); + var chat = await CreateChatAsync(client, alice, bob); + for (var i = 0; i < messages; i++) + { + Assert.Equal(HttpStatusCode.Created, (await SendMessageAsync(client, alice, chat, $"m{i}")).StatusCode); + } + + return (alice, bob, chat); + } + + [Fact] + public async Task SecondRead_IsServedFromCache_WithFewerSqlQueries_AndIdenticalBody() + { + using var client = fixture.CreateClient(); + var (_, bob, chat) = await ChatWithMessagesAsync(client, 3); + + var first = await GetPageAsync(client, bob, chat); + var second = await GetPageAsync(client, bob, chat); + + Assert.Equal("miss", Header(first, "X-Cache")); + Assert.Equal("hit", Header(second, "X-Cache")); + // miss: сессия + версия/доступ + страница; hit: сессия + версия/доступ. + Assert.Equal("3", Header(first, "X-Db-Queries")); + Assert.Equal("2", Header(second, "X-Db-Queries")); + Assert.Equal(await first.Content.ReadAsStringAsync(), await second.Content.ReadAsStringAsync()); + } + + [Fact] + public async Task ReadAfterWrite_NeverReturnsStaleCachedPage() + { + using var client = fixture.CreateClient(); + var (alice, bob, chat) = await ChatWithMessagesAsync(client, 2); + await GetPageAsync(client, bob, chat); // прогрели кэш + Assert.Equal("hit", Header(await GetPageAsync(client, bob, chat), "X-Cache")); + + for (var i = 0; i < 20; i++) + { + var sent = await SendMessageAsync(client, alice, chat, $"new {i}"); + var id = (await ReadJsonAsync(sent)).GetProperty("id").GetGuid(); + + // Сразу после подтверждённой записи (201) следующее чтение обязано содержать новое сообщение. + var ids = await ReadAllMessagesAsync(client, chat, bob, 100); + Assert.Contains(id, ids); + Assert.Equal(3 + i, ids.Count); + } + } + + [Fact] + public async Task FlushedCache_DoesNotChangeResults() + { + using var client = fixture.CreateClient(); + var (_, bob, chat) = await ChatWithMessagesAsync(client, 5); + var before = await ReadAllMessagesAsync(client, chat, bob, 2); + Assert.Equal("hit", Header(await GetPageAsync(client, bob, chat, 2), "X-Cache")); + + await fixture.FlushCacheAsync(); + + var response = await GetPageAsync(client, bob, chat, 2); + Assert.Equal("miss", Header(response, "X-Cache")); + Assert.Equal(before, await ReadAllMessagesAsync(client, chat, bob, 2)); + } + + [Fact] + public async Task CachedPage_IsNotVisibleToNonMember() + { + using var client = fixture.CreateClient(); + var (_, bob, chat) = await ChatWithMessagesAsync(client, 2); + var eve = await CreateUserAsync(client); + await GetPageAsync(client, bob, chat); + Assert.Equal("hit", Header(await GetPageAsync(client, bob, chat), "X-Cache")); + + var response = await GetPageAsync(client, eve, chat); + + Assert.Equal(HttpStatusCode.NotFound, response.StatusCode); // доступ проверяется до обращения к кэшу + Assert.DoesNotContain("m0", await response.Content.ReadAsStringAsync()); + } + + [Fact] + public async Task PagesWithDifferentLimitsAndCursors_AreCachedSeparately() + { + using var client = fixture.CreateClient(); + var (_, bob, chat) = await ChatWithMessagesAsync(client, 9); + + var firstPass = await ReadAllMessagesAsync(client, chat, bob, 4); + var secondPass = await ReadAllMessagesAsync(client, chat, bob, 4); // все страницы уже в кэше + var otherLimit = await ReadAllMessagesAsync(client, chat, bob, 3); + + Assert.Equal(9, firstPass.Count); + Assert.Equal(firstPass, secondPass); + Assert.Equal(firstPass, otherLimit); + } + + [Fact] + public async Task UnavailableCache_IsBypassed_AndRequestsStillSucceed() + { + using var client = fixture.CreateClient(); + var (_, bob, chat) = await ChatWithMessagesAsync(client, 3); + var expected = await ReadAllMessagesAsync(client, chat, bob, 100); + + // Второй экземпляр приложения, у которого кэш указывает на закрытый порт. + await using var broken = fixture.WithWebHostBuilder(b => b.UseSetting("CACHE_CONNECTION", "127.0.0.1:1")); + using var brokenClient = broken.CreateClient(); + + for (var i = 0; i < 3; i++) + { + var response = await GetPageAsync(brokenClient, bob, chat); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.Equal("bypass", Header(response, "X-Cache")); + } + + Assert.Equal(expected, await ReadAllMessagesAsync(brokenClient, chat, bob, 100)); + // Запись тоже не зависит от кэша. + Assert.Equal(HttpStatusCode.Created, (await SendMessageAsync(brokenClient, bob, chat, "при отказе кэша")).StatusCode); + } + + [Fact] + public async Task UnavailableCache_DoesNotTrustAnonymousRequests() + { + await using var broken = fixture.WithWebHostBuilder(b => b.UseSetting("CACHE_CONNECTION", "127.0.0.1:1")); + using var client = broken.CreateClient(); + + var response = await client.GetAsync($"/api/v1/chats/{Guid.NewGuid()}/messages"); + + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); + } +} diff --git a/scr/Messenger.Api.Tests/ConcurencyTests.cs b/scr/Messenger.Api.Tests/ConcurencyTests.cs new file mode 100644 index 00000000..772273e2 --- /dev/null +++ b/scr/Messenger.Api.Tests/ConcurencyTests.cs @@ -0,0 +1,79 @@ +using System.Net; +using static Messenger.Api.Tests.ApiHelpers; + +namespace Messenger.Api.Tests; + +[Collection("api")] +public class ConcurencyTests(ApiFixture fixture) +{ + [Fact] + public async Task Create100MessagesBy10DifferentUsers_Concurrent() + { + using var client = fixture.CreateClient(); + var users = new List(); + for (var i = 0; i < 10; i++) + { + users.Add(await CreateUserAsync(client)); + } + + var chat = await CreateChatAsync(client, users[0], users.Skip(1).ToArray()); + + var messageTasks = Enumerable.Range(0, 100) + .Select(i => SendMessageAsync(client, users[i % 10], chat, $"Message {i + 1} from {users[i % 10].Username}")) + .ToList(); + + foreach (var response in await Task.WhenAll(messageTasks)) + { + Assert.Equal(HttpStatusCode.Created, response.StatusCode); + } + + var messages = await ReadAllMessagesAsync(client, chat, users[0], 7); + + Assert.Equal(100, messages.Count); + Assert.Equal(100, messages.Distinct().Count()); + } + + [Fact] + public async Task RegisterSameUsernameConcurrently_ExactlyOneSucceeds_NoServerErrors() + { + // Проверяется гарантия уникального индекса, а не скорость железа: очередь хеширования делаем практически + // неограниченной по времени (по умолчанию лишние запросы получают 503, см. следующий тест). + await using var app = fixture.WithWebHostBuilder(b => b.UseSetting("PASSWORD_HASH_QUEUE_TIMEOUT_SECONDS", "120")); + using var client = app.CreateClient(); + var username = "race" + Guid.NewGuid().ToString("N")[..10]; + + var attempts = Enumerable.Range(0, 20).Select(_ => client.PostAsync("/api/v1/users", + Json($$"""{"username":"{{username}}","display_name":"Гонка","password":"{{DefaultPassword}}"}"""))); + var statuses = (await Task.WhenAll(attempts)).Select(r => r.StatusCode).ToList(); + + Assert.Single(statuses, HttpStatusCode.Created); + Assert.Equal(19, statuses.Count(s => s == HttpStatusCode.Conflict)); + + await using var db = await fixture.OpenConnectionAsync(); + await using var count = new Npgsql.NpgsqlCommand("select count(*) from users where username = @u", db); + count.Parameters.AddWithValue("u", username); + Assert.Equal(1L, await count.ExecuteScalarAsync()); + } + + [Fact] + public async Task RegistrationBurstBeyondHashingCapacity_GetsBoundedUnavailable_NotServerError() + { + // Один слот Argon2 и ожидание 50 мс: пачка регистраций разных пользователей упирается в лимит. + // Лишние запросы получают 503 unavailable (а не 500 и не зависание), принятые — 201. + await using var app = fixture.WithWebHostBuilder(b => b + .UseSetting("PASSWORD_HASH_CONCURRENCY", "1") + .UseSetting("PASSWORD_HASH_QUEUE_TIMEOUT_SECONDS", "0.05")); + using var client = app.CreateClient(); + var prefix = "burst" + Guid.NewGuid().ToString("N")[..6]; + + var responses = await Task.WhenAll(Enumerable.Range(0, 12).Select(i => client.PostAsync("/api/v1/users", + Json($$"""{"username":"{{prefix}}_{{i}}","display_name":"Пачка","password":"{{DefaultPassword}}"}""")))); + var statuses = responses.Select(r => r.StatusCode).ToList(); + + Assert.All(statuses, s => Assert.True(s is HttpStatusCode.Created or HttpStatusCode.ServiceUnavailable, $"неожиданный статус {s}")); + Assert.Contains(HttpStatusCode.Created, statuses); + Assert.Contains(HttpStatusCode.ServiceUnavailable, statuses); + var rejected = responses.First(r => r.StatusCode == HttpStatusCode.ServiceUnavailable); + Assert.Equal("unavailable", await ErrorCodeAsync(rejected)); + } +} diff --git a/scr/Messenger.Api.Tests/DependencyFailureTests.cs b/scr/Messenger.Api.Tests/DependencyFailureTests.cs new file mode 100644 index 00000000..b1338c25 --- /dev/null +++ b/scr/Messenger.Api.Tests/DependencyFailureTests.cs @@ -0,0 +1,192 @@ +using System.Diagnostics; +using System.Net; +using System.Net.Sockets; +using Microsoft.AspNetCore.Mvc.Testing; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; +using Testcontainers.PostgreSql; +using static Messenger.Api.Tests.ApiHelpers; + +namespace Messenger.Api.Tests; + +[Collection("api")] +public class DependencyFailureTests(ApiFixture fixture) +{ + private static int FreePort() + { + using var listener = new TcpListener(IPAddress.Loopback, 0); + listener.Start(); + return ((IPEndPoint)listener.LocalEndpoint).Port; + } + + [Fact] + public async Task DatabaseDown_Returns503_NeverTrustsAnonymous_AndRecovers() + { + // Отдельный контейнер БД, который тест останавливает и запускает снова на том же порту. + var port = FreePort(); + await using var pg = new PostgreSqlBuilder().WithImage(ApiFixture.PostgresImage).WithPortBinding(port, 5432).Build(); + await pg.StartAsync(); + var file = ApiFixture.WriteConnectionFile(pg.GetConnectionString()); + try + { + await using var app = fixture.WithWebHostBuilder(b => b + .UseSetting("DATABASE_URL_FILE", file) + .UseSetting("DB_CONNECT_TIMEOUT_SECONDS", "2")); + using var client = app.CreateClient(); + var user = await CreateUserAsync(client); + using (var ok = Request(HttpMethod.Get, "/api/v1/users/me", user)) + { + Assert.Equal(HttpStatusCode.OK, (await client.SendAsync(ok)).StatusCode); + } + + await pg.StopAsync(); + + // Аутентифицированный запрос: ограниченная ошибка 503 без внутренних деталей. + using var down = Request(HttpMethod.Get, "/api/v1/users/me", user); + var downResponse = await client.SendAsync(down); + Assert.Equal(HttpStatusCode.ServiceUnavailable, downResponse.StatusCode); + Assert.Equal("unavailable", await ErrorCodeAsync(downResponse)); + var body = await downResponse.Content.ReadAsStringAsync(); + Assert.DoesNotContain("Npgsql", body); + Assert.DoesNotContain("Host=", body); + Assert.True(downResponse.Headers.Contains("X-Request-Id")); + + // Анонимный запрос не становится доверенным: без токена по-прежнему 401, а не 200/503 «как гость». + Assert.Equal(HttpStatusCode.Unauthorized, (await client.GetAsync("/api/v1/chats")).StatusCode); + // Токен, который нельзя проверить, не принимается. + Assert.Equal(HttpStatusCode.ServiceUnavailable, + (await LoginAsync(client, user.Username, user.Password)).StatusCode); + // Готовность отражает отказ, живость — нет. + Assert.Equal(HttpStatusCode.ServiceUnavailable, (await client.GetAsync("/health/ready")).StatusCode); + Assert.Equal(HttpStatusCode.OK, (await client.GetAsync("/health/live")).StatusCode); + + // Восстановление: после запуска БД тот же токен снова работает (данные не потеряны), без перезапуска API. + await pg.StartAsync(); + var recovered = false; + var started = Stopwatch.StartNew(); + while (started.Elapsed < TimeSpan.FromSeconds(30) && !recovered) + { + using var retry = Request(HttpMethod.Get, "/api/v1/users/me", user); + recovered = (await client.SendAsync(retry)).StatusCode == HttpStatusCode.OK; + if (!recovered) + { + await Task.Delay(500); + } + } + + Assert.True(recovered, "API не восстановился после возврата PostgreSQL"); + } + finally + { + File.Delete(file); + } + } + + [Fact] + public async Task ExhaustedConnectionPool_ReturnsBoundedError() + { + using var setup = fixture.CreateClient(); + var user = await CreateUserAsync(setup); + + // Пул из одного соединения и короткое ожидание: пока тест держит единственное соединение, запросы не зависают. + await using var app = fixture.WithWebHostBuilder(b => b + .UseSetting("DB_MAX_POOL_SIZE", "1") + .UseSetting("DB_CONNECT_TIMEOUT_SECONDS", "1")); + using var client = app.CreateClient(); + + using var scope = app.Services.CreateScope(); + var held = scope.ServiceProvider.GetRequiredService(); + await held.Database.OpenConnectionAsync(); + try + { + var started = Stopwatch.StartNew(); + using var request = Request(HttpMethod.Get, "/api/v1/users/me", user); + var response = await client.SendAsync(request); + started.Stop(); + + Assert.Equal(HttpStatusCode.ServiceUnavailable, response.StatusCode); + Assert.True(started.Elapsed < TimeSpan.FromSeconds(6), $"ответ занял {started.Elapsed}"); + } + finally + { + await held.Database.CloseConnectionAsync(); + } + + // После освобождения соединения сервис работает. + using var after = Request(HttpMethod.Get, "/api/v1/users/me", user); + Assert.Equal(HttpStatusCode.OK, (await client.SendAsync(after)).StatusCode); + } + + [Fact] + public async Task FailedMessageInsert_RollsBackVersionAndTimestamp() + { + using var client = fixture.CreateClient(); + var alice = await CreateUserAsync(client); + var chat = await CreateChatAsync(client, alice); + Assert.Equal(HttpStatusCode.Created, (await SendMessageAsync(client, alice, chat, "до сбоя")).StatusCode); + + var marker = "boom-" + Guid.NewGuid().ToString("N"); + var suffix = Guid.NewGuid().ToString("N")[..8]; + // Сбой «после UPDATE чата, во время INSERT сообщения»: триггер БД отклоняет сообщение с маркером. + await fixture.ExecuteAsync($$""" + CREATE FUNCTION fail_{{suffix}}() RETURNS trigger LANGUAGE plpgsql AS $$ + BEGIN IF NEW.text = '{{marker}}' THEN RAISE EXCEPTION 'injected failure'; END IF; RETURN NEW; END $$; + CREATE TRIGGER tr_{{suffix}} BEFORE INSERT ON messages FOR EACH ROW EXECUTE FUNCTION fail_{{suffix}}(); + """); + try + { + var versionBefore = await fixture.ScalarAsync("select history_version from chats where id = @c", ("c", chat)); + var lastBefore = await fixture.ScalarAsync("select last_message_at from chats where id = @c", ("c", chat)); + + var failed = await SendMessageAsync(client, alice, chat, marker); + + Assert.Equal(HttpStatusCode.InternalServerError, failed.StatusCode); + var body = await failed.Content.ReadAsStringAsync(); + Assert.Contains("internal_error", body); + Assert.DoesNotContain("injected", body); // внутренние детали не раскрываются + Assert.Equal(versionBefore, await fixture.ScalarAsync("select history_version from chats where id = @c", ("c", chat))); + Assert.Equal(lastBefore, await fixture.ScalarAsync("select last_message_at from chats where id = @c", ("c", chat))); + Assert.Equal(1L, await fixture.ScalarAsync("select count(*) from messages where chat_id = @c", ("c", chat))); + + // Блокировка строки чата снята, следующая запись проходит и версия растёт ровно на 1. + Assert.Equal(HttpStatusCode.Created, (await SendMessageAsync(client, alice, chat, "после сбоя")).StatusCode); + Assert.Equal(versionBefore + 1, await fixture.ScalarAsync("select history_version from chats where id = @c", ("c", chat))); + } + finally + { + await fixture.ExecuteAsync($"DROP TRIGGER tr_{suffix} ON messages; DROP FUNCTION fail_{suffix}();"); + } + } + + [Fact] + public async Task FailedChatMemberInsert_RollsBackWholeChat() + { + using var client = fixture.CreateClient(); + var alice = await CreateUserAsync(client); + var bob = await CreateUserAsync(client); + var suffix = Guid.NewGuid().ToString("N")[..8]; + var title = "rollback-" + suffix; + + // Сбой при добавлении второго участника, уже после вставки строки чата и первого участника. + await fixture.ExecuteAsync($$""" + CREATE FUNCTION fail_{{suffix}}() RETURNS trigger LANGUAGE plpgsql AS $$ + BEGIN IF NEW.user_id = '{{bob.Id}}' THEN RAISE EXCEPTION 'injected failure'; END IF; RETURN NEW; END $$; + CREATE TRIGGER tr_{{suffix}} BEFORE INSERT ON chat_members FOR EACH ROW EXECUTE FUNCTION fail_{{suffix}}(); + """); + try + { + using var request = Request(HttpMethod.Post, "/api/v1/chats", alice, + Json($$"""{"title":"{{title}}","member_ids":["{{alice.Id}}","{{bob.Id}}"]}""")); + var response = await client.SendAsync(request); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + Assert.Equal(0L, await fixture.ScalarAsync("select count(*) from chats where title = @t", ("t", title))); + Assert.Equal(0L, await fixture.ScalarAsync( + "select count(*) from chat_members where user_id in (@a, @b) ", ("a", alice.Id), ("b", bob.Id))); + } + finally + { + await fixture.ExecuteAsync($"DROP TRIGGER tr_{suffix} ON chat_members; DROP FUNCTION fail_{suffix}();"); + } + } +} diff --git a/scr/Messenger.Api.Tests/HealthTests.cs b/scr/Messenger.Api.Tests/HealthTests.cs new file mode 100644 index 00000000..dc46951e --- /dev/null +++ b/scr/Messenger.Api.Tests/HealthTests.cs @@ -0,0 +1,28 @@ +using System.Net; + +namespace Messenger.Api.Tests; + +[Collection("api")] +public class HealthTests(ApiFixture fixture) +{ + [Fact] + public async Task Live_ReturnsOk() + { + using var client = fixture.CreateClient(); + + var response = await client.GetAsync("/health/live"); + + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Fact] + public async Task Ready_ReturnsOkWhenDatabaseIsAvailable() + { + using var client = fixture.CreateClient(); + + var response = await client.GetAsync("/health/ready"); + + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.True(response.Headers.Contains("X-Request-Id")); + } +} diff --git a/scr/Messenger.Api.Tests/IdempotencyTests.cs b/scr/Messenger.Api.Tests/IdempotencyTests.cs new file mode 100644 index 00000000..1e28cc84 --- /dev/null +++ b/scr/Messenger.Api.Tests/IdempotencyTests.cs @@ -0,0 +1,261 @@ +using System.Net; +using static Messenger.Api.Tests.ApiHelpers; + +namespace Messenger.Api.Tests; + +// lab3: общая идемпотентность отправки сообщения. «Разные реплики» в тесте моделируются разными экземплярами приложения +// (fixture.WithWebHostBuilder) с общей PostgreSQL — ровно так же, как в Compose работают реплики за балансировщиком. +[Collection("api")] +public class IdempotencyTests(ApiFixture fixture) +{ + private static string NewKey() => Guid.NewGuid().ToString("N"); + + private static async Task CountMessagesAsync(HttpClient client, Guid chat, TestUser user) => + (await ReadAllMessagesAsync(client, chat, user, 100)).Count; + + [Fact] + public async Task Replay_ReturnsSameCodeAndSameMessage_WithoutDuplicate() + { + using var client = fixture.CreateClient(); + var alice = await CreateUserAsync(client); + var chat = await CreateChatAsync(client, alice); + var key = NewKey(); + + var first = await SendMessageAsync(client, alice, chat, "привет", key); + var second = await SendMessageAsync(client, alice, chat, "привет", key); + + Assert.Equal(HttpStatusCode.Created, first.StatusCode); + Assert.Equal(HttpStatusCode.Created, second.StatusCode); + Assert.Equal((await ReadJsonAsync(first)).ToString(), (await ReadJsonAsync(second)).ToString()); + Assert.Equal(1, await CountMessagesAsync(client, chat, alice)); + } + + [Fact] + public async Task SameKeyDifferentBody_Conflict_AndOriginalIsKept() + { + using var client = fixture.CreateClient(); + var alice = await CreateUserAsync(client); + var chat = await CreateChatAsync(client, alice); + var key = NewKey(); + + await SendMessageAsync(client, alice, chat, "первое", key); + var other = await SendMessageAsync(client, alice, chat, "второе", key); + + Assert.Equal(HttpStatusCode.Conflict, other.StatusCode); + Assert.Equal("conflict", await ErrorCodeAsync(other)); + Assert.Equal(1, await CountMessagesAsync(client, chat, alice)); + } + + [Theory] + [InlineData(null)] + [InlineData("")] + [InlineData("has space")] + [InlineData("кириллица")] + public async Task MissingOrInvalidKey_BadRequest(string? key) + { + using var client = fixture.CreateClient(); + var alice = await CreateUserAsync(client); + var chat = await CreateChatAsync(client, alice); + + using var request = Request(HttpMethod.Post, $"/api/v1/chats/{chat}/messages", alice, + Json("""{"text":"x"}""")); + if (key is not null) + { + request.Headers.TryAddWithoutValidation("Idempotency-Key", key); + } + + var response = await client.SendAsync(request); + + Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); + Assert.Equal(0, await CountMessagesAsync(client, chat, alice)); + } + + [Fact] + public async Task KeyTooLong_BadRequest_ButMaxLengthAccepted() + { + using var client = fixture.CreateClient(); + var alice = await CreateUserAsync(client); + var chat = await CreateChatAsync(client, alice); + + var tooLong = await SendMessageAsync(client, alice, chat, "x", new string('a', 129)); + var maxLength = await SendMessageAsync(client, alice, chat, "x", new string('a', 128)); + + Assert.Equal(HttpStatusCode.BadRequest, tooLong.StatusCode); + Assert.Equal(HttpStatusCode.Created, maxLength.StatusCode); + } + + [Fact] + public async Task SameKeyIsIndependent_ForDifferentUsersAndDifferentChats() + { + using var client = fixture.CreateClient(); + var alice = await CreateUserAsync(client); + var bob = await CreateUserAsync(client); + var chat1 = await CreateChatAsync(client, alice, bob); + var chat2 = await CreateChatAsync(client, alice, bob); + var key = NewKey(); + + var statuses = new[] + { + (await SendMessageAsync(client, alice, chat1, "a1", key)).StatusCode, + (await SendMessageAsync(client, bob, chat1, "b1", key)).StatusCode, + (await SendMessageAsync(client, alice, chat2, "a2", key)).StatusCode, + }; + + Assert.All(statuses, s => Assert.Equal(HttpStatusCode.Created, s)); + Assert.Equal(2, await CountMessagesAsync(client, chat1, alice)); + Assert.Equal(1, await CountMessagesAsync(client, chat2, alice)); + } + + [Fact] + public async Task Replay_StillRequiresValidSessionAndAccess() + { + using var client = fixture.CreateClient(); + var alice = await CreateUserAsync(client); + var eve = await CreateUserAsync(client); + var chat = await CreateChatAsync(client, alice); + var key = NewKey(); + await SendMessageAsync(client, alice, chat, "секрет", key); + + // Посторонний не может «прочитать» чужой результат по ключу; без токена — 401. + var asEve = await SendMessageAsync(client, eve, chat, "секрет", key); + using var anonymous = Request(HttpMethod.Post, $"/api/v1/chats/{chat}/messages", null, Json("""{"text":"секрет"}""")); + anonymous.Headers.Add("Idempotency-Key", key); + var noToken = await client.SendAsync(anonymous); + + Assert.Equal(HttpStatusCode.NotFound, asEve.StatusCode); + Assert.Equal(HttpStatusCode.Unauthorized, noToken.StatusCode); + } + + [Fact] + public async Task ConcurrentReplays_OnOneInstance_CreateExactlyOneMessage() + { + using var client = fixture.CreateClient(); + var alice = await CreateUserAsync(client); + var chat = await CreateChatAsync(client, alice); + var key = NewKey(); + + var responses = await Task.WhenAll(Enumerable.Range(0, 30) + .Select(_ => Task.Run(() => SendMessageAsync(client, alice, chat, "гонка", key)))); + + Assert.All(responses, r => Assert.Equal(HttpStatusCode.Created, r.StatusCode)); + var ids = await Task.WhenAll(responses.Select(async r => (await ReadJsonAsync(r)).GetProperty("id").GetGuid())); + Assert.Single(ids.Distinct()); + Assert.Equal(1, await CountMessagesAsync(client, chat, alice)); + } + + [Fact] + public async Task ConcurrentReplays_ThroughDifferentInstances_CreateExactlyOneMessage() + { + // Три независимых экземпляра приложения (как три реплики) с общей PostgreSQL. + await using var replicaB = fixture.WithWebHostBuilder(b => b.UseSetting("INSTANCE_ID", "replica-b")); + await using var replicaC = fixture.WithWebHostBuilder(b => b.UseSetting("INSTANCE_ID", "replica-c")); + using var a = fixture.CreateClient(); + using var b = replicaB.CreateClient(); + using var c = replicaC.CreateClient(); + + var alice = await CreateUserAsync(a); // сессия создана на A и действует на B и C: сессии общие + var chat = await CreateChatAsync(a, alice); + var clients = new[] { a, b, c }; + + for (var round = 0; round < 5; round++) + { + var key = NewKey(); + var responses = await Task.WhenAll(Enumerable.Range(0, 30) + .Select(i => Task.Run(() => SendMessageAsync(clients[i % 3], alice, chat, $"гонка {round}", key)))); + + Assert.All(responses, r => Assert.Equal(HttpStatusCode.Created, r.StatusCode)); + var ids = await Task.WhenAll(responses.Select(async r => (await ReadJsonAsync(r)).GetProperty("id").GetGuid())); + Assert.Single(ids.Distinct()); + } + + Assert.Equal(5, await CountMessagesAsync(b, chat, alice)); + } + + [Fact] + public async Task ConcurrentSameKeyWithDifferentBodies_ExactlyOneWins_OthersConflict() + { + using var client = fixture.CreateClient(); + var alice = await CreateUserAsync(client); + var chat = await CreateChatAsync(client, alice); + var key = NewKey(); + + var responses = await Task.WhenAll(Enumerable.Range(0, 10) + .Select(i => Task.Run(() => SendMessageAsync(client, alice, chat, $"вариант {i}", key)))); + + var created = responses.Count(r => r.StatusCode == HttpStatusCode.Created); + var conflicts = responses.Count(r => r.StatusCode == HttpStatusCode.Conflict); + Assert.True(created >= 1 && created + conflicts == 10, $"created={created}, conflicts={conflicts}"); + Assert.Equal(1, await CountMessagesAsync(client, chat, alice)); + } + + [Fact] + public async Task FailedWrite_IsNotRemembered_AndCanBeRetriedWithSameKey() + { + using var client = fixture.CreateClient(); + var alice = await CreateUserAsync(client); + var chat = await CreateChatAsync(client, alice); + var key = NewKey(); + + // Принудительная ошибка БД при вставке сообщения: транзакция (вместе с ключом) откатывается. + var suffix = Guid.NewGuid().ToString("N")[..8]; + await fixture.ExecuteAsync($$""" + CREATE FUNCTION fail_idem_{{suffix}}() RETURNS trigger AS $$ BEGIN RAISE EXCEPTION 'forced failure' USING ERRCODE = '53000'; END $$ LANGUAGE plpgsql; + CREATE TRIGGER tr_idem_{{suffix}} BEFORE INSERT ON messages FOR EACH ROW WHEN (NEW.chat_id = '{{chat}}') EXECUTE FUNCTION fail_idem_{{suffix}}(); + """); + try + { + var failed = await SendMessageAsync(client, alice, chat, "повторимо", key); + Assert.True((int)failed.StatusCode >= 500, $"expected 5xx, got {(int)failed.StatusCode}"); + Assert.Equal(0L, await fixture.ScalarAsync("select count(*) from idempotency_keys where chat_id = @c", ("c", chat))); + } + finally + { + await fixture.ExecuteAsync($"DROP TRIGGER tr_idem_{suffix} ON messages; DROP FUNCTION fail_idem_{suffix}();"); + } + + var retried = await SendMessageAsync(client, alice, chat, "повторимо", key); + var again = await SendMessageAsync(client, alice, chat, "повторимо", key); + + Assert.Equal(HttpStatusCode.Created, retried.StatusCode); + Assert.Equal(HttpStatusCode.Created, again.StatusCode); + Assert.Equal(1, await CountMessagesAsync(client, chat, alice)); + } + + [Fact] + public async Task ExpiredKey_CanBeReused_AsNewMessage() + { + await using var shortTtl = fixture.WithWebHostBuilder(b => b.UseSetting("IDEMPOTENCY_TTL_SECONDS", "1")); + using var client = shortTtl.CreateClient(); + var alice = await CreateUserAsync(client); + var chat = await CreateChatAsync(client, alice); + var key = NewKey(); + + var first = await SendMessageAsync(client, alice, chat, "срок", key); + await Task.Delay(TimeSpan.FromMilliseconds(1500)); + var second = await SendMessageAsync(client, alice, chat, "срок", key); + + Assert.Equal(HttpStatusCode.Created, first.StatusCode); + Assert.Equal(HttpStatusCode.Created, second.StatusCode); + Assert.NotEqual( + (await ReadJsonAsync(first)).GetProperty("id").GetGuid(), + (await ReadJsonAsync(second)).GetProperty("id").GetGuid()); + } + + [Fact] + public async Task EveryResponse_HasInstanceId_IncludingErrorsAndHealth() + { + await using var replica = fixture.WithWebHostBuilder(b => b.UseSetting("INSTANCE_ID", "replica-x")); + using var client = replica.CreateClient(); + + var health = await client.GetAsync("/health/live"); + var ready = await client.GetAsync("/health/ready"); + var unauthorized = await client.GetAsync("/api/v1/users/me"); + var notFound = await client.GetAsync("/no/such/route"); + var badJson = await client.PostAsync("/api/v1/users", Json("{broken")); + + foreach (var response in new[] { health, ready, unauthorized, notFound, badJson }) + { + Assert.Equal("replica-x", Assert.Single(response.Headers.GetValues("X-Instance-Id"))); + } + } +} diff --git a/scr/Messenger.Api.Tests/Messenger.Api.Tests.csproj b/scr/Messenger.Api.Tests/Messenger.Api.Tests.csproj new file mode 100644 index 00000000..62302f8b --- /dev/null +++ b/scr/Messenger.Api.Tests/Messenger.Api.Tests.csproj @@ -0,0 +1,27 @@ + + + + net10.0 + enable + enable + false + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scr/Messenger.Api.Tests/PasswordHasherTests.cs b/scr/Messenger.Api.Tests/PasswordHasherTests.cs new file mode 100644 index 00000000..a9ea0333 --- /dev/null +++ b/scr/Messenger.Api.Tests/PasswordHasherTests.cs @@ -0,0 +1,69 @@ +using Messenger.Api.Services; + +namespace Messenger.Api.Tests; + +public class PasswordHasherTests +{ + private readonly Argon2PasswordHasher _hasher = new(new PasswordHashingSettings(4, TimeSpan.FromSeconds(30))); + + [Fact] + public async Task Hash_IsArgon2idPhcString_WithoutPlaintext() + { + var hash = await _hasher.HashAsync("correct horse battery staple", CancellationToken.None); + + Assert.StartsWith("$argon2id$", hash); + Assert.DoesNotContain("correct horse", hash); + } + + [Fact] + public async Task Hash_UsesRandomSalt() + { + var a = await _hasher.HashAsync("same-password-123", CancellationToken.None); + var b = await _hasher.HashAsync("same-password-123", CancellationToken.None); + + Assert.NotEqual(a, b); + } + + [Theory] + [InlineData("correct horse battery staple")] + [InlineData("пароль-с-юникодом-и:двоеточием-12")] + public async Task Verify_AcceptsCorrect_RejectsWrong(string password) + { + var hash = await _hasher.HashAsync(password, CancellationToken.None); + + Assert.True(await _hasher.VerifyAsync(hash, password, CancellationToken.None)); + Assert.False(await _hasher.VerifyAsync(hash, password + "x", CancellationToken.None)); + } + + [Fact] + public async Task Verify_DoesNotTruncateLongPasswords() + { + // Это ограничение bcrypt (72 байта); Argon2id его не имеет. Пароли отличаются только хвостом. + var prefix = new string('я', 60); // 120 байт в UTF-8 + var hash = await _hasher.HashAsync(prefix + "A", CancellationToken.None); + + Assert.False(await _hasher.VerifyAsync(hash, prefix + "B", CancellationToken.None)); + } + + [Fact] + public async Task Hash_WhenAllSlotsAreBusy_FailsWithBusyException() + { + // Один слот и почти нулевое ожидание: параллельные вызовы не копят память, лишние получают исключение (→ 503). + var hasher = new Argon2PasswordHasher(new PasswordHashingSettings(1, TimeSpan.FromMilliseconds(20))); + + var attempts = await Task.WhenAll(Enumerable.Range(0, 6).Select(async _ => + { + try { await hasher.HashAsync("some-long-enough-password", CancellationToken.None); return true; } + catch (PasswordHasherBusyException) { return false; } + })); + + Assert.Contains(true, attempts); // кто-то получил слот + Assert.Contains(false, attempts); // остальные получили контролируемый отказ + } + + [Fact] + public async Task Verify_UnknownUser_ReturnsFalse() + { + Assert.False(await _hasher.VerifyAsync(null, "any-password-123", CancellationToken.None)); + } +} diff --git a/scr/Messenger.Api/Data/DesignTimeDbContextFactory.cs b/scr/Messenger.Api/Data/DesignTimeDbContextFactory.cs new file mode 100644 index 00000000..20cedd06 --- /dev/null +++ b/scr/Messenger.Api/Data/DesignTimeDbContextFactory.cs @@ -0,0 +1,20 @@ +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Design; + +namespace Messenger.Api.Data; + +// Используется только командами `dotnet ef`. Для генерации миграций подключение к БД не открывается; +// для `dotnet ef database update` строка берётся из MESSENGER_DESIGN_CONNECTION. +public sealed class DesignTimeDbContextFactory : IDesignTimeDbContextFactory +{ + public MessengerDbContext CreateDbContext(string[] args) + { + var connection = Environment.GetEnvironmentVariable("MESSENGER_DESIGN_CONNECTION") + ?? "Host=localhost;Database=messenger;Username=design;Password=design"; + var options = new DbContextOptionsBuilder() + .UseNpgsql(connection) + .UseSnakeCaseNamingConvention() + .Options; + return new MessengerDbContext(options); + } +} diff --git a/scr/Messenger.Api/Data/Entities.cs b/scr/Messenger.Api/Data/Entities.cs new file mode 100644 index 00000000..580b6a99 --- /dev/null +++ b/scr/Messenger.Api/Data/Entities.cs @@ -0,0 +1,68 @@ +namespace Messenger.Api.Data; + +// Строки таблиц. API-модели (Messenger.Api.Models) остаются отдельными: в них нет password_hash и служебных полей. + +public sealed class UserEntity +{ + public Guid Id { get; set; } + public string Username { get; set; } = string.Empty; + public string DisplayName { get; set; } = string.Empty; + // Результат Argon2id (PHC-строка с солью и параметрами). Наружу не отдаётся никогда. + public string PasswordHash { get; set; } = string.Empty; + public DateTimeOffset CreatedAt { get; set; } +} + +public sealed class ChatEntity +{ + public Guid Id { get; set; } + public string Title { get; set; } = string.Empty; + public DateTimeOffset CreatedAt { get; set; } + + // Версия истории: растёт на 1 в той же транзакции, что и вставка сообщения (UPDATE ... RETURNING). + // Источник версии для ключей кэша; одновременно сериализует записи в один чат (см. DESIGN). + public long HistoryVersion { get; set; } + + // Время последнего сообщения. Обновляется тем же UPDATE, что и версия: следующее сообщение получает + // created_at строго больше этого значения, поэтому порядок (created_at, id) совпадает с порядком коммитов. + public DateTimeOffset? LastMessageAt { get; set; } +} + +public sealed class ChatMemberEntity +{ + public Guid ChatId { get; set; } + public Guid UserId { get; set; } +} + +public sealed class MessageEntity +{ + public Guid Id { get; set; } + public Guid ChatId { get; set; } + public Guid SenderId { get; set; } + public string Text { get; set; } = string.Empty; + public DateTimeOffset CreatedAt { get; set; } +} + +public sealed class SessionEntity +{ + public Guid Id { get; set; } + // SHA-256 от токена. Сам токен в БД не хранится: утечка БД не даёт действующих Bearer-токенов. + public byte[] TokenHash { get; set; } = Array.Empty(); + public Guid UserId { get; set; } + public DateTimeOffset CreatedAt { get; set; } + public DateTimeOffset ExpiresAt { get; set; } + public DateTimeOffset? RevokedAt { get; set; } +} + +// Результат идемпотентной отправки сообщения. Область уникальности: пользователь + чат (метод и путь у эндпоинта один: +// POST /api/v1/chats/{chat_id}/messages) + ключ. Строка создаётся в той же транзакции, что и сообщение. +public sealed class IdempotencyKeyEntity +{ + public Guid UserId { get; set; } + public Guid ChatId { get; set; } + public string Key { get; set; } = string.Empty; + // SHA-256 от смысла запроса (см. IdempotencyKeys.RequestHash): другой хеш при том же ключе → 409. + public byte[] RequestHash { get; set; } = Array.Empty(); + public Guid MessageId { get; set; } + public DateTimeOffset CreatedAt { get; set; } + public DateTimeOffset ExpiresAt { get; set; } +} diff --git a/scr/Messenger.Api/Data/MessengerDbContext.cs b/scr/Messenger.Api/Data/MessengerDbContext.cs new file mode 100644 index 00000000..80202612 --- /dev/null +++ b/scr/Messenger.Api/Data/MessengerDbContext.cs @@ -0,0 +1,116 @@ +using Microsoft.EntityFrameworkCore; + +namespace Messenger.Api.Data; + +public sealed class MessengerDbContext(DbContextOptions options) : DbContext(options) +{ + public DbSet Users => Set(); + public DbSet Chats => Set(); + public DbSet ChatMembers => Set(); + public DbSet Messages => Set(); + public DbSet Sessions => Set(); + public DbSet IdempotencyKeys => Set(); + + protected override void OnModelCreating(ModelBuilder modelBuilder) + { + // Идентификаторы создаёт приложение (Guid.CreateVersion7: монотонные, индексы вставляются «справа»). + // Время created_at тоже назначает приложение, а не DEFAULT now(): см. порядок операций отправки сообщения. + + modelBuilder.Entity(e => + { + e.ToTable("users", t => + { + t.HasCheckConstraint("ck_users_username_format", @"username ~ '^[a-z0-9_]{3,32}$'"); + t.HasCheckConstraint("ck_users_display_name_not_blank", @"display_name ~ '\S'"); + }); + e.HasKey(x => x.Id); + e.Property(x => x.Id).ValueGeneratedNever(); + e.Property(x => x.Username).HasMaxLength(32).IsRequired(); + e.Property(x => x.DisplayName).HasMaxLength(100).IsRequired(); // varchar(n) считает символы, не байты + e.Property(x => x.PasswordHash).IsRequired(); + e.Property(x => x.CreatedAt).IsRequired(); + e.HasIndex(x => x.Username).IsUnique().HasDatabaseName("ux_users_username"); + }); + + modelBuilder.Entity(e => + { + e.ToTable("chats", t => + { + t.HasCheckConstraint("ck_chats_title_not_blank", @"title ~ '\S'"); + t.HasCheckConstraint("ck_chats_history_version_nonneg", "history_version >= 0"); + }); + e.HasKey(x => x.Id); + e.Property(x => x.Id).ValueGeneratedNever(); + e.Property(x => x.Title).HasMaxLength(100).IsRequired(); + e.Property(x => x.CreatedAt).IsRequired(); + e.Property(x => x.HistoryVersion).HasDefaultValue(0L).IsRequired(); + // Список чатов: сортировка по (created_at, id) с keyset-курсором. + e.HasIndex(x => new { x.CreatedAt, x.Id }).HasDatabaseName("ix_chats_created_at_id"); + }); + + modelBuilder.Entity(e => + { + e.ToTable("chat_members"); + e.HasKey(x => new { x.ChatId, x.UserId }); // один пользователь не может быть в чате дважды + e.HasOne().WithMany().HasForeignKey(x => x.ChatId).OnDelete(DeleteBehavior.Cascade); + e.HasOne().WithMany().HasForeignKey(x => x.UserId).OnDelete(DeleteBehavior.Restrict); + // PK обслуживает «участники чата»; этот индекс — «чаты пользователя» и проверку доступа. + e.HasIndex(x => x.UserId).HasDatabaseName("ix_chat_members_user_id"); + }); + + modelBuilder.Entity(e => + { + e.ToTable("messages", t => + t.HasCheckConstraint("ck_messages_text_not_blank", @"text ~ '\S'")); // lab2: вложений нет + e.HasKey(x => x.Id); + e.Property(x => x.Id).ValueGeneratedNever(); + e.Property(x => x.Text).HasMaxLength(4000).IsRequired(); + e.Property(x => x.CreatedAt).IsRequired(); + // Составной FK: отправитель обязан быть участником именно этого чата. Он же гарантирует существование + // чата и пользователя, поэтому отдельные FK на chats/users не нужны. + e.HasOne().WithMany() + .HasForeignKey(x => new { x.ChatId, x.SenderId }) + .HasPrincipalKey(x => new { x.ChatId, x.UserId }) + .OnDelete(DeleteBehavior.Cascade); + // Страница истории: WHERE chat_id = @c AND (created_at, id) > (@t, @i) ORDER BY created_at, id LIMIT n. + e.HasIndex(x => new { x.ChatId, x.CreatedAt, x.Id }).HasDatabaseName("ix_messages_chat_history"); + }); + + modelBuilder.Entity(e => + { + e.ToTable("sessions", t => + { + t.HasCheckConstraint("ck_sessions_token_hash_len", "octet_length(token_hash) = 32"); + t.HasCheckConstraint("ck_sessions_expiry_after_creation", "expires_at > created_at"); + }); + e.HasKey(x => x.Id); + e.Property(x => x.Id).ValueGeneratedNever(); + e.Property(x => x.TokenHash).IsRequired(); + e.Property(x => x.CreatedAt).IsRequired(); + e.Property(x => x.ExpiresAt).IsRequired(); + e.HasOne().WithMany().HasForeignKey(x => x.UserId).OnDelete(DeleteBehavior.Cascade); + // Аутентификация каждого запроса: поиск по хешу токена. + e.HasIndex(x => x.TokenHash).IsUnique().HasDatabaseName("ux_sessions_token_hash"); + // Фоновая очистка истёкших сессий. + e.HasIndex(x => x.ExpiresAt).HasDatabaseName("ix_sessions_expires_at"); + }); + + modelBuilder.Entity(e => + { + e.ToTable("idempotency_keys", t => + { + t.HasCheckConstraint("ck_idempotency_keys_hash_len", "octet_length(request_hash) = 32"); + t.HasCheckConstraint("ck_idempotency_keys_expiry", "expires_at > created_at"); + }); + // PK = область уникальности. Именно его уникальный индекс заставляет конкурентные запросы с одним ключом + // ждать друг друга. FK на messages(id) (DEFERRABLE INITIALLY DEFERRED) добавлен в миграции вручную. + e.HasKey(x => new { x.UserId, x.ChatId, x.Key }); + e.Property(x => x.Key).HasMaxLength(128).IsRequired(); + e.Property(x => x.RequestHash).IsRequired(); + e.Property(x => x.CreatedAt).IsRequired(); + e.Property(x => x.ExpiresAt).IsRequired(); + // Очистка истёкших ключей. + e.HasIndex(x => x.ExpiresAt).HasDatabaseName("ix_idempotency_keys_expires_at"); + }); + } +} diff --git a/scr/Messenger.Api/Data/Migrations/20261023140810_InitialSchema.Designer.cs b/scr/Messenger.Api/Data/Migrations/20261023140810_InitialSchema.Designer.cs new file mode 100644 index 00000000..cc15e205 --- /dev/null +++ b/scr/Messenger.Api/Data/Migrations/20261023140810_InitialSchema.Designer.cs @@ -0,0 +1,251 @@ +// +using System; +using Messenger.Api.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace Messenger.Api.Data.Migrations +{ + [DbContext(typeof(MessengerDbContext))] + [Migration("20261023140810_InitialSchema")] + partial class InitialSchema + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "10.0.13") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("Messenger.Api.Data.ChatEntity", b => + { + b.Property("Id") + .HasColumnType("uuid") + .HasColumnName("id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("HistoryVersion") + .ValueGeneratedOnAdd() + .HasColumnType("bigint") + .HasDefaultValue(0L) + .HasColumnName("history_version"); + + b.Property("Title") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("title"); + + b.HasKey("Id") + .HasName("pk_chats"); + + b.HasIndex("CreatedAt", "Id") + .HasDatabaseName("ix_chats_created_at_id"); + + b.ToTable("chats", null, t => + { + t.HasCheckConstraint("ck_chats_history_version_nonneg", "history_version >= 0"); + + t.HasCheckConstraint("ck_chats_title_not_blank", "title ~ '\\S'"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.ChatMemberEntity", b => + { + b.Property("ChatId") + .HasColumnType("uuid") + .HasColumnName("chat_id"); + + b.Property("UserId") + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.HasKey("ChatId", "UserId") + .HasName("pk_chat_members"); + + b.HasIndex("UserId") + .HasDatabaseName("ix_chat_members_user_id"); + + b.ToTable("chat_members", (string)null); + }); + + modelBuilder.Entity("Messenger.Api.Data.MessageEntity", b => + { + b.Property("Id") + .HasColumnType("uuid") + .HasColumnName("id"); + + b.Property("ChatId") + .HasColumnType("uuid") + .HasColumnName("chat_id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("SenderId") + .HasColumnType("uuid") + .HasColumnName("sender_id"); + + b.Property("Text") + .IsRequired() + .HasMaxLength(4000) + .HasColumnType("character varying(4000)") + .HasColumnName("text"); + + b.HasKey("Id") + .HasName("pk_messages"); + + b.HasIndex("ChatId", "SenderId") + .HasDatabaseName("ix_messages_chat_id_sender_id"); + + b.HasIndex("ChatId", "CreatedAt", "Id") + .HasDatabaseName("ix_messages_chat_history"); + + b.ToTable("messages", null, t => + { + t.HasCheckConstraint("ck_messages_text_not_blank", "text ~ '\\S'"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.SessionEntity", b => + { + b.Property("Id") + .HasColumnType("uuid") + .HasColumnName("id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("ExpiresAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("expires_at"); + + b.Property("RevokedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("revoked_at"); + + b.Property("TokenHash") + .IsRequired() + .HasColumnType("bytea") + .HasColumnName("token_hash"); + + b.Property("UserId") + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.HasKey("Id") + .HasName("pk_sessions"); + + b.HasIndex("ExpiresAt") + .HasDatabaseName("ix_sessions_expires_at"); + + b.HasIndex("TokenHash") + .IsUnique() + .HasDatabaseName("ux_sessions_token_hash"); + + b.HasIndex("UserId") + .HasDatabaseName("ix_sessions_user_id"); + + b.ToTable("sessions", null, t => + { + t.HasCheckConstraint("ck_sessions_expiry_after_creation", "expires_at > created_at"); + + t.HasCheckConstraint("ck_sessions_token_hash_len", "octet_length(token_hash) = 32"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.UserEntity", b => + { + b.Property("Id") + .HasColumnType("uuid") + .HasColumnName("id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("display_name"); + + b.Property("PasswordHash") + .IsRequired() + .HasColumnType("text") + .HasColumnName("password_hash"); + + b.Property("Username") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("character varying(32)") + .HasColumnName("username"); + + b.HasKey("Id") + .HasName("pk_users"); + + b.HasIndex("Username") + .IsUnique() + .HasDatabaseName("ux_users_username"); + + b.ToTable("users", null, t => + { + t.HasCheckConstraint("ck_users_display_name_not_blank", "display_name ~ '\\S'"); + + t.HasCheckConstraint("ck_users_username_format", "username ~ '^[a-z0-9_]{3,32}$'"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.ChatMemberEntity", b => + { + b.HasOne("Messenger.Api.Data.ChatEntity", null) + .WithMany() + .HasForeignKey("ChatId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_chat_members_chats_chat_id"); + + b.HasOne("Messenger.Api.Data.UserEntity", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired() + .HasConstraintName("fk_chat_members_users_user_id"); + }); + + modelBuilder.Entity("Messenger.Api.Data.MessageEntity", b => + { + b.HasOne("Messenger.Api.Data.ChatMemberEntity", null) + .WithMany() + .HasForeignKey("ChatId", "SenderId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_messages_chat_members_chat_id_sender_id"); + }); + + modelBuilder.Entity("Messenger.Api.Data.SessionEntity", b => + { + b.HasOne("Messenger.Api.Data.UserEntity", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_sessions_users_user_id"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/scr/Messenger.Api/Data/Migrations/20261023140810_InitialSchema.cs b/scr/Messenger.Api/Data/Migrations/20261023140810_InitialSchema.cs new file mode 100644 index 00000000..686e73e3 --- /dev/null +++ b/scr/Messenger.Api/Data/Migrations/20261023140810_InitialSchema.cs @@ -0,0 +1,179 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Messenger.Api.Data.Migrations +{ + /// + public partial class InitialSchema : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "chats", + columns: table => new + { + id = table.Column(type: "uuid", nullable: false), + title = table.Column(type: "character varying(100)", maxLength: 100, nullable: false), + created_at = table.Column(type: "timestamp with time zone", nullable: false), + history_version = table.Column(type: "bigint", nullable: false, defaultValue: 0L) + }, + constraints: table => + { + table.PrimaryKey("pk_chats", x => x.id); + table.CheckConstraint("ck_chats_history_version_nonneg", "history_version >= 0"); + table.CheckConstraint("ck_chats_title_not_blank", "title ~ '\\S'"); + }); + + migrationBuilder.CreateTable( + name: "users", + columns: table => new + { + id = table.Column(type: "uuid", nullable: false), + username = table.Column(type: "character varying(32)", maxLength: 32, nullable: false), + display_name = table.Column(type: "character varying(100)", maxLength: 100, nullable: false), + password_hash = table.Column(type: "text", nullable: false), + created_at = table.Column(type: "timestamp with time zone", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("pk_users", x => x.id); + table.CheckConstraint("ck_users_display_name_not_blank", "display_name ~ '\\S'"); + table.CheckConstraint("ck_users_username_format", "username ~ '^[a-z0-9_]{3,32}$'"); + }); + + migrationBuilder.CreateTable( + name: "chat_members", + columns: table => new + { + chat_id = table.Column(type: "uuid", nullable: false), + user_id = table.Column(type: "uuid", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("pk_chat_members", x => new { x.chat_id, x.user_id }); + table.ForeignKey( + name: "fk_chat_members_chats_chat_id", + column: x => x.chat_id, + principalTable: "chats", + principalColumn: "id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "fk_chat_members_users_user_id", + column: x => x.user_id, + principalTable: "users", + principalColumn: "id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateTable( + name: "sessions", + columns: table => new + { + id = table.Column(type: "uuid", nullable: false), + token_hash = table.Column(type: "bytea", nullable: false), + user_id = table.Column(type: "uuid", nullable: false), + created_at = table.Column(type: "timestamp with time zone", nullable: false), + expires_at = table.Column(type: "timestamp with time zone", nullable: false), + revoked_at = table.Column(type: "timestamp with time zone", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_sessions", x => x.id); + table.CheckConstraint("ck_sessions_expiry_after_creation", "expires_at > created_at"); + table.CheckConstraint("ck_sessions_token_hash_len", "octet_length(token_hash) = 32"); + table.ForeignKey( + name: "fk_sessions_users_user_id", + column: x => x.user_id, + principalTable: "users", + principalColumn: "id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "messages", + columns: table => new + { + id = table.Column(type: "uuid", nullable: false), + chat_id = table.Column(type: "uuid", nullable: false), + sender_id = table.Column(type: "uuid", nullable: false), + text = table.Column(type: "character varying(4000)", maxLength: 4000, nullable: false), + created_at = table.Column(type: "timestamp with time zone", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("pk_messages", x => x.id); + table.CheckConstraint("ck_messages_text_not_blank", "text ~ '\\S'"); + table.ForeignKey( + name: "fk_messages_chat_members_chat_id_sender_id", + columns: x => new { x.chat_id, x.sender_id }, + principalTable: "chat_members", + principalColumns: new[] { "chat_id", "user_id" }, + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "ix_chat_members_user_id", + table: "chat_members", + column: "user_id"); + + migrationBuilder.CreateIndex( + name: "ix_chats_created_at_id", + table: "chats", + columns: new[] { "created_at", "id" }); + + migrationBuilder.CreateIndex( + name: "ix_messages_chat_history", + table: "messages", + columns: new[] { "chat_id", "created_at", "id" }); + + migrationBuilder.CreateIndex( + name: "ix_messages_chat_id_sender_id", + table: "messages", + columns: new[] { "chat_id", "sender_id" }); + + migrationBuilder.CreateIndex( + name: "ix_sessions_expires_at", + table: "sessions", + column: "expires_at"); + + migrationBuilder.CreateIndex( + name: "ix_sessions_user_id", + table: "sessions", + column: "user_id"); + + migrationBuilder.CreateIndex( + name: "ux_sessions_token_hash", + table: "sessions", + column: "token_hash", + unique: true); + + migrationBuilder.CreateIndex( + name: "ux_users_username", + table: "users", + column: "username", + unique: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "messages"); + + migrationBuilder.DropTable( + name: "sessions"); + + migrationBuilder.DropTable( + name: "chat_members"); + + migrationBuilder.DropTable( + name: "chats"); + + migrationBuilder.DropTable( + name: "users"); + } + } +} diff --git a/scr/Messenger.Api/Data/Migrations/20261023170730_AddChatLastMessageAt.Designer.cs b/scr/Messenger.Api/Data/Migrations/20261023170730_AddChatLastMessageAt.Designer.cs new file mode 100644 index 00000000..f96f9c43 --- /dev/null +++ b/scr/Messenger.Api/Data/Migrations/20261023170730_AddChatLastMessageAt.Designer.cs @@ -0,0 +1,255 @@ +// +using System; +using Messenger.Api.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace Messenger.Api.Data.Migrations +{ + [DbContext(typeof(MessengerDbContext))] + [Migration("20261023170730_AddChatLastMessageAt")] + partial class AddChatLastMessageAt + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "10.0.13") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("Messenger.Api.Data.ChatEntity", b => + { + b.Property("Id") + .HasColumnType("uuid") + .HasColumnName("id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("HistoryVersion") + .ValueGeneratedOnAdd() + .HasColumnType("bigint") + .HasDefaultValue(0L) + .HasColumnName("history_version"); + + b.Property("LastMessageAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("last_message_at"); + + b.Property("Title") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("title"); + + b.HasKey("Id") + .HasName("pk_chats"); + + b.HasIndex("CreatedAt", "Id") + .HasDatabaseName("ix_chats_created_at_id"); + + b.ToTable("chats", null, t => + { + t.HasCheckConstraint("ck_chats_history_version_nonneg", "history_version >= 0"); + + t.HasCheckConstraint("ck_chats_title_not_blank", "title ~ '\\S'"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.ChatMemberEntity", b => + { + b.Property("ChatId") + .HasColumnType("uuid") + .HasColumnName("chat_id"); + + b.Property("UserId") + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.HasKey("ChatId", "UserId") + .HasName("pk_chat_members"); + + b.HasIndex("UserId") + .HasDatabaseName("ix_chat_members_user_id"); + + b.ToTable("chat_members", (string)null); + }); + + modelBuilder.Entity("Messenger.Api.Data.MessageEntity", b => + { + b.Property("Id") + .HasColumnType("uuid") + .HasColumnName("id"); + + b.Property("ChatId") + .HasColumnType("uuid") + .HasColumnName("chat_id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("SenderId") + .HasColumnType("uuid") + .HasColumnName("sender_id"); + + b.Property("Text") + .IsRequired() + .HasMaxLength(4000) + .HasColumnType("character varying(4000)") + .HasColumnName("text"); + + b.HasKey("Id") + .HasName("pk_messages"); + + b.HasIndex("ChatId", "SenderId") + .HasDatabaseName("ix_messages_chat_id_sender_id"); + + b.HasIndex("ChatId", "CreatedAt", "Id") + .HasDatabaseName("ix_messages_chat_history"); + + b.ToTable("messages", null, t => + { + t.HasCheckConstraint("ck_messages_text_not_blank", "text ~ '\\S'"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.SessionEntity", b => + { + b.Property("Id") + .HasColumnType("uuid") + .HasColumnName("id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("ExpiresAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("expires_at"); + + b.Property("RevokedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("revoked_at"); + + b.Property("TokenHash") + .IsRequired() + .HasColumnType("bytea") + .HasColumnName("token_hash"); + + b.Property("UserId") + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.HasKey("Id") + .HasName("pk_sessions"); + + b.HasIndex("ExpiresAt") + .HasDatabaseName("ix_sessions_expires_at"); + + b.HasIndex("TokenHash") + .IsUnique() + .HasDatabaseName("ux_sessions_token_hash"); + + b.HasIndex("UserId") + .HasDatabaseName("ix_sessions_user_id"); + + b.ToTable("sessions", null, t => + { + t.HasCheckConstraint("ck_sessions_expiry_after_creation", "expires_at > created_at"); + + t.HasCheckConstraint("ck_sessions_token_hash_len", "octet_length(token_hash) = 32"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.UserEntity", b => + { + b.Property("Id") + .HasColumnType("uuid") + .HasColumnName("id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("display_name"); + + b.Property("PasswordHash") + .IsRequired() + .HasColumnType("text") + .HasColumnName("password_hash"); + + b.Property("Username") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("character varying(32)") + .HasColumnName("username"); + + b.HasKey("Id") + .HasName("pk_users"); + + b.HasIndex("Username") + .IsUnique() + .HasDatabaseName("ux_users_username"); + + b.ToTable("users", null, t => + { + t.HasCheckConstraint("ck_users_display_name_not_blank", "display_name ~ '\\S'"); + + t.HasCheckConstraint("ck_users_username_format", "username ~ '^[a-z0-9_]{3,32}$'"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.ChatMemberEntity", b => + { + b.HasOne("Messenger.Api.Data.ChatEntity", null) + .WithMany() + .HasForeignKey("ChatId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_chat_members_chats_chat_id"); + + b.HasOne("Messenger.Api.Data.UserEntity", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired() + .HasConstraintName("fk_chat_members_users_user_id"); + }); + + modelBuilder.Entity("Messenger.Api.Data.MessageEntity", b => + { + b.HasOne("Messenger.Api.Data.ChatMemberEntity", null) + .WithMany() + .HasForeignKey("ChatId", "SenderId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_messages_chat_members_chat_id_sender_id"); + }); + + modelBuilder.Entity("Messenger.Api.Data.SessionEntity", b => + { + b.HasOne("Messenger.Api.Data.UserEntity", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_sessions_users_user_id"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/scr/Messenger.Api/Data/Migrations/20261023170730_AddChatLastMessageAt.cs b/scr/Messenger.Api/Data/Migrations/20261023170730_AddChatLastMessageAt.cs new file mode 100644 index 00000000..82002c62 --- /dev/null +++ b/scr/Messenger.Api/Data/Migrations/20261023170730_AddChatLastMessageAt.cs @@ -0,0 +1,29 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Messenger.Api.Data.Migrations +{ + /// + public partial class AddChatLastMessageAt : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "last_message_at", + table: "chats", + type: "timestamp with time zone", + nullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "last_message_at", + table: "chats"); + } + } +} diff --git a/scr/Messenger.Api/Data/Migrations/20261106145724_AddIdempotencyKeys.Designer.cs b/scr/Messenger.Api/Data/Migrations/20261106145724_AddIdempotencyKeys.Designer.cs new file mode 100644 index 00000000..d0ee58b6 --- /dev/null +++ b/scr/Messenger.Api/Data/Migrations/20261106145724_AddIdempotencyKeys.Designer.cs @@ -0,0 +1,301 @@ +// +using System; +using Messenger.Api.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace Messenger.Api.Data.Migrations +{ + [DbContext(typeof(MessengerDbContext))] + [Migration("20261106145724_AddIdempotencyKeys")] + partial class AddIdempotencyKeys + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "10.0.13") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("Messenger.Api.Data.ChatEntity", b => + { + b.Property("Id") + .HasColumnType("uuid") + .HasColumnName("id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("HistoryVersion") + .ValueGeneratedOnAdd() + .HasColumnType("bigint") + .HasDefaultValue(0L) + .HasColumnName("history_version"); + + b.Property("LastMessageAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("last_message_at"); + + b.Property("Title") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("title"); + + b.HasKey("Id") + .HasName("pk_chats"); + + b.HasIndex("CreatedAt", "Id") + .HasDatabaseName("ix_chats_created_at_id"); + + b.ToTable("chats", null, t => + { + t.HasCheckConstraint("ck_chats_history_version_nonneg", "history_version >= 0"); + + t.HasCheckConstraint("ck_chats_title_not_blank", "title ~ '\\S'"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.ChatMemberEntity", b => + { + b.Property("ChatId") + .HasColumnType("uuid") + .HasColumnName("chat_id"); + + b.Property("UserId") + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.HasKey("ChatId", "UserId") + .HasName("pk_chat_members"); + + b.HasIndex("UserId") + .HasDatabaseName("ix_chat_members_user_id"); + + b.ToTable("chat_members", (string)null); + }); + + modelBuilder.Entity("Messenger.Api.Data.IdempotencyKeyEntity", b => + { + b.Property("UserId") + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.Property("ChatId") + .HasColumnType("uuid") + .HasColumnName("chat_id"); + + b.Property("Key") + .HasMaxLength(128) + .HasColumnType("character varying(128)") + .HasColumnName("key"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("ExpiresAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("expires_at"); + + b.Property("MessageId") + .HasColumnType("uuid") + .HasColumnName("message_id"); + + b.Property("RequestHash") + .IsRequired() + .HasColumnType("bytea") + .HasColumnName("request_hash"); + + b.HasKey("UserId", "ChatId", "Key") + .HasName("pk_idempotency_keys"); + + b.HasIndex("ExpiresAt") + .HasDatabaseName("ix_idempotency_keys_expires_at"); + + b.ToTable("idempotency_keys", null, t => + { + t.HasCheckConstraint("ck_idempotency_keys_expiry", "expires_at > created_at"); + + t.HasCheckConstraint("ck_idempotency_keys_hash_len", "octet_length(request_hash) = 32"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.MessageEntity", b => + { + b.Property("Id") + .HasColumnType("uuid") + .HasColumnName("id"); + + b.Property("ChatId") + .HasColumnType("uuid") + .HasColumnName("chat_id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("SenderId") + .HasColumnType("uuid") + .HasColumnName("sender_id"); + + b.Property("Text") + .IsRequired() + .HasMaxLength(4000) + .HasColumnType("character varying(4000)") + .HasColumnName("text"); + + b.HasKey("Id") + .HasName("pk_messages"); + + b.HasIndex("ChatId", "SenderId") + .HasDatabaseName("ix_messages_chat_id_sender_id"); + + b.HasIndex("ChatId", "CreatedAt", "Id") + .HasDatabaseName("ix_messages_chat_history"); + + b.ToTable("messages", null, t => + { + t.HasCheckConstraint("ck_messages_text_not_blank", "text ~ '\\S'"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.SessionEntity", b => + { + b.Property("Id") + .HasColumnType("uuid") + .HasColumnName("id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("ExpiresAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("expires_at"); + + b.Property("RevokedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("revoked_at"); + + b.Property("TokenHash") + .IsRequired() + .HasColumnType("bytea") + .HasColumnName("token_hash"); + + b.Property("UserId") + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.HasKey("Id") + .HasName("pk_sessions"); + + b.HasIndex("ExpiresAt") + .HasDatabaseName("ix_sessions_expires_at"); + + b.HasIndex("TokenHash") + .IsUnique() + .HasDatabaseName("ux_sessions_token_hash"); + + b.HasIndex("UserId") + .HasDatabaseName("ix_sessions_user_id"); + + b.ToTable("sessions", null, t => + { + t.HasCheckConstraint("ck_sessions_expiry_after_creation", "expires_at > created_at"); + + t.HasCheckConstraint("ck_sessions_token_hash_len", "octet_length(token_hash) = 32"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.UserEntity", b => + { + b.Property("Id") + .HasColumnType("uuid") + .HasColumnName("id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("display_name"); + + b.Property("PasswordHash") + .IsRequired() + .HasColumnType("text") + .HasColumnName("password_hash"); + + b.Property("Username") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("character varying(32)") + .HasColumnName("username"); + + b.HasKey("Id") + .HasName("pk_users"); + + b.HasIndex("Username") + .IsUnique() + .HasDatabaseName("ux_users_username"); + + b.ToTable("users", null, t => + { + t.HasCheckConstraint("ck_users_display_name_not_blank", "display_name ~ '\\S'"); + + t.HasCheckConstraint("ck_users_username_format", "username ~ '^[a-z0-9_]{3,32}$'"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.ChatMemberEntity", b => + { + b.HasOne("Messenger.Api.Data.ChatEntity", null) + .WithMany() + .HasForeignKey("ChatId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_chat_members_chats_chat_id"); + + b.HasOne("Messenger.Api.Data.UserEntity", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired() + .HasConstraintName("fk_chat_members_users_user_id"); + }); + + modelBuilder.Entity("Messenger.Api.Data.MessageEntity", b => + { + b.HasOne("Messenger.Api.Data.ChatMemberEntity", null) + .WithMany() + .HasForeignKey("ChatId", "SenderId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_messages_chat_members_chat_id_sender_id"); + }); + + modelBuilder.Entity("Messenger.Api.Data.SessionEntity", b => + { + b.HasOne("Messenger.Api.Data.UserEntity", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_sessions_users_user_id"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/scr/Messenger.Api/Data/Migrations/20261106145724_AddIdempotencyKeys.cs b/scr/Messenger.Api/Data/Migrations/20261106145724_AddIdempotencyKeys.cs new file mode 100644 index 00000000..e9883548 --- /dev/null +++ b/scr/Messenger.Api/Data/Migrations/20261106145724_AddIdempotencyKeys.cs @@ -0,0 +1,57 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Messenger.Api.Data.Migrations +{ + /// + public partial class AddIdempotencyKeys : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "idempotency_keys", + columns: table => new + { + user_id = table.Column(type: "uuid", nullable: false), + chat_id = table.Column(type: "uuid", nullable: false), + key = table.Column(type: "character varying(128)", maxLength: 128, nullable: false), + request_hash = table.Column(type: "bytea", nullable: false), + message_id = table.Column(type: "uuid", nullable: false), + created_at = table.Column(type: "timestamp with time zone", nullable: false), + expires_at = table.Column(type: "timestamp with time zone", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("pk_idempotency_keys", x => new { x.user_id, x.chat_id, x.key }); + table.CheckConstraint("ck_idempotency_keys_expiry", "expires_at > created_at"); + table.CheckConstraint("ck_idempotency_keys_hash_len", "octet_length(request_hash) = 32"); + }); + + migrationBuilder.CreateIndex( + name: "ix_idempotency_keys_expires_at", + table: "idempotency_keys", + column: "expires_at"); + + // Ключ идемпотентности вставляется РАНЬШЕ сообщения (claim → резервирование слота → вставка), поэтому FK + // проверяется при COMMIT (DEFERRABLE INITIALLY DEFERRED): запись «ключ → сообщение» без сообщения не переживёт транзакцию. + // Миграция только добавляет таблицу: запущенная предыдущая версия API её не использует и продолжает работать + // (совместимость для rolling update). + migrationBuilder.Sql(""" + ALTER TABLE idempotency_keys + ADD CONSTRAINT fk_idempotency_keys_messages_message_id + FOREIGN KEY (message_id) REFERENCES messages (id) ON DELETE CASCADE + DEFERRABLE INITIALLY DEFERRED; + """); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "idempotency_keys"); + } + } +} diff --git a/scr/Messenger.Api/Data/Migrations/MessengerDbContextModelSnapshot.cs b/scr/Messenger.Api/Data/Migrations/MessengerDbContextModelSnapshot.cs new file mode 100644 index 00000000..ea3d5428 --- /dev/null +++ b/scr/Messenger.Api/Data/Migrations/MessengerDbContextModelSnapshot.cs @@ -0,0 +1,298 @@ +// +using System; +using Messenger.Api.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace Messenger.Api.Data.Migrations +{ + [DbContext(typeof(MessengerDbContext))] + partial class MessengerDbContextModelSnapshot : ModelSnapshot + { + protected override void BuildModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "10.0.13") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("Messenger.Api.Data.ChatEntity", b => + { + b.Property("Id") + .HasColumnType("uuid") + .HasColumnName("id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("HistoryVersion") + .ValueGeneratedOnAdd() + .HasColumnType("bigint") + .HasDefaultValue(0L) + .HasColumnName("history_version"); + + b.Property("LastMessageAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("last_message_at"); + + b.Property("Title") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("title"); + + b.HasKey("Id") + .HasName("pk_chats"); + + b.HasIndex("CreatedAt", "Id") + .HasDatabaseName("ix_chats_created_at_id"); + + b.ToTable("chats", null, t => + { + t.HasCheckConstraint("ck_chats_history_version_nonneg", "history_version >= 0"); + + t.HasCheckConstraint("ck_chats_title_not_blank", "title ~ '\\S'"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.ChatMemberEntity", b => + { + b.Property("ChatId") + .HasColumnType("uuid") + .HasColumnName("chat_id"); + + b.Property("UserId") + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.HasKey("ChatId", "UserId") + .HasName("pk_chat_members"); + + b.HasIndex("UserId") + .HasDatabaseName("ix_chat_members_user_id"); + + b.ToTable("chat_members", (string)null); + }); + + modelBuilder.Entity("Messenger.Api.Data.IdempotencyKeyEntity", b => + { + b.Property("UserId") + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.Property("ChatId") + .HasColumnType("uuid") + .HasColumnName("chat_id"); + + b.Property("Key") + .HasMaxLength(128) + .HasColumnType("character varying(128)") + .HasColumnName("key"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("ExpiresAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("expires_at"); + + b.Property("MessageId") + .HasColumnType("uuid") + .HasColumnName("message_id"); + + b.Property("RequestHash") + .IsRequired() + .HasColumnType("bytea") + .HasColumnName("request_hash"); + + b.HasKey("UserId", "ChatId", "Key") + .HasName("pk_idempotency_keys"); + + b.HasIndex("ExpiresAt") + .HasDatabaseName("ix_idempotency_keys_expires_at"); + + b.ToTable("idempotency_keys", null, t => + { + t.HasCheckConstraint("ck_idempotency_keys_expiry", "expires_at > created_at"); + + t.HasCheckConstraint("ck_idempotency_keys_hash_len", "octet_length(request_hash) = 32"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.MessageEntity", b => + { + b.Property("Id") + .HasColumnType("uuid") + .HasColumnName("id"); + + b.Property("ChatId") + .HasColumnType("uuid") + .HasColumnName("chat_id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("SenderId") + .HasColumnType("uuid") + .HasColumnName("sender_id"); + + b.Property("Text") + .IsRequired() + .HasMaxLength(4000) + .HasColumnType("character varying(4000)") + .HasColumnName("text"); + + b.HasKey("Id") + .HasName("pk_messages"); + + b.HasIndex("ChatId", "SenderId") + .HasDatabaseName("ix_messages_chat_id_sender_id"); + + b.HasIndex("ChatId", "CreatedAt", "Id") + .HasDatabaseName("ix_messages_chat_history"); + + b.ToTable("messages", null, t => + { + t.HasCheckConstraint("ck_messages_text_not_blank", "text ~ '\\S'"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.SessionEntity", b => + { + b.Property("Id") + .HasColumnType("uuid") + .HasColumnName("id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("ExpiresAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("expires_at"); + + b.Property("RevokedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("revoked_at"); + + b.Property("TokenHash") + .IsRequired() + .HasColumnType("bytea") + .HasColumnName("token_hash"); + + b.Property("UserId") + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.HasKey("Id") + .HasName("pk_sessions"); + + b.HasIndex("ExpiresAt") + .HasDatabaseName("ix_sessions_expires_at"); + + b.HasIndex("TokenHash") + .IsUnique() + .HasDatabaseName("ux_sessions_token_hash"); + + b.HasIndex("UserId") + .HasDatabaseName("ix_sessions_user_id"); + + b.ToTable("sessions", null, t => + { + t.HasCheckConstraint("ck_sessions_expiry_after_creation", "expires_at > created_at"); + + t.HasCheckConstraint("ck_sessions_token_hash_len", "octet_length(token_hash) = 32"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.UserEntity", b => + { + b.Property("Id") + .HasColumnType("uuid") + .HasColumnName("id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("display_name"); + + b.Property("PasswordHash") + .IsRequired() + .HasColumnType("text") + .HasColumnName("password_hash"); + + b.Property("Username") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("character varying(32)") + .HasColumnName("username"); + + b.HasKey("Id") + .HasName("pk_users"); + + b.HasIndex("Username") + .IsUnique() + .HasDatabaseName("ux_users_username"); + + b.ToTable("users", null, t => + { + t.HasCheckConstraint("ck_users_display_name_not_blank", "display_name ~ '\\S'"); + + t.HasCheckConstraint("ck_users_username_format", "username ~ '^[a-z0-9_]{3,32}$'"); + }); + }); + + modelBuilder.Entity("Messenger.Api.Data.ChatMemberEntity", b => + { + b.HasOne("Messenger.Api.Data.ChatEntity", null) + .WithMany() + .HasForeignKey("ChatId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_chat_members_chats_chat_id"); + + b.HasOne("Messenger.Api.Data.UserEntity", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired() + .HasConstraintName("fk_chat_members_users_user_id"); + }); + + modelBuilder.Entity("Messenger.Api.Data.MessageEntity", b => + { + b.HasOne("Messenger.Api.Data.ChatMemberEntity", null) + .WithMany() + .HasForeignKey("ChatId", "SenderId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_messages_chat_members_chat_id_sender_id"); + }); + + modelBuilder.Entity("Messenger.Api.Data.SessionEntity", b => + { + b.HasOne("Messenger.Api.Data.UserEntity", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_sessions_users_user_id"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/scr/Messenger.Api/Endpoints/AuthEndpoints.cs b/scr/Messenger.Api/Endpoints/AuthEndpoints.cs new file mode 100644 index 00000000..d3bfff22 --- /dev/null +++ b/scr/Messenger.Api/Endpoints/AuthEndpoints.cs @@ -0,0 +1,146 @@ +using System.Text; +using Messenger.Api.Data; +using Messenger.Api.Models; +using Messenger.Api.Services; +using Microsoft.EntityFrameworkCore; + +namespace Messenger.Api.Endpoints; + +public static class AuthEndpoints +{ + private const string BasicChallenge = "Basic realm=\"messenger\", charset=\"UTF-8\""; + + public static IEndpointRouteBuilder MapAuthEndpoints(this IEndpointRouteBuilder endpoints) + { + endpoints.MapPost("/api/v1/auth/sessions", CreateSession); + endpoints.MapDelete("/api/v1/auth/sessions/current", RevokeCurrentSession).RequireAuthorization(); + return endpoints; + } + + private static async Task CreateSession( + HttpContext httpContext, + MessengerDbContext db, + IPasswordHasher hasher, + AuthSessionOptions options, + CancellationToken ct) + { + // Любая проблема с заголовком или credentials даёт один и тот же ответ. + var unauthorized = () => ApiErrors.Unauthorized(httpContext, BasicChallenge, "Неверное имя пользователя или пароль"); + + if (!TryParseBasic(httpContext.Request, out var username, out var password)) + { + return unauthorized(); + } + + var user = await db.Users.AsNoTracking().FirstOrDefaultAsync(u => u.Username == username, ct); + + // Проверка выполняется и для несуществующего пользователя (null → заглушка), чтобы время ответа + // не выдавало, существует ли username. + bool passwordOk; + try + { + passwordOk = await hasher.VerifyAsync(user?.PasswordHash, password, ct); + } + catch (PasswordHasherBusyException) + { + return ApiErrors.Error(httpContext, 503, "unavailable", "Сервис временно перегружен, повторите запрос позже"); + } + + if (user is null || !passwordOk) + { + return unauthorized(); + } + + var token = SessionTokens.Generate(); + var now = Timestamps.UtcNowMilliseconds(); + var session = new SessionEntity + { + Id = Guid.CreateVersion7(), + TokenHash = SessionTokens.Hash(token), + UserId = user.Id, + CreatedAt = now, + ExpiresAt = now + options.Ttl + }; + + db.Sessions.Add(session); + await db.SaveChangesAsync(ct); + + // Ответ с токеном нельзя кэшировать промежуточными узлами. + httpContext.Response.Headers.CacheControl = "no-store"; + + return Results.Json( + new SessionResponse( + token, + "Bearer", + session.ExpiresAt, + new User + { + Id = user.Id, + Username = user.Username, + DisplayName = user.DisplayName, + CreatedAt = user.CreatedAt + }), + statusCode: StatusCodes.Status201Created); + } + + private static async Task RevokeCurrentSession( + HttpContext httpContext, + MessengerDbContext db, + CancellationToken ct) + { + var sessionId = httpContext.GetSessionId(); + var now = Timestamps.UtcNowMilliseconds(); + + // Один UPDATE с условием: отзыв атомарен даже при двух параллельных DELETE с одним токеном. + var revoked = await db.Sessions + .Where(s => s.Id == sessionId && s.RevokedAt == null) + .ExecuteUpdateAsync(s => s.SetProperty(x => x.RevokedAt, now), ct); + + return revoked == 0 + ? ApiErrors.Unauthorized(httpContext, BearerAuth.Challenge, "Требуется действительный Bearer-токен") + : Results.NoContent(); + } + + // Basic: base64("username:password"), разделитель — ПЕРВОЕ двоеточие (в пароле двоеточие допустимо). + // Всё, что не разбирается строго (схема, base64, UTF-8, формат), считается неверными credentials. + private static bool TryParseBasic(HttpRequest request, out string username, out string password) + { + username = password = string.Empty; + + if (request.Headers.Authorization.Count != 1) + { + return false; + } + + var header = request.Headers.Authorization[0]; + const string prefix = "Basic "; + if (header is null || !header.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) + { + return false; + } + + string decoded; + try + { + var bytes = Convert.FromBase64String(header[prefix.Length..].Trim()); + decoded = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false, throwOnInvalidBytes: true).GetString(bytes); + } + catch (Exception ex) when (ex is FormatException or DecoderFallbackException) + { + return false; + } + + var separator = decoded.IndexOf(':'); + if (separator <= 0) + { + return false; + } + + username = decoded[..separator]; + password = decoded[(separator + 1)..]; + + // Username по контракту — ASCII [a-z0-9_]{3,32}; пароль — 12..128 code points. Отсекаем до дорогого Argon2. + var length = ApiErrors.CodePoints(password); + return username.Length is >= 3 and <= 32 && length is >= 12 and <= 128; + } +} diff --git a/scr/Messenger.Api/Endpoints/ChatEndpoints.cs b/scr/Messenger.Api/Endpoints/ChatEndpoints.cs new file mode 100644 index 00000000..087feebc --- /dev/null +++ b/scr/Messenger.Api/Endpoints/ChatEndpoints.cs @@ -0,0 +1,158 @@ +using Messenger.Api.Data; +using Messenger.Api.Models; +using Messenger.Api.Services; +using Microsoft.EntityFrameworkCore; +using Npgsql; + +namespace Messenger.Api.Endpoints; + +public static class ChatEndpoints +{ + public static IEndpointRouteBuilder MapChatEndpoints( + this IEndpointRouteBuilder endpoints) + { + endpoints.MapPost("/api/v1/chats", CreateChat).RequireAuthorization(); + endpoints.MapGet("/api/v1/chats", ListChats).RequireAuthorization(); + endpoints.MapGet("/api/v1/chats/{chatId}", GetChat).RequireAuthorization(); + return endpoints; + } + + private static async Task CreateChat( + CreateChatRequest request, + HttpContext httpContext, + MessengerDbContext db, + CancellationToken ct) + { + var userId = httpContext.GetUserId(); + + if (string.IsNullOrWhiteSpace(request.Title) || + ApiErrors.CodePoints(request.Title) > 100 || + request.MemberIds.Count is < 1 or > 100 || + request.MemberIds.Distinct().Count() != request.MemberIds.Count) + { + return ApiErrors.Error(httpContext, 400, "invalid_request", "Некорректные данные чата"); + } + + if (!request.MemberIds.Contains(userId)) + { + return ApiErrors.Error(httpContext, 400, "invalid_request", "Создатель должен быть участником чата"); + } + + var knownMembers = await db.Users.CountAsync(u => request.MemberIds.Contains(u.Id), ct); + if (knownMembers != request.MemberIds.Count) + { + return ApiErrors.Error(httpContext, 400, "invalid_request", "Неизвестный участник чата"); + } + + var chat = new ChatEntity + { + Id = Guid.CreateVersion7(), + Title = request.Title, + CreatedAt = Timestamps.UtcNowMilliseconds() + }; + + // Чат и все его участники сохраняются одним SaveChanges, то есть одной транзакцией: + // либо создано всё, либо ничего (нет чата без участников). + db.Chats.Add(chat); + db.ChatMembers.AddRange(request.MemberIds.Select(id => new ChatMemberEntity { ChatId = chat.Id, UserId = id })); + + try + { + await db.SaveChangesAsync(ct); + } + catch (DbUpdateException ex) when (ex.InnerException is PostgresException { SqlState: PostgresErrorCodes.ForeignKeyViolation }) + { + return ApiErrors.Error(httpContext, 400, "invalid_request", "Неизвестный участник чата"); + } + + return Results.Created($"/api/v1/chats/{chat.Id}", ToDto(chat, request.MemberIds.Order().ToList())); + } + + private static async Task ListChats( + int? limit, + string? cursor, + HttpContext httpContext, + MessengerDbContext db, + CancellationToken ct) + { + var userId = httpContext.GetUserId(); + var pageSize = limit ?? 50; + + if (pageSize is < 1 or > 100 || !Cursors.TryDecode(cursor, Cursors.Chats, out var after)) + { + return ApiErrors.Error(httpContext, 400, "invalid_request", "Некорректные параметры пагинации"); + } + + // Keyset: строковое сравнение (created_at, id) > (курсор), без OFFSET и без просмотра всей выдачи. + IQueryable source = after is null + ? db.Chats.FromSql($""" + SELECT c.* FROM chats c + WHERE EXISTS (SELECT 1 FROM chat_members m WHERE m.chat_id = c.id AND m.user_id = {userId}) + """) + : db.Chats.FromSql($""" + SELECT c.* FROM chats c + WHERE EXISTS (SELECT 1 FROM chat_members m WHERE m.chat_id = c.id AND m.user_id = {userId}) + AND (c.created_at, c.id) > ({after.Value.CreatedAt}, {after.Value.Id}) + """); + + var chats = await source + .AsNoTracking() + .OrderBy(c => c.CreatedAt).ThenBy(c => c.Id) + .Take(pageSize + 1) + .ToListAsync(ct); + + var hasNext = chats.Count > pageSize; + if (hasNext) + { + chats.RemoveAt(chats.Count - 1); + } + + var ids = chats.Select(c => c.Id).ToList(); + var members = (await db.ChatMembers + .AsNoTracking() + .Where(m => ids.Contains(m.ChatId)) + .Select(m => new { m.ChatId, m.UserId }) + .ToListAsync(ct)) + .ToLookup(m => m.ChatId, m => m.UserId); + + var items = chats.Select(c => ToDto(c, members[c.Id].Order().ToList())).ToList(); + var nextCursor = hasNext ? Cursors.Encode(Cursors.Chats, chats[^1].CreatedAt, chats[^1].Id) : null; + + return Results.Ok(new { items, next_cursor = nextCursor }); + } + + private static async Task GetChat( + Guid chatId, + HttpContext httpContext, + MessengerDbContext db, + CancellationToken ct) + { + var userId = httpContext.GetUserId(); + + // Отсутствующий и чужой чат неразличимы: оба дают 404. + var chat = await db.Chats + .AsNoTracking() + .FirstOrDefaultAsync(c => c.Id == chatId && db.ChatMembers.Any(m => m.ChatId == c.Id && m.UserId == userId), ct); + + if (chat is null) + { + return ApiErrors.Error(httpContext, 404, "not_found", "Объект не найден"); + } + + var memberIds = await db.ChatMembers + .AsNoTracking() + .Where(m => m.ChatId == chatId) + .Select(m => m.UserId) + .ToListAsync(ct); + + return Results.Ok(ToDto(chat, memberIds.Order().ToList())); + } + + private static Chat ToDto(ChatEntity chat, List memberIds) => new() + { + Id = chat.Id, + Title = chat.Title, + MemberIds = memberIds, + CreatedAt = chat.CreatedAt + }; +} diff --git a/scr/Messenger.Api/Endpoints/MessageEndpoints.cs b/scr/Messenger.Api/Endpoints/MessageEndpoints.cs new file mode 100644 index 00000000..88110976 --- /dev/null +++ b/scr/Messenger.Api/Endpoints/MessageEndpoints.cs @@ -0,0 +1,226 @@ +using Messenger.Api.Data; +using Messenger.Api.Models; +using Messenger.Api.Services; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Storage; +using Microsoft.Extensions.Options; +using Npgsql; + +namespace Messenger.Api.Endpoints; + +public static class MessageEndpoints +{ + public static IEndpointRouteBuilder MapMessageEndpoints( + this IEndpointRouteBuilder endpoints) + { + endpoints.MapPost("/api/v1/chats/{chatId}/messages", CreateMessage).RequireAuthorization(); + endpoints.MapGet("/api/v1/chats/{chatId}/messages", ListMessages).RequireAuthorization(); + return endpoints; + } + + private static async Task CreateMessage( + Guid chatId, + CreateMessageRequest request, + HttpContext httpContext, + MessengerDbContext db, + IdempotencySettings idempotency, + CancellationToken ct) + { + var userId = httpContext.GetUserId(); + + // Сначала доступ к ресурсу (404 для постороннего), затем валидация ключа и тела. Доступ проверяется при каждом + // запросе, в том числе при повторе с тем же Idempotency-Key. + if (!await IsMemberAsync(db, chatId, userId, ct)) + { + return ApiErrors.Error(httpContext, 404, "not_found", "Объект не найден"); + } + + var key = IdempotencyKeys.ReadKey(httpContext.Request); + if (key is null) + { + return ApiErrors.Error(httpContext, 400, "invalid_request", "Требуется заголовок Idempotency-Key ([A-Za-z0-9._:-], 1-128 символов)"); + } + + if (string.IsNullOrWhiteSpace(request.Text) || ApiErrors.CodePoints(request.Text) > 4000) + { + return ApiErrors.Error(httpContext, 400, "invalid_request", "Некорректный текст сообщения"); + } + + // Транзакция: (0) claim ключа идемпотентности, (1) UPDATE чата берёт блокировку его строки и выдаёт created_at, + // (2) INSERT сообщения, (3) COMMIT. Записи в один чат идут строго по очереди, поэтому порядок коммитов совпадает + // с порядком (created_at, id) и курсор не может «проскочить» сообщение, закоммиченное позже. Версия истории + // растёт в той же транзакции. Ключ и сообщение коммитятся вместе: при любой ошибке откатывается и то и другое, + // поэтому 5xx не «запоминается» как результат, а клиент может безопасно повторить запрос с тем же ключом. + await using var tx = await db.Database.BeginTransactionAsync(ct); + + var messageId = Guid.CreateVersion7(); + var (claim, storedMessageId) = await IdempotencyKeys.ClaimAsync( + db, tx, userId, chatId, key, IdempotencyKeys.RequestHash(request.Text), messageId, idempotency.Ttl, ct); + + if (claim == ClaimResult.Conflict) + { + return ApiErrors.Error(httpContext, 409, "conflict", "Idempotency-Key уже использован с другим сообщением"); + } + + if (claim == ClaimResult.Replay) + { + // Повтор: ничего не пишем, возвращаем то же сообщение и тот же код 201. + var original = await db.Messages.AsNoTracking().FirstAsync(m => m.Id == storedMessageId, ct); + return Results.Created($"/api/v1/chats/{chatId}/messages", ToDto(original)); + } + + var createdAt = await ReserveMessageSlotAsync(db, tx, chatId, userId, ct); + if (createdAt is null) + { + return ApiErrors.Error(httpContext, 404, "not_found", "Объект не найден"); + } + + var message = new MessageEntity + { + Id = messageId, + ChatId = chatId, + SenderId = userId, + Text = request.Text, + CreatedAt = createdAt.Value + }; + + db.Messages.Add(message); + try + { + await db.SaveChangesAsync(ct); + } + catch (DbUpdateException ex) when (ex.InnerException is PostgresException { SqlState: PostgresErrorCodes.CheckViolation }) + { + return ApiErrors.Error(httpContext, 400, "invalid_request", "Некорректный текст сообщения"); + } + + await tx.CommitAsync(ct); + + return Results.Created($"/api/v1/chats/{chatId}/messages", ToDto(message)); + } + + private static async Task ListMessages( + Guid chatId, + int? limit, + string? cursor, + HttpContext httpContext, + MessengerDbContext db, + IMessageHistoryCache cache, + DiagnosticsSettings diagnostics, + IOptions jsonOptions, + CancellationToken ct) + { + var userId = httpContext.GetUserId(); + var pageSize = limit ?? 50; + + // Один запрос проверяет доступ (null → 404) и читает актуальную версию истории из PostgreSQL. + // Версия берётся из БД при каждом чтении, а не из кэша: после подтверждённой записи ключ гарантированно новый. + var version = await db.Chats + .AsNoTracking() + .Where(c => c.Id == chatId && db.ChatMembers.Any(m => m.ChatId == c.Id && m.UserId == userId)) + .Select(c => (long?)c.HistoryVersion) + .FirstOrDefaultAsync(ct); + + if (version is null) + { + return ApiErrors.Error(httpContext, 404, "not_found", "Объект не найден"); + } + + if (pageSize is < 1 or > 100 || !Cursors.TryDecode(cursor, Cursors.Messages(chatId), out var after)) + { + return ApiErrors.Error(httpContext, 400, "invalid_request", "Некорректные параметры пагинации"); + } + + // Ключ = чат + версия истории + размер страницы + курсор. Страница под этим ключом никогда не устаревает: + // любая запись увеличивает версию, и читатели переходят на другой ключ. + var key = $"hist:{chatId:N}:v{version}:l{pageSize}:{cursor ?? "-"}"; + + var (cached, status) = await cache.GetAsync(key, ct); + if (cached is not null) + { + return CachedJson(httpContext, diagnostics, cached, status); + } + + // Keyset по индексу (chat_id, created_at, id): читается только страница, а не вся история. + IQueryable source = after is null + ? db.Messages.FromSql($"SELECT * FROM messages WHERE chat_id = {chatId}") + : db.Messages.FromSql($""" + SELECT * FROM messages + WHERE chat_id = {chatId} AND (created_at, id) > ({after.Value.CreatedAt}, {after.Value.Id}) + """); + + var messages = await source + .AsNoTracking() + .OrderBy(m => m.CreatedAt).ThenBy(m => m.Id) + .Take(pageSize + 1) + .ToListAsync(ct); + + var hasNext = messages.Count > pageSize; + if (hasNext) + { + messages.RemoveAt(messages.Count - 1); + } + + var nextCursor = hasNext + ? Cursors.Encode(Cursors.Messages(chatId), messages[^1].CreatedAt, messages[^1].Id) + : null; + + var json = System.Text.Json.JsonSerializer.Serialize( + new { items = messages.Select(ToDto).ToList(), next_cursor = nextCursor }, + jsonOptions.Value.SerializerOptions); + + await cache.SetAsync(key, json, ct); + return CachedJson(httpContext, diagnostics, json, status); + } + + // Ответ из кэша и ответ из БД байт-в-байт одинаковы: сериализуется одна и та же структура теми же настройками. + private static IResult CachedJson(HttpContext context, DiagnosticsSettings diagnostics, string json, CacheStatus status) + { + if (diagnostics.Headers) + { + context.Response.Headers["X-Cache"] = status.ToString().ToLowerInvariant(); + } + + return Results.Content(json, "application/json; charset=utf-8"); + } + + private static Task IsMemberAsync(MessengerDbContext db, Guid chatId, Guid userId, CancellationToken ct) => + db.ChatMembers.AnyAsync(m => m.ChatId == chatId && m.UserId == userId, ct); + + // Атомарно: проверяет членство, увеличивает версию истории и возвращает created_at нового сообщения — + // строго больше времени предыдущего (даже при откате системных часов или двух сообщениях в одну миллисекунду). + // null — чата нет или пользователь не участник. + private static async Task ReserveMessageSlotAsync( + MessengerDbContext db, + IDbContextTransaction tx, + Guid chatId, + Guid userId, + CancellationToken ct) + { + var connection = (NpgsqlConnection)db.Database.GetDbConnection(); + await using var command = new NpgsqlCommand(""" + UPDATE chats c + SET history_version = c.history_version + 1, + last_message_at = GREATEST(@now, COALESCE(c.last_message_at + interval '1 millisecond', @now)) + WHERE c.id = @chat + AND EXISTS (SELECT 1 FROM chat_members m WHERE m.chat_id = c.id AND m.user_id = @user) + RETURNING c.last_message_at + """, connection, (NpgsqlTransaction)tx.GetDbTransaction()); + + command.Parameters.AddWithValue("now", Timestamps.UtcNowMilliseconds()); + command.Parameters.AddWithValue("chat", chatId); + command.Parameters.AddWithValue("user", userId); + + await using var reader = await command.ExecuteReaderAsync(ct); + return await reader.ReadAsync(ct) ? reader.GetFieldValue(0) : null; + } + + private static Message ToDto(MessageEntity m) => new() + { + Id = m.Id, + ChatId = m.ChatId, + SenderId = m.SenderId, + Text = m.Text, + CreatedAt = m.CreatedAt + }; +} diff --git a/scr/Messenger.Api/Endpoints/UserEndpoints.cs b/scr/Messenger.Api/Endpoints/UserEndpoints.cs new file mode 100644 index 00000000..db68d5c2 --- /dev/null +++ b/scr/Messenger.Api/Endpoints/UserEndpoints.cs @@ -0,0 +1,125 @@ +using System.Text.RegularExpressions; +using Messenger.Api.Models; +using Messenger.Api.Services; +using Microsoft.EntityFrameworkCore; +using Messenger.Api.Data; +using Npgsql; + +namespace Messenger.Api.Endpoints; + +public static class UserEndpoints +{ + public static IEndpointRouteBuilder MapUserEndpoints( + this IEndpointRouteBuilder endpoints) + { + endpoints.MapPost( + "/api/v1/users", + CreateUser); + + endpoints.MapGet( + "/api/v1/users/me", + GetCurrentUser).RequireAuthorization(); + + return endpoints; + } + + private static async Task CreateUser( + CreateUserRequest request, + HttpContext httpContext, + MessengerDbContext db, + IPasswordHasher hasher, + CancellationToken ct) + { + if (!Regex.IsMatch(request.Username, @"\A[a-z0-9_]{3,32}\z")) + { + return ApiErrors.Error(httpContext, 400, "invalid_request", "Некорректный username"); + } + + if (string.IsNullOrWhiteSpace(request.DisplayName) || + ApiErrors.CodePoints(request.DisplayName) > 100) + { + return ApiErrors.Error(httpContext, 400, "invalid_request", "display_name должен содержать от 1 до 100 символов"); + } + + var passwordLength = ApiErrors.CodePoints(request.Password); + if (passwordLength < 12 || passwordLength > 128) + { + return ApiErrors.Error(httpContext, 400, "invalid_request", "Пароль должен содержать от 12 до 128 символов"); + } + + // Быстрый отказ, чтобы не тратить дорогой Argon2 на заведомо занятый username. + // Это только оптимизация: от гонки защищает уникальный индекс (см. catch ниже). + if (await db.Users.AnyAsync(u => u.Username == request.Username, ct)) + { + return ApiErrors.Error(httpContext, 409, "conflict", "Username уже занят"); + } + + // Хеш считается до SaveChanges: соединение с БД не простаивает на CPU-работе. + string passwordHash; + try + { + passwordHash = await hasher.HashAsync(request.Password, ct); + } + catch (PasswordHasherBusyException) + { + return ApiErrors.Error(httpContext, 503, "unavailable", "Сервис временно перегружен, повторите запрос позже"); + } + + var entity = new UserEntity + { + Id = Guid.CreateVersion7(), + Username = request.Username, + DisplayName = request.DisplayName, + PasswordHash = passwordHash, + CreatedAt = Timestamps.UtcNowMilliseconds() + }; + + db.Users.Add(entity); + try + { + await db.SaveChangesAsync(ct); + } + catch (DbUpdateException ex) when ( + ex.InnerException is PostgresException { SqlState: PostgresErrorCodes.UniqueViolation, ConstraintName: "ux_users_username" }) + { + // Параллельный запрос с тем же username успел раньше проверки AnyAsync. + return ApiErrors.Error(httpContext, 409, "conflict", "Username уже занят"); + } + + // В ответ уходит API-модель без password_hash, а не сущность таблицы. + var user = new User + { + Id = entity.Id, + Username = entity.Username, + DisplayName = entity.DisplayName, + CreatedAt = entity.CreatedAt + }; + + return Results.Created($"/api/v1/users/{user.Id}", user); + } + + private static async Task GetCurrentUser( + HttpContext httpContext, + MessengerDbContext db, + CancellationToken ct) + { + var userId = httpContext.GetUserId(); + + var user = await db.Users + .AsNoTracking() + .Where(u => u.Id == userId) + .Select(u => new User + { + Id = u.Id, + Username = u.Username, + DisplayName = u.DisplayName, + CreatedAt = u.CreatedAt + }) + .FirstOrDefaultAsync(ct); + + // Сессия ссылается на пользователя внешним ключом, поэтому null здесь невозможен; ответ всё равно безопасный. + return user is null + ? ApiErrors.Unauthorized(httpContext, BearerAuth.Challenge, "Требуется действительный Bearer-токен") + : Results.Ok(user); + } +} diff --git a/scr/Messenger.Api/Messenger.Api.csproj b/scr/Messenger.Api/Messenger.Api.csproj new file mode 100644 index 00000000..fadb9878 --- /dev/null +++ b/scr/Messenger.Api/Messenger.Api.csproj @@ -0,0 +1,25 @@ + + + + net10.0 + enable + enable + + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + diff --git a/scr/Messenger.Api/Models/Chat.cs b/scr/Messenger.Api/Models/Chat.cs new file mode 100644 index 00000000..71777680 --- /dev/null +++ b/scr/Messenger.Api/Models/Chat.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Messenger.Api.Models +{ + public sealed class Chat + { + public Guid Id { get; init; } + public string Title { get; init; } = String.Empty; + public List MemberIds { get; init; } = new List(); + public DateTimeOffset CreatedAt { get; init; } + } +} diff --git a/scr/Messenger.Api/Models/CreateChatRequest.cs b/scr/Messenger.Api/Models/CreateChatRequest.cs new file mode 100644 index 00000000..8b2e4611 --- /dev/null +++ b/scr/Messenger.Api/Models/CreateChatRequest.cs @@ -0,0 +1,6 @@ +namespace Messenger.Api.Models +{ + public sealed record CreateChatRequest( + [property: System.Text.Json.Serialization.JsonRequired] string Title, + [property: System.Text.Json.Serialization.JsonRequired] List MemberIds); +} diff --git a/scr/Messenger.Api/Models/CreateMessageRequest.cs b/scr/Messenger.Api/Models/CreateMessageRequest.cs new file mode 100644 index 00000000..27f01a37 --- /dev/null +++ b/scr/Messenger.Api/Models/CreateMessageRequest.cs @@ -0,0 +1,3 @@ +namespace Messenger.Api.Models; + +public sealed record CreateMessageRequest([property: System.Text.Json.Serialization.JsonRequired] string Text); \ No newline at end of file diff --git a/scr/Messenger.Api/Models/CreateUserRequest.cs b/scr/Messenger.Api/Models/CreateUserRequest.cs new file mode 100644 index 00000000..49415b63 --- /dev/null +++ b/scr/Messenger.Api/Models/CreateUserRequest.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Messenger.Api.Models +{ + public sealed record CreateUserRequest( + [property: System.Text.Json.Serialization.JsonRequired] string Username, + [property: System.Text.Json.Serialization.JsonRequired] string DisplayName, + [property: System.Text.Json.Serialization.JsonRequired] string Password); + +} diff --git a/scr/Messenger.Api/Models/Message.cs b/scr/Messenger.Api/Models/Message.cs new file mode 100644 index 00000000..4a5ff923 --- /dev/null +++ b/scr/Messenger.Api/Models/Message.cs @@ -0,0 +1,16 @@ +using Microsoft.AspNetCore.Http.HttpResults; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Messenger.Api.Models +{ + public sealed class Message + { + public Guid Id { get; init; } + public Guid ChatId { get; init; } + public Guid SenderId { get; init; } + public string Text { get; init; } = String.Empty; + public DateTimeOffset CreatedAt { get; init; } + } +} diff --git a/scr/Messenger.Api/Models/SessionResponse.cs b/scr/Messenger.Api/Models/SessionResponse.cs new file mode 100644 index 00000000..7c3b7bf1 --- /dev/null +++ b/scr/Messenger.Api/Models/SessionResponse.cs @@ -0,0 +1,7 @@ +namespace Messenger.Api.Models; + +public sealed record SessionResponse( + string Token, + string TokenType, + DateTimeOffset ExpiresAt, + User User); diff --git a/scr/Messenger.Api/Models/User.cs b/scr/Messenger.Api/Models/User.cs new file mode 100644 index 00000000..bb088c33 --- /dev/null +++ b/scr/Messenger.Api/Models/User.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Messenger.Api.Models +{ + public sealed class User + { + public Guid Id { get; init; } + public string Username { get; init; } = string.Empty; + public string DisplayName { get; init; } = string.Empty; + public DateTimeOffset CreatedAt { get; init; } + } +} diff --git a/scr/Messenger.Api/Program.cs b/scr/Messenger.Api/Program.cs new file mode 100644 index 00000000..9ad5f02f --- /dev/null +++ b/scr/Messenger.Api/Program.cs @@ -0,0 +1,250 @@ +using Microsoft.AspNetCore.Diagnostics; +using Messenger.Api.Endpoints; +using Messenger.Api.Services; +using Messenger.Api.Data; +using System.Text.Json; +using Microsoft.EntityFrameworkCore; +using Microsoft.AspNetCore.Authentication; + +// Режим для Docker HEALTHCHECK: в образе aspnet нет curl, поэтому проверку выполняет само приложение. +if (args.Contains("--healthcheck")) +{ + var port = Environment.GetEnvironmentVariable("APP_PORT") ?? "8080"; + try + { + using var probe = new HttpClient { Timeout = TimeSpan.FromSeconds(2) }; + var probeResponse = await probe.GetAsync($"http://127.0.0.1:{port}/health/live"); + return probeResponse.IsSuccessStatusCode ? 0 : 1; + } + catch (Exception) + { + return 1; + } +} + +var builder = WebApplication.CreateBuilder(args); + +// SIGTERM: сначала drain (SHUTDOWN_DRAIN_SECONDS, /health/ready → 503, запросы ещё принимаются), затем слушатель +// закрывается и активные запросы получают не более 5 секунд. Итого < 10 секунд (лимит задания) и < stop_grace_period. +builder.Services.Configure(options => options.ShutdownTimeout = TimeSpan.FromSeconds(5)); + +// Настройки читаются лениво из IConfiguration (после Build), поэтому тесты могут задавать их через UseSetting. +builder.Services.AddSingleton(sp => DatabaseSettings.From(sp.GetRequiredService())); +builder.Services.AddSingleton(sp => AuthSessionOptions.From(sp.GetRequiredService())); +builder.Services.AddSingleton(sp => CacheSettings.From(sp.GetRequiredService())); +builder.Services.AddSingleton(sp => DiagnosticsSettings.From(sp.GetRequiredService())); +builder.Services.AddSingleton(sp => InstanceSettings.From(sp.GetRequiredService())); +builder.Services.AddSingleton(sp => IdempotencySettings.From(sp.GetRequiredService())); +builder.Services.AddSingleton(); +builder.Services.AddHostedService(); +builder.Services.AddHttpContextAccessor(); +builder.Services.AddSingleton(); +builder.Services.AddDbContext((sp, options) => +{ + options.UseNpgsql(sp.GetRequiredService().ConnectionString) + .UseSnakeCaseNamingConvention(); + if (sp.GetRequiredService().Headers) + { + options.AddInterceptors(sp.GetRequiredService()); + } +}); +builder.Services.AddSingleton(sp => PasswordHashingSettings.From(sp.GetRequiredService())); +builder.Services.AddSingleton(); +builder.Services.AddSingleton(sp => +{ + var settings = sp.GetRequiredService(); + return settings.Enabled + ? new ValkeyMessageHistoryCache(settings, sp.GetRequiredService>()) + : new NullMessageHistoryCache(); +}); +builder.Services.AddAuthentication(BearerAuth.Scheme) + .AddScheme(BearerAuth.Scheme, null); +builder.Services.AddAuthorization(); +builder.Services.ConfigureHttpJsonOptions(options => +{ + options.SerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower; + options.SerializerOptions.Converters.Add(new UtcDateTimeOffsetJsonConverter()); + options.SerializerOptions.UnmappedMemberHandling = System.Text.Json.Serialization.JsonUnmappedMemberHandling.Disallow; + options.SerializerOptions.RespectNullableAnnotations = true; + // Web-настройки по умолчанию включают регистронезависимое сопоставление имён: контракт его не допускает. + options.SerializerOptions.PropertyNameCaseInsensitive = false; +}); + +var app = builder.Build(); + +// Режим one-shot миграции (`dotnet Messenger.Api.dll --migrate`): отдельный контейнер применяет схему и завершается. +// API-реплики схему не меняют, поэтому одновременный старт N реплик не создаёт гонку миграций. +if (args.Contains("--migrate")) +{ + using var migrationScope = app.Services.CreateScope(); + migrationScope.ServiceProvider.GetRequiredService().Database.Migrate(); + app.Logger.LogInformation("Migrations applied"); + return 0; +} + +// Только для локального запуска и тестов (MIGRATE_ON_START=true); в Compose выключено. +if (app.Services.GetRequiredService().MigrateOnStart) +{ + using var scope = app.Services.CreateScope(); + scope.ServiceProvider.GetRequiredService().Database.Migrate(); +} + +// Диагностика (только при DIAGNOSTIC_HEADERS=true): число SQL-команд EF Core за запрос — в заголовке X-Db-Queries. +if (app.Services.GetRequiredService().Headers) +{ + app.Use(async (context, next) => + { + var counter = new QueryCounter(); + context.Items[QueryCountingInterceptor.ItemKey] = counter; + context.Response.OnStarting(() => + { + context.Response.Headers["X-Db-Queries"] = Volatile.Read(ref counter.Count).ToString(); + return Task.CompletedTask; + }); + await next(); + }); +} + +// X-Instance-Id в каждом ответе API (включая ошибки и health). Заголовок ставится в OnStarting: UseExceptionHandler +// очищает заголовки, а этот обратный вызов срабатывает уже после очистки, перед отправкой ответа. +var instanceId = app.Services.GetRequiredService().InstanceId; +app.Use(async (context, next) => +{ + context.Response.OnStarting(() => + { + context.Response.Headers["X-Instance-Id"] = instanceId; + return Task.CompletedTask; + }); + await next(); +}); + +app.Use(async (context, next) => +{ + var requestId = Guid.NewGuid().ToString(); + context.Items["request_id"] = requestId; + context.Response.Headers["X-Request-Id"] = requestId; + await next(); +}); + +// Лог запроса: метод, путь, статус, время, request_id. Тело и query не логируются. +app.Use(async (context, next) => +{ + var logger = context.RequestServices.GetRequiredService().CreateLogger("Messenger.Requests"); + var started = System.Diagnostics.Stopwatch.GetTimestamp(); + try + { + await next(); + } + finally + { + logger.LogInformation( + "{Method} {Path} -> {Status} in {ElapsedMs:0.0} ms (request_id={RequestId})", + context.Request.Method, + context.Request.Path.Value, + context.Response.StatusCode, + System.Diagnostics.Stopwatch.GetElapsedTime(started).TotalMilliseconds, + context.Items["request_id"]); + } +}); + +app.UseExceptionHandler(errorApp => errorApp.Run(context => +{ + // В Development ошибки чтения запроса приходят исключением: сохраняем их 400/415 вместо 500. + var error = context.Features.Get()?.Error; + if (error is BadHttpRequestException { StatusCode: 400 or 415 } badRequest) + { + var (code, message) = badRequest.StatusCode == 415 + ? ("unsupported_media_type", "Требуется Content-Type: application/json") + : ("invalid_request", "Некорректный запрос"); + return ApiErrors.Error(context, badRequest.StatusCode, code, message).ExecuteAsync(context); + } + + // PostgreSQL недоступен или перегружен: ограниченный ответ 503 без внутренних деталей (стек и SQL только в логе). + if (DependencyFailures.IsDatabaseUnavailable(error)) + { + return ApiErrors.Error(context, 503, "unavailable", "Сервис временно недоступен").ExecuteAsync(context); + } + + return ApiErrors.Error(context, 500, "internal_error", "Внутренняя ошибка сервера").ExecuteAsync(context); +})); + +// Пустые ответы 400/404/415 (ошибки привязки, неизвестный маршрут) получают стандартное тело ошибки. +app.UseStatusCodePages(context => +{ + var http = context.HttpContext; + var (code, message) = http.Response.StatusCode switch + { + 400 => ("invalid_request", "Некорректный запрос"), + 404 => ("not_found", "Объект не найден"), + 415 => ("unsupported_media_type", "Требуется Content-Type: application/json"), + _ => ("internal_error", "Ошибка запроса") + }; + return ApiErrors.Error(http, http.Response.StatusCode, code, message).ExecuteAsync(http); +}); + +// Аутентификация (Bearer) выполняется до выбора обработчика и разбора тела: 401 приоритетнее 400/404. +app.UseAuthentication(); +app.UseAuthorization(); + +app.MapGet("/health/live", () => +{ + return Results.Ok(new + { + status = "ok" + }); +}); + +// Готовность = API может обслуживать обязательный синхронный путь, а он требует PostgreSQL (сессии, данные, ключи +// идемпотентности). Valkey не критичен: без него чтение идёт напрямую из PostgreSQL. После SIGTERM — всегда 503: +// балансировщик выводит экземпляр из ротации ещё до закрытия слушателя. Таймаут проверки (1 с) меньше таймаута +// проверки в HAProxy (2 с), чтобы зависшая БД давала явный 503, а не обрыв проверки. +app.MapGet("/health/ready", async (HttpContext context, MessengerDbContext db, ShutdownState shutdown) => +{ + if (shutdown.Draining) + { + return ApiErrors.Error(context, 503, "unavailable", "Экземпляр останавливается"); + } + + using var timeout = CancellationTokenSource.CreateLinkedTokenSource(context.RequestAborted); + timeout.CancelAfter(TimeSpan.FromSeconds(1)); + try + { + return await db.Database.CanConnectAsync(timeout.Token) + ? Results.Ok(new { status = "ok" }) + : ApiErrors.Error(context, 503, "unavailable", "База данных недоступна"); + } + catch (OperationCanceledException) when (!context.RequestAborted.IsCancellationRequested) + { + return ApiErrors.Error(context, 503, "unavailable", "База данных недоступна"); + } +}); + +app.MapUserEndpoints(); +app.MapAuthEndpoints(); +app.MapChatEndpoints(); +app.MapMessageEndpoints(); + + +app.Lifetime.ApplicationStarted.Register(() => + app.Logger.LogInformation("Messenger API started (instance {InstanceId}, version {Version})", + instanceId, Environment.GetEnvironmentVariable("APP_VERSION") ?? "dev")); +// ApplicationStopping выполняется синхронно ДО остановки Kestrel: пока этот обработчик спит, слушатель ещё открыт, +// а /health/ready уже отвечает 503. Так балансировщик (inter 1s, fall 2) успевает убрать экземпляр до обрыва соединений. +app.Lifetime.ApplicationStopping.Register(() => +{ + var shutdown = app.Services.GetRequiredService(); + var drain = app.Services.GetRequiredService().DrainDelay; + shutdown.StartDraining(); + app.Logger.LogInformation("SIGTERM received: readiness=503, draining {Seconds} s, then the listener closes", drain.TotalSeconds); + if (drain > TimeSpan.Zero) + { + Thread.Sleep(drain); + } +}); +app.Lifetime.ApplicationStopped.Register(() => app.Logger.LogInformation("Messenger API stopped")); + +app.Run(); +return 0; + +// Делает Program доступным для WebApplicationFactory в тестах. +public partial class Program { } diff --git a/scr/Messenger.Api/Properties/launchSettings.json b/scr/Messenger.Api/Properties/launchSettings.json new file mode 100644 index 00000000..1e19d965 --- /dev/null +++ b/scr/Messenger.Api/Properties/launchSettings.json @@ -0,0 +1,23 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:5015", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:7165;http://localhost:5015", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/scr/Messenger.Api/Services/ApiErrors.cs b/scr/Messenger.Api/Services/ApiErrors.cs new file mode 100644 index 00000000..7348ac68 --- /dev/null +++ b/scr/Messenger.Api/Services/ApiErrors.cs @@ -0,0 +1,37 @@ +namespace Messenger.Api.Services; + +public static class ApiErrors +{ + public static int CodePoints(string value) => value.EnumerateRunes().Count(); + + // 401 с обязательным заголовком WWW-Authenticate (контракт: Basic для входа, Bearer для остального API). + public static IResult Unauthorized(HttpContext context, string challenge, string message) + { + context.Response.Headers.WWWAuthenticate = challenge; + return Error(context, 401, "unauthorized", message); + } + + public static IResult Error( + HttpContext context, + int statusCode, + string code, + string message) + { + var requestId = context.Items["request_id"]?.ToString() ?? context.TraceIdentifier; + + // UseExceptionHandler очищает заголовки ответа, поэтому выставляем X-Request-Id заново. + context.Response.Headers["X-Request-Id"] = requestId; + + return Results.Json( + new + { + error = new + { + code, + message, + request_id = requestId + } + }, + statusCode: statusCode); + } +} \ No newline at end of file diff --git a/scr/Messenger.Api/Services/Argon2PasswordHasher.cs b/scr/Messenger.Api/Services/Argon2PasswordHasher.cs new file mode 100644 index 00000000..6b677d08 --- /dev/null +++ b/scr/Messenger.Api/Services/Argon2PasswordHasher.cs @@ -0,0 +1,68 @@ +using Isopoh.Cryptography.Argon2; + +namespace Messenger.Api.Services; + +public sealed class Argon2PasswordHasher : IPasswordHasher +{ + // Минимум по рекомендации OWASP для Argon2id: m=19 MiB, t=2, p=1. Обоснование и выбор — в REPORT.md. + private const int TimeCost = 2; + private const int MemoryCostKiB = 19 * 1024; + private const int Parallelism = 1; + + // Каждое вычисление занимает ~19 MiB и ядро CPU: без лимита 100 параллельных входов = ~2 GiB памяти. + // Размер и время ожидания слотов задаются PASSWORD_HASH_CONCURRENCY / PASSWORD_HASH_QUEUE_TIMEOUT_SECONDS. + private readonly SemaphoreSlim _slots; + private readonly TimeSpan _slotWaitTimeout; + + // Хеш от случайного пароля, который никто не знает. Нужен только для выравнивания времени при неизвестном username. + private readonly string _dummyHash; + + public Argon2PasswordHasher(PasswordHashingSettings settings) + { + _slots = new SemaphoreSlim(settings.MaxConcurrency, settings.MaxConcurrency); + _slotWaitTimeout = settings.QueueTimeout; + _dummyHash = HashCore(Convert.ToBase64String(System.Security.Cryptography.RandomNumberGenerator.GetBytes(32))); + } + + public async Task HashAsync(string password, CancellationToken ct) + { + await AcquireSlotAsync(ct); + try + { + return await Task.Run(() => HashCore(password), ct); + } + finally + { + _slots.Release(); + } + } + + public async Task VerifyAsync(string? hash, string password, CancellationToken ct) + { + await AcquireSlotAsync(ct); + try + { + return await Task.Run(() => + { + var ok = Argon2.Verify(hash ?? _dummyHash, password, secret: null, secureArrayCall: null); + return hash is not null && ok; + }, ct); + } + finally + { + _slots.Release(); + } + } + + private async Task AcquireSlotAsync(CancellationToken ct) + { + if (!await _slots.WaitAsync(_slotWaitTimeout, ct)) + { + throw new PasswordHasherBusyException(); + } + } + + // HybridAddressing — это Argon2id. Соль генерируется библиотекой и входит в возвращаемую строку. + private static string HashCore(string password) => + Argon2.Hash(password, TimeCost, MemoryCostKiB, Parallelism, Argon2Type.HybridAddressing); +} diff --git a/scr/Messenger.Api/Services/BearerAuth.cs b/scr/Messenger.Api/Services/BearerAuth.cs new file mode 100644 index 00000000..132d9bd8 --- /dev/null +++ b/scr/Messenger.Api/Services/BearerAuth.cs @@ -0,0 +1,91 @@ +using System.Security.Claims; +using System.Text.Encodings.Web; +using Messenger.Api.Data; +using Microsoft.AspNetCore.Authentication; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Options; + +namespace Messenger.Api.Services; + +public static class BearerAuth +{ + public const string Scheme = "Bearer"; + public const string Challenge = "Bearer realm=\"messenger\""; + public const string SessionIdClaim = "session_id"; + + // Ровно один заголовок Authorization вида "Bearer "; иначе null (Basic и прочее здесь не принимаются). + public static string? ExtractToken(HttpRequest request) + { + if (request.Headers.Authorization.Count != 1) + { + return null; + } + + var value = request.Headers.Authorization[0]; + const string prefix = "Bearer "; + if (value is null || !value.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) + { + return null; + } + + var token = value[prefix.Length..].Trim(); + return token.Length == 0 ? null : token; + } + + public static Guid GetUserId(this HttpContext context) => + Guid.Parse(context.User.FindFirstValue(ClaimTypes.NameIdentifier)!); + + public static Guid GetSessionId(this HttpContext context) => + Guid.Parse(context.User.FindFirstValue(SessionIdClaim)!); +} + +// Стандартный обработчик аутентификации ASP.NET: превращает Bearer-токен в ClaimsPrincipal. +// Срабатывает до выбора и выполнения эндпоинта (в том числе до разбора тела), поэтому 401 всегда раньше 400/404. +public sealed class SessionAuthenticationHandler( + IOptionsMonitor options, + ILoggerFactory logger, + UrlEncoder encoder, + MessengerDbContext db) + : AuthenticationHandler(options, logger, encoder) +{ + protected override async Task HandleAuthenticateAsync() + { + var token = BearerAuth.ExtractToken(Request); + if (token is null) + { + return AuthenticateResult.NoResult(); + } + + var hash = SessionTokens.Hash(token); + var now = Timestamps.UtcNowMilliseconds(); + + // Неизвестный, истёкший и отозванный токен неразличимы для клиента: во всех случаях это один 401. + var session = await db.Sessions + .AsNoTracking() + .Where(s => s.TokenHash == hash && s.RevokedAt == null && s.ExpiresAt > now) + .Select(s => new { s.Id, s.UserId }) + .FirstOrDefaultAsync(Context.RequestAborted); + + if (session is null) + { + return AuthenticateResult.Fail("Недействительная сессия"); + } + + var identity = new ClaimsIdentity( + [ + new Claim(ClaimTypes.NameIdentifier, session.UserId.ToString()), + new Claim(BearerAuth.SessionIdClaim, session.Id.ToString()) + ], + BearerAuth.Scheme); + + return AuthenticateResult.Success( + new AuthenticationTicket(new ClaimsPrincipal(identity), BearerAuth.Scheme)); + } + + protected override async Task HandleChallengeAsync(AuthenticationProperties properties) + { + await ApiErrors + .Unauthorized(Context, BearerAuth.Challenge, "Требуется действительный Bearer-токен") + .ExecuteAsync(Context); + } +} diff --git a/scr/Messenger.Api/Services/Cursors.cs b/scr/Messenger.Api/Services/Cursors.cs new file mode 100644 index 00000000..166d9e7f --- /dev/null +++ b/scr/Messenger.Api/Services/Cursors.cs @@ -0,0 +1,56 @@ +using System.Text; + +namespace Messenger.Api.Services; + +// Непрозрачный для клиента cursor keyset-пагинации: (created_at, id) последнего элемента страницы. +// Привязан к ресурсу (scope): cursor от другого списка или чата отклоняется как 400. +public static class Cursors +{ + public const string Chats = "chats"; + + public static string Messages(Guid chatId) => $"messages/{chatId:D}"; + + public static string Encode(string scope, DateTimeOffset createdAt, Guid id) => + Convert.ToBase64String(Encoding.UTF8.GetBytes($"{scope}|{createdAt.UtcTicks}:{id:D}")); + + // cursor == null — первая страница (успех, value == null). Любая ошибка формата или чужой scope — false. + public static bool TryDecode(string? cursor, string scope, out (DateTimeOffset CreatedAt, Guid Id)? value) + { + value = null; + if (cursor is null) + { + return true; + } + + if (cursor.Length == 0) + { + return false; + } + + try + { + var decoded = new UTF8Encoding(false, throwOnInvalidBytes: true).GetString(Convert.FromBase64String(cursor)); + var scoped = decoded.Split('|', 2); + if (scoped.Length != 2 || scoped[0] != scope) + { + return false; + } + + var parts = scoped[1].Split(':', 2); + if (parts.Length != 2 || + !long.TryParse(parts[0], out var ticks) || + ticks < DateTimeOffset.MinValue.UtcTicks || ticks > DateTimeOffset.MaxValue.UtcTicks || + !Guid.TryParse(parts[1], out var id)) + { + return false; + } + + value = (new DateTimeOffset(ticks, TimeSpan.Zero), id); + return true; + } + catch (Exception ex) when (ex is FormatException or ArgumentException or DecoderFallbackException) + { + return false; + } + } +} diff --git a/scr/Messenger.Api/Services/Diagnostics.cs b/scr/Messenger.Api/Services/Diagnostics.cs new file mode 100644 index 00000000..130b0343 --- /dev/null +++ b/scr/Messenger.Api/Services/Diagnostics.cs @@ -0,0 +1,90 @@ +using System.Data.Common; +using Microsoft.EntityFrameworkCore.Diagnostics; +using Npgsql; + +namespace Messenger.Api.Services; + +public sealed class QueryCounter +{ + public int Count; +} + +// Считает SQL-команды, выполненные EF Core в рамках текущего HTTP-запроса (для измерения «запросов к БД на запрос API»). +// Включается только при DIAGNOSTIC_HEADERS=true. Команда ReserveMessageSlot (сырой NpgsqlCommand) не учитывается. +public sealed class QueryCountingInterceptor(IHttpContextAccessor accessor) : DbCommandInterceptor +{ + public const string ItemKey = "diagnostics.query_counter"; + + private void Count() + { + if (accessor.HttpContext?.Items[ItemKey] is QueryCounter counter) + { + Interlocked.Increment(ref counter.Count); + } + } + + public override InterceptionResult ReaderExecuting(DbCommand command, CommandEventData eventData, InterceptionResult result) + { + Count(); + return result; + } + + public override ValueTask> ReaderExecutingAsync(DbCommand command, CommandEventData eventData, InterceptionResult result, CancellationToken cancellationToken = default) + { + Count(); + return ValueTask.FromResult(result); + } + + public override InterceptionResult NonQueryExecuting(DbCommand command, CommandEventData eventData, InterceptionResult result) + { + Count(); + return result; + } + + public override ValueTask> NonQueryExecutingAsync(DbCommand command, CommandEventData eventData, InterceptionResult result, CancellationToken cancellationToken = default) + { + Count(); + return ValueTask.FromResult(result); + } + + public override InterceptionResult ScalarExecuting(DbCommand command, CommandEventData eventData, InterceptionResult result) + { + Count(); + return result; + } + + public override ValueTask> ScalarExecutingAsync(DbCommand command, CommandEventData eventData, InterceptionResult result, CancellationToken cancellationToken = default) + { + Count(); + return ValueTask.FromResult(result); + } +} + +public static class DependencyFailures +{ + // Недоступность или перегрузка PostgreSQL (нет соединения, таймаут, исчерпан пул, остановка сервера) — это 503, + // а не 500: ошибка ограничена, внутренние детали не раскрываются, запрос не принимается как доверенный. + public static bool IsDatabaseUnavailable(Exception? error) + { + for (var e = error; e is not null; e = e.InnerException) + { + switch (e) + { + case PostgresException pg: + // 08 — соединение, 53 — нехватка ресурсов, 57 — вмешательство оператора (shutdown и т.п.) + if (pg.SqlState.StartsWith("08") || pg.SqlState.StartsWith("53") || pg.SqlState.StartsWith("57")) + { + return true; + } + + break; + case NpgsqlException: + case TimeoutException: + case System.Net.Sockets.SocketException: + return true; + } + } + + return false; + } +} diff --git a/scr/Messenger.Api/Services/IPasswordHasher.cs b/scr/Messenger.Api/Services/IPasswordHasher.cs new file mode 100644 index 00000000..fb2a91d3 --- /dev/null +++ b/scr/Messenger.Api/Services/IPasswordHasher.cs @@ -0,0 +1,18 @@ +namespace Messenger.Api.Services; + +public interface IPasswordHasher +{ + /// PHC-строка Argon2id (соль и параметры внутри). Бросает , если слот не освободился вовремя. + Task HashAsync(string password, CancellationToken ct); + + /// + /// == null означает «пользователя нет»: проверка всё равно выполняется (против заглушки), + /// чтобы время ответа не раскрывало существование username. + /// + Task VerifyAsync(string? hash, string password, CancellationToken ct); +} + +public sealed class PasswordHasherBusyException : Exception +{ + public PasswordHasherBusyException() : base("Слишком много одновременных вычислений хеша пароля") { } +} diff --git a/scr/Messenger.Api/Services/IdempotencyKeys.cs b/scr/Messenger.Api/Services/IdempotencyKeys.cs new file mode 100644 index 00000000..94343ec2 --- /dev/null +++ b/scr/Messenger.Api/Services/IdempotencyKeys.cs @@ -0,0 +1,145 @@ +using System.Security.Cryptography; +using System.Text; +using System.Text.RegularExpressions; +using Messenger.Api.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Storage; +using Npgsql; + +namespace Messenger.Api.Services; + +public enum ClaimResult +{ + Claimed, // ключ наш: можно выполнять побочный эффект (вставку сообщения) в этой же транзакции + Replay, // такой ключ с тем же телом уже выполнен: вернуть сохранённое сообщение + Conflict // такой ключ уже использован с другим телом +} + +public static partial class IdempotencyKeys +{ + public const string HeaderName = "Idempotency-Key"; + + [GeneratedRegex("^[A-Za-z0-9._:-]{1,128}$")] + private static partial Regex KeyFormat(); + + // Ровно один заголовок допустимого формата; иначе null (→ 400). + public static string? ReadKey(HttpRequest request) + { + var values = request.Headers[HeaderName]; + return values.Count == 1 && values[0] is { } key && KeyFormat().IsMatch(key) ? key : null; + } + + // Отпечаток смысла запроса, а не его байтов: порядок ключей JSON и пробелы не влияют, потому что хешируются + // уже разобранные поля. Для текстового сообщения это сам text (длина кодируется, чтобы поля не склеивались). + public static byte[] RequestHash(string text) => + SHA256.HashData(Encoding.UTF8.GetBytes($"message\n{text.Length}\n{text}")); + + // Атомарно «занимает» ключ в транзакции вызывающего. Ключевое свойство — INSERT ... ON CONFLICT: + // * ключа нет → строка вставляется, мы владеем ключом (Claimed); + // * ключ вставила другая, ещё не завершённая транзакция (в том числе на другой реплике) → INSERT ЖДЁТ её + // COMMIT/ROLLBACK на уникальном индексе. После COMMIT вставки не происходит, и мы читаем её результат (Replay); + // после ROLLBACK (например, 5xx у конкурента) вставка проходит, и ключ достаётся нам; + // * ключ есть, но истёк → перезахватывается (DO UPDATE ... WHERE expires_at <= now). + // Поэтому claim и сообщение коммитятся вместе: запись «ключ → сообщение» не может появиться без сообщения и наоборот. + public static async Task<(ClaimResult Result, Guid MessageId)> ClaimAsync( + MessengerDbContext db, + IDbContextTransaction tx, + Guid userId, + Guid chatId, + string key, + byte[] requestHash, + Guid newMessageId, + TimeSpan ttl, + CancellationToken ct) + { + var connection = (NpgsqlConnection)db.Database.GetDbConnection(); + var transaction = (NpgsqlTransaction)tx.GetDbTransaction(); + var now = Timestamps.UtcNowMilliseconds(); + + await using (var insert = new NpgsqlCommand(""" + INSERT INTO idempotency_keys (user_id, chat_id, key, request_hash, message_id, created_at, expires_at) + VALUES (@user, @chat, @key, @hash, @message, @now, @expires) + ON CONFLICT (user_id, chat_id, key) DO UPDATE + SET request_hash = EXCLUDED.request_hash, + message_id = EXCLUDED.message_id, + created_at = EXCLUDED.created_at, + expires_at = EXCLUDED.expires_at + WHERE idempotency_keys.expires_at <= EXCLUDED.created_at + RETURNING 1 + """, connection, transaction)) + { + insert.Parameters.AddWithValue("user", userId); + insert.Parameters.AddWithValue("chat", chatId); + insert.Parameters.AddWithValue("key", key); + insert.Parameters.AddWithValue("hash", requestHash); + insert.Parameters.AddWithValue("message", newMessageId); + insert.Parameters.AddWithValue("now", now); + insert.Parameters.AddWithValue("expires", now + ttl); + + if (await insert.ExecuteScalarAsync(ct) is not null) + { + return (ClaimResult.Claimed, newMessageId); + } + } + + await using var select = new NpgsqlCommand(""" + SELECT request_hash, message_id FROM idempotency_keys + WHERE user_id = @user AND chat_id = @chat AND key = @key + """, connection, transaction); + select.Parameters.AddWithValue("user", userId); + select.Parameters.AddWithValue("chat", chatId); + select.Parameters.AddWithValue("key", key); + + await using var reader = await select.ExecuteReaderAsync(ct); + if (!await reader.ReadAsync(ct)) + { + // Строку успел удалить очиститель между INSERT и SELECT: крайне редко; клиент безопасно повторит запрос. + throw new TimeoutException("idempotency key disappeared during claim"); + } + + var storedHash = reader.GetFieldValue(0); + var storedMessage = reader.GetGuid(1); + return CryptographicOperations.FixedTimeEquals(storedHash, requestHash) + ? (ClaimResult.Replay, storedMessage) + : (ClaimResult.Conflict, storedMessage); + } +} + +// Периодически удаляет истёкшие ключи. Запускается на каждой реплике; параллельные DELETE безопасны +// (физически строку удалит одна из них, остальные удалят 0). +public sealed class IdempotencyCleaner( + IServiceScopeFactory scopes, + IdempotencySettings settings, + ILogger logger) : BackgroundService +{ + protected override async Task ExecuteAsync(CancellationToken stoppingToken) + { + using var timer = new PeriodicTimer(settings.CleanupInterval); + try + { + while (await timer.WaitForNextTickAsync(stoppingToken)) + { + try + { + using var scope = scopes.CreateScope(); + var db = scope.ServiceProvider.GetRequiredService(); + var now = Timestamps.UtcNowMilliseconds(); + var removed = await db.IdempotencyKeys.Where(k => k.ExpiresAt <= now).ExecuteDeleteAsync(stoppingToken); + if (removed > 0) + { + logger.LogInformation("Удалено истёкших ключей идемпотентности: {Count}", removed); + } + } + catch (Exception ex) when (ex is not OperationCanceledException) + { + logger.LogWarning("Очистка ключей идемпотентности не удалась ({Error}); повтор через {Seconds} с", + ex.GetType().Name, settings.CleanupInterval.TotalSeconds); + } + } + } + catch (OperationCanceledException) + { + // остановка приложения + } + } +} diff --git a/scr/Messenger.Api/Services/MessageHistoryCache.cs b/scr/Messenger.Api/Services/MessageHistoryCache.cs new file mode 100644 index 00000000..efd5525a --- /dev/null +++ b/scr/Messenger.Api/Services/MessageHistoryCache.cs @@ -0,0 +1,102 @@ +using StackExchange.Redis; + +namespace Messenger.Api.Services; + +public enum CacheStatus +{ + Disabled, // кэш не настроен + Hit, + Miss, + Bypass // кэш настроен, но недоступен: запрос обслужен напрямую из PostgreSQL +} + +// Кэш страниц истории. Источник истины — PostgreSQL; кэш лишь ускоряет чтение и никогда не обязателен. +// Согласованность: версия истории чата (chats.history_version) входит в ключ, а версия читается из PostgreSQL +// при каждом запросе (см. MessageEndpoints). Запись увеличивает версию в своей транзакции, поэтому +// после подтверждённой записи ключ меняется, и устаревшая страница недостижима — явная инвалидация не нужна. +// Старые ключи удаляются по TTL (CACHE_TTL_SECONDS) и вытесняются политикой maxmemory. +public interface IMessageHistoryCache +{ + Task<(string? Json, CacheStatus Status)> GetAsync(string key, CancellationToken ct); + Task SetAsync(string key, string json, CancellationToken ct); +} + +public sealed class NullMessageHistoryCache : IMessageHistoryCache +{ + public Task<(string? Json, CacheStatus Status)> GetAsync(string key, CancellationToken ct) => + Task.FromResult<(string?, CacheStatus)>((null, CacheStatus.Disabled)); + + public Task SetAsync(string key, string json, CancellationToken ct) => Task.CompletedTask; +} + +public sealed class ValkeyMessageHistoryCache : IMessageHistoryCache, IDisposable +{ + // После ошибки кэш пропускается на это время, чтобы каждый запрос не ждал таймаут недоступного сервера. + private static readonly TimeSpan BypassWindow = TimeSpan.FromSeconds(5); + + private readonly ConnectionMultiplexer _connection; + private readonly TimeSpan _ttl; + private readonly ILogger _logger; + private long _bypassUntilTicks; + + public ValkeyMessageHistoryCache(CacheSettings settings, ILogger logger) + { + var options = ConfigurationOptions.Parse(settings.Connection!); + // Недоступный кэш не должен ронять ни старт, ни запросы: короткие таймауты, подключение в фоне. + options.AbortOnConnectFail = false; + options.ConnectTimeout = 500; + options.SyncTimeout = 200; + options.AsyncTimeout = 200; + options.ConnectRetry = 1; + _connection = ConnectionMultiplexer.Connect(options); + _ttl = settings.Ttl; + _logger = logger; + } + + public async Task<(string? Json, CacheStatus Status)> GetAsync(string key, CancellationToken ct) + { + if (IsBypassed()) + { + return (null, CacheStatus.Bypass); + } + + try + { + var value = await _connection.GetDatabase().StringGetAsync(key); + return value.IsNull ? (null, CacheStatus.Miss) : ((string?)value, CacheStatus.Hit); + } + catch (Exception ex) when (ex is RedisException or TimeoutException) + { + StartBypass(ex); + return (null, CacheStatus.Bypass); + } + } + + public async Task SetAsync(string key, string json, CancellationToken ct) + { + if (IsBypassed()) + { + return; + } + + try + { + await _connection.GetDatabase().StringSetAsync(key, json, _ttl); + } + catch (Exception ex) when (ex is RedisException or TimeoutException) + { + StartBypass(ex); + } + } + + private bool IsBypassed() => Environment.TickCount64 < Interlocked.Read(ref _bypassUntilTicks); + + private void StartBypass(Exception ex) + { + Interlocked.Exchange(ref _bypassUntilTicks, Environment.TickCount64 + (long)BypassWindow.TotalMilliseconds); + _logger.LogWarning("Кэш недоступен ({Error}); чтение идёт напрямую из PostgreSQL ближайшие {Seconds} с", + ex.GetType().Name, BypassWindow.TotalSeconds); + } + + public void Dispose() => _connection.Dispose(); +} diff --git a/scr/Messenger.Api/Services/SessionTokens.cs b/scr/Messenger.Api/Services/SessionTokens.cs new file mode 100644 index 00000000..f8a0669e --- /dev/null +++ b/scr/Messenger.Api/Services/SessionTokens.cs @@ -0,0 +1,16 @@ +using System.Security.Cryptography; +using System.Text; + +namespace Messenger.Api.Services; + +public static class SessionTokens +{ + // 32 случайных байта = 256 бит энтропии (контракт: не менее 256). В base64url это 43 символа. + public static string Generate() => + Convert.ToBase64String(RandomNumberGenerator.GetBytes(32)) + .TrimEnd('=').Replace('+', '-').Replace('/', '_'); + + // В БД хранится только SHA-256 токена. Быстрый хеш здесь уместен: токен случайный и длинный, подбирать нечего + // (в отличие от пароля, который выбирает человек и который поэтому хешируется медленным Argon2id). + public static byte[] Hash(string token) => SHA256.HashData(Encoding.UTF8.GetBytes(token)); +} diff --git a/scr/Messenger.Api/Services/Settings.cs b/scr/Messenger.Api/Services/Settings.cs new file mode 100644 index 00000000..83cd74ec --- /dev/null +++ b/scr/Messenger.Api/Services/Settings.cs @@ -0,0 +1,136 @@ +namespace Messenger.Api.Services; + +// Все настройки читаются из IConfiguration (переменные окружения и, в тестах, UseSetting), а не напрямую из окружения: +// так одно приложение можно поднять с разными настройками в одном процессе. Секреты передаются файлами (*_FILE). + +public sealed record DatabaseSettings(string ConnectionString) +{ + public static DatabaseSettings From(IConfiguration configuration) + { + var file = configuration["DATABASE_URL_FILE"] + ?? throw new InvalidOperationException("DATABASE_URL_FILE не задан"); + + var builder = new Npgsql.NpgsqlConnectionStringBuilder(File.ReadAllText(file).Trim()) + { + Pooling = true, + MinPoolSize = 1, + // Ограниченный пул: больше MaxPoolSize соединений от одного экземпляра не открывается, + // ожидающие запросы ждут не дольше Timeout и затем получают 503. + MaxPoolSize = configuration.GetValue("DB_MAX_POOL_SIZE", 20), + Timeout = configuration.GetValue("DB_CONNECT_TIMEOUT_SECONDS", 5), + CommandTimeout = configuration.GetValue("DB_COMMAND_TIMEOUT_SECONDS", 5) + }; + return new DatabaseSettings(builder.ConnectionString); + } +} + +public sealed record AuthSessionOptions(TimeSpan Ttl) +{ + // SESSION_TTL_SECONDS: по умолчанию 3600; в тесте истечения допустимо 2. Неверное значение — ошибка старта, а не молчаливый дефолт. + public static AuthSessionOptions From(IConfiguration configuration) + { + var raw = configuration["SESSION_TTL_SECONDS"]; + if (string.IsNullOrWhiteSpace(raw)) + { + return new AuthSessionOptions(TimeSpan.FromSeconds(3600)); + } + + if (!int.TryParse(raw, out var seconds) || seconds < 1) + { + throw new InvalidOperationException("SESSION_TTL_SECONDS должен быть положительным целым числом"); + } + + return new AuthSessionOptions(TimeSpan.FromSeconds(seconds)); + } +} + +// Ограничитель Argon2: сколько хешей считается одновременно и сколько запрос ждёт свободный слот, прежде чем получить 503. +// Один хеш занимает ~19 MiB и ядро CPU, поэтому без лимита пачка регистраций исчерпала бы память. +public sealed record PasswordHashingSettings(int MaxConcurrency, TimeSpan QueueTimeout) +{ + public static PasswordHashingSettings From(IConfiguration configuration) + { + var concurrency = configuration.GetValue("PASSWORD_HASH_CONCURRENCY", 4); + var timeoutSeconds = configuration.GetValue("PASSWORD_HASH_QUEUE_TIMEOUT_SECONDS", 2.0); + if (concurrency < 1 || timeoutSeconds < 0) + { + throw new InvalidOperationException("PASSWORD_HASH_CONCURRENCY >= 1 и PASSWORD_HASH_QUEUE_TIMEOUT_SECONDS >= 0"); + } + + return new PasswordHashingSettings(concurrency, TimeSpan.FromSeconds(timeoutSeconds)); + } +} + +// Кэш необязателен: без CACHE_URL_FILE / CACHE_CONNECTION приложение работает только на PostgreSQL. +public sealed record CacheSettings(string? Connection, TimeSpan Ttl) +{ + public bool Enabled => !string.IsNullOrWhiteSpace(Connection); + + public static CacheSettings From(IConfiguration configuration) + { + var connection = configuration["CACHE_CONNECTION"]; + var file = configuration["CACHE_URL_FILE"]; + if (!string.IsNullOrWhiteSpace(file) && File.Exists(file)) + { + connection = File.ReadAllText(file).Trim(); + } + + return new CacheSettings(connection, TimeSpan.FromSeconds(configuration.GetValue("CACHE_TTL_SECONDS", 300))); + } +} + +// Диагностические заголовки X-Cache и X-Db-Queries для экспериментов; в обычной работе выключены. +public sealed record DiagnosticsSettings(bool Headers) +{ + public static DiagnosticsSettings From(IConfiguration configuration) => + new(configuration.GetValue("DIAGNOSTIC_HEADERS", false)); +} + +// Идентичность и жизненный цикл экземпляра (lab3). +// InstanceId — значение X-Instance-Id. В Docker hostname контейнера = первые 12 символов его ID, поэтому +// stop-one.sh по заголовку находит нужный контейнер. DrainDelay — пауза между SIGTERM и закрытием слушателя: +// за это время /health/ready уже отвечает 503, и балансировщик успевает вывести экземпляр из ротации. +// MigrateOnStart по умолчанию выключен: миграции выполняет отдельный one-shot контейнер (--migrate), а не гонка реплик. +public sealed record InstanceSettings(string InstanceId, TimeSpan DrainDelay, bool MigrateOnStart) +{ + public static InstanceSettings From(IConfiguration configuration) + { + var id = configuration["INSTANCE_ID"]; + if (string.IsNullOrWhiteSpace(id)) + { + id = Environment.MachineName; + } + + var drainSeconds = configuration.GetValue("SHUTDOWN_DRAIN_SECONDS", 3.0); + if (drainSeconds < 0) + { + throw new InvalidOperationException("SHUTDOWN_DRAIN_SECONDS должен быть >= 0"); + } + + return new InstanceSettings(id, TimeSpan.FromSeconds(drainSeconds), configuration.GetValue("MIGRATE_ON_START", false)); + } +} + +// Время хранения результата идемпотентной отправки сообщения (контракт: не менее 24 часов). +public sealed record IdempotencySettings(TimeSpan Ttl, TimeSpan CleanupInterval) +{ + public static IdempotencySettings From(IConfiguration configuration) + { + var ttl = configuration.GetValue("IDEMPOTENCY_TTL_SECONDS", 86400); + var cleanup = configuration.GetValue("IDEMPOTENCY_CLEANUP_INTERVAL_SECONDS", 300); + if (ttl < 1 || cleanup < 1) + { + throw new InvalidOperationException("IDEMPOTENCY_TTL_SECONDS и IDEMPOTENCY_CLEANUP_INTERVAL_SECONDS должны быть положительными"); + } + + return new IdempotencySettings(TimeSpan.FromSeconds(ttl), TimeSpan.FromSeconds(cleanup)); + } +} + +// Признак «экземпляр останавливается»: после SIGTERM /health/ready отвечает 503, а уже принятые запросы дорабатывают. +public sealed class ShutdownState +{ + private volatile bool _draining; + public bool Draining => _draining; + public void StartDraining() => _draining = true; +} diff --git a/scr/Messenger.Api/Services/Timestamps.cs b/scr/Messenger.Api/Services/Timestamps.cs new file mode 100644 index 00000000..d9601015 --- /dev/null +++ b/scr/Messenger.Api/Services/Timestamps.cs @@ -0,0 +1,13 @@ +namespace Messenger.Api.Services; + +public static class Timestamps +{ + // Единая точность времени для хранения, сортировки, cursor и JSON-ответа: миллисекунды. + // Клиент видит время с точностью до миллисекунды, поэтому порядок (created_at, id) должен + // определяться теми же значениями, которые он видит. + public static DateTimeOffset UtcNowMilliseconds() + { + var ticks = DateTimeOffset.UtcNow.UtcTicks; + return new DateTimeOffset(ticks - ticks % TimeSpan.TicksPerMillisecond, TimeSpan.Zero); + } +} diff --git a/scr/Messenger.Api/Services/UtcDateTimeOffsetJsonConverter.cs b/scr/Messenger.Api/Services/UtcDateTimeOffsetJsonConverter.cs new file mode 100644 index 00000000..bf12e0cd --- /dev/null +++ b/scr/Messenger.Api/Services/UtcDateTimeOffsetJsonConverter.cs @@ -0,0 +1,28 @@ +using System.Globalization; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Messenger.Api.Services; + +public sealed class UtcDateTimeOffsetJsonConverter : JsonConverter +{ + public override DateTimeOffset Read( + ref Utf8JsonReader reader, + Type typeToConvert, + JsonSerializerOptions options) + { + return DateTimeOffset.Parse( + reader.GetString()!, + CultureInfo.InvariantCulture, + DateTimeStyles.RoundtripKind); + } + + public override void Write( + Utf8JsonWriter writer, + DateTimeOffset value, + JsonSerializerOptions options) + { + writer.WriteStringValue( + value.UtcDateTime.ToString("yyyy-MM-dd'T'HH:mm:ss.fff'Z'", CultureInfo.InvariantCulture)); + } +} \ No newline at end of file diff --git a/scr/Messenger.Api/appsettings.Development.json b/scr/Messenger.Api/appsettings.Development.json new file mode 100644 index 00000000..0c208ae9 --- /dev/null +++ b/scr/Messenger.Api/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/scr/Messenger.Api/appsettings.json b/scr/Messenger.Api/appsettings.json new file mode 100644 index 00000000..10f68b8c --- /dev/null +++ b/scr/Messenger.Api/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/scripts/collect-evidence.sh b/scripts/collect-evidence.sh new file mode 100755 index 00000000..54f69ac6 --- /dev/null +++ b/scripts/collect-evidence.sh @@ -0,0 +1,53 @@ +#!/bin/sh +# Воспроизводимо собирает доказательства уровней 3-4 в evidence/level3 (выполнять из WSL/Linux при поднятом стенде). +# Использование: BASE_URL=http://localhost:8080 scripts/collect-evidence.sh +# Секретов в выводе нет: токены тесты не печатают, значения secrets/ не читаются. +set -eu +cd "$(dirname "$0")/.." +BASE_URL=${BASE_URL:-http://localhost:8080} +OUT=evidence/level3 +mkdir -p "$OUT" + +started() { docker compose ps -q "$@" | while read -r id; do + printf '%s %s started=%s\n' "$(docker inspect -f '{{.Name}}' "$id")" "$(echo "$id" | cut -c1-12)" "$(docker inspect -f '{{.State.StartedAt}}' "$id")"; done; } + +{ + echo "# $(date -u +%FT%TZ) commit=$(git rev-parse --short HEAD 2>/dev/null || echo none)" + echo "## docker compose ps (публикуется только lb; у api порт только внутри сети)" + docker compose ps --format 'table {{.Name}}\t{{.Service}}\t{{.Status}}\t{{.Ports}}' + echo "## лимиты ресурсов (NanoCpus / Memory) и образы" + for id in $(docker compose ps -q); do + docker inspect -f '{{.Name}} cpus={{printf "%.2f" (div (printf "%d" .HostConfig.NanoCpus) 1000000000.0)}} mem_bytes={{.HostConfig.Memory}} image={{.Config.Image}}' "$id" 2>/dev/null \ + || docker inspect -f '{{.Name}} nanocpus={{.HostConfig.NanoCpus}} mem_bytes={{.HostConfig.Memory}} image={{.Config.Image}}' "$id" + done + echo "## container_name не задан; число реплик api:" + docker compose ps -q api | wc -l + echo "## состояние backend'ов в HAProxy" + docker compose exec -T lb wget -qO- 'http://127.0.0.1:8404/stats;csv' | awk -F, '$1=="api"{print $1,$2,$18}' +} > "$OUT/topology.txt" 2>&1 + +python3 tests/smoke.py --base-url "$BASE_URL" > "$OUT/smoke.txt" 2>&1 || { cat "$OUT/smoke.txt"; exit 1; } + +python3 tools/lab3/idempotency_race.py --base-url "$BASE_URL" --rounds 20 --parallel 40 --output "$OUT/idempotency-race.json" > /dev/null + +for n in 1 2; do + { + echo "## failover #$n: контейнеры до" + docker compose ps --format '{{.Name}} {{.Status}}' | grep api + python3 tests/resilience.py --mode failover --action-script scripts/stop-one.sh --base-url "$BASE_URL" + echo "## контейнеры после (остановленная реплика должна быть Exited)" + docker compose ps -a --format '{{.Name}} {{.Status}}' | grep api + scripts/restore-replicas.sh | tail -n 1 + } > "$OUT/failover-$n.txt" 2>&1 +done + +{ + echo "## persistence: старт контейнеров ДО" + started db cache api lb + python3 tests/resilience.py --mode persistence --action-script scripts/restart.sh --base-url "$BASE_URL" + echo "## старт контейнеров ПОСЛЕ (время старта db/cache/api/lb должно измениться; volume pgdata прежний)" + started db cache api lb + docker volume ls --format "{{.Name}}" | grep -x "messenger-lab3_pgdata" +} > "$OUT/persistence.txt" 2>&1 + +echo "evidence written to $OUT" diff --git a/scripts/init-secrets.sh b/scripts/init-secrets.sh new file mode 100755 index 00000000..056ffb76 --- /dev/null +++ b/scripts/init-secrets.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# Создаёт локальные секреты для compose.yaml, если их ещё нет. Существующие файлы не перезаписываются. +# Пароль случайный (24 символа [A-Za-z0-9]); значения не печатаются. Каталог secrets/ исключён из Git. +set -eu +cd "$(dirname "$0")/.." + +mkdir -p secrets +umask 077 + +if [ ! -f secrets/db_password ]; then + # tr читает конечный поток /dev/urandom до нужной длины; head закрывает канал. + LC_ALL=C tr -dc 'A-Za-z0-9' < /dev/urandom | head -c 24 > secrets/db_password + echo "created secrets/db_password" +fi + +if [ ! -f secrets/database_url.compose ]; then + printf 'Host=db;Port=5432;Database=messenger;Username=messenger;Password=%s' "$(cat secrets/db_password)" \ + > secrets/database_url.compose + echo "created secrets/database_url.compose" +fi + +if [ ! -f secrets/cache_password ]; then + LC_ALL=C tr -dc 'A-Za-z0-9' < /dev/urandom | head -c 24 > secrets/cache_password + echo "created secrets/cache_password" +fi + +if [ ! -f secrets/cache_url ]; then + printf 'cache:6379,password=%s' "$(cat secrets/cache_password)" > secrets/cache_url + echo "created secrets/cache_url" +fi diff --git a/scripts/restart.sh b/scripts/restart.sh new file mode 100755 index 00000000..c4e66246 --- /dev/null +++ b/scripts/restart.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# Полный перезапуск стенда для `make test-persistence`: останавливаются LB и все API-реплики, затем перезапускаются +# ВСЕ хранилища — PostgreSQL (тот же именованный volume) и Valkey (кэш без persistence: его содержимое после этого пусто), +# затем поднимаются migrate (идемпотентно), API и LB. Volumes не удаляются, данные не пересоздаются. +# Токены сессий и ключи идемпотентности живут в PostgreSQL, поэтому переживают этот перезапуск; кэш — только ускорение. +set -eu +cd "$(dirname "$0")/.." + +docker compose stop lb api +docker compose restart db cache +docker compose up -d --wait db cache +docker compose up -d --wait api lb diff --git a/scripts/restore-replicas.sh b/scripts/restore-replicas.sh new file mode 100755 index 00000000..f759dcef --- /dev/null +++ b/scripts/restore-replicas.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# Возвращает остановленные API-реплики (после stop-one.sh) и ждёт, пока LB снова видит все реплики UP. +# Существующие контейнеры не пересоздаются (--no-recreate), зависимости (БД, миграции) не трогаются (--no-deps). +# Готовность подтверждает LB (readiness по HTTP), а не docker healthcheck: после разморозки он обновляется с задержкой. +set -eu +cd "$(dirname "$0")/.." + +# Замороженные (HARD_KILL=pause) реплики сначала размораживаются, остановленные запускает up. +docker compose unpause api >/dev/null 2>&1 || true +docker compose up -d --no-recreate --no-deps api >/dev/null + +expected=$(docker compose ps -q api | wc -l | tr -d ' ') +for _ in $(seq 1 60); do + # Статистика HAProxy изнутри контейнера lb: не зависит от пробросов портов хоста. + up=$(docker compose exec -T lb wget -qO- 'http://127.0.0.1:8404/stats;csv' 2>/dev/null \ + | awk -F, '$1=="api" && $2!="BACKEND" && $18=="UP"' | wc -l | tr -d ' ') + if [ "$up" = "$expected" ]; then + echo "LB sees ${up}/${expected} api replicas UP" + exit 0 + fi + sleep 1 +done +echo "LB did not report all replicas UP within 60 s" >&2 +exit 1 diff --git a/scripts/rolling-update.sh b/scripts/rolling-update.sh new file mode 100755 index 00000000..83365368 --- /dev/null +++ b/scripts/rolling-update.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# Rolling update API без простоя: «surge +1, unavailable 0». +# 1. собрать новый образ (APP_VERSION) и однократно применить миграции (expand-only, совместимы со старой версией); +# 2. для каждой СТАРОЙ реплики: поднять одну НОВУЮ, дождаться, пока LB видит её UP, затем штатно остановить +# (SIGTERM → drain → выход) и удалить старую. Число реплик в рабочем состоянии не падает ниже исходного. +# Использование: scripts/rolling-update.sh [версия] (по умолчанию — метка времени) +set -eu +cd "$(dirname "$0")/.." + +APP_VERSION=${1:-$(date +%s)} +export APP_VERSION + +log() { printf '%s %s\n' "$(date +%H:%M:%S)" "$*"; } + +lb_up_count() { + docker compose exec -T lb wget -qO- 'http://127.0.0.1:8404/stats;csv' 2>/dev/null \ + | awk -F, '$1=="api" && $2!="BACKEND" && $18=="UP"' | wc -l | tr -d ' ' +} + +image_version() { + docker inspect -f '{{index .Config.Labels "org.opencontainers.image.version"}}' "$1" +} + +old_replicas=$(docker compose ps -q api) +count=$(echo "$old_replicas" | wc -l | tr -d ' ') +log "replicas before: ${count}; building version ${APP_VERSION}" + +docker compose build api >/dev/null +# Миграции — один раз, отдельным контейнером, ДО замены реплик. +docker compose run --rm --no-deps migrate >/dev/null +log "migrations applied once" + +for old in $old_replicas; do + docker compose up -d --no-recreate --no-deps --wait --scale api=$((count + 1)) api >/dev/null + for _ in $(seq 1 60); do + [ "$(lb_up_count)" = "$((count + 1))" ] && break + sleep 1 + done + [ "$(lb_up_count)" = "$((count + 1))" ] || { log "new replica did not become UP in LB; old replica kept" >&2; exit 1; } + log "new replica is UP in LB; stopping old $(echo "$old" | cut -c1-12) (version $(image_version "$old"))" + docker stop --time 10 "$old" >/dev/null + docker rm "$old" >/dev/null +done + +log "replicas after:" +for c in $(docker compose ps -q api); do + log " $(echo "$c" | cut -c1-12) version $(image_version "$c")" +done diff --git a/scripts/stop-one.sh b/scripts/stop-one.sh new file mode 100755 index 00000000..6c2a3e73 --- /dev/null +++ b/scripts/stop-one.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# Останавливает ОДНУ API-реплику и оставляет её остановленной (для `make test-failover`). +# TARGET_INSTANCE_ID — значение X-Instance-Id реплики, обслужившей тест. Это hostname контейнера, то есть первые +# 12 символов его ID, поэтому по заголовку однозначно находится контейнер сервиса api. LB, БД, кэш и тома не затрагиваются. +# Остановка штатная (SIGTERM): реплика сначала отвечает на /health/ready кодом 503 (drain 3 с), затем закрывает слушатель. +# Вернуть реплику: scripts/restore-replicas.sh. Вывод не содержит секретов. +set -eu +cd "$(dirname "$0")/.." + +: "${TARGET_INSTANCE_ID:?test provides target API instance alias}" +case "$TARGET_INSTANCE_ID" in + *[!0-9a-f]*) echo "TARGET_INSTANCE_ID must be a hex container id prefix" >&2; exit 2 ;; +esac + +# Ищем только среди запущенных контейнеров сервиса api этого проекта: чужие контейнеры остановить нельзя. +container=$(docker compose ps -q api | grep "^${TARGET_INSTANCE_ID}" | head -n 1 || true) +if [ -z "$container" ]; then + echo "no running api container with id prefix ${TARGET_INSTANCE_ID}" >&2 + exit 3 +fi + +echo "stopping api replica $(echo "$container" | cut -c1-12)" +if [ "${HARD_KILL:-0}" = "1" ]; then + # Эксперимент «аварийный отказ процесса»: SIGKILL без drain, соединения обрываются мгновенно. + docker kill "$container" >/dev/null +elif [ "${HARD_KILL:-0}" = "pause" ]; then + # Эксперимент «зависший backend»: процесс заморожен, порт открыт, но ответов нет (худший случай для обнаружения). + docker pause "$container" >/dev/null +else + # --time 10: если приложение не завершилось за 10 с после SIGTERM, Docker шлёт SIGKILL. + docker stop --time 10 "$container" >/dev/null +fi diff --git a/tools/LoadTest/Helpers.cs b/tools/LoadTest/Helpers.cs new file mode 100644 index 00000000..c4c5fc6a --- /dev/null +++ b/tools/LoadTest/Helpers.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.Net; +using System.Net.Http.Json; +using System.Text; +using System.Text.Json; + +namespace LoadTest +{ + internal sealed record TestUser(Guid Id, string Username); + internal class Helpers + { + public static StringContent Json(string raw) => + new(raw, Encoding.UTF8, "application/json"); + + public static HttpRequestMessage Request(HttpMethod method, string url, Guid? userId = null, HttpContent? content = null) + { + var request = new HttpRequestMessage(method, url) { Content = content }; + if (userId is not null) + { + request.Headers.Add("X-User-Id", userId.Value.ToString()); + } + + return request; + } + + public static async Task ReadJsonAsync(HttpResponseMessage response) + { + var body = await response.Content.ReadAsStringAsync(); + return JsonDocument.Parse(body).RootElement.Clone(); + } + + public static async Task CreateUserAsync(HttpClient client, string? username = null) + { + username ??= "u" + Guid.NewGuid().ToString("N")[..12]; + var response = await client.PostAsJsonAsync("/api/v1/users", + new { username, display_name = "Тест" }); + var json = await ReadJsonAsync(response); + response.EnsureSuccessStatusCode(); + return new TestUser(json.GetProperty("id").GetGuid(), username); + } + + public static async Task CreateChatAsync(HttpClient client, TestUser owner, params TestUser[] others) + { + var members = others.Append(owner).Select(u => u.Id).ToArray(); + using var request = Request(HttpMethod.Post, "/api/v1/chats", owner.Id, + JsonContent.Create(new { title = "Чат", member_ids = members })); + var response = await client.SendAsync(request); + response.EnsureSuccessStatusCode(); + return (await ReadJsonAsync(response)).GetProperty("id").GetGuid(); + } + + public static async Task SendMessageAsync(HttpClient client, TestUser sender, Guid chatId, string text) + { + using var request = Request(HttpMethod.Post, $"/api/v1/chats/{chatId}/messages", sender.Id, + JsonContent.Create(new { text })); + var response = await client.SendAsync(request); + response.EnsureSuccessStatusCode(); + return response; + } + } +} diff --git a/tools/LoadTest/LoadTest.csproj b/tools/LoadTest/LoadTest.csproj new file mode 100644 index 00000000..ed9781c2 --- /dev/null +++ b/tools/LoadTest/LoadTest.csproj @@ -0,0 +1,10 @@ + + + + Exe + net10.0 + enable + enable + + + diff --git a/tools/LoadTest/Phases.cs b/tools/LoadTest/Phases.cs new file mode 100644 index 00000000..46a4f82d --- /dev/null +++ b/tools/LoadTest/Phases.cs @@ -0,0 +1,143 @@ +using System.Diagnostics; + +namespace LoadTest +{ + /// Пользователь и чат с заранее залитой историей; Cursor — позиция нужной страницы (null = первая). + internal sealed record Scenario(Guid UserId, Guid ChatId, string? Cursor); + + /// Сырые данные измерения: задержки успешных запросов, число ошибок и фактическая длительность. + internal sealed record MeasureResult(List LatenciesMs, int Errors, double ElapsedSeconds); + + internal sealed record Summary( + int Successful, + int Errors, + double ElapsedSeconds, + double Rps, + double P50Ms, + double P95Ms, + double P99Ms, + double MaxMs); + + internal static class Phases + { + /// Создаёт пользователя и чат и заливает historySize сообщений не более чем в fillConcurrency потоков. + public static async Task PrepareAsync( + HttpClient client, int historySize, int fillConcurrency, int limit, bool lastPage) + { + var user = await Helpers.CreateUserAsync(client); + var chatId = await Helpers.CreateChatAsync(client, user); + + var options = new ParallelOptions { MaxDegreeOfParallelism = fillConcurrency }; + await Parallel.ForEachAsync(Enumerable.Range(0, historySize), options, async (i, _) => + { + using var response = await Helpers.SendMessageAsync(client, user, chatId, $"history message {i}"); + response.EnsureSuccessStatusCode(); + }); + + string? cursor = null; + if (lastPage) + { + cursor = await FindLastPageCursorAsync(client, user, chatId, limit); + } + + return new Scenario(user.Id, chatId, cursor); + } + + public static async Task WarmUpAsync( + HttpClient client, Scenario scenario, int clients, TimeSpan duration, int limit) + { + // Результат прогрева отбрасывается: он нужен только для JIT, пулов потоков и соединений. + await MeasureAsync(client, scenario, clients, duration, limit); + } + + /// Замкнутый цикл: каждый из clients клиентов шлёт GET страницы истории до истечения duration. + public static async Task MeasureAsync( + HttpClient client, Scenario scenario, int clients, TimeSpan duration, int limit) + { + var url = PageUrl(scenario.ChatId, limit, scenario.Cursor); + var started = Stopwatch.GetTimestamp(); + var deadline = started + (long)(duration.TotalSeconds * Stopwatch.Frequency); + + // У каждого клиента свой список задержек: общей изменяемой структуры нет, блокировки не нужны. + var workers = Enumerable.Range(0, clients).Select(_ => Task.Run(async () => + { + var latencies = new List(); + var errors = 0; + while (Stopwatch.GetTimestamp() < deadline) + { + var requestStarted = Stopwatch.GetTimestamp(); + try + { + using var request = Helpers.Request(HttpMethod.Get, url, scenario.UserId); + // Тело читается целиком (буферизация по умолчанию), но не разбирается как JSON. + using var response = await client.SendAsync(request); + if (response.IsSuccessStatusCode) + { + latencies.Add(Stopwatch.GetElapsedTime(requestStarted).TotalMilliseconds); + } + else + { + errors++; + } + } + catch (Exception ex) when (ex is HttpRequestException or TaskCanceledException) + { + errors++; + } + } + + return (latencies, errors); + })).ToArray(); + + var results = await Task.WhenAll(workers); + var elapsed = Stopwatch.GetElapsedTime(started).TotalSeconds; + + return new MeasureResult( + results.SelectMany(r => r.latencies).ToList(), + results.Sum(r => r.errors), + elapsed); + } + + public static Summary GetResults(MeasureResult result) + { + var sorted = result.LatenciesMs.OrderBy(x => x).ToList(); + double Percentile(double p) => + sorted.Count == 0 ? double.NaN : sorted[Math.Max(0, (int)Math.Ceiling(p * sorted.Count) - 1)]; + + return new Summary( + sorted.Count, + result.Errors, + Math.Round(result.ElapsedSeconds, 3), + Math.Round(sorted.Count / result.ElapsedSeconds, 2), + Math.Round(Percentile(0.50), 3), + Math.Round(Percentile(0.95), 3), + Math.Round(Percentile(0.99), 3), + sorted.Count == 0 ? double.NaN : Math.Round(sorted[^1], 3)); + } + + private static string PageUrl(Guid chatId, int limit, string? cursor) => + $"/api/v1/chats/{chatId}/messages?limit={limit}" + + (cursor is null ? "" : "&cursor=" + Uri.EscapeDataString(cursor)); + + /// Идёт по страницам до конца и возвращает cursor, с которым была запрошена последняя страница. + private static async Task FindLastPageCursorAsync( + HttpClient client, TestUser user, Guid chatId, int limit) + { + string? cursor = null; + while (true) + { + using var request = Helpers.Request(HttpMethod.Get, PageUrl(chatId, limit, cursor), user.Id); + using var response = await client.SendAsync(request); + response.EnsureSuccessStatusCode(); + var page = await Helpers.ReadJsonAsync(response); + var next = page.GetProperty("next_cursor"); + if (next.ValueKind == System.Text.Json.JsonValueKind.Null) + { + return cursor; + } + + cursor = next.GetString(); + } + } + } +} diff --git a/tools/LoadTest/Program.cs b/tools/LoadTest/Program.cs new file mode 100644 index 00000000..2025f313 --- /dev/null +++ b/tools/LoadTest/Program.cs @@ -0,0 +1,91 @@ +using System.Text.Json; +using LoadTest; + +// Использование (запускать в Release, сервер должен быть уже запущен): +// dotnet run -c Release --project tools/LoadTest -- --history 10000 --clients 8 --duration 15 \ +// --container mtusi-messenger-lab1 --label before --output evidence/track1/results.jsonl +var options = ParseArguments(args); +string Get(string key, string fallback) => options.TryGetValue(key, out var value) ? value : fallback; + +var url = Get("url", "http://127.0.0.1:8080"); +var history = int.Parse(Get("history", "1000")); +var clients = int.Parse(Get("clients", "1")); +var duration = TimeSpan.FromSeconds(double.Parse(Get("duration", "15"))); +var warmup = TimeSpan.FromSeconds(double.Parse(Get("warmup", "3"))); +var limit = int.Parse(Get("limit", "50")); +var fillConcurrency = int.Parse(Get("fill-concurrency", "16")); +var lastPage = Get("page", "first") == "last"; +var container = options.GetValueOrDefault("container"); +var label = Get("label", "run"); +var output = options.GetValueOrDefault("output"); + +using var client = new HttpClient { BaseAddress = new Uri(url), Timeout = TimeSpan.FromSeconds(30) }; + +var rssIdle = Rss.ReadMegabytes(container); +Console.Error.WriteLine($"[1/4] prepare: filling {history} messages ({fillConcurrency} parallel)..."); +var scenario = await Phases.PrepareAsync(client, history, fillConcurrency, limit, lastPage); +var rssAfterPrepare = Rss.ReadMegabytes(container); + +Console.Error.WriteLine($"[2/4] warm-up: {warmup.TotalSeconds} s, {clients} clients"); +await Phases.WarmUpAsync(client, scenario, clients, warmup, limit); + +Console.Error.WriteLine($"[3/4] measure: {duration.TotalSeconds} s, {clients} clients, page={(lastPage ? "last" : "first")}"); +var measured = await Phases.MeasureAsync(client, scenario, clients, duration, limit); +var rssAfterMeasure = Rss.ReadMegabytes(container); + +Console.Error.WriteLine("[4/4] results"); +var summary = Phases.GetResults(measured); + +var report = new +{ + label, + timestamp = DateTimeOffset.UtcNow.ToString("O"), + history, + clients, + page = lastPage ? "last" : "first", + limit, + duration_seconds = duration.TotalSeconds, + successful_requests = summary.Successful, + errors = summary.Errors, + elapsed_seconds = summary.ElapsedSeconds, + rps = summary.Rps, + p50_ms = summary.P50Ms, + p95_ms = summary.P95Ms, + p99_ms = summary.P99Ms, + max_ms = summary.MaxMs, + rss_mb_idle = rssIdle, + rss_mb_after_prepare = rssAfterPrepare, + rss_mb_after_measure = rssAfterMeasure, +}; + +var json = JsonSerializer.Serialize(report, new JsonSerializerOptions { WriteIndented = false }); +Console.WriteLine(JsonSerializer.Serialize(report, new JsonSerializerOptions { WriteIndented = true })); + +if (output is not null) +{ + Directory.CreateDirectory(Path.GetDirectoryName(Path.GetFullPath(output))!); + File.AppendAllText(output, json + Environment.NewLine); +} + +return summary.Errors == 0 && summary.Successful > 0 ? 0 : 1; + +static Dictionary ParseArguments(string[] args) +{ + var result = new Dictionary(); + for (var i = 0; i < args.Length; i++) + { + if (!args[i].StartsWith("--")) + { + throw new ArgumentException($"Unexpected argument: {args[i]}"); + } + + if (i + 1 >= args.Length) + { + throw new ArgumentException($"Missing value for {args[i]}"); + } + + result[args[i][2..]] = args[++i]; + } + + return result; +} diff --git a/tools/LoadTest/Rss.cs b/tools/LoadTest/Rss.cs new file mode 100644 index 00000000..6b2fdeb0 --- /dev/null +++ b/tools/LoadTest/Rss.cs @@ -0,0 +1,45 @@ +using System.Diagnostics; + +namespace LoadTest +{ + internal static class Rss + { + /// + /// RSS процесса приложения в МБ: читает VmRSS из /proc/1/status внутри контейнера + /// (PID 1 — dotnet, ENTRYPOINT в exec-форме). Возвращает null, если контейнер не задан или недоступен. + /// + public static double? ReadMegabytes(string? container) + { + if (string.IsNullOrEmpty(container)) + { + return null; + } + + try + { + var info = new ProcessStartInfo("docker", ["exec", container, "cat", "/proc/1/status"]) + { + RedirectStandardOutput = true, + RedirectStandardError = true, + }; + using var process = Process.Start(info)!; + var output = process.StandardOutput.ReadToEnd(); + process.WaitForExit(); + + var line = output.Split('\n').FirstOrDefault(l => l.StartsWith("VmRSS:")); + if (line is null) + { + return null; + } + + var kb = double.Parse(line.Split(' ', StringSplitOptions.RemoveEmptyEntries)[1], + System.Globalization.CultureInfo.InvariantCulture); + return Math.Round(kb / 1024, 1); + } + catch (Exception) + { + return null; + } + } + } +} diff --git a/tools/LoadTest/run-matrix.ps1 b/tools/LoadTest/run-matrix.ps1 new file mode 100644 index 00000000..f71090a9 --- /dev/null +++ b/tools/LoadTest/run-matrix.ps1 @@ -0,0 +1,88 @@ +<# +.SYNOPSIS + Track 1: матрица размер истории x число клиентов с перезапуском контейнера на каждую точку. + +.EXAMPLE + # замеры "до" (образ уже собран) + .\tools\LoadTest\run-matrix.ps1 -Label before + # замеры "после": пересобрать образ и повторить те же точки + .\tools\LoadTest\run-matrix.ps1 -Label after -Rebuild + # быстрая проверка скрипта + .\tools\LoadTest\run-matrix.ps1 -Label smoke -Sizes 1000 -Clients 1 -Repeats 1 -Duration 3 -Warmup 2 -Output $env:TEMP\smoke.jsonl +#> +[CmdletBinding()] +param( + [string]$Label = 'before', + [int[]]$Sizes = @(1000, 10000, 50000), + [int[]]$Clients = @(1, 8, 32), + [int]$Repeats = 2, + [int]$Duration = 8, + [int]$Warmup = 5, + [string]$Cpus = '2', + [string]$Memory = '512m', + [string]$Output = 'evidence/track1/results.jsonl', + [string]$Image = 'mtusi-messenger:lab1', + [ValidateSet('first', 'last')][string]$Page = 'first', + [switch]$Rebuild +) + +$ErrorActionPreference = 'Stop' +Set-Location (Resolve-Path (Join-Path $PSScriptRoot '..\..')) + +$name = 'mtusi-messenger-lab1' +$url = 'http://127.0.0.1:8080' + +function Remove-Api { + if (docker ps -aq --filter "name=^/$name$") { + docker rm -f $name | Out-Null + } +} + +function Start-Api { + Remove-Api + docker run -d --rm --name $name --cpus $Cpus --memory $Memory ` + -p 127.0.0.1:8080:8080 --env-file .env $Image | Out-Null + for ($i = 0; $i -lt 60; $i++) { + try { + if ((Invoke-WebRequest "$url/health/ready" -UseBasicParsing -TimeoutSec 2).StatusCode -eq 200) { return } + } catch { } + Start-Sleep -Milliseconds 500 + } + throw 'API did not become ready within 30 s' +} + +if ($Rebuild) { + Write-Host 'Rebuilding image...' + docker build -t $Image . | Out-Null + if ($LASTEXITCODE -ne 0) { throw 'docker build failed' } +} + +dotnet build tools/LoadTest -c Release -v q | Out-Null +if ($LASTEXITCODE -ne 0) { throw 'LoadTest build failed' } + +$points = @(foreach ($n in $Sizes) { foreach ($c in $Clients) { [pscustomobject]@{ History = $n; Clients = $c } } }) +$total = $points.Count * $Repeats +$done = 0 +$started = Get-Date +Write-Host "Label=$Label page=$Page points=$($points.Count) repeats=$Repeats runs=$total cpus=$Cpus memory=$Memory output=$Output" + +try { + for ($rep = 1; $rep -le $Repeats; $rep++) { + # Случайный порядок точек в каждом повторе: эффект прогрева не должен совпасть с одним размером. + foreach ($p in ($points | Sort-Object { Get-Random })) { + $done++ + Write-Host ("[{0}/{1}] rep={2} history={3} clients={4} (elapsed {5:mm\:ss})" -f $done, $total, $rep, $p.History, $p.Clients, ((Get-Date) - $started)) + Start-Api + dotnet run -c Release --project tools/LoadTest --no-build -- ` + --url $url --history $p.History --clients $p.Clients ` + --duration $Duration --warmup $Warmup ` + --page $Page --container $name --label "$Label-r$rep" --output $Output | Out-Null + if ($LASTEXITCODE -ne 0) { Write-Warning "run failed (exit $LASTEXITCODE), continuing" } + } + } +} +finally { + Remove-Api +} + +Write-Host ("Done in {0:mm\:ss}. Results appended to {1}" -f ((Get-Date) - $started), $Output) diff --git a/tools/LoadTest/summarize.py b/tools/LoadTest/summarize.py new file mode 100644 index 00000000..b307fdcf --- /dev/null +++ b/tools/LoadTest/summarize.py @@ -0,0 +1,76 @@ +import json, statistics as st, collections, sys + +path = sys.argv[1] +rows = [json.loads(l) for l in open(path, encoding='utf-8') if l.strip()] + +def group(prefix, page='first'): + g = collections.defaultdict(list) + for r in rows: + if r['label'].startswith(prefix) and r['page'] == page: + g[(r['history'], r['clients'])].append(r) + return g + +def mean(rs, k): + v = [r[k] for r in rs if r.get(k) is not None] + return st.mean(v) + +def rng(rs, k): + v = [r[k] for r in rs if r.get(k) is not None] + return min(v), max(v) + +before = group('before-r') +after = group('after-r') + +out = [] +out.append('Track 1: before/after summary (mean of repeats; page=first, limit=50; container --cpus=2 --memory=512m)') +out.append('') +hdr = f"{'N':>6} {'C':>3} {'runs':>4} | {'RPS before':>10} {'RPS after':>10} {'x':>6} | {'p50 b':>7} {'p50 a':>7} | {'p95 b':>7} {'p95 a':>7} | {'p99 b':>7} {'p99 a':>7} | {'RSS prep b/a':>12} {'RSS end b/a':>12} | err b/a" +out.append(hdr) +for key in sorted(set(before) | set(after)): + b, a = before.get(key, []), after.get(key, []) + if not b or not a: + continue + rb, ra = mean(b, 'rps'), mean(a, 'rps') + out.append( + f"{key[0]:>6} {key[1]:>3} {len(b):>1}/{len(a):<2} | {rb:>10.0f} {ra:>10.0f} {ra/rb:>6.1f} | " + f"{mean(b,'p50_ms'):>7.1f} {mean(a,'p50_ms'):>7.1f} | {mean(b,'p95_ms'):>7.1f} {mean(a,'p95_ms'):>7.1f} | " + f"{mean(b,'p99_ms'):>7.1f} {mean(a,'p99_ms'):>7.1f} | " + f"{mean(b,'rss_mb_after_prepare'):>5.0f}/{mean(a,'rss_mb_after_prepare'):<5.0f} {mean(b,'rss_mb_after_measure'):>5.0f}/{mean(a,'rss_mb_after_measure'):<5.0f} | " + f"{sum(r['errors'] for r in b)}/{sum(r['errors'] for r in a)}") + +out.append('') +out.append('RPS spread (min-max across repeats):') +for key in sorted(set(before) | set(after)): + b, a = before.get(key, []), after.get(key, []) + if b and a: + out.append(f" N={key[0]:>6} C={key[1]:>2} before {rng(b,'rps')[0]:.0f}-{rng(b,'rps')[1]:.0f} after {rng(a,'rps')[0]:.0f}-{rng(a,'rps')[1]:.0f}") + +out.append('') +out.append('Idle RSS (empty process, MB): before %.0f, after %.0f' % ( + st.mean([r['rss_mb_idle'] for rs in before.values() for r in rs]), + st.mean([r['rss_mb_idle'] for rs in after.values() for r in rs]))) + +# last page vs first page at N=50000, C=8 +bl, al = group('before-last', 'last'), group('after-last', 'last') +out.append('') +out.append('First vs last page, N=50000, C=8 (mean RPS / p95 ms):') +key = (50000, 8) +for name, g_first, g_last in (('before', before, bl), ('after', after, al)): + f, l = g_first.get(key, []), g_last.get(key, []) + if f and l: + out.append(f" {name}: first {mean(f,'rps'):.0f} rps / {mean(f,'p95_ms'):.1f} ms ({len(f)} runs); last {mean(l,'rps'):.0f} rps / {mean(l,'p95_ms'):.1f} ms ({len(l)} runs)") + +# saturation: RPS growth with clients per N +out.append('') +out.append('Throughput vs clients (mean RPS):') +for name, g in (('before', before), ('after', after)): + for n in sorted({k[0] for k in g}): + out.append(f" {name} N={n:>6}: " + ' '.join(f"C={c}: {mean(g[(n,c)],'rps'):.0f}" for c in sorted({k[1] for k in g if k[0]==n}))) + +# per-message cost under saturation (before): 1000/rps at C=32 -> ms per request +out.append('') +out.append('Service time at saturation, C=32 (ms per request = 1000/RPS):') +for name, g in (('before', before), ('after', after)): + out.append(f" {name}: " + ' '.join(f"N={n}: {1000/mean(g[(n,32)],'rps'):.3f}" for n in sorted({k[0] for k in g}) if (n, 32) in g)) + +print('\n'.join(out)) diff --git a/tools/ScaleLoad/Program.cs b/tools/ScaleLoad/Program.cs new file mode 100644 index 00000000..435c11da --- /dev/null +++ b/tools/ScaleLoad/Program.cs @@ -0,0 +1,209 @@ +using System.Diagnostics; +using System.Net.Http.Headers; +using System.Net.Http.Json; +using System.Text; +using System.Text.Json; + +// Генератор нагрузки для трека 1 (цена масштабирования). Замкнутый цикл: каждый из --clients потоков шлёт запрос, +// ждёт ответ и сразу шлёт следующий. Профиль: --write-ratio доля POST сообщения (уникальный Idempotency-Key), +// остальное — GET страницы истории (limit=50). У каждого пользователя свой чат с --history сообщений, +// поэтому записи разных клиентов не сериализуются на одной строке чата. +// +// Запуск (стенд поднят): +// dotnet run -c Release --project tools/ScaleLoad -- --url http://localhost:8081 --clients 64 --duration 20 \ +// --label A-2x1.0 --output evidence/track1/results.jsonl +// Загрузка CPU контейнеров снимается `docker stats` во время измерения (если доступен docker CLI). +var o = ParseArguments(args); +string Get(string k, string d) => o.TryGetValue(k, out var v) ? v : d; +var url = Get("url", "http://localhost:8080"); +var clients = int.Parse(Get("clients", "32")); +var users = int.Parse(Get("users", "32")); +var history = int.Parse(Get("history", "200")); +var duration = TimeSpan.FromSeconds(double.Parse(Get("duration", "20"))); +var warmup = TimeSpan.FromSeconds(double.Parse(Get("warmup", "5"))); +var writeRatio = double.Parse(Get("write-ratio", "0.2"), System.Globalization.CultureInfo.InvariantCulture); +var label = Get("label", "run"); +var output = o.GetValueOrDefault("output"); +var project = Get("compose-project", "messenger-lab3"); + +var handler = new SocketsHttpHandler { MaxConnectionsPerServer = clients * 2, PooledConnectionLifetime = TimeSpan.FromMinutes(5) }; +using var http = new HttpClient(handler) { BaseAddress = new Uri(url), Timeout = TimeSpan.FromSeconds(30) }; + +Console.Error.WriteLine($"[1/4] prepare: {users} users, {history} messages per chat"); +var actors = await Prepare(http, users, history); + +Console.Error.WriteLine($"[2/4] warm-up {warmup.TotalSeconds}s, {clients} clients"); +await Measure(http, actors, clients, warmup, writeRatio); + +Console.Error.WriteLine($"[3/4] measure {duration.TotalSeconds}s"); +using var statsCts = new CancellationTokenSource(); +var statsTask = Task.Run(() => SampleDockerStats(project, statsCts.Token)); +var r = await Measure(http, actors, clients, duration, writeRatio); +statsCts.Cancel(); +var stats = await statsTask; + +Console.Error.WriteLine("[4/4] results"); +var lat = r.Latencies.OrderBy(x => x).ToArray(); +double P(double p) => lat.Length == 0 ? double.NaN : Math.Round(lat[Math.Max(0, (int)Math.Ceiling(p * lat.Length) - 1)], 2); +var report = new Dictionary +{ + ["label"] = label, + ["timestamp"] = DateTimeOffset.UtcNow.ToString("O"), + ["clients"] = clients, ["users"] = users, ["history"] = history, ["write_ratio"] = writeRatio, + ["duration_s"] = Math.Round(r.Elapsed, 2), + ["ok"] = lat.Length, ["errors"] = r.Errors, ["ok_get"] = r.OkGet, ["ok_post"] = r.OkPost, + ["rps"] = Math.Round(lat.Length / r.Elapsed, 1), + ["p50_ms"] = P(0.50), ["p95_ms"] = P(0.95), ["p99_ms"] = P(0.99), + ["cpu_pct"] = stats, +}; +var line = JsonSerializer.Serialize(report); +Console.WriteLine(line); +if (output is not null) +{ + Directory.CreateDirectory(Path.GetDirectoryName(Path.GetFullPath(output))!); + File.AppendAllText(output, line + Environment.NewLine); +} +return r.Errors == 0 ? 0 : 1; + +static async Task Prepare(HttpClient http, int users, int history) +{ + var result = new Actor[users]; + await Parallel.ForEachAsync(Enumerable.Range(0, users), new ParallelOptions { MaxDegreeOfParallelism = 4 }, async (i, ct) => + { + var username = "sl" + Guid.NewGuid().ToString("N")[..14]; + var password = "Load-" + Guid.NewGuid().ToString("N"); + using var reg = await http.PostAsJsonAsync("/api/v1/users", new { username, display_name = "Load", password }, ct); + reg.EnsureSuccessStatusCode(); + var me = (await reg.Content.ReadFromJsonAsync(ct)).GetProperty("id").GetGuid(); + using var login = new HttpRequestMessage(HttpMethod.Post, "/api/v1/auth/sessions"); + login.Headers.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.UTF8.GetBytes($"{username}:{password}"))); + using var loginResponse = await http.SendAsync(login, ct); + loginResponse.EnsureSuccessStatusCode(); + var token = (await loginResponse.Content.ReadFromJsonAsync(ct)).GetProperty("token").GetString()!; + using var chatRequest = Authorized(HttpMethod.Post, "/api/v1/chats", token); + chatRequest.Content = JsonContent.Create(new { title = "Load", member_ids = new[] { me } }); + using var chatResponse = await http.SendAsync(chatRequest, ct); + chatResponse.EnsureSuccessStatusCode(); + var chatId = (await chatResponse.Content.ReadFromJsonAsync(ct)).GetProperty("id").GetGuid(); + for (var m = 0; m < history; m++) + { + using var post = PostMessage(chatId, token, $"history {m}"); + using var response = await http.SendAsync(post, ct); + response.EnsureSuccessStatusCode(); + } + result[i] = new Actor(token, chatId); + }); + return result; +} + +static HttpRequestMessage Authorized(HttpMethod method, string path, string token) +{ + var request = new HttpRequestMessage(method, path); + request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token); + return request; +} + +static HttpRequestMessage PostMessage(Guid chatId, string token, string text) +{ + var request = Authorized(HttpMethod.Post, $"/api/v1/chats/{chatId}/messages", token); + request.Headers.Add("Idempotency-Key", Guid.NewGuid().ToString("N")); + request.Content = JsonContent.Create(new { text }); + return request; +} + +static async Task Measure(HttpClient http, Actor[] actors, int clients, TimeSpan duration, double writeRatio) +{ + var started = Stopwatch.GetTimestamp(); + var deadline = started + (long)(duration.TotalSeconds * Stopwatch.Frequency); + var workers = Enumerable.Range(0, clients).Select(i => Task.Run(async () => + { + var actor = actors[i % actors.Length]; + var rnd = new Random(i * 7919 + Environment.TickCount); + var latencies = new List(); + int errors = 0, okGet = 0, okPost = 0; + while (Stopwatch.GetTimestamp() < deadline) + { + var write = rnd.NextDouble() < writeRatio; + var t = Stopwatch.GetTimestamp(); + try + { + using var request = write + ? PostMessage(actor.ChatId, actor.Token, "load " + Guid.NewGuid().ToString("N")) + : Authorized(HttpMethod.Get, $"/api/v1/chats/{actor.ChatId}/messages?limit=50", actor.Token); + using var response = await http.SendAsync(request); + await response.Content.ReadAsByteArrayAsync(); + if (response.IsSuccessStatusCode) + { + latencies.Add(Stopwatch.GetElapsedTime(t).TotalMilliseconds); + if (write) okPost++; else okGet++; + } + else + { + errors++; + } + } + catch (Exception ex) when (ex is HttpRequestException or TaskCanceledException) + { + errors++; + } + } + + return (latencies, errors, okGet, okPost); + })).ToArray(); + + var results = await Task.WhenAll(workers); + return new Result( + results.SelectMany(x => x.latencies).ToList(), results.Sum(x => x.errors), + results.Sum(x => x.okGet), results.Sum(x => x.okPost), Stopwatch.GetElapsedTime(started).TotalSeconds); +} + +// Средняя загрузка CPU (в % одного ядра, как в docker stats) по роли контейнера за время измерения. +static async Task> SampleDockerStats(string project, CancellationToken ct) +{ + var sums = new Dictionary(); + try + { + while (!ct.IsCancellationRequested) + { + var info = new ProcessStartInfo("docker", ["stats", "--no-stream", "--format", "{{.Name}} {{.CPUPerc}}"]) + { RedirectStandardOutput = true, RedirectStandardError = true }; + using var p = Process.Start(info)!; + var text = await p.StandardOutput.ReadToEndAsync(ct); + await p.WaitForExitAsync(ct); + // Внутри одного снимка суммируем реплики одной роли, затем усредняем снимки. + var snapshot = new Dictionary(); + foreach (var line in text.Split('\n', StringSplitOptions.RemoveEmptyEntries)) + { + var parts = line.Trim().Split(' '); + if (parts.Length < 2 || !parts[0].StartsWith(project + "-")) continue; + var role = parts[0][(project.Length + 1)..]; + role = role[..role.LastIndexOf('-')]; + if (!double.TryParse(parts[1].TrimEnd('%'), System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.InvariantCulture, out var cpu)) continue; + snapshot[role] = snapshot.GetValueOrDefault(role) + cpu; + } + + foreach (var (role, cpu) in snapshot) + { + var (sum, n) = sums.GetValueOrDefault(role); + sums[role] = (sum + cpu, n + 1); + } + } + } + catch (OperationCanceledException) { } + catch (Exception) { } + return sums.ToDictionary(kv => kv.Key, kv => Math.Round(kv.Value.Sum / Math.Max(1, kv.Value.N), 1)); +} + +static Dictionary ParseArguments(string[] args) +{ + var result = new Dictionary(); + for (var i = 0; i < args.Length; i++) + { + if (!args[i].StartsWith("--") || i + 1 >= args.Length) throw new ArgumentException($"Bad argument: {args[i]}"); + result[args[i][2..]] = args[++i]; + } + return result; +} + +internal sealed record Actor(string Token, Guid ChatId); +internal sealed record Result(List Latencies, int Errors, int OkGet, int OkPost, double Elapsed); diff --git a/tools/ScaleLoad/ScaleLoad.csproj b/tools/ScaleLoad/ScaleLoad.csproj new file mode 100644 index 00000000..dfb40caa --- /dev/null +++ b/tools/ScaleLoad/ScaleLoad.csproj @@ -0,0 +1,10 @@ + + + + Exe + net10.0 + enable + enable + + + diff --git a/tools/ScaleLoad/compose.cpuset.yaml b/tools/ScaleLoad/compose.cpuset.yaml new file mode 100644 index 00000000..83c4136d --- /dev/null +++ b/tools/ScaleLoad/compose.cpuset.yaml @@ -0,0 +1,6 @@ +# Override для эксперимента трека 1: API закрепляется за ядрами (cpuset) вместо квоты CFS. +# Использование: COMPOSE_FILE=compose.yaml:tools/ScaleLoad/compose.cpuset.yaml API_CPUSET=0-1 API_CPUS=16 docker compose up -d ... +# API_CPUS=16 делает квоту CFS практически неограниченной: бюджет задаёт только cpuset. +services: + api: + cpuset: ${API_CPUSET:?задайте API_CPUSET, например 0-1} diff --git a/tools/ScaleLoad/run-config.sh b/tools/ScaleLoad/run-config.sh new file mode 100644 index 00000000..75442802 --- /dev/null +++ b/tools/ScaleLoad/run-config.sh @@ -0,0 +1,30 @@ +#!/bin/bash +# Один замер трека 1: применяет конфигурацию стенда (реплики/ресурсы), ждёт готовности LB и запускает ScaleLoad. +# Использование: +# tools/ScaleLoad/run-config.sh