From f3ba37f736715ee1ef2cc8dace5d5fc548cc348d Mon Sep 17 00:00:00 2001 From: andrejkamenskij Date: Thu, 12 Nov 2026 19:38:03 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 7 + Dockerfile | 25 + LAB4_AUDIT.md | 67 + LAB4_GUIDE.md | 44 + LAB4_RECONCILIATION.md | 207 +++ PULL_REQUEST.md | 62 + SOURCE_MANIFEST.json | 379 ++++ STUDENT_REPORT.md | 200 +++ alembic.ini | 3 + compose.yaml | 211 +++ evidence/lab4-clean-start.json | 250 +++ evidence/lab4-final-attachments.txt | 1 + evidence/lab4-final-clean-start.txt | 169 ++ evidence/lab4-final-course-files.txt | 1 + evidence/lab4-final-format.txt | 1 + evidence/lab4-final-idempotency.txt | 10 + evidence/lab4-final-openapi.txt | 1 + evidence/lab4-final-persistence-proof.txt | 5 + evidence/lab4-final-public-smoke.txt | 1 + evidence/lab4-final-quality.txt | 1 + evidence/lab4-final-readiness-budget.txt | 1 + evidence/lab4-final-reconciliation.txt | 18 + evidence/lab4-final-request-deadline.txt | 1 + evidence/lab4-final-reviewer-cases.txt | 96 ++ evidence/lab4-final-run.txt | 17 + evidence/lab4-final-structure.txt | 1 + evidence/lab4-final-summary.json | 101 ++ evidence/lab4-final-upload-memory.txt | 1 + evidence/lab4-final-uploader-failover.txt | 1 + evidence/lab4-public-artifacts.json | 29 + evidence/lab4-research/results.json | 225 +++ evidence/lab4-research/results.png | Bin 0 -> 66361 bytes evidence/lab4-research/results.svg | 1812 ++++++++++++++++++++ evidence/lab4-review-inflight-before.txt | 3 + evidence/lab4-s3-unavailable.txt | 2 + evidence/lab4-track2-environment.json | 1 + infra/haproxy.cfg | 43 + infra/minio/Dockerfile | 20 + infra/s3/api-policy.json | 20 + infra/s3/reconciler-policy.json | 15 + migrations/env.py | 34 + migrations/script.py.mako | 17 + migrations/versions/001_initial.py | 60 + migrations/versions/002_redis_sessions.py | 22 + migrations/versions/003_admin.py | 16 + migrations/versions/004_idempotency.py | 25 + migrations/versions/005_message_unicode.py | 55 + migrations/versions/006_unicode_names.py | 40 + migrations/versions/007_attachments.py | 65 + migrations/versions/008_reconciliation.py | 37 + pyproject.toml | 8 + requirements.txt | 21 + scripts/export-submission.py | 63 + scripts/plot-lab4.py | 38 + scripts/replicas.py | 31 + scripts/restart.sh | 7 + scripts/setup-env.py | 26 + scripts/stop-one.py | 34 + scripts/stop-one.sh | 4 + scripts/test-clean-lab4.py | 92 + scripts/test-expiry.sh | 8 + scripts/test-persistence.py | 46 + scripts/test-reconciliation.sh | 7 + scripts/test-upload-memory.sh | 11 + scripts/verify-lab4.py | 51 + src/__init__.py | 0 src/__main__.py | 13 + src/api/__init__.py | 0 src/api/dependencies.py | 106 ++ src/api/router.py | 17 + src/api/v1/__init__.py | 0 src/api/v1/routers/__init__.py | 0 src/api/v1/routers/attachments.py | 118 ++ src/api/v1/routers/auth/__init__.py | 0 src/api/v1/routers/auth/callback.py | 31 + src/api/v1/routers/auth/router.py | 50 + src/api/v1/routers/auth/schemas.py | 13 + src/api/v1/routers/chats/__init__.py | 0 src/api/v1/routers/chats/router.py | 86 + src/api/v1/routers/chats/schemas.py | 42 + src/api/v1/routers/messages/__init__.py | 0 src/api/v1/routers/messages/router.py | 96 ++ src/api/v1/routers/messages/schemas.py | 43 + src/api/v1/routers/users/__init__.py | 0 src/api/v1/routers/users/router.py | 44 + src/api/v1/routers/users/schemas.py | 29 + src/api/v1/schemas.py | 21 + src/core/__init__.py | 0 src/core/cache.py | 68 + src/core/callback.py | 24 + src/core/db/__init__.py | 0 src/core/db/models.py | 160 ++ src/core/db/repo/__init__.py | 0 src/core/db/repo/auth.py | 16 + src/core/db/repo/chat.py | 59 + src/core/db/repo/message.py | 148 ++ src/core/db/repo/user.py | 120 ++ src/core/db/session.py | 48 + src/core/db/types.py | 15 + src/core/errors.py | 29 + src/core/pagination.py | 43 + src/core/readiness.py | 89 + src/core/request_deadline.py | 77 + src/core/request_limits.py | 132 ++ src/core/security.py | 42 + src/core/session_store.py | 55 + src/core/settings.py | 112 ++ src/core/storage.py | 77 + src/core/storage_bootstrap.py | 89 + src/core/upload_coordination.py | 21 + src/main.py | 116 ++ src/maintenance/__init__.py | 1 + src/maintenance/reconcile.py | 357 ++++ src/service/__init__.py | 0 src/service/attachment.py | 188 ++ src/service/auth.py | 74 + src/service/chat.py | 61 + src/service/dto.py | 50 + src/service/exceptions.py | 30 + src/service/message.py | 64 + src/service/user.py | 63 + student.env.example | 46 + tests/attachment_failover.py | 44 + tests/attachments.py | 98 ++ tests/auth_logging.py | 36 + tests/callbacks.py | 107 ++ tests/database.py | 87 + tests/dependencies.py | 160 ++ tests/error_headers.py | 53 + tests/expiry.py | 17 + tests/extra.py | 111 ++ tests/idempotency_db.py | 79 + tests/lab4_review.py | 208 +++ tests/passwords.py | 68 + tests/production.py | 187 ++ tests/production_limits.py | 137 ++ tests/readiness.py | 53 + tests/reconciliation.py | 418 +++++ tests/regressions.py | 163 ++ tests/request_deadline.py | 47 + tests/settings.py | 53 + tests/upload_memory.py | 78 + 142 files changed, 10257 insertions(+) create mode 100644 .gitattributes create mode 100644 Dockerfile create mode 100644 LAB4_AUDIT.md create mode 100644 LAB4_GUIDE.md create mode 100644 LAB4_RECONCILIATION.md create mode 100644 PULL_REQUEST.md create mode 100644 SOURCE_MANIFEST.json create mode 100644 STUDENT_REPORT.md create mode 100644 alembic.ini create mode 100644 compose.yaml create mode 100644 evidence/lab4-clean-start.json create mode 100644 evidence/lab4-final-attachments.txt create mode 100644 evidence/lab4-final-clean-start.txt create mode 100644 evidence/lab4-final-course-files.txt create mode 100644 evidence/lab4-final-format.txt create mode 100644 evidence/lab4-final-idempotency.txt create mode 100644 evidence/lab4-final-openapi.txt create mode 100644 evidence/lab4-final-persistence-proof.txt create mode 100644 evidence/lab4-final-public-smoke.txt create mode 100644 evidence/lab4-final-quality.txt create mode 100644 evidence/lab4-final-readiness-budget.txt create mode 100644 evidence/lab4-final-reconciliation.txt create mode 100644 evidence/lab4-final-request-deadline.txt create mode 100644 evidence/lab4-final-reviewer-cases.txt create mode 100644 evidence/lab4-final-run.txt create mode 100644 evidence/lab4-final-structure.txt create mode 100644 evidence/lab4-final-summary.json create mode 100644 evidence/lab4-final-upload-memory.txt create mode 100644 evidence/lab4-final-uploader-failover.txt create mode 100644 evidence/lab4-public-artifacts.json create mode 100644 evidence/lab4-research/results.json create mode 100644 evidence/lab4-research/results.png create mode 100644 evidence/lab4-research/results.svg create mode 100644 evidence/lab4-review-inflight-before.txt create mode 100644 evidence/lab4-s3-unavailable.txt create mode 100644 evidence/lab4-track2-environment.json create mode 100644 infra/haproxy.cfg create mode 100644 infra/minio/Dockerfile create mode 100644 infra/s3/api-policy.json create mode 100644 infra/s3/reconciler-policy.json create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/001_initial.py create mode 100644 migrations/versions/002_redis_sessions.py create mode 100644 migrations/versions/003_admin.py create mode 100644 migrations/versions/004_idempotency.py create mode 100644 migrations/versions/005_message_unicode.py create mode 100644 migrations/versions/006_unicode_names.py create mode 100644 migrations/versions/007_attachments.py create mode 100644 migrations/versions/008_reconciliation.py create mode 100644 pyproject.toml create mode 100644 requirements.txt create mode 100644 scripts/export-submission.py create mode 100644 scripts/plot-lab4.py create mode 100644 scripts/replicas.py create mode 100755 scripts/restart.sh create mode 100644 scripts/setup-env.py create mode 100644 scripts/stop-one.py create mode 100755 scripts/stop-one.sh create mode 100644 scripts/test-clean-lab4.py create mode 100755 scripts/test-expiry.sh create mode 100644 scripts/test-persistence.py create mode 100755 scripts/test-reconciliation.sh create mode 100755 scripts/test-upload-memory.sh create mode 100644 scripts/verify-lab4.py create mode 100644 src/__init__.py create mode 100644 src/__main__.py create mode 100644 src/api/__init__.py create mode 100644 src/api/dependencies.py create mode 100644 src/api/router.py create mode 100644 src/api/v1/__init__.py create mode 100644 src/api/v1/routers/__init__.py create mode 100644 src/api/v1/routers/attachments.py create mode 100644 src/api/v1/routers/auth/__init__.py create mode 100644 src/api/v1/routers/auth/callback.py create mode 100644 src/api/v1/routers/auth/router.py create mode 100644 src/api/v1/routers/auth/schemas.py create mode 100644 src/api/v1/routers/chats/__init__.py create mode 100644 src/api/v1/routers/chats/router.py create mode 100644 src/api/v1/routers/chats/schemas.py create mode 100644 src/api/v1/routers/messages/__init__.py create mode 100644 src/api/v1/routers/messages/router.py create mode 100644 src/api/v1/routers/messages/schemas.py create mode 100644 src/api/v1/routers/users/__init__.py create mode 100644 src/api/v1/routers/users/router.py create mode 100644 src/api/v1/routers/users/schemas.py create mode 100644 src/api/v1/schemas.py create mode 100644 src/core/__init__.py create mode 100644 src/core/cache.py create mode 100644 src/core/callback.py create mode 100644 src/core/db/__init__.py create mode 100644 src/core/db/models.py create mode 100644 src/core/db/repo/__init__.py create mode 100644 src/core/db/repo/auth.py create mode 100644 src/core/db/repo/chat.py create mode 100644 src/core/db/repo/message.py create mode 100644 src/core/db/repo/user.py create mode 100644 src/core/db/session.py create mode 100644 src/core/db/types.py create mode 100644 src/core/errors.py create mode 100644 src/core/pagination.py create mode 100644 src/core/readiness.py create mode 100644 src/core/request_deadline.py create mode 100644 src/core/request_limits.py create mode 100644 src/core/security.py create mode 100644 src/core/session_store.py create mode 100644 src/core/settings.py create mode 100644 src/core/storage.py create mode 100644 src/core/storage_bootstrap.py create mode 100644 src/core/upload_coordination.py create mode 100644 src/main.py create mode 100644 src/maintenance/__init__.py create mode 100644 src/maintenance/reconcile.py create mode 100644 src/service/__init__.py create mode 100644 src/service/attachment.py create mode 100644 src/service/auth.py create mode 100644 src/service/chat.py create mode 100644 src/service/dto.py create mode 100644 src/service/exceptions.py create mode 100644 src/service/message.py create mode 100644 src/service/user.py create mode 100644 student.env.example create mode 100644 tests/attachment_failover.py create mode 100644 tests/attachments.py create mode 100644 tests/auth_logging.py create mode 100644 tests/callbacks.py create mode 100644 tests/database.py create mode 100644 tests/dependencies.py create mode 100644 tests/error_headers.py create mode 100644 tests/expiry.py create mode 100644 tests/extra.py create mode 100644 tests/idempotency_db.py create mode 100644 tests/lab4_review.py create mode 100644 tests/passwords.py create mode 100644 tests/production.py create mode 100644 tests/production_limits.py create mode 100644 tests/readiness.py create mode 100644 tests/reconciliation.py create mode 100644 tests/regressions.py create mode 100644 tests/request_deadline.py create mode 100644 tests/settings.py create mode 100644 tests/upload_memory.py diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..45b555d4 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,7 @@ +# Matplotlib SVG paths contain generated trailing separators. +evidence/**/*.svg -whitespace +# Preserve generated measurements byte-for-byte for evidence checksums. +evidence/**/*.csv -text -whitespace + +# Raw verification output is kept byte-for-byte, including command whitespace. +evidence/**/*.txt -text -whitespace diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..cfd86cb9 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,25 @@ +FROM python:3.13.0-slim-bookworm + +ENV PYTHONDONTWRITEBYTECODE=1 \ + PYTHONUNBUFFERED=1 + +WORKDIR /app + +COPY requirements.txt . +RUN pip install --no-cache-dir -r requirements.txt \ + && python -m pip uninstall --yes pip \ + && addgroup --system app \ + && adduser --system --ingroup app app + +COPY --chown=app:app src ./src +COPY --chown=app:app migrations ./migrations +COPY --chown=app:app infra/s3 ./infra/s3 +COPY --chown=app:app alembic.ini ./alembic.ini + +USER app +EXPOSE 8080 + +HEALTHCHECK --interval=10s --timeout=3s --start-period=5s --retries=3 \ + CMD python -c "import urllib.request; from src.core.settings import settings; urllib.request.urlopen(f'http://127.0.0.1:{settings.app_port}/health/ready', timeout=settings.healthcheck_timeout_seconds)" + +CMD ["python", "-m", "src"] diff --git a/LAB4_AUDIT.md b/LAB4_AUDIT.md new file mode 100644 index 00000000..ffa0e120 --- /dev/null +++ b/LAB4_AUDIT.md @@ -0,0 +1,67 @@ +# Lab4: проверка замечаний преподавателя + +Перечень сценариев взят из замечаний, переданных пользователем. Проверяется наша +реализация; доступность или текущее состояние чужих репозиториев не утверждаются. +Повтор: `make -f student.mk test-lab4-review PYTHON=.venv/bin/python`, затем +`make -f student.mk test-reconciliation`. Итоговый повтор входит в `make -f student.mk verify-lab4`. + +| Замечание | Проверка у нас | Ожидаемый результат / защита | +| --- | --- | --- | +| Readiness не отвечает 12 секунд при pause PostgreSQL | Прямой HTTP внутри API-контейнера, без LB, при замороженной БД | 503 примерно за 2 секунды, контрактный error и оба ID-заголовка | +| История зависает при уже выполняющемся SQL | Удержать SELECT истории на SQL-блокировке, подтвердить wait в pg_stat_activity, затем pause | 503 примерно за 5 секунд; unpause восстанавливает 200 без рестарта API | +| Username review123 с завершающим LF попадает в БД и даёт 500 | Реальная регистрация с LF, CR, TAB, NUL | 400 до INSERT; Pydantic проверяет имя по ограниченному ASCII-шаблону | +| Усечённый PNG принимается после чтения заголовка | Полный fixture без IEND и только первые 33 байта | 415; после раннего лимита проверяются структура и полное декодирование | +| Обрыв клиента или слишком большое chunked-тело | Прервать передачу до EOF; отправить >10 MiB без Content-Length | Постоянное состояние не создаётся; oversized получает 413 | +| PNG с MIME image/jpeg принимается | Загрузить реальный PNG с image/jpeg | 415; определённый формат сравнивается с Content-Type | +| API использует owner credentials и создаёт другой bucket | Выполнить make_bucket с фактическими API credentials | AccessDenied; owner/reconciler credentials отсутствуют в API | +| Лишние S3 credentials в служебных контейнерах | Проверить environment API, reconciler и migration без вывода значений | Owner ключей нет во всех трёх; migration не получает S3-ключей вообще | +| После неуспешного DELETE объект навсегда выпадает из очистки | Реальный объект, ошибка до DELETE, восстановление S3 и повтор apply | Pending не фиксируется как очищенный; следующий проход реально удаляет объект | +| Ответ DELETE потерян после удаления | Удалить объект и выбросить ошибку до фиксации БД, повторить | Повтор безопасен, старая попытка закрывается | +| В сдаче отсутствуют файлы Dockerfile COPY | Скопировать полный снимок исходников, собрать API с --no-cache и MinIO, запустить пустой UUID-проект | Образы собираются, миграция 008, public smoke, вложения и сверка проходят | +| PNG 8000×5001 даёт 415, PNG 20000×10000 даёт 500 | Сформировать настоящие PNG со всеми scanlines/CRC, загрузить с корректным MIME | Оба 413; перехватываются DecompressionBombWarning и DecompressionBombError | +| Граница 40 млн пикселей | Настоящий PNG 8000×5000, загрузка и скачивание | 201 и полное совпадение исходных байтов | +| DEL допускается в filename | filename=a%7F.png | 400; запрещены все Unicode Cc, включая C0 и DEL | +| Нет filename → 422 detail | POST без query-параметра filename | 400 в общем error-конверте, X-Request-Id совпадает с request_id | + +## Обнаруженный дефект и исправление + +До исправления обычный pause давал ограниченные ошибки, но запрос, уже вошедший +в SQL, не возвращался за 8 секунд: `evidence/lab4-review-inflight-before.txt`. +Одних connect/pool/statement timeout недостаточно, когда процесс PostgreSQL +заморожен, а драйвер ждёт отмену/rollback. + +Добавлен `RequestDeadlineMiddleware`: обычный запрос получает 503 по истечении +5 секунд до заголовков. Незавершённый обработчик отменяется, но HTTP не ждёт его +очистки. Его слот остаётся занятым до фактического завершения; максимум — 64 на +процесс. Поздняя отправка ответа от отменённой работы подавляется. Отдельная проверка +с задержанным rollback доказывает ограниченный ответ, сохранение лимита и восстановление. +Readiness использует собственную пробу с бюджетом 2 секунды и максимум одной +незавершённой пробой на процесс. + +После исправления реальные запросы возвращают 503 в бюджете и восстанавливают 200 +без рестарта: `evidence/lab4-final-reviewer-cases.txt`. Unit-проверки таймаутов: +`evidence/lab4-final-request-deadline.txt` и `lab4-final-readiness-budget.txt`. + +## Источники замечаний + +- [Pause PostgreSQL и readiness](https://gitea.privcloud.tech/Savelev_Ivan/mtusi2026lab4/src/commit/c43d3490a07ad939e4e4748863589b73c84ad05a/src/db.py#L14). +- [Pause и история](https://gitea.privcloud.tech/sokolova-bvt2304/mtusi2026lab3/src/commit/03ca3a6562981e644bfe5531f93e57167a82d6e1/app/db.py#L27). +- [Завершающий LF в username](https://gitea.privcloud.tech/Anatoly01/mtusi2026lab4/src/commit/92ce8c9a59eb4ea0f4db893b0ff02a3b61f1c7a9/app/main.py#L236). +- [PNG, MIME, S3-права и повтор очистки](https://gitea.privcloud.tech/Rakshasa/mtusi2026lab4-fork/src/commit/8c7375a6ea5f823ffce9f1b1e068a10b13266535/src/internal/handler/handler.go#L179). +- [Отсутствующие файлы сборки](https://gitea.privcloud.tech/mtusi2026/mtusi2026lab4/src/commit/ad63cf53bd4eba22495c037e448021f3fafdce51/Dockerfile#L13). +- [Пиксельные границы, DEL и filename](https://gitea.privcloud.tech/Artu-Rito/mtusi2026lab4/src/commit/38268f63f854a6ca947f0c75089ea52c4ee67706/app/images.py#L25). + +## Итоговый прогон + +Все случаи из таблицы прошли в составе 16 итоговых этапов. Реальные задержки +при замороженном выполняющемся SQL: история 5.1013 с, +readiness 2.0959 с, оба ответа 503. После unpause — 200. +Ошибка до S3 DELETE теперь проверяется отдельно от потерянного ответа после DELETE; +восстановление приводит к реальному удалению объекта, а не только смене статуса. + +## Дополнительная проверка после переноса + +В отдельном клоне обнаружена передача owner S3 credentials контейнеру migration +через общий env_file. Для migration явно очищены все S3-ключи; API и reconciler +ранее уже имели отдельные ограничения. Контейнерный environment теперь проверяется +в tests/lab4_review.py без печати секретных значений. diff --git a/LAB4_GUIDE.md b/LAB4_GUIDE.md new file mode 100644 index 00000000..9800225a --- /dev/null +++ b/LAB4_GUIDE.md @@ -0,0 +1,44 @@ +# Проверки и результаты лабораторной 4 + +Основная инструкция запуска — [README.md](STUDENT_README.md), отчёт — [REPORT.md](STUDENT_REPORT.md). +Выбран трек 2 на оценку 5: согласованность PostgreSQL и приватного S3. + +## Команды + +```sh +make -f student.mk check validate lint PYTHON=.venv/bin/python +make -f student.mk verify-lab4 PYTHON=.venv/bin/python +``` + +Полный прогон выполняет 16 этапов последовательно. Он проверяет контракт, +PNG/JPEG, SHA-256, доступ к чатам, ограничения файлов, идемпотентность сообщений, +замечания преподавателя, сверку с внедрением сбоев, память при 10 загрузках, +отказ принявшей файл реплики, restart и сборку с пустыми volumes. + +Для отдельных HTTP-проверок локального стенда на порту 8084: + +```sh +make -f student.mk test test-attachments test-idempotency BASE_URL=http://127.0.0.1:8084 PYTHON=.venv/bin/python +``` + +Инфраструктурные проверки временно меняют состояние учебного стенда и восстанавливают +его. Clean-start использует отдельный UUID-проект и удаляет только свои временные +volumes. Обычный restart сохраняет данные API, PostgreSQL, Redis, MinIO, reconciler и LB. + +## Доказательства + +- `evidence/lab4-final-summary.json` — итог команд и exit codes. +- `evidence/lab4-final-public-smoke.txt` — исходный публичный сценарий lab4. +- `evidence/lab4-final-attachments.txt` — байты оригинала, ACL, MIME и лимиты. +- `evidence/lab4-final-idempotency.txt` — параллельные повторы через две реплики. +- `evidence/lab4-final-reviewer-cases.txt` — ошибки файлов, пиксели, filename, S3-права и frozen PostgreSQL. +- `evidence/lab4-final-reconciliation.txt` — orphan/missing, dry-run, ошибки PUT/COMMIT/DELETE и стоимость обхода. +- `evidence/lab4-final-upload-memory.txt` — 10 одновременных загрузок и RAM. +- `evidence/lab4-final-uploader-failover.txt` — остановка именно загрузившей реплики. +- `evidence/lab4-final-persistence-proof.txt` — сохранность и реальные StartedAt до/после. +- `evidence/lab4-clean-start.json` — пустые volumes, миграция 008 и build без кэша API. +- `evidence/lab4-public-artifacts.json` — контрольные суммы неизменного публичного контракта и тестов. +- `evidence/lab4-research/` — исходные измерения и графики трека 2. + +Алгоритм загрузки и сверки: [LAB4_RECONCILIATION.md](LAB4_RECONCILIATION.md). +Соответствие замечаниям преподавателя: [LAB4_AUDIT.md](LAB4_AUDIT.md). diff --git a/LAB4_RECONCILIATION.md b/LAB4_RECONCILIATION.md new file mode 100644 index 00000000..cf1a14dd --- /dev/null +++ b/LAB4_RECONCILIATION.md @@ -0,0 +1,207 @@ +# Lab4, трек 2: согласованность PostgreSQL и S3 + +## Задача и гипотеза + +S3 PUT и PostgreSQL COMMIT не образуют общую транзакцию. При сбоях возможны: +объект без Attachment, зависший pending без объекта и Attachment с потерянным +оригиналом. Гипотеза: устойчивый журнал намерений, общая блокировка на ключ и +повторяемая сверка устраняют бесхозные объекты, сохраняя свежие, активные и +используемые вложения. Время обхода ожидается примерно линейным по числу ключей. + +## Что хранится в БД + +- `attachments` — опубликованные вложения. Наличие записи защищает оригинал, + даже если вложение ещё не использовано в сообщении. +- `upload_intents` — ключ, время регистрации и состояние `pending`, `committed` + или `abandoned`. Это внутренний журнал, не публичные статусы Attachment. +- `storage_findings` — наблюдения orphan/missing, время обнаружения/последней + проверки/закрытия и отпечаток объекта для диагностики. +- `attachments.storage_missing_since` — внутренняя отметка о потере оригинала. + +Миграция `008` добавляет эти данные без изменения предыдущих вложений. Старые +Attachment защищаются и без журнала. Наличие строки журнала само по себе не +защищает мусор навсегда: старые pending проверяются и закрываются. + +## Загрузка и транзакции + +1. Проверить пользователя, чат, имя, размер, MIME, структуру и число пикселей. + До S3 файл находится во временном ограниченном хранилище; считать SHA-256. +2. Назначить уникальный `originals/`. +3. В отдельной транзакции взять advisory lock на ключ, записать pending и COMMIT. +4. В HTTP-транзакции взять ту же блокировку, повторно проверить pending. +5. Выполнить S3 PUT, удерживая блокировку. +6. Одним COMMIT сохранить Attachment и перевести журнал в committed. +7. Только после COMMIT вернуть 201 ready. + +Блокировка `pg_advisory_xact_lock` вычисляется по стабильному хешу object key; +она действует до конца транзакции и освобождается PostgreSQL при разрыве +соединения. Reconciler использует `pg_try_advisory_xact_lock`: занятый ключ +пропускается, а не задерживает весь обход. Случайная коллизия хеша только +сериализует независимые ключи, но не разрешает удаление используемого объекта. + +При неизвестном результате COMMIT файл сразу не удаляется. Журнал и последующая +проверка Attachment позволяют разобрать исход без риска удалить уже подтверждённый +оригинал. При обрыве HTTP до этапа S3 PUT постоянного объекта ещё нет. + +## Алгоритм сверки + +Область действия — только настроенный `S3_BUCKET` и `originals/` либо более узкий +префикс. Другие bucket и префиксы не перечисляются. ListObjectsV2 читается лениво +постранично; приложение не собирает весь список в RAM. Записи БД читаются +порциями по 200 с продолжением по ключу. + +Для каждого объекта: + +1. Попробовать взять блокировку; занят — пропустить. +2. Проверить Attachment заново под блокировкой. Есть запись — сохранить. +3. Проверить актуальный S3 HEAD и pending, зафиксировать наблюдение. +4. Если объект или намерение свежие — сохранить. +5. Иначе закрыть существующее намерение как abandoned, удалить бесхозный объект, + закрыть наблюдение и COMMIT. + +Запас `RECONCILE_GRACE_SECONDS=300` — один настраиваемый период, без второго +ожидания после первого обнаружения. Он проверяется относительно времени изменения +S3-объекта и создания намерения. Он не заменяет блокировку и не является lease: +сколько бы ни длилась активная загрузка, занятый ключ пропускается. + +Старые pending без Attachment и без S3-объекта переводятся в abandoned. Отложенный +загрузчик повторно проверяет состояние и не публикует закрытую попытку. +Незавершённые multipart parts не видны в ListObjectsV2. SDK пытается отменить +неудачный multipart; дополнительно MinIO настроен на expiry незавершённых загрузок +через 24 часа с проверкой раз в час. Объекты целиком по этим настройкам не удаляются. + +Обратный проход проверяет S3 HEAD для каждого Attachment: + +- Подтверждённое NoSuchKey/NoSuchObject отмечается как missing. Метаданные, + сообщения и связи сохраняются. API отвечает 503 на чтение такого вложения; + новые сообщения с ним получают 409. Повтор ранее подтверждённого сообщения + с прежним Idempotency-Key сохраняет прежний результат. +- Если отсутствовавший объект появился снова, проверяются размер и фактический + SHA-256 при ограниченном чтении. Совпали — отметка снимается. ETag не считается SHA-256. +- AccessDenied, пропавший bucket, timeout и другие ошибки прерывают проход; + они не интерпретируются как отсутствие всех файлов. + +Отдельный проход закрывает оставшиеся orphan-наблюдения, если S3 DELETE выполнился, +но его ответ или последующий COMMIT потерялись. Повтор удаления безопасен. +Reconciler не восстанавливает потерянные байты из метаданных: для восстановления +нужна копия исходного файла. Он безопасно изолирует потерю и проверяет восстановление. + +## Запуск и наблюдение + +Compose запускает отдельный reconciler: apply каждые 300 секунд, grace 300 секунд. +Процесс пишет JSON: режим, область обхода, действия, ограниченную выборку ключей, +время, число SQL statements, HTTP-запросы S3 по операциям и пик RSS процесса. +Healthcheck этого контейнера проверяет жизнь процесса; результаты проходов — в JSON. +Сбой обслуживания S3/БД оставляет цикл работающим для повторной попытки. + +```sh +make -f student.mk reconcile # просмотр, без изменения БД и S3 +make -f student.mk reconcile-apply # применить безопасные исправления +# Полные отчёты фонового процесса: +docker compose logs reconciler +``` + +Dry-run не пишет наблюдения, не меняет статусы и не удаляет файлы. Он не обещает, +что последующий apply увидит ровно то же состояние: apply перепроверяет всё заново. +Другой фоновый процесс может менять данные одновременно с dry-run. Для спокойного +просмотра без фоновой очистки: + +```sh +docker compose stop reconciler +docker compose run --rm --no-deps reconciler python -m src.maintenance.reconcile +# После просмотра восстановить периодическую работу: +docker compose up -d reconciler +``` + +## Права доступа + +Bootstrap с MinIO owner credentials создаёт приватный bucket и двух отдельных +пользователей. Декларативные политики находятся в `infra/s3/api-policy.json` и +`infra/s3/reconciler-policy.json`; Dockerfile копирует их в образ. Python-сценарий +явно выполняет подготовку bucket и настройку каждого пользователя. В API-контейнерах owner/reconciler credentials переопределены пустыми +значениями; в reconciler нет owner/API credentials. + +| Роль | Права | +| --- | --- | +| API | ListBucket/GetBucketLocation своего bucket; GetObject/PutObject и multipart операции только в originals/; нет DeleteObject | +| Reconciler | ListBucket/GetBucketLocation/GetBucketVersioning своего bucket; GetObject/DeleteObject только в originals/; нет PutObject и admin прав | +| Bootstrap | Создание bucket, пользователей и политик; доступен только как отдельная завершающаяся задача | + +`MINIO_ROOT_*` должны сохранять прежние credentials владельца при обновлении +существующего volume. `S3_ACCESS_KEY_ID`/`S3_SECRET_ACCESS_KEY` теперь относятся к +отдельному API-пользователю. Значения по умолчанию предназначены для локального +учебного стенда. Консоль выключена, порты S3 наружу не публикуются. + +## Методика и доказательства + +```sh +make -f student.mk test-reconciliation +make -f student.mk test-upload-memory PYTHON=.venv/bin/python +make -f student.mk test +make -f student.mk test-attachments PYTHON=.venv/bin/python +``` + +`tests/reconciliation.py` использует отдельную UUID-схему PostgreSQL и приватный +UUID-bucket MinIO; при завершении удаляет только собственные тестовые ресурсы. +Проверяет реальные PUT/HEAD/GET/DELETE, процесс, аварийно завершающий настоящий +код загрузки после PUT, ошибку COMMIT, отказ PUT, занятую блокировку, свежий файл, +публикацию между dry-run и apply, missing, неправильное и правильное восстановление, +потерянный ответ DELETE, AccessDenied и отказ БД. Snapshot доказывает отсутствие +изменений при dry-run. Отдельно проверяются развёрнутые S3-права API/reconciler. + +Стоимость обхода измеряется на 10, 100 и 1005 объектах, по три прогона; 1005 +объектов проверяют переход между страницами ListObjectsV2. Используется dry-run +по свежим бесхозным объектам: на объект приходится HEAD и примерно пять SQL +statements. Размер объекта почти не влияет на этот профиль, поскольку его байты +не читаются. Hash-проверка восстановленного missing имеет отдельную стоимость +чтения исходника. Точные результаты — `evidence/lab4-final-reconciliation.txt`. + +Локальное исследование не доказывает ту же скорость на удалённых сервисах: +RTT, объём bucket и задержки СУБД могут существенно изменить время. Текущий обход +последовательный; пакетная сверка могла бы уменьшить число SQL round trips. + +Эксперимент памяти временно задаёт 5 принимаемых загрузок на каждую из двух API- +реплик; декодирование изображений ограничено одним потоком на реплику. Запускает +10 одновременных загрузок для двух размеров PNG, проверяет SHA-256 и скачивание, +измеряет cgroup memory.current каждые 20 мс, включая tmpfs. После теста восстанавливает +обычную настройку параллелизма. Короткие пики между измерениями могут быть пропущены; +эти два размера не доказывают worst case для изображения в 40 млн пикселей. + +## Границы безопасности + +Поддерживается один неверсионируемый bucket. CLI отказывается работать с Enabled +или Suspended versioning: там нужны отдельный учёт версий и политика delete markers. +Все штатные писатели должны соблюдать протокол блокировок. Прямая административная +перезапись/удаление S3-объекта одновременно со сверкой обходят эту координацию. +Не обещается автоматическое восстановление БД/S3 из backup или защита от потери +всего Docker host. Согласованность S3-провайдера, расхождение часов и допустимый срок +pending нужно учитывать при переносе; будущие временные метки консервативно задерживают очистку. +Журнал и закрытые наблюдения пока сохраняются без автоматического удаления истории. + +## Итоговые измерения + +Все 16 этапов `make -f student.mk verify-lab4` завершились с exit code 0. Интеграционный +набор сверки содержит 15 проверок, включая отказ DELETE до удаления +и прямой unsigned GET существующего объекта с результатом 403. + +| Объектов | Медиана 3 обходов, с | LIST | HEAD | SQL statements | +| --- | --- | --- | --- | --- | +| 10 | 0.0181 | 1 | 10 | 53 | +| 100 | 0.1559 | 1 | 100 | 503 | +| 1005 | 1.9679 | 2 | 1005 | 5028 | + +Оба профиля по 10 одновременных загрузок завершились без отказов: 20 ответов 201, +все SHA-256 и скачанные оригиналы совпали. Пики RAM: **124.71 / 128.91 MiB** +при 512 MiB на реплику. Размеры PNG: 197105 и +4923446 байт. Обычный UPLOAD_CONCURRENCY=1 восстановлен. + +При замороженной PostgreSQL уже выполнявшаяся история вернула 503 за +**5.0988 с**, readiness — за **2.1109 с**. +После unpause восстановились 200 без рестарта API. Пустой стенд дошёл до миграции +008; API build --no-cache занял 32.829 с. Временный проект, +volumes и его теги образов удалены; действующие данные сохранены. + +![Измеренная стоимость обхода и память API](evidence/lab4-research/results.png) + +Усы на графике — min/max трёх запусков, не доверительный интервал. +Указанная RAM — максимум отсчётов, а не доказанный абсолютный пик между ними. diff --git a/PULL_REQUEST.md b/PULL_REQUEST.md new file mode 100644 index 00000000..4c477911 --- /dev/null +++ b/PULL_REQUEST.md @@ -0,0 +1,62 @@ +## Лабораторная 4: S3-хранилище и вложения + +Автор / группа: **Каменский Андрей, БПИ2301**. +Целевая оценка: **5**. Трек **2 — согласованность двух хранилищ**. + +### Реализация + +Обязательная основа приложения: PostgreSQL, Redis-сессии с TTL/AOF, два API за HAProxy, контракт +авторизации, пагинация и общая идемпотентность. Добавлены приватный MinIO, +метаданные Attachment, до 10 вложений в сообщении, raw PNG/JPEG upload и +авторизованный побайтный download. Проверяются размер до 10 MiB, MIME по содержимому, +целостность, безопасный filename и не более 40 млн пикселей включительно. + +Миграции до 008 и bootstrap запускаются отдельными задачами. Две декларативные +S3-политики хранятся в infra/s3 и копируются в Docker-образ. API и reconciler +получают разные ограниченные S3-права; owner credentials отсутствуют в API. +Публикуется только LB, консоль MinIO выключена. MinIO собирается из закреплённого +исходного commit, поэтому отсутствующий готовый образ не блокирует сборку. + +Перед PUT отдельно коммитится журнал pending. Advisory lock на ключ удерживается +до общего COMMIT Attachment/committed. Worker сверяет наш bucket/prefix постранично, +пропускает активные и свежие файлы, закрывает зависшие попытки и удаляет orphan. +Dry-run не меняет БД/S3. Missing-оригиналы отмечаются с сохранением сообщений; +восстановление подтверждается размером и SHA-256. Ошибка DELETE не исключает +объект из дальнейшей очистки. + +### Запуск и проверки + +```sh +python3 scripts/setup-env.py +docker compose up -d --build --wait +python3 -m venv .venv +.venv/bin/python -m pip install -r requirements-student.txt +make -f student.mk verify-lab4 PYTHON=.venv/bin/python +``` + +Инфраструктурные проверки выполняются последовательно на локальном учебном стенде. +Сохранность проверяется с прежним токеном и доказательствами StartedAt до/после API, +PostgreSQL, Redis и MinIO. Чистый запуск использует отдельный UUID-проект, пустые +volumes и полный снимок исходников, включая новые файлы; API строится с --no-cache. + +Сводка: `evidence/lab4-final-summary.json`; подробный вывод — +`evidence/lab4-final-*.txt`, чистый старт — `evidence/lab4-clean-start.json`. +Отчёт и методика: [REPORT.md](STUDENT_REPORT.md), +[LAB4_RECONCILIATION.md](LAB4_RECONCILIATION.md). + +### Ограничения + +Нет автоматического восстановления потерянных байтов из backup. Поддерживается +неверсионируемый bucket и штатные писатели, соблюдающие блокировки. Хранилища, +LB и host остаются едиными точками отказа. Последовательный обход имеет линейную +стоимость; локальные измерения не задают production SLA. Журнал/наблюдения сохраняют +историю без автоматического сокращения. Применение любых исправлений перепроверяет +состояние, а не слепо выполняет ранее выведенный план dry-run. + +- [x] Обязательное API lab4 и прежние возможности сохранены. +- [x] Оригинал, ACL, failover и restart проверены. +- [x] Негативные случаи и замечания преподавателя покрыты проверками. +- [x] Ограниченные S3-роли и приватность bucket проверены реальными запросами. +- [x] Трек 2 имеет гипотезу, сценарии сбоев, повторяемые измерения и ограничения. +- [x] Секреты не входят в исходники сдачи; .env создаётся локально. +- [x] Использование Codex и первичные источники указаны в REPORT.md. diff --git a/SOURCE_MANIFEST.json b/SOURCE_MANIFEST.json new file mode 100644 index 00000000..00533bf2 --- /dev/null +++ b/SOURCE_MANIFEST.json @@ -0,0 +1,379 @@ +{ + "format": 1, + "lab": 4, + "author": "Каменский Андрей, БПИ2301", + "clean_start_code_matches": true, + "private_credentials_scan": "PASS", + "files": { + ".dockerignore": "62c0534ad74d9f0e2982e97d1fbadb66d80c493ed237df5bcb9fbb797062eb38", + ".env.example": "08edfd4f68f801cd8db6000dfa040f9be7ff10a11c6bbdf7544f6c996fc2f909", + ".gitattributes": "0dadd4b1a4ae7778c71877bdf1643531eddda7d36768bc06205692cbcd89f42b", + ".github/pull_request_template.md": "3e565965912efed231a91675bc25950b76d7303892bdd8819d2e5209b522a55e", + ".github/workflows/contracts.yml": "419e73533e32f083c20516f683711f0c1a3206fa497d9538fa8cb676b9ffb00b", + ".gitignore": "c999f938485ff5e0bf83e5d0c386f936abc051e1d4e0fb7eeb66b6995f06c0b8", + "CONTRIBUTING.md": "2c01dd698cc9653dece49a94c9fd3f58d36e84764aaa643b46e26d7e599dc12e", + "COURSE.md": "c34d53cd082d194aa4b58f504c4e0348d25b6afec3d6a9c0963dd01c9c81e971", + "Dockerfile": "f6d3a539fd5b0787c366c76dc0e02086857eb465790bcaa599ab7a36ea2f5c35", + "Dockerfile.example": "fd7ac9491c0c3c663b083c41a762fb38bc2d212fa4a2ed3e6a0702af72108709", + "LAB2_CHECKLIST.md": "93c6a769e9976e27a0385306caa47d1f1ecb801b5eee8d8291acb71407f316c0", + "LAB2_GUIDE.md": "d1fd24c4d20466dba4671c44699b1811b48b820c11ebcb2fc7d76019e1d9bd82", + "LAB2_REVIEW.md": "dea37b8a76f9e274429d23572cf1e10b61deea71b1f01501d69defb92eb6872d", + "LAB2_TASK.md": "4f14a97911bd3ea335868d37fec187d1738b42f91a7d4780d33b721edf25b6dc", + "LAB3_AUDIT.md": "8e38000227ac201472e7983f19deedbf4858c9fda541851fb8010350ba0da853", + "LAB3_TASK.md": "7622c956ad4508d10d1807b4190461e3a7911a22759108ecf812d5bc477ff7a2", + "LAB4_AUDIT.md": "4d1cad8f5821421bac85cd2d88d73a5197db62955b8fe03f917c4e36d0ebaf5f", + "LAB4_GUIDE.md": "6b43c78768c051f540afc075ab87eae6b553c186069e9f33d442c16d4fdc6baa", + "LAB4_RECONCILIATION.md": "32ad564a38ceff48668ac09936e3d2beaaecd1e2f2edd29e3c0742e9a1a6ee6e", + "LAB4_TASK.md": "7fc4cfff884705202115fd93b7145d5bc3452e4db156dfef2b04e9d9edb74408", + "LAB5_BASE.md": "fb5ce2691f159dbc8368eadb16840b1da2fad315aac8afdda01267564a90329d", + "MAINTAINERS.md": "bc1bcc8c415c606f55274ee67987f80206321e045626b0a9236f5721719b7e9f", + "Makefile": "eff61ab3bed88c2a5697735643d94df1f2b3d0db14971abbd3fcc70323bd42f8", + "PRODUCTION_REVIEW.md": "48e34919dc4f9e96a2f8bad4446a8d75badeea6326af82fdb025fca48f7b4af8", + "README.md": "3a4bce648cbddccd735b55eea1f9d743faffceaf61f762a8a4a7e89df7926092", + "REPORT.md": "c319f814d086c9de12d03a94ad26b4e99ba1f122c3cddc57a781feb201dd9d98", + "alembic.ini": "024bf3fe092ea4f8e6bb6309cba89e67b53bada366dee6859339297f090fdda1", + "compose.example.yaml": "5368758f38e47f42c864b207f4baa05d5086773fa397b035dd2784d385e5c4a0", + "compose.yaml": "86f40a2b6485fd9ba18b33171d7cd1c99e36b9b5e2e1ac0409e2aabd45af0793", + "contracts/README.md": "72df27a559f88ffa3fd8c3c79d3c32f6db2c5986a0602677c51994c434a3fc4f", + "contracts/course-README.md": "72df27a559f88ffa3fd8c3c79d3c32f6db2c5986a0602677c51994c434a3fc4f", + "contracts/course-openapi.json": "c5c0ebdcf205018126c5bb91e2512b11f543827e76baa21d776210d05a0b2cca", + "contracts/examples.json": "381cc18c03789e935b391d007fb5843964be9cfd9f7530cb6b1996ed4a1c4c37", + "contracts/infrastructure.json": "baaeb5a2233096a50d791f521bfc6dd66a23e516f81833c2b17c554cc0bab5d8", + "contracts/openapi.json": "c5c0ebdcf205018126c5bb91e2512b11f543827e76baa21d776210d05a0b2cca", + "course-tests/README.md": "e0bfa7e196797f6a5bf6e44d8ad2ffeb82651927ff5d8484eb1c2dda1ec7dec5", + "course-tests/client.py": "8d50976fc7c7bbb81e88a152f613c61ab25eaf53dba33c6a9dfab19f868d546d", + "course-tests/fixtures/sample.png": "99ea7533c441f79cd630d15ce4d58d1ec4e06f6f0efb3b77a5c088305cd1bd75", + "course-tests/load.py": "6d3511ea719c7a7e841083e73d435c86dcbfd9f4e5c2a07d62eb9614b01d9933", + "course-tests/resilience.py": "1f96663a174b3978d24eff66f2741f5f8c9b788d3242261d37a972720c52788b", + "course-tests/smoke.py": "52ac38eb343ff7d43e7543588e1da58ca06c9fce74b2b0d0bf0e4982bc23c1db", + "evidence/README.md": "78e4bfd738d034597d15d8846accd8a8a5dc738a23a3d15f243f3992bd530cc3", + "evidence/lab1-report.md": "472496ea046dac25daaf1db2cd490beb1eed3aa080f2a82ee2fead0371ffdd54", + "evidence/lab1-results.txt": "39f86842b8ac61cdb4e46a2c51c68f1b5515c91a1a2e3bb783e5041054f50951", + "evidence/lab2-alembic-api.txt": "002a16c65fdd6f2615b383903b73902c70b63a7f6e3d36f44d2826e525c9db9b", + "evidence/lab2-alembic.txt": "5750f1e935c6ca64102d33d86f4e88019016c2a2428d69407614ccbd4593d778", + "evidence/lab2-argon2.txt": "3d1a3447fe342ddf4179a9529a6057c9855d96d22f1cc6ab0c9a0cc36c0befba", + "evidence/lab2-auth-quality.txt": "72957b6e091a1885c694134a59ab0da519c8c94c126303ed6178a001d766c2a7", + "evidence/lab2-auth-runtime.txt": "47e606243307c4fc949f9f39765739dc72770e6b770cb0ace5b1eeb6f1c6a2a0", + "evidence/lab2-callbacks-quality.txt": "8319eb9f5f6f62e7472c63f7fd07598a754675c042bc1d7a3315bbe86ffc2a22", + "evidence/lab2-callbacks-runtime.txt": "0d35bac31b0eb9a3deff4280bb86d148e8346e87dcedbdfc2e2143ae802a5f4e", + "evidence/lab2-checks.txt": "fd877dcc9c6d119e9eb4fc81f232eb838c23dcf1d9c885f223a2ed6c02c2d907", + "evidence/lab2-database.txt": "f9757b39ef374afb644725c34449987efb110b456dca3e1b0368b7aa2905df63", + "evidence/lab2-failures.txt": "51d2a30d0d8f5f535db52cdf1de46939683fb1df1a25e113de58193d268663d8", + "evidence/lab2-json-login-quality.txt": "983f8bbc5c8b529b3546c38861e5547c08cb0343f9b4b8e86025e819a935f938", + "evidence/lab2-json-login-runtime.txt": "9b32fc093b6790d66ee8342fa69ed664282f2d3a19a1232b4ad6bfb575320183", + "evidence/lab2-persistence.txt": "bebee89766b9933d4b1279060658983b981bb109eddc4e6fb7499ebf86d08977", + "evidence/lab2-production-after.txt": "bbbc9c4143eadf7eaf6ffe65e10b2ca334cd9746b7d8e143128bd7d7bffe59a9", + "evidence/lab2-production-before.txt": "352dd41f1cc1ae11038c8cf7d1e56353f951ccba7d29f450768f15a283b2a910", + "evidence/lab2-production-dependencies-before.json": "60e09e41f38a6ee74c4e8b0b752a16e4588c7cbc89d4b116369702e6704512f4", + "evidence/lab2-production-dependencies-before.txt": "7850b311e17fa98f27125dd2f676ece0afe14a8e758e225059e80918051ebe91", + "evidence/lab2-production-dependencies.json": "4ef346f6390d6ae670ccb5f5a151273d09ec70ea08c2bb30d71d091bd834f901", + "evidence/lab2-production-dependencies.txt": "67d375e91856b0385a8bf51f8900f87ab2ead441c86d5028f797f943511eef08", + "evidence/lab2-production-image.txt": "f612ab3d7ca8ea093018b8f40ffe763bf14129fb52721d65353ad538eff529c2", + "evidence/lab2-production-limits.txt": "dab3534fe2c4751d8596d6106ccb38a42ee68f7dc2d7b988c93cd2f457bc204b", + "evidence/lab2-production-network-final.txt": "5443bbc1e6cffe3440e5316a1313b3e5da09c7d5fbc0e81b3643c1074f536310", + "evidence/lab2-production-quality.txt": "8ac2c95ba5c3c5fb7765ed383092898ecd4d3ca445f508ce4ec43c864899bcc2", + "evidence/lab2-production-runtime.txt": "55f6828860ec1334cfc45759c4a3a25cd7ddc981c787207519df8686f95f9e6c", + "evidence/lab2-redis-sessions.txt": "c36d39ea99e59e03188249662a19948792c13fc9ac839bfd6234771593cab47e", + "evidence/lab2-report.md": "3a5bc857d78cadd2cf939b7bc712f740ac8da9ce8c2a63c8c7fa041b025ec8dd", + "evidence/lab2-review-additional.txt": "dd1366d1ed1774d7f659a752457eecee09f33715a9872bba51ed3273f73806fc", + "evidence/lab2-review-failures.txt": "4ce930892e3b8b6291be7e49e1a45972ec495fec0c177f2246535cb2c402cd42", + "evidence/lab2-review-quality.txt": "983f8bbc5c8b529b3546c38861e5547c08cb0343f9b4b8e86025e819a935f938", + "evidence/lab2-review-runtime.txt": "755638752b236f9447c3f590ed873dacf1351ff8c161dc557bd69d1739c28a2a", + "evidence/lab2-settings-expiry.txt": "77c2092073557c14439051d0fe4b5bd704582c6061368b521d85ec836a775a5e", + "evidence/lab2-settings-quality.txt": "15738f352e6b489669f1c2b78b499405edee2998839263dfab7935c85f973f3e", + "evidence/lab2-settings-runtime.txt": "3952868e8c4d9ca6b1cf50a5edec2d59717bd12d86ad46bfbe56752afcda05c6", + "evidence/lab2-sqlalchemy.txt": "e02382975a3854ad997288e6baea79885669878e0bf166838e5678b318fac022", + "evidence/lab3-500-headers.txt": "78d154cb8adfce2887505fa75061d30922a187a5e01c7c782a6d01ff69026d9f", + "evidence/lab3-audit-before.json": "e028214d4d634a1568dcf3dee446419c67ab78b1d281f6a764c78cecdc3caa85", + "evidence/lab3-audit-changing-ips.json": "dd8d3ac3c12dafb24c0fad75e7d1b361c3e1a1a290f743e931bf08c5ebfa8a0b", + "evidence/lab3-audit-contract.json": "0cb908ee39402a4c762fbe54bd21a5cbe608bf62a51c563bac3da1ac18140b72", + "evidence/lab3-audit-first-run.txt": "225d7866052c114ef51b7600b5ff1f6737d0b89716e50387324b34cdb52e8927", + "evidence/lab3-audit-frozen-stores.json": "a8172e1edae6d7ecd00f98d657df7ae724c57449cee1f81c5096be182f0578f6", + "evidence/lab3-audit-limits-evidence.json": "8aacb91500cd0609d8d4357d302fd1f9f4d52293119a91e44384326b14e5e921", + "evidence/lab3-audit-readiness.json": "e3d03a2f399ba1b02319b182967095772acd4a396bd291768a5f9ccf013a54f2", + "evidence/lab3-audit-run.txt": "ec07d1d4e1fd64d9fc7291dedcb91cf118103e9ea969663231d0995d13b15ddd", + "evidence/lab3-audit-summary-all.json": "662475dbaf9038285f89de2b79bcf2dcd258850d7a5f379bc34df5b52ae3626d", + "evidence/lab3-cache-edge-before.json": "2515e2ffa2e41c0eba56aca797c66f167140c1ba583191e3ce31a7cb38ca8ab9", + "evidence/lab3-clean-start.json": "5767655646e659600b8d73465fc1b6e340a01130a8fb235a06a672122926613c", + "evidence/lab3-clean-start.txt": "5767655646e659600b8d73465fc1b6e340a01130a8fb235a06a672122926613c", + "evidence/lab3-control/method.json": "d0b58111acd56ba8153b636304e13788c9b958e7dbe8618840aa1aa8330dbd1f", + "evidence/lab3-control/results.json": "25eef5d12a45f068209dca8f8acd4c0c0e918c178f34b20b30be795b8bead05e", + "evidence/lab3-control/run-01.json": "cbee52c4c2c91328b71301b7a3b6e0f7c6cc2dbeac4c38146afc1da0ce7f33c6", + "evidence/lab3-control/run-02.json": "54c091a8aa6a407c82e8e19ce6d89841fd7f845fb76e8f4775560c9932844d6f", + "evidence/lab3-control/summary.csv": "3c77706e65ae8291092a0512e6757c642d8908d1a49faa47a2c29b4135f475d4", + "evidence/lab3-db-idempotency.txt": "22a74ebaa53afe9c3e50e25a384c47866daa2ea0022dac1d6aa6c519b062da8d", + "evidence/lab3-edge-audit.json": "d069cfdb5fe2efdbc54dfc4d1e6b7b912033a9aa773c82fd11e6e0f9a5701c7e", + "evidence/lab3-edge-audit.txt": "d069cfdb5fe2efdbc54dfc4d1e6b7b912033a9aa773c82fd11e6e0f9a5701c7e", + "evidence/lab3-extra-audit-before.json": "bff94786de7081de3f2e0d0bc4213af630099ecd1b78989d13b861ea1929d3f9", + "evidence/lab3-extra.txt": "5a1fb843ce8fe3fe3440da1d32471ac850945333b3cd76d181b5cdadab6d2c8e", + "evidence/lab3-failures.json": "66cd4f46921697809bcd5ae11e48a87a283f757d17a58f2c39a2836e8b16e6c1", + "evidence/lab3-final-callbacks.txt": "4a0892bdb647713353af05b2e8a2286a6943acc3d1ef17cc96a3c9fa66a4d68f", + "evidence/lab3-final-checks.txt": "b9248ecea6a33fb267aee05dfb0c5aabebd69698d61e469adffa5503d6d87576", + "evidence/lab3-final-database.txt": "9cbbd011646c1a7bb5864a07868c80d382f71708cc53e5d13c6f72609b3f6a12", + "evidence/lab3-final-dependencies.txt": "ccc50fed22eee589139911021bb1bc4f74671603cc6af54f4d3a9f124c422ada", + "evidence/lab3-final-error_headers.txt": "01eef328846520f6222186372fd816355d00d9b5674ede1775f2b505cbd5a4b6", + "evidence/lab3-final-idempotency_db.txt": "22a74ebaa53afe9c3e50e25a384c47866daa2ea0022dac1d6aa6c519b062da8d", + "evidence/lab3-final-lab3.txt": "3239d3e8305c00c51c74fcc363f55fc6f4baae9dc359d08c495506e1419f172b", + "evidence/lab3-final-passwords.txt": "2c39e0ea11b0bf55c64f7a6f828eb4f19bebfd791404d7fbb6200acb86857692", + "evidence/lab3-final-readiness.txt": "b438a8c6836924e83830cf0efdd4355be5e9227c332fd6fedc9a5c16f12084e2", + "evidence/lab3-final-regressions.txt": "34a9299a69c01de47319f7ed8fccccfecea566b2c37715a34585b387b34ccabb", + "evidence/lab3-final-settings.txt": "08e331f85ae830bc10461a995f2fa82ccc94e985d5310897ede3be293f446e66", + "evidence/lab3-final-smoke.txt": "58cee16087387ba887af7995d3492b9549bc11a0e6b0ab8d204daefbd7271d14", + "evidence/lab3-idempotency.json": "96193806eba0dc609847b066a14d8a9f74b34ed7a348dc10e18b9a91cf363496", + "evidence/lab3-infrastructure.json": "3b8cc78233d192ccad2498ff1797afef9c06d78d7b0d224cd78b4be1ee40925b", + "evidence/lab3-lab3.txt": "1fdab40c96c91d93c9addae9648a851af41de3f814d7fdf8630c0026b64b101a", + "evidence/lab3-original-research-run.txt": "af5854bda4fd7e74a181d3f9020389d0c9e5855750074c5ef229d6c870e93d43", + "evidence/lab3-persistence.txt": "e02faf150363968a8e46ae95e2beb9bd1081d9cb13e8be490a170712f8a81851", + "evidence/lab3-pr-description.md": "f944732e2d6ec2c668e4a14ddd20b3728dce039be82491e87d07abe55bff2958", + "evidence/lab3-production.txt": "e2749c926b6aab4e47435e5b499ebec4d9828fcafb492f968dd4646c682bfdb1", + "evidence/lab3-public-artifacts.json": "2f8ed4935870c8c865012b4ef0cad43f7a3ea03b1cceb7e586d4b14eb37929ab", + "evidence/lab3-public-failover.txt": "49e0eb9268ebe732cb8b0b7706dd0fd8441872e79903ce1cc77c9373ff4c3f40", + "evidence/lab3-quality.txt": "484010ce995e90e28854a117ccff672afca7241adb6a371dc6d2baa35a989aaa", + "evidence/lab3-readiness-budget.txt": "b438a8c6836924e83830cf0efdd4355be5e9227c332fd6fedc9a5c16f12084e2", + "evidence/lab3-readme.md": "c20fc548a1d7e3137cd329448c23694ddb07b1886f4c6b98ac724ff4ef754e48", + "evidence/lab3-regressions.txt": "34a9299a69c01de47319f7ed8fccccfecea566b2c37715a34585b387b34ccabb", + "evidence/lab3-report.md": "a30e7b4cf1b9fb52f43d17b8c014ec720dfb75cad37549816aefe002a90d55de", + "evidence/lab3-research-plots.txt": "1827ffc6b07de12d354d69d7e6d6a1497731be5ebebb7521d26cc0f10feb4a62", + "evidence/lab3-research-run.txt": "5d60ca3991831c5441d88276ea603771fb909948d0f3f96dcc0c5dd3eb2a28ee", + "evidence/lab3-research/README.md": "7c0767ab14847d3abe9b3cb46da2114c598d1cacbc4311d29e8192f26446155c", + "evidence/lab3-research/bottleneck.png": "2639512b3147cb5a29f515e7704417eebb014a6557a110647d21d352423f7cbc", + "evidence/lab3-research/bottleneck.svg": "85e890a8dc1c2b8ecb9884122e6acca29378e76dc74f0c1346a59c03b7790800", + "evidence/lab3-research/method.json": "cc8c8f1a41defc136ac18932662c938ce8a9e87e5e5a7387abe4d55703d0d764", + "evidence/lab3-research/results.json": "07c0a21c7b74efe1e0cf9ddab5ccb6f2d52daa943055245170bd1c87c4e7e241", + "evidence/lab3-research/run-01.json": "85911358cc985036335cd839fa7a43f00d68c5c92b31cc336972a22c53574b05", + "evidence/lab3-research/run-02.json": "b96e89642ec371455d40b4f0e5bf98173a5a7b63b555eca1d0044514c9cf4f96", + "evidence/lab3-research/run-03.json": "398da4de7e5e4d07a7b04d7a62641fbc1c95b5527c98c5ed900089bada5359ca", + "evidence/lab3-research/run-04.json": "3530f35583a49b62c9a9eab7a0245f57368f09d60308c2b4b15109c8c7c80884", + "evidence/lab3-research/run-05.json": "947ccdedd719f5f71934a54579c4f61a0832d5c407f033ead6711f8e6dcc2ded", + "evidence/lab3-research/run-06.json": "b2641494dcf7a37e7118cace9cdfe59fa60e285bd5c11f21b692cead53d449bd", + "evidence/lab3-research/run-07.json": "bb0a5a957271bd2e62a4581790c00c972498cd35c54ddad2d93f90962551abfc", + "evidence/lab3-research/run-08.json": "25de3ea5f76ec198bc819361a24f68216e7b18fdc4bf12b433c1033ff5d1915a", + "evidence/lab3-research/run-09.json": "c39fc1238f25c4f502f2a02ebf67725b8b27d305cccf783405600dff05501ecf", + "evidence/lab3-research/run-10.json": "9cedb0553356d14da67c58cf37e176270c8c2546599553db5c1e0cde87ba240b", + "evidence/lab3-research/run-11.json": "cc9d2858ba22981895897f1ddd9ba9668b5d3b25d611b010b822c18203209ac7", + "evidence/lab3-research/run-12.json": "1700b51d5f14c68bdffe0f8f81ee8a86e44d67eb7f3e9acf3237a80db9cd62c9", + "evidence/lab3-research/run-13.json": "5d33b91230252bd22571e24216919dd98cf8f29c79e1a396e6bc15445fa629e9", + "evidence/lab3-research/run-14.json": "35f697b1c9abb62924498023280bd846af4699b6e2e6c58a28694768ef0e6916", + "evidence/lab3-research/run-15.json": "e17d874073eef8de68d19f068242a13aa14bafa63e415f1481bd6a512098520f", + "evidence/lab3-research/run-16.json": "909f683f7638d16f515fafebd6f143dda68a50ed23386a28401622a4719181c3", + "evidence/lab3-research/run-17.json": "2a95a33015e5846e19ad128cc1f95115b99f247b0ff38eb694fefc5203eb73d7", + "evidence/lab3-research/run-18.json": "11f1b66c6df6f2a2fd06cb8e4ca6bfe7865aaabc8c81c1113572ef20d686fd58", + "evidence/lab3-research/scaling.png": "654be1b0652d19b4eb2c70db1c102947cadb8dd92ca3586ebf20e9c15d10b3b7", + "evidence/lab3-research/scaling.svg": "f7d94e8d60623ceae87fcef0972649ba2cb538d24195d87d3e5ad690e159ae54", + "evidence/lab3-research/summary.csv": "a6f75217347794f4acf414f5367c95b691189ec8474a61e72009da84d4c88465", + "evidence/lab3-restart-proof.json": "b3dc6651f3cbd5d3bdd8ea173b02c24d422d9362fc3726c64ef7ad77d6f31e19", + "evidence/lab3-review-summary.json": "ce00141c300a1caf64e6300863ddba61235059c2fad12b0cf213350f52de5986", + "evidence/lab3-review.txt": "8ba77e5766ef665dfbf795d478b5dbe1d25897606fe24e3e5f0090ec612cae32", + "evidence/lab3-rolling-load.json": "94922bff8fbfb823064200bebeca3201476d2b60da4296406474f6245ae38b1c", + "evidence/lab3-rolling.txt": "d0f30f65e47f732d3fc514e87d5ed0974bbd1f610f6dd4608ec5634b418b5b72", + "evidence/lab3-smoke.txt": "58cee16087387ba887af7995d3492b9549bc11a0e6b0ab8d204daefbd7271d14", + "evidence/lab3-unicode-migration.json": "8e98c090381e7ed694d46b62d799d9ff96e5cf56f5765f858f4a8e9da47b8451", + "evidence/lab3-unicode-names-migration.json": "7d2038b09921bd700986b73b47016d37d13d9996b3f1ce779d9825a6e364dd29", + "evidence/lab3-verify.txt": "2d3d149de2300454320c3d63f99099d13b6e8da9c167b25fd8e69c9b1e0766d7", + "evidence/lab4-attachment-failover.txt": "f64d39de3dc97f2f63aac414e3f31d2b7fe470cc482627ba558b8496443c53ca", + "evidence/lab4-attachments.txt": "506ecbf2abb8c553d632ae2077dfa6ada440cc071abcda53379cd5fa289376e7", + "evidence/lab4-bootstrap-clean-start.txt": "c28ca3be3dce9cd6dfcf1bc2d63043416fdf39f9e1f1b09b8212bcc6e371e9f0", + "evidence/lab4-bootstrap-refactor.txt": "91a00a93324cd7da9f9088f57ef85bdfa097df072fe6a811d42b01651afaadae", + "evidence/lab4-clean-start.json": "4298040cc2f9459f011e7a1a3e292007fc918a415b53960b003617f152fa7116", + "evidence/lab4-clean-start.txt": "6a411e542880440eefe3b6068797fdc41e3f52aabe58ad7e3d1c5af04adead78", + "evidence/lab4-final-attachments.txt": "506ecbf2abb8c553d632ae2077dfa6ada440cc071abcda53379cd5fa289376e7", + "evidence/lab4-final-clean-start.txt": "8b70c88dc4241419e44d85217f8251539497ab384fa80a7dda69a311cb1c7e1d", + "evidence/lab4-final-format.txt": "b642d2f0cc49caff9e609808fb9c82854fc174b2f54b459a0d09dbe4c0f837ab", + "evidence/lab4-final-idempotency.txt": "4606fd4dbc1d5fdfcc891cbfc967ac76c5c5b5bbb790ba6c00ea6dad436fbc9f", + "evidence/lab4-final-openapi.txt": "516e71d5728e863ed942752e9efbc4f65714ab7281a3af2c472fda5bb4a9b963", + "evidence/lab4-final-persistence-proof.txt": "3f32089a7c4f484b1c1d4a3ac8993abe07312f8f1b3bd8a986b198760fd93669", + "evidence/lab4-final-public-smoke.txt": "59c0b2b30d44d6ee3d44ea86fa4946c2f87d0b89ad0fcd57652dd4082bcceafd", + "evidence/lab4-final-quality.txt": "82b3e6a6c090a57601d22943bd23fca9218d1031dbe5a7b754092f9a156b4f18", + "evidence/lab4-final-readiness-budget.txt": "b438a8c6836924e83830cf0efdd4355be5e9227c332fd6fedc9a5c16f12084e2", + "evidence/lab4-final-reconciliation.txt": "32d3797ec915dbf9cc829e14ea546f68b042da30dc9553a072769733721b9622", + "evidence/lab4-final-request-deadline.txt": "6a5288cc2d77e914541566f45d716642fa227350ae92badc5a4eeff3610f69f0", + "evidence/lab4-final-reviewer-cases.txt": "ba4b919516c839e73146b7b9f1d1ecd5194b7e42b107d661b035e0547caf86d1", + "evidence/lab4-final-run.txt": "5b65eba805cc8283798fbe22492747db2e9f3f19fbce37862899bdfd477d322c", + "evidence/lab4-final-structure.txt": "cd7f9c6d8443a7595346367c3ecc9daa099204db17d71ba8c41bb40d0d868bc1", + "evidence/lab4-final-summary.json": "e1cb94a9bfe63ecf011ab5c86e7229819f5a0fbd101553d9cd98db0e1fa7145f", + "evidence/lab4-final-upload-memory.txt": "c059a9e6634dd1b26969d45d17ed3947573acec900ceb1344e1c75d7851dc64e", + "evidence/lab4-final-uploader-failover.txt": "f64d39de3dc97f2f63aac414e3f31d2b7fe470cc482627ba558b8496443c53ca", + "evidence/lab4-lab3-regression.txt": "aea3426c0326c4d4718b29f3674485cba7c5ea39ce9d0a05978e5157dbdce2b0", + "evidence/lab4-persistence.txt": "e02faf150363968a8e46ae95e2beb9bd1081d9cb13e8be490a170712f8a81851", + "evidence/lab4-public-artifacts.json": "d032d7b251dd20e46b34b9fd79f2f691dc49c1878fcde1315f397fe45a1b26c2", + "evidence/lab4-reconciliation.txt": "9aae52dcb823c58d9a21f1561c173bd64c6260f3653682f8e3e15f0171791373", + "evidence/lab4-research/results.json": "9bb75f7190c316a0645aea398615e6c60e9b336b162cfbcfbec29d042b60592b", + "evidence/lab4-research/results.png": "869e660c4ba969749570645aa90d2bcdf75d3669cd909bad76b58cef7be897e6", + "evidence/lab4-research/results.svg": "2f7613ad1e156f519743b4b6abbd4b3207718fe3d690f249f50edbf26a4bce19", + "evidence/lab4-review-inflight-after.txt": "a783c0a1a5fb1b8138d81faefe025283d562af18325a6bd961433533fc5b5f28", + "evidence/lab4-review-inflight-before.txt": "3b3375fdd1aef72907eb416e6eccc85c240556e81d775c8a20bd8b6ce2c2be04", + "evidence/lab4-review-pause-before.txt": "ac2070384201bae2f159294f8129fd9ffa231e5b1079199000a3a32b9dfc8708", + "evidence/lab4-review.txt": "b0798b3f3693657c69de9cae939a813698c2d259af638fa9bf211be5f6981ff7", + "evidence/lab4-s3-unavailable.txt": "2c805922abff1234a5956bd804453415b0bc3b2dd648caf92f87136912ab28f4", + "evidence/lab4-smoke.txt": "59c0b2b30d44d6ee3d44ea86fa4946c2f87d0b89ad0fcd57652dd4082bcceafd", + "evidence/lab4-track2-attachments.txt": "506ecbf2abb8c553d632ae2077dfa6ada440cc071abcda53379cd5fa289376e7", + "evidence/lab4-track2-environment.json": "fcaa8cfbbd225fe24f8986bddaa124119f061c5d9bff80f0a436d60003102a0b", + "evidence/lab4-track2-failover.txt": "f64d39de3dc97f2f63aac414e3f31d2b7fe470cc482627ba558b8496443c53ca", + "evidence/lab4-track2-idempotency.txt": "d94fef6a46877d2a1de1b8b7315ad2622de353bb37f0844595985d7bcd9eb447", + "evidence/lab4-track2-persistence.txt": "e02faf150363968a8e46ae95e2beb9bd1081d9cb13e8be490a170712f8a81851", + "evidence/lab4-track2-smoke.txt": "59c0b2b30d44d6ee3d44ea86fa4946c2f87d0b89ad0fcd57652dd4082bcceafd", + "evidence/lab4-transfer.json": "fc7a2df55fe0a39da9c651dd46502a6168d91fa2687c449801fa6d08021ad775", + "evidence/lab4-upload-memory.txt": "979939bb093cc16af4c0823763b921d51955d2b6dce214e84d3a8503ab3c91ce", + "evidence/pre-audit-research/README.md": "04058068412952041038a6ce4649a98d5ecfea8452306fd9e3aad8703cb6e38a", + "evidence/pre-audit-research/bottleneck.png": "2639512b3147cb5a29f515e7704417eebb014a6557a110647d21d352423f7cbc", + "evidence/pre-audit-research/bottleneck.svg": "e43c0d0f47c3a51b8b10f174dcb922d99e8766905712ecdf2cf6fc78362a2198", + "evidence/pre-audit-research/method.json": "cc8c8f1a41defc136ac18932662c938ce8a9e87e5e5a7387abe4d55703d0d764", + "evidence/pre-audit-research/results.json": "07c0a21c7b74efe1e0cf9ddab5ccb6f2d52daa943055245170bd1c87c4e7e241", + "evidence/pre-audit-research/run-01.json": "85911358cc985036335cd839fa7a43f00d68c5c92b31cc336972a22c53574b05", + "evidence/pre-audit-research/run-02.json": "b96e89642ec371455d40b4f0e5bf98173a5a7b63b555eca1d0044514c9cf4f96", + "evidence/pre-audit-research/run-03.json": "398da4de7e5e4d07a7b04d7a62641fbc1c95b5527c98c5ed900089bada5359ca", + "evidence/pre-audit-research/run-04.json": "3530f35583a49b62c9a9eab7a0245f57368f09d60308c2b4b15109c8c7c80884", + "evidence/pre-audit-research/run-05.json": "947ccdedd719f5f71934a54579c4f61a0832d5c407f033ead6711f8e6dcc2ded", + "evidence/pre-audit-research/run-06.json": "b2641494dcf7a37e7118cace9cdfe59fa60e285bd5c11f21b692cead53d449bd", + "evidence/pre-audit-research/run-07.json": "bb0a5a957271bd2e62a4581790c00c972498cd35c54ddad2d93f90962551abfc", + "evidence/pre-audit-research/run-08.json": "25de3ea5f76ec198bc819361a24f68216e7b18fdc4bf12b433c1033ff5d1915a", + "evidence/pre-audit-research/run-09.json": "c39fc1238f25c4f502f2a02ebf67725b8b27d305cccf783405600dff05501ecf", + "evidence/pre-audit-research/run-10.json": "9cedb0553356d14da67c58cf37e176270c8c2546599553db5c1e0cde87ba240b", + "evidence/pre-audit-research/run-11.json": "cc9d2858ba22981895897f1ddd9ba9668b5d3b25d611b010b822c18203209ac7", + "evidence/pre-audit-research/run-12.json": "1700b51d5f14c68bdffe0f8f81ee8a86e44d67eb7f3e9acf3237a80db9cd62c9", + "evidence/pre-audit-research/run-13.json": "5d33b91230252bd22571e24216919dd98cf8f29c79e1a396e6bc15445fa629e9", + "evidence/pre-audit-research/run-14.json": "35f697b1c9abb62924498023280bd846af4699b6e2e6c58a28694768ef0e6916", + "evidence/pre-audit-research/run-15.json": "e17d874073eef8de68d19f068242a13aa14bafa63e415f1481bd6a512098520f", + "evidence/pre-audit-research/run-16.json": "909f683f7638d16f515fafebd6f143dda68a50ed23386a28401622a4719181c3", + "evidence/pre-audit-research/run-17.json": "2a95a33015e5846e19ad128cc1f95115b99f247b0ff38eb694fefc5203eb73d7", + "evidence/pre-audit-research/run-18.json": "11f1b66c6df6f2a2fd06cb8e4ca6bfe7865aaabc8c81c1113572ef20d686fd58", + "evidence/pre-audit-research/run-log.txt": "af5854bda4fd7e74a181d3f9020389d0c9e5855750074c5ef229d6c870e93d43", + "evidence/pre-audit-research/scaling.png": "654be1b0652d19b4eb2c70db1c102947cadb8dd92ca3586ebf20e9c15d10b3b7", + "evidence/pre-audit-research/scaling.svg": "e4fb3f9cb4f0a895cde9e2939753e0da8ca6a61a117740f0e3de8a4ce04e6b37", + "evidence/pre-audit-research/summary.csv": "a6f75217347794f4acf414f5367c95b691189ec8474a61e72009da84d4c88465", + "examples/requests.http": "397bc6c114287388f39921bd5fdbc0783438c662b6969f0230e327e44faa0986", + "infra/README.md": "0e804fa51debba4c38d3cc84abf4704897665e0335b272060363f03aadd6354f", + "infra/haproxy.cfg": "6640795207cee655e5c22d685d73b2a57ae1a987156783ad5226d57d7ed6d59c", + "infra/minio/Dockerfile": "632a16d3468aa0290a0dcb69cdbdba7a8827ada9ab56d5b9903d1ba8eaf182d7", + "infra/s3/api-policy.json": "ab08e1c66eeb8e872768cba5b72a2ebc2d82f31353c2ad5c5c20a88200ca1782", + "infra/s3/reconciler-policy.json": "80fc157de3beb754a713644ed213c18d1fb571f13b5c062576fc3602cd3177cc", + "lab.json": "1fd0bc0c8de97cad2bc6e574bc5d318669e99933f2ff9a0a5615fa8d384f4b5b", + "migrations/env.py": "67360cd30a7dd1295ee80b1991c773d817bc601b30cd32d88fb38769c91144f9", + "migrations/script.py.mako": "d7558dcb7ce01d3e44830898336d3027de66e5ffdb1491c0cd27f6159b021902", + "migrations/versions/001_initial.py": "72862742da825a042bb63deef80e22cbef79da8a9b0f369644c344211c8a5a87", + "migrations/versions/002_redis_sessions.py": "5bdd751818e8577f81cbb96cd28031b569f62afff43ee72660f980bc0ee7614a", + "migrations/versions/003_admin.py": "24fcc923b12d0b68e401c7b47642563de3d5b5808821e4fefed8d69e48eb8b6d", + "migrations/versions/004_idempotency.py": "4f51289fd202cde682bf1256f9f4bfc2f17c35fc00ada7d1c4bf36182968e9b9", + "migrations/versions/005_message_unicode.py": "0851e4ae1e4d3ca8e11b00cb7714827c0de1651d9bb49cd2bfb4525cd1f2c999", + "migrations/versions/006_unicode_names.py": "fb087985717e280b7b6f67348e9cd8abb9c193ab759cff23a6e5628ecd2818ac", + "migrations/versions/007_attachments.py": "c4936a499313cd22f32fac9538d5892cfe2f2eb49aa8427d54dc72b73c7b5a7c", + "migrations/versions/008_reconciliation.py": "84fd1650ee4338c57f68328221cb82c9e75b69c52512b58907be9660677a3963", + "pyproject.toml": "a97aafb1fe0db23b2f66ad5a354b13b75f86b0aeeedd91bc3254967ddf0f0f71", + "requirements-dev.txt": "ff726d128963d3df8620a8a658387290350642ca22444c367d25dd4ccc988a92", + "requirements.txt": "977716fbc3ee1b11681500aa61cf1d561ec1d4267a1f2c35dbbed8bdcf7493e0", + "scripts/audit-dependencies.py": "39b53062b565610b531f0c7aa46842db5fc742097eddcd0bd9d25c3837c208fc", + "scripts/audit-lab3.py": "4c6cba35b5795453477ce68b1e29d35b12e981c03ff8c7be1d7d28bd9a5eb062", + "scripts/benchmark.py": "d93a933bea29400700c1ad9825929a7031406134eeffe704b7b615844549b5f5", + "scripts/check_contract.py": "7c4402c2a6ab80d3b4676e1866d6ecc87b6daea14c080bcb9be9a7e8b959d671", + "scripts/edge-audit-lab3.py": "23414eb0c2c718c942fd49380382aeb9272770bc592518be101a439c35e60216", + "scripts/export-submission.py": "d4fb68cec4680b98d1eba63873b49f7ea9c79a2b4d6d429b21837175cf96f472", + "scripts/final-checks-lab3.py": "beb2dcb18b989b8d7269b118165c2f85721412c84af3136bee7a09899a7f8558", + "scripts/haproxy.py": "6491aecbcd7f3720cde4bdd616230a8ec3a9d081d9eff3793da34e98cf332834", + "scripts/plot-lab3.py": "446426926111688c223e651f30118f9db78baac66705ed8f28b56ace5ce48352", + "scripts/plot-lab4.py": "feec49b550721bed42642edb52e1f83bbcf56d986eb051af7f0248307e6fbb9f", + "scripts/replicas.py": "ac0ba64e73cdd06957b1c8bdba5b691192cc7b261ee54f67555220f387519f21", + "scripts/research-lab3.py": "58b2aa7d7467c8d2d9bbd533a2888ea6703017ee6243b04de3f413dec47cff53", + "scripts/restart.example.sh": "0328246ba75defbced992104e986fde973f63e3830d83251eced5953263e944b", + "scripts/restart.sh": "f4bca13c78ddffbd03211b12e12d9d514e9caef750ba191dca10557e36500e93", + "scripts/review-lab3.py": "2d0b1160e448c3a8bfe9905e5d3f6f7b1683cf82d7a33e1a2f0d20267ddf12fd", + "scripts/rolling-update.py": "bb151cab072bd678e27c7152f6048f5647d1170f42dce8a2d683aa7e13517696", + "scripts/setup-env.py": "a966f0e359b1c754879cfedef2ec7408c3c6582c9631dbf4009fccbda5560239", + "scripts/stop-one.example.sh": "1bcf34394520b89d95b7605ec56675be799eea920e83cfbba306d5dc0a6d9811", + "scripts/stop-one.py": "8f14d78e99f1b86529a5e23278a33eeb7199acc77ddc529b012a38f9d6e782bc", + "scripts/stop-one.sh": "81a4e83f4daf989005e19d55d2f64c6079cfdc0d674acc4aa54e3317f66ff8d8", + "scripts/test-clean-lab3.py": "63c806eafee190008eb27dd0ec7fc0d6c18aa57614eea419fd7ee2e7eb18e96a", + "scripts/test-clean-lab4.py": "c605bfbea6e0efa464c449b2446be572078133b4428845399b462f43b2979285", + "scripts/test-expiry.sh": "657bd7b3c757d1a51ad60a3e1590c11d73e40cd098319c0d841f68345806a080", + "scripts/test-persistence.py": "699920fc23bf17f0db148f82be30d11edaff2ee9078643748383d5ba61169681", + "scripts/test-reconciliation.sh": "f61b07c5553f84b59fffceab236bf6b600aea02ec7e14f843b77868e464ee96d", + "scripts/test-upload-memory.sh": "cf4b1049c6e8b3602c2ba3b96977b6f1e193e9cb9437475d6a027b840013750c", + "scripts/validate_openapi.py": "4e981acbfc10dac58817bf922d5896e996798551fedc1b2385130e1cddb13d54", + "scripts/verify-lab3.py": "daaeb8d2a49aeeb7c32fbde4c192f98882b8fec9ae665e7028a7c0350a597db8", + "scripts/verify-lab4.py": "fce5836c17c7e6ba3cdff8a9471c25d9bb45ff09b18f38c4dbb4be251dac941f", + "src/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/__main__.py": "b1b472fa858b203911db455eb5c25965b961510985ec4d2c94f627d378aaa9f8", + "src/api/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/api/dependencies.py": "73c3f94d7c14d6c34031214933340124ebc4e22730b2b1bf8a2eb89a0d42e986", + "src/api/router.py": "4ac01f4ab0e646e0782c760a29fe7b5caa577046eb1ae981328daa1510393915", + "src/api/v1/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/api/v1/routers/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/api/v1/routers/attachments.py": "c95476d41d5794e2dbe6d24b1ced381035d6626889b0b14def2f21485e2e6658", + "src/api/v1/routers/auth/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/api/v1/routers/auth/callback.py": "69a2cde6ac37f445e64d9afdea55437240846d158460e6fc5601ff0ce2045d2c", + "src/api/v1/routers/auth/router.py": "075648602d66bdc3497c4714d9789b2ea5661501478b05ba845b65c55a725fd8", + "src/api/v1/routers/auth/schemas.py": "ba3345570c35b8a9e55751202f9c8a27f7d338cfcd85b300c196a43ac03aa311", + "src/api/v1/routers/chats/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/api/v1/routers/chats/router.py": "85cac2d5ade6917c99e4e6a82053f681e1d253eca4fe3eee726e9f7621635bce", + "src/api/v1/routers/chats/schemas.py": "00e0fc283069cca6c7929ef8d704aa1e577e6bfb555a496eb1b8170231c3b240", + "src/api/v1/routers/messages/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/api/v1/routers/messages/router.py": "88f020fc60fdbf00f574308aa7b811416e308588fad27ff78ccc0f3d3b77f032", + "src/api/v1/routers/messages/schemas.py": "fa82dfb70f2f8f344c3e3577a8df4e5e365241ddcc9f2bcd43021ab952a40316", + "src/api/v1/routers/users/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/api/v1/routers/users/router.py": "fedd9cb7da2fb21caccd8ae2080d013719b4f13382dc795de880fb8ca87f857f", + "src/api/v1/routers/users/schemas.py": "c30356333a3f6bd1b80b8cf6f4208d550201adfaaa0667e1db074c4aecc70dd7", + "src/api/v1/schemas.py": "403d5821588d8abcc33a285cd2689be5eba0e7ab0373d1e17856ff0464934766", + "src/core/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/core/cache.py": "1973038f948f2eff50b18ba9c0ea3aa1eedd712932a41045ba6dd18dee358966", + "src/core/callback.py": "9046a504d8324a32e428ff8f4d159d452160828d470e3205400473394d380fee", + "src/core/db/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/core/db/models.py": "3f9293b6a34334a7d9256c5666dfd050264be44589bde49628ec677312c9abee", + "src/core/db/repo/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/core/db/repo/auth.py": "63fb17b55cf05a4b05c5f0b08d3e4f6dc6c83981c7f9d89a0d798b0d270283f2", + "src/core/db/repo/chat.py": "fa1042b689e1e2242360d1432ca84ca49f35a6a2de03810135907333466e76fd", + "src/core/db/repo/message.py": "0d5610e60e516ac5cd87e4486605f0665b6394cacd2c13e2698ff314b282e3fc", + "src/core/db/repo/user.py": "f1d36be8530772e6a969687e78bc7bb9bfe7daf8be67d1e079acb1e6c9d7017b", + "src/core/db/session.py": "9d4c07446ccc0990843c7f978c487a9976f9d926bf1e69a57f88021f742c7c5f", + "src/core/db/types.py": "1e8890cfa43c31ce77ce0c95f0a8a535d0730835db16f33b086226bb189ad7aa", + "src/core/errors.py": "5f93764110b969832766be8a6302515edf2eecc44de4d43c4d350c9c20d31432", + "src/core/pagination.py": "3e1c7e5232dc27688f20c622f312ea10d5ce45e9d3960a4c1b61af3e885079c6", + "src/core/readiness.py": "4064b105e7157e5dfbf3591983e3d6cbf27daf418b764f9ea2ee5f3140772ee1", + "src/core/request_deadline.py": "908433803b2238b9b9bd004a5ca74010a05ee60fcb68b80f589bb3c7e1e3044a", + "src/core/request_limits.py": "69ce991f604b8c6f6a225c1f3c09002402c680ce89b2146fdedf5b816c7f836b", + "src/core/security.py": "64d6769b36090ab2824f19668f99d23669f838e82d6a785636c339b7c1876663", + "src/core/session_store.py": "874b3ffa5b52b5b6a4587dc785784f41b6958d1b3be5a6a62470623f2182a6c1", + "src/core/settings.py": "5a96b4a95d558982d4f7806b8957aa7b660ad899dc080a02f3a637b4e9a301e0", + "src/core/storage.py": "80b361c08a078574fa8204ddbda4b3806ccef9921d0744ba12c1bac4f6331d13", + "src/core/storage_bootstrap.py": "ea4ec70f9a3001c7c84f22bd414a2ad7e82866dc32de7a2ad02d0c5e2b1a5d39", + "src/core/upload_coordination.py": "9ee87e7cf79cad25af1e9454c7997f5d9312f1f978301ce801ef1596a7effe48", + "src/main.py": "8d3aae82b2a74a859ecd0d71bfe30dff85ea44e98d3aa1fedadaed0b41b2eba9", + "src/maintenance/__init__.py": "bd9fc4293e0380e6b62c869dfa75a798f83090c85490c9e6b42df87e8d344b71", + "src/maintenance/reconcile.py": "619a56167f1f72b7a3912be6d0e0a6d1453c1b27e775561515550de4e3f106e7", + "src/service/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/service/attachment.py": "d96e09f9a2419f0ffa1047a539297361241debf06bfe0964ed4a12a318c5b025", + "src/service/auth.py": "c979b1bdf157d7468ec584093e56a16abbb6b3fb25da0a1cce6eecac792db5ce", + "src/service/chat.py": "baa2b0eb570fa0965a0e4b929313ecb1c96464997b592872f4ed193e22c48489", + "src/service/dto.py": "c44fdd911f063348efff8471277d8dcb0ffaf91672e139ad1d97c5140b813a29", + "src/service/exceptions.py": "32a232596795b28c1ca5ebbd19ed938cc6086263ceaf476716e9ae310da9f685", + "src/service/message.py": "87ea10afea7ce0d2b666015135e052cfa58af39977965712d3ca8c940ff9e977", + "src/service/user.py": "44e561c97aff49d358e5f9ed02cfe6ae85abdd384423fe9dcc7b9b05f13f4bbb", + "tests/README.md": "e0bfa7e196797f6a5bf6e44d8ad2ffeb82651927ff5d8484eb1c2dda1ec7dec5", + "tests/attachment_failover.py": "187ccd294301c5349714cbf6b3736a3f4d261f94962397db8a0cf41bd006449e", + "tests/attachments.py": "24c3c7a8b21b7943da8edd4524de550e99b42246f8af1b31eacaff9a4acb5da8", + "tests/auth_logging.py": "775d8b0024d7a06adc4965ebc3311a105039e08dba27339f19d6611a55c505ca", + "tests/callbacks.py": "15ae31258582a1dd396c1fbba40923ad62d160cc5c7ef0a7b9316085bd407f68", + "tests/client.py": "8d50976fc7c7bbb81e88a152f613c61ab25eaf53dba33c6a9dfab19f868d546d", + "tests/database.py": "f3861a319d62e70ccd59d88a5c8eeb4f59ae35ca5b58b4f1b8c3c9da99fb432a", + "tests/dependencies.py": "10d4964c56b0ab658413f5d422c45dcd489f307c6806b17d03d492f7074cc128", + "tests/error_headers.py": "093435d8ed7a897e5dea8af23e499b78d02a52ed22a50d8bccfaf2c107e921f7", + "tests/expiry.py": "7fb2f9aa4c9ecba789e826692d0e9b00b78019dffd4d19302eb0716f881cbf31", + "tests/extra.py": "d4b0df0ed2ad3713d88ae6df5fc347317481afd5cac252c9e2fab24b3ede9914", + "tests/fixtures/README.md": "c001783760b4f87a7a8441a7ba55f5d080ff48e1397d3581d72a88d7691f96c2", + "tests/fixtures/sample.png": "99ea7533c441f79cd630d15ce4d58d1ec4e06f6f0efb3b77a5c088305cd1bd75", + "tests/idempotency_db.py": "e34287187b0e5abfef8ebe9f954fdcefc7fbb315ba99151b5179ff0fdd92665f", + "tests/image_probe.py": "a9a4f89181c8e0fda6ce42e1a1af32fb42d8e3ae519e314207127c9b9b448b13", + "tests/lab3.py": "014ceba9d8fe4360257a59ab593cff25050f7c2a653a40b441f7cc290a9fe5a4", + "tests/lab4_review.py": "11a958ed47feb016abd50bb8148fb49930603f70f6842e33b8f6b1307cf50482", + "tests/load.py": "6d3511ea719c7a7e841083e73d435c86dcbfd9f4e5c2a07d62eb9614b01d9933", + "tests/passwords.py": "8e5fbb5f5ff504c61500954335b9704f94e168b6adea57da64f69919e781e5ac", + "tests/production.py": "2d09cfe976d11b3c89c7203bb8b0eeb84b0ead6f161fc718e73bca2688383ab0", + "tests/production_limits.py": "87d751175908196af89a65c9c5a606b54c870357c30f8285d5195900f3631641", + "tests/readiness.py": "780d6f07a945bdb55c6c1c124870ca9f74a6c8349ee564ce03b0a0c82a90c865", + "tests/reconciliation.py": "28e6bbba2cc928a715262a6a8da337c194eaec7933198c2b6337deffe8bdf6eb", + "tests/regressions.py": "e04157cc3ecd4d5db234bd05584d7229e68eb6d054646e804504dd589fb45471", + "tests/request_deadline.py": "e562fe4b251f5b148730aa9ba0a0364f952e88814b714d76edff152842c55d74", + "tests/resilience.py": "1f96663a174b3978d24eff66f2741f5f8c9b788d3242261d37a972720c52788b", + "tests/settings.py": "9e798922300d6614f3805922407e79754e231b362fc4e9e5f766521c70c6aefb", + "tests/smoke.py": "52ac38eb343ff7d43e7543588e1da58ca06c9fce74b2b0d0bf0e4982bc23c1db", + "tests/upload_memory.py": "4034e1dca090d5bb642e0bc59b0527c5d758c67e21aef3b9ab8e4a6653ac496c" + } +} diff --git a/STUDENT_REPORT.md b/STUDENT_REPORT.md new file mode 100644 index 00000000..6c81be01 --- /dev/null +++ b/STUDENT_REPORT.md @@ -0,0 +1,200 @@ +# Отчёт — лабораторная 4 + +- Автор, группа: **Каменский Андрей, БПИ2301** +- Целевая оценка: **5**, трек 2 «Согласованность двух хранилищ»; обязательный минимум и уровень 4 сохранены. +- Использованы исходное задание lab4, контракт и публичные проверки предоставленного skeleton. + +## Запуск из чистого клона + +```sh +python3 scripts/setup-env.py +docker compose config --quiet +docker compose up -d --build --wait +python3 tests/smoke.py +python3 -m venv .venv +.venv/bin/python -m pip install -r requirements-student.txt +make -f student.mk verify-lab4 PYTHON=.venv/bin/python +``` + +Генератор создаёт локальный `.env` с новыми hex-паролями и правами 0600, значения +не печатает, существующий файл не перезаписывает. Для обновления сохранить прежние +пароли и volumes. Если ранее owner MinIO был записан в `S3_ACCESS_KEY_ID` / +`S3_SECRET_ACCESS_KEY`, перенести его в `MINIO_ROOT_USER` / `MINIO_ROOT_PASSWORD`, +а для API задать отдельного пользователя. Для стенда с прежними значениями по +умолчанию перенос не нужен. Уже существующий пароль администратора не меняется автоматически. + +`docker compose down` сохраняет данные. `docker compose down --volumes` — отдельная +команда осознанного удаления учебных данных; сценарии сохранности её не используют. +Clean-start удаляет только собственный UUID-проект с временными volumes. + +Версии закреплены: Python 3.13.0, PostgreSQL 16.6-bookworm, Redis 7.4.2-bookworm, +HAProxy 3.0.12-alpine, SQLAlchemy 2.0.44, asyncpg 0.30.0, Alembic 1.17.0, +minio-py 7.2.20, Pillow 13.0.0. MinIO community собирается из commit +`9e49d5e7a648f00e26f2246f4dc28e6b07f8c84a` релиза RELEASE.2025-10-15T17-29-55Z; +готовый официальный образ не требуется. Первый build занимает несколько минут. + +## Архитектура и данные + +Клиент → HAProxy → API × 2 → PostgreSQL + Redis + приватный MinIO. +Отдельный reconciler обращается к PostgreSQL и S3; bootstrap и migration — +завершающиеся задачи до запуска API. Публикуется только `127.0.0.1:8080` LB; +у API, PostgreSQL, Redis и MinIO нет опубликованных портов. Консоль S3 выключена. + +| Компонент | Назначение | Постоянные данные / права | +| --- | --- | --- | +| PostgreSQL | Пользователи, чаты, сообщения, Attachment, идемпотентность, журнал и наблюдения | postgres_data | +| Redis | Сессии с абсолютным expiry, AOF appendfsync always, кэш профиля | redis_data; TTL после рестарта не продлевается | +| MinIO | Неизменённые оригиналы PNG/JPEG | minio_data; приватный bucket messenger-attachments | +| API | Авторизация, проверка картинок, синхронный upload и авторизованный download | Get/Put своего префикса; нет удаления и администрирования S3 | +| Reconciler | Обнаружение orphan/missing и повторяемые исправления | List/Get/Delete своего bucket/prefix; нет PutObject и admin | +| Migration / bootstrap | Миграции до 008, bucket, пользователи и политики | Owner credentials только в bootstrap/MinIO | + +Обязательная основа API включает Bearer-сессии, PostgreSQL/Redis, два API за LB, X-Request-Id, +X-Instance-Id, пагинация, доступ к чатам и атомарная идемпотентность на 24 часа. +Идемпотентность теперь сравнивает текст и упорядоченный список вложений. + +Миграция 007 создаёт `attachments` и `message_attachments`, разрешает пустой текст +при вложении. Связи с чатом защищены составными FK. Позиции 0–9 с UNIQUE на сообщение +ограничивают число файлов десятью, повтор ID запрещён. Вложение можно повторно +использовать в сообщениях того же чата. Миграция 008 добавляет `upload_intents`, +`storage_findings` и внутреннюю отметку `storage_missing_since`. + +S3 object key назначает сервер, filename используется только для отображения. +API отдаёт оригинал побайтно, без redirect и перекодирования. MIME сравнивается +с определённым форматом; проверяются целостность и декодирование после раннего +лимита в 40 млн пикселей. Ограничение тела — 10 MiB, включая chunked-передачу. +Приём ограничен временем и параллелизмом; декодирование — одно на API-процесс. +Временный файл находится в tmpfs 64 MiB и закрывается после запроса. Скачивание +читает S3 порциями. Метаданные не раскрывают внутренний ключ или credentials. + +## Согласованность PostgreSQL и S3 + +До PUT отдельным COMMIT фиксируется pending-намерение. Перед PUT загрузчик берёт +транзакционный advisory lock на ключ и повторно проверяет состояние. Он удерживает +блокировку до общего COMMIT Attachment и committed-намерения. Только после этого +возвращается 201 ready. При обрыве клиента до PUT постоянного объекта ещё нет. + +Reconciler каждые 300 секунд перечисляет только наш bucket под originals/ с +пагинацией ListObjectsV2. На ключ берёт неблокирующий advisory lock: занятый +пропускается. Attachment защищает файл даже без сообщения. Старый pending без +Attachment закрывается; бесхозный объект удаляется после проверки возраста +объекта/намерения. Запас — 300 секунд, настраивается. Дополнительного ожидания +после первого обнаружения нет. + +Ошибка DELETE не фиксируется как завершённая очистка: транзакция откатывается, +объект остаётся кандидатом при следующем проходе. Потерянный ответ DELETE также +безопасен для повторного запуска. При неизвестном результате COMMIT файл немедленно +не удаляется — это мог бы быть оригинал уже подтверждённого вложения. + +Обратный проход HEAD обнаруживает Attachment без оригинала. Сообщения, связи и +метаданные сохраняются, чтение получает 503, новые ссылки — 409. Повтор уже +подтверждённого сообщения сохраняет прежний результат идемпотентности. После +восстановления файла размер и фактический SHA-256 должны совпасть. ETag не заменяет +SHA-256. Бесследное восстановление байтов из метаданных не обещается: нужна копия. + +Dry-run выполняет проверки без записей и удаления. Apply перепроверяет условия +под блокировкой; параллельные изменения учитываются. Недоступность БД/S3, AccessDenied +или потеря bucket прерывают проход, а не объявляют все файлы отсутствующими. +Алгоритм, команды и ограничения подробно описаны в `LAB4_RECONCILIATION.md`. + +## Готовность и ограничение ожидания + +Liveness проверяет процесс. Readiness проверяет схему PostgreSQL, Redis и bucket; +бюджет ответа — 2 секунды, незавершённая отмена драйвера не задерживает HTTP. +Обычные бизнес-запросы имеют бюджет 5 секунд до заголовков. Таймаут не ждёт +зависшего rollback: обработчик отменяется, его слот сохраняется до реального +завершения. Предел незавершённых обработчиков — 64 на процесс. Это ограничивает +накопление работ при замороженной БД. Upload имеет отдельный бюджет приёма 30 секунд +и суммарный предел до заголовков 45 секунд; сокеты S3 ограничены 5 секундами. + +Исправление проверено на действительно выполняющемся запросе: сначала история +удерживается SQL-блокировкой messages, наличие ожидающего SELECT подтверждается +через pg_stat_activity, затем PostgreSQL замораживается. История возвращает 503 +примерно за 5 секунд, readiness — за 2 секунды; после unpause оба восстанавливаются +без перезапуска API. Одна проверка подключения не доказывала бы этот сценарий. + +## Доказательства критериев + +| Критерий | Повторяемая проверка | Результат / доказательство | +| --- | --- | --- | +| Контракт и прежнее API | make -f student.mk check validate; tests/smoke.py | lab4-final-structure/openapi/public-smoke.txt | +| PNG/JPEG, оригинал, SHA-256, ACL и 10 вложений | tests/attachments.py | lab4-final-attachments.txt | +| Отказ принявшей файл API | tests/attachment_failover.py | lab4-final-uploader-failover.txt | +| Restart API и всех хранилищ с прежним токеном | scripts/test-persistence.py | lab4-final-persistence-proof.txt: StartedAt до/после всех работающих ролей | +| Чистый build и пустые volumes | scripts/test-clean-lab4.py | lab4-clean-start.json, lab4-final-clean-start.txt: snapshot, build, миграция 008, smoke, вложения | +| Большой/повреждённый файл, MIME, чужой чат | tests/attachments.py; tests/lab4_review.py | lab4-final-attachments/reviewer-cases.txt | +| Обрыв, ошибка S3 PUT, COMMIT и DELETE, повтор очистки | tests/reconciliation.py | lab4-final-reconciliation.txt | +| 10 одновременных загрузок, пик RAM | tests/upload_memory.py | lab4-final-upload-memory.txt | +| Приватность S3, ограниченные роли, повторяемый bootstrap | tests/reconciliation.py; clean-start | unsigned GET 403; API не удаляет/не создаёт чужой bucket; reconciler не загружает | +| Полный трек 2: orphan/missing, dry-run, свежие/занятые файлы | tests/reconciliation.py | snapshot до/после, контролируемые сбои, повторный apply | +| Стоимость обхода, включая >1000 объектов | tests/reconciliation.py | 10/100/1005 объектов, три прогона, LIST/HEAD/SQL и время | +| Замечания преподавателя и восстановление после pause | tests/lab4_review.py; tests/request_deadline.py | lab4-final-reviewer-cases/request-deadline.txt; LAB4_AUDIT.md | + +Имена файлов в таблице относятся к `evidence/`. Сводка всех команд и exit codes — +`evidence/lab4-final-summary.json`. Подробные наблюдения и исходные результаты +экспериментов — в JSON-строках соответствующих txt-файлов. + +## Исследование и результаты + +Гипотеза: журнал до PUT, единая блокировка и сверка устраняют бесхозные объекты +после частичных сбоев, сохраняя свежие и используемые файлы. Стоимость последовательного +обхода растёт примерно линейно по числу объектов. Проверки выполняются на отдельной +UUID-схеме PostgreSQL и приватном UUID-bucket; реальные данные текущего стенда не +удаляются. Используются реальные операции MinIO и аварийное завершение настоящего +кода загрузки после PUT. Дополнительно моделируются отказы БД, S3, потерянный ответ +удаления и публикация между dry-run и apply. + +Стоимость dry-run измеряется для 10/100/1005 свежих бесхозных объектов по три раза. +Это metadata-профиль: LIST и HEAD, без чтения оригиналов. Для 1005 объектов нужны +две страницы LIST. Текущая реализация делает около пяти SQL statements на бесхозный +объект; для удалённой БД это заметная стоимость. Измерения итогового прогона приведены в таблице результатов ниже. Hash-проверка восстановления дополнительно +читает исходник и учитывается отдельно. + +В опыте RAM временно допускаются пять загрузок на реплику при одном декодировании. +Две реплики принимают 10 одновременных PNG для двух размеров, затем проверяются +SHA-256 и скачанные байты. Cgroup memory.current измеряется каждые 20 мс, включая +tmpfs. После опыта восстанавливается обычный лимит одной загрузки на реплику. +Короткие пики между отсчётами могут быть пропущены; два размера не покрывают все +возможные картинки в 40 млн пикселей. Это не benchmark максимальных RPS. + +## Итоговые измерения + +Все 16 этапов `make -f student.mk verify-lab4` завершились с exit code 0. Интеграционный +набор сверки содержит 15 проверок, включая отказ DELETE до удаления +и прямой unsigned GET существующего объекта с результатом 403. + +| Объектов | Медиана 3 обходов, с | LIST | HEAD | SQL statements | +| --- | --- | --- | --- | --- | +| 10 | 0.0181 | 1 | 10 | 53 | +| 100 | 0.1559 | 1 | 100 | 503 | +| 1005 | 1.9679 | 2 | 1005 | 5028 | + +Оба профиля по 10 одновременных загрузок завершились без отказов: 20 ответов 201, +все SHA-256 и скачанные оригиналы совпали. Пики RAM: **124.71 / 128.91 MiB** +при 512 MiB на реплику. Размеры PNG: 197105 и +4923446 байт. Обычный UPLOAD_CONCURRENCY=1 восстановлен. + +При замороженной PostgreSQL уже выполнявшаяся история вернула 503 за +**5.0988 с**, readiness — за **2.1109 с**. +После unpause восстановились 200 без рестарта API. Пустой стенд дошёл до миграции +008; API build --no-cache занял 32.829 с. Временный проект, +volumes и его теги образов удалены; действующие данные сохранены. + +![Измеренная стоимость обхода и память API](evidence/lab4-research/results.png) + +Усы на графике — min/max трёх запусков, не доверительный интервал. +Указанная RAM — максимум отсчётов, а не доказанный абсолютный пик между ними. + +## Ограничения + +Поддерживается один неверсионируемый bucket; worker отказывается работать с Enabled +или Suspended versioning. Все штатные писатели обязаны соблюдать блокировки; +прямые административные операции в S3 обходят эту координацию. Backup/restore +потерянных байтов не реализованы. PostgreSQL, Redis, MinIO, LB и Docker host остаются +едиными точками отказа. Не обещается отсутствие переходных ошибок при отказах. +Старые журнал и наблюдения пока сохраняются без автоматического сокращения истории. + +Тест чистого запуска использует полный снимок рабочего каталога, включая новые +файлы, отдельные образы и пустые volumes; API строится с --no-cache. Кэш сборки +закреплённого MinIO может использоваться. Это проверка исходников сдачи, а не +утверждение, что текущий Git HEAD уже содержит все локальные изменения. diff --git a/alembic.ini b/alembic.ini new file mode 100644 index 00000000..d3b7004f --- /dev/null +++ b/alembic.ini @@ -0,0 +1,3 @@ +[alembic] +script_location = %(here)s/migrations +prepend_sys_path = . diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 00000000..0cb102f7 --- /dev/null +++ b/compose.yaml @@ -0,0 +1,211 @@ +x-logging: &logging + driver: json-file + options: + max-size: "10m" + max-file: "3" + +x-app: &app + build: . + image: ${APP_IMAGE:-mtusi-messenger:lab4} + env_file: ${ENV_FILE:-.env} + logging: *logging + +services: + minio: + build: ./infra/minio + image: ${MINIO_IMAGE:-mtusi-minio:RELEASE.2025-10-15T17-29-55Z} + logging: *logging + mem_limit: 512m + cpus: 1.0 + environment: + MINIO_ROOT_USER: ${MINIO_ROOT_USER:-messenger} + MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-local-messenger-s3-password} + MINIO_BROWSER: "off" + MINIO_API_STALE_UPLOADS_EXPIRY: "24h" + MINIO_API_STALE_UPLOADS_CLEANUP_INTERVAL: "1h" + volumes: + - minio_data:/data + healthcheck: + test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:9000/minio/health/live"] + interval: 2s + timeout: 3s + retries: 60 + start_period: 10s + + s3-bootstrap: + <<: *app + command: ["python", "-m", "src.core.storage_bootstrap"] + environment: + MINIO_ROOT_USER: ${MINIO_ROOT_USER:-messenger} + MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-local-messenger-s3-password} + S3_RECONCILE_ACCESS_KEY_ID: ${S3_RECONCILE_ACCESS_KEY_ID:-messenger-reconciler} + S3_RECONCILE_SECRET_ACCESS_KEY: ${S3_RECONCILE_SECRET_ACCESS_KEY:-local-messenger-reconciler-password} + DATABASE_URL: postgresql://unused:unused@postgres/unused + REDIS_URL: redis://redis:6379/0 + S3_ENDPOINT: http://minio:9000 + S3_BUCKET: ${S3_BUCKET:-messenger-attachments} + S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-messenger-api} + S3_SECRET_ACCESS_KEY: ${S3_SECRET_ACCESS_KEY:-local-messenger-api-password} + depends_on: + minio: + condition: service_healthy + healthcheck: + disable: true + + postgres: + logging: *logging + image: postgres:16.6-bookworm + cpus: ${POSTGRES_CPUS:-1.0} + mem_limit: 512m + environment: + POSTGRES_DB: ${POSTGRES_DB:-messenger} + POSTGRES_USER: ${POSTGRES_USER:-messenger} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?Задай POSTGRES_PASSWORD в .env} + volumes: + - postgres_data:/var/lib/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"] + interval: 2s + timeout: 3s + retries: 30 + + redis: + logging: *logging + image: redis:7.4.2-bookworm + cpus: 0.25 + mem_limit: 128m + command: ["redis-server", "--appendonly", "yes", "--appendfsync", "always", "--maxmemory", "64mb", "--maxmemory-policy", "noeviction"] + volumes: + - redis_data:/data + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 2s + timeout: 3s + retries: 30 + + migration: + <<: *app + command: ["alembic", "upgrade", "head"] + cpus: 0.5 + mem_limit: 256m + environment: + # Schema migrations do not access S3 or administer MinIO. + MINIO_ROOT_USER: "" + MINIO_ROOT_PASSWORD: "" + S3_ACCESS_KEY_ID: "" + S3_SECRET_ACCESS_KEY: "" + S3_RECONCILE_ACCESS_KEY_ID: "" + S3_RECONCILE_SECRET_ACCESS_KEY: "" + REDIS_URL: &redis_url redis://redis:6379/0 + DATABASE_URL: &database_url postgresql://${POSTGRES_USER:-messenger}:${POSTGRES_PASSWORD:?Задай POSTGRES_PASSWORD в .env}@postgres:5432/${POSTGRES_DB:-messenger} + depends_on: + postgres: + condition: service_healthy + healthcheck: + disable: true + + api: + <<: *app + cpus: ${API_CPUS:-0.5} + mem_limit: ${API_MEMORY:-512m} + stop_grace_period: 15s + deploy: + replicas: ${API_REPLICAS:-2} + read_only: true + tmpfs: + - /tmp:rw,noexec,nosuid,size=64m + cap_drop: [ALL] + security_opt: ["no-new-privileges:true"] + environment: + S3_ENDPOINT: http://minio:9000 + S3_BUCKET: ${S3_BUCKET:-messenger-attachments} + S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-messenger-api} + S3_SECRET_ACCESS_KEY: ${S3_SECRET_ACCESS_KEY:-local-messenger-api-password} + # Do not inherit privileged S3 credentials from env_file into API containers. + MINIO_ROOT_USER: "" + MINIO_ROOT_PASSWORD: "" + S3_RECONCILE_ACCESS_KEY_ID: "" + S3_RECONCILE_SECRET_ACCESS_KEY: "" + UPLOAD_CONCURRENCY: ${UPLOAD_CONCURRENCY:-1} + APP_HOST: 0.0.0.0 + APP_PORT: 8080 + DATABASE_URL: *database_url + REDIS_URL: *redis_url + SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-3600} + LOG_LEVEL: ${LOG_LEVEL:-INFO} + APP_WORKERS: 1 + DATABASE_POOL_SIZE: ${DATABASE_POOL_SIZE:-10} + DATABASE_POOL_TIMEOUT_SECONDS: 2 + DATABASE_CONNECT_TIMEOUT_SECONDS: 1 + DATABASE_COMMAND_TIMEOUT_SECONDS: 3 + DATABASE_STATEMENT_TIMEOUT_MS: 2500 + SHUTDOWN_TIMEOUT_SECONDS: 10 + HTTP_REQUEST_TIMEOUT_SECONDS: ${HTTP_REQUEST_TIMEOUT_SECONDS:-5} + expose: ["8080"] + depends_on: + s3-bootstrap: + condition: service_completed_successfully + migration: + condition: service_completed_successfully + redis: + condition: service_healthy + healthcheck: + interval: 2s + timeout: 3s + retries: 30 + start_period: 10s + + reconciler: + <<: *app + command: ["python", "-m", "src.maintenance.reconcile", "--apply", "--interval", "300"] + mem_limit: 256m + cpus: 0.5 + read_only: true + cap_drop: [ALL] + security_opt: ["no-new-privileges:true"] + environment: + DATABASE_URL: *database_url + REDIS_URL: *redis_url + S3_ENDPOINT: http://minio:9000 + S3_BUCKET: ${S3_BUCKET:-messenger-attachments} + S3_RECONCILE_ACCESS_KEY_ID: ${S3_RECONCILE_ACCESS_KEY_ID:-messenger-reconciler} + S3_RECONCILE_SECRET_ACCESS_KEY: ${S3_RECONCILE_SECRET_ACCESS_KEY:-local-messenger-reconciler-password} + RECONCILE_GRACE_SECONDS: ${RECONCILE_GRACE_SECONDS:-300} + MINIO_ROOT_USER: "" + MINIO_ROOT_PASSWORD: "" + S3_ACCESS_KEY_ID: "" + S3_SECRET_ACCESS_KEY: "" + depends_on: + migration: + condition: service_completed_successfully + s3-bootstrap: + condition: service_completed_successfully + healthcheck: + test: ["CMD", "python", "-c", "import os; os.kill(1, 0)"] + interval: 10s + timeout: 3s + retries: 3 + start_period: 2s + + lb: + image: haproxy:3.0.12-alpine + logging: *logging + cpus: 0.5 + mem_limit: 128m + read_only: true + tmpfs: ["/tmp:rw,noexec,nosuid,size=4m"] + security_opt: ["no-new-privileges:true"] + ports: + - "127.0.0.1:${APP_PORT:-8080}:8080" + volumes: + - ./infra/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro + depends_on: + api: + condition: service_healthy + stop_signal: SIGUSR1 + stop_grace_period: 15s + +volumes: + redis_data: + postgres_data: + minio_data: diff --git a/evidence/lab4-clean-start.json b/evidence/lab4-clean-start.json new file mode 100644 index 00000000..dd1b1b7c --- /dev/null +++ b/evidence/lab4-clean-start.json @@ -0,0 +1,250 @@ +{ + "project": "lab4-clean-81041e6e", + "empty_volumes": true, + "source": "complete working snapshot including new files", + "build_cache": "API rebuilt with --no-cache; pinned MinIO build may use BuildKit cache", + "api_build": { + "seconds": 51.866, + "exit_code": 0 + }, + "minio_build": { + "seconds": 1.964, + "exit_code": 0 + }, + "schema_revision": "008", + "public_smoke": "PASS: lab4 public API scenario; infrastructure and grading evidence remain separate.", + "attachments": "PASS: PNG/JPEG bytes, metadata, ACL, chat boundaries, limits and idempotency", + "reconciler": { + "mode": "dry-run", + "bucket": "messenger-attachments", + "prefix": "originals/", + "grace_seconds": 300.0, + "counts": { + "objects_scanned": 11, + "protected_referenced": 11, + "attachments_scanned": 11, + "healthy": 11 + }, + "samples": [ + { + "action": "protected_referenced", + "object_key": "originals/0998d02e-da4c-4840-b0d7-3b823469000e" + }, + { + "action": "protected_referenced", + "object_key": "originals/0afe9186-dab8-458d-8013-1c1d8d79e613" + }, + { + "action": "protected_referenced", + "object_key": "originals/1390631b-9a1c-4dc8-b9c8-35762269ddad" + }, + { + "action": "protected_referenced", + "object_key": "originals/6e863904-e4e8-439d-94d5-520d88e0042a" + }, + { + "action": "protected_referenced", + "object_key": "originals/7b5c868c-4fc8-4268-a7b3-ef7fbffdcc3f" + }, + { + "action": "protected_referenced", + "object_key": "originals/7f672038-98bb-490b-8649-15ad9bd9ae88" + }, + { + "action": "protected_referenced", + "object_key": "originals/ab226893-27e5-45bc-a72a-0fcced3191af" + }, + { + "action": "protected_referenced", + "object_key": "originals/b95724e7-9ca4-4d11-9763-cb80b2ada04a" + }, + { + "action": "protected_referenced", + "object_key": "originals/d1be5f8e-a73a-4620-b333-e30f44f4c368" + }, + { + "action": "protected_referenced", + "object_key": "originals/d738c9d2-b106-4c92-862f-330f26f81150" + }, + { + "action": "protected_referenced", + "object_key": "originals/e0a838a7-d602-453c-a4d3-19944bd0e213" + }, + { + "action": "healthy", + "object_key": "originals/0998d02e-da4c-4840-b0d7-3b823469000e" + }, + { + "action": "healthy", + "object_key": "originals/0afe9186-dab8-458d-8013-1c1d8d79e613" + }, + { + "action": "healthy", + "object_key": "originals/1390631b-9a1c-4dc8-b9c8-35762269ddad" + }, + { + "action": "healthy", + "object_key": "originals/6e863904-e4e8-439d-94d5-520d88e0042a" + }, + { + "action": "healthy", + "object_key": "originals/7b5c868c-4fc8-4268-a7b3-ef7fbffdcc3f" + }, + { + "action": "healthy", + "object_key": "originals/7f672038-98bb-490b-8649-15ad9bd9ae88" + }, + { + "action": "healthy", + "object_key": "originals/ab226893-27e5-45bc-a72a-0fcced3191af" + }, + { + "action": "healthy", + "object_key": "originals/b95724e7-9ca4-4d11-9763-cb80b2ada04a" + }, + { + "action": "healthy", + "object_key": "originals/d1be5f8e-a73a-4620-b333-e30f44f4c368" + }, + { + "action": "healthy", + "object_key": "originals/d738c9d2-b106-4c92-862f-330f26f81150" + }, + { + "action": "healthy", + "object_key": "originals/e0a838a7-d602-453c-a4d3-19944bd0e213" + } + ], + "content_bytes_read": 0, + "result": "ok", + "elapsed_seconds": 0.126615, + "db_statements": 70, + "s3_requests": { + "VERSIONING": 1, + "LIST": 1, + "HEAD": 11 + }, + "process_peak_rss_kib": 79372 + }, + "services": [ + { + "service": "api", + "state": "running", + "health": "healthy" + }, + { + "service": "api", + "state": "running", + "health": "healthy" + }, + { + "service": "lb", + "state": "running", + "health": "" + }, + { + "service": "minio", + "state": "running", + "health": "healthy" + }, + { + "service": "postgres", + "state": "running", + "health": "healthy" + }, + { + "service": "reconciler", + "state": "running", + "health": "healthy" + }, + { + "service": "redis", + "state": "running", + "health": "healthy" + } + ], + "code_manifest": { + "Dockerfile.dockerignore": "62c0534ad74d9f0e2982e97d1fbadb66d80c493ed237df5bcb9fbb797062eb38", + "requirements-student.txt": "83af5551944a4384b3afd4e2a663cf7329a5bc952ad748a5379018509b9298d4", + "student.env.example": "08edfd4f68f801cd8db6000dfa040f9be7ff10a11c6bbdf7544f6c996fc2f909", + "student.mk": "dea22dba57c5a474576ea6d7c4fe6e4e13e2d8b4baf0c5ec82b227d5aba47780", + "Dockerfile": "f6d3a539fd5b0787c366c76dc0e02086857eb465790bcaa599ab7a36ea2f5c35", + "alembic.ini": "024bf3fe092ea4f8e6bb6309cba89e67b53bada366dee6859339297f090fdda1", + "compose.yaml": "86f40a2b6485fd9ba18b33171d7cd1c99e36b9b5e2e1ac0409e2aabd45af0793", + "infra/README.md": "0e804fa51debba4c38d3cc84abf4704897665e0335b272060363f03aadd6354f", + "infra/haproxy.cfg": "6640795207cee655e5c22d685d73b2a57ae1a987156783ad5226d57d7ed6d59c", + "infra/minio/Dockerfile": "632a16d3468aa0290a0dcb69cdbdba7a8827ada9ab56d5b9903d1ba8eaf182d7", + "infra/s3/api-policy.json": "ab08e1c66eeb8e872768cba5b72a2ebc2d82f31353c2ad5c5c20a88200ca1782", + "infra/s3/reconciler-policy.json": "80fc157de3beb754a713644ed213c18d1fb571f13b5c062576fc3602cd3177cc", + "migrations/env.py": "67360cd30a7dd1295ee80b1991c773d817bc601b30cd32d88fb38769c91144f9", + "migrations/script.py.mako": "d7558dcb7ce01d3e44830898336d3027de66e5ffdb1491c0cd27f6159b021902", + "migrations/versions/001_initial.py": "72862742da825a042bb63deef80e22cbef79da8a9b0f369644c344211c8a5a87", + "migrations/versions/002_redis_sessions.py": "5bdd751818e8577f81cbb96cd28031b569f62afff43ee72660f980bc0ee7614a", + "migrations/versions/003_admin.py": "24fcc923b12d0b68e401c7b47642563de3d5b5808821e4fefed8d69e48eb8b6d", + "migrations/versions/004_idempotency.py": "4f51289fd202cde682bf1256f9f4bfc2f17c35fc00ada7d1c4bf36182968e9b9", + "migrations/versions/005_message_unicode.py": "0851e4ae1e4d3ca8e11b00cb7714827c0de1651d9bb49cd2bfb4525cd1f2c999", + "migrations/versions/006_unicode_names.py": "fb087985717e280b7b6f67348e9cd8abb9c193ab759cff23a6e5628ecd2818ac", + "migrations/versions/007_attachments.py": "c4936a499313cd22f32fac9538d5892cfe2f2eb49aa8427d54dc72b73c7b5a7c", + "migrations/versions/008_reconciliation.py": "84fd1650ee4338c57f68328221cb82c9e75b69c52512b58907be9660677a3963", + "requirements.txt": "977716fbc3ee1b11681500aa61cf1d561ec1d4267a1f2c35dbbed8bdcf7493e0", + "src/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/__main__.py": "b1b472fa858b203911db455eb5c25965b961510985ec4d2c94f627d378aaa9f8", + "src/api/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/api/dependencies.py": "73c3f94d7c14d6c34031214933340124ebc4e22730b2b1bf8a2eb89a0d42e986", + "src/api/router.py": "4ac01f4ab0e646e0782c760a29fe7b5caa577046eb1ae981328daa1510393915", + "src/api/v1/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/api/v1/routers/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/api/v1/routers/attachments.py": "c95476d41d5794e2dbe6d24b1ced381035d6626889b0b14def2f21485e2e6658", + "src/api/v1/routers/auth/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/api/v1/routers/auth/callback.py": "69a2cde6ac37f445e64d9afdea55437240846d158460e6fc5601ff0ce2045d2c", + "src/api/v1/routers/auth/router.py": "075648602d66bdc3497c4714d9789b2ea5661501478b05ba845b65c55a725fd8", + "src/api/v1/routers/auth/schemas.py": "ba3345570c35b8a9e55751202f9c8a27f7d338cfcd85b300c196a43ac03aa311", + "src/api/v1/routers/chats/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/api/v1/routers/chats/router.py": "85cac2d5ade6917c99e4e6a82053f681e1d253eca4fe3eee726e9f7621635bce", + "src/api/v1/routers/chats/schemas.py": "00e0fc283069cca6c7929ef8d704aa1e577e6bfb555a496eb1b8170231c3b240", + "src/api/v1/routers/messages/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/api/v1/routers/messages/router.py": "88f020fc60fdbf00f574308aa7b811416e308588fad27ff78ccc0f3d3b77f032", + "src/api/v1/routers/messages/schemas.py": "fa82dfb70f2f8f344c3e3577a8df4e5e365241ddcc9f2bcd43021ab952a40316", + "src/api/v1/routers/users/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/api/v1/routers/users/router.py": "fedd9cb7da2fb21caccd8ae2080d013719b4f13382dc795de880fb8ca87f857f", + "src/api/v1/routers/users/schemas.py": "c30356333a3f6bd1b80b8cf6f4208d550201adfaaa0667e1db074c4aecc70dd7", + "src/api/v1/schemas.py": "403d5821588d8abcc33a285cd2689be5eba0e7ab0373d1e17856ff0464934766", + "src/core/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/core/cache.py": "1973038f948f2eff50b18ba9c0ea3aa1eedd712932a41045ba6dd18dee358966", + "src/core/callback.py": "9046a504d8324a32e428ff8f4d159d452160828d470e3205400473394d380fee", + "src/core/db/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/core/db/models.py": "3f9293b6a34334a7d9256c5666dfd050264be44589bde49628ec677312c9abee", + "src/core/db/repo/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/core/db/repo/auth.py": "63fb17b55cf05a4b05c5f0b08d3e4f6dc6c83981c7f9d89a0d798b0d270283f2", + "src/core/db/repo/chat.py": "fa1042b689e1e2242360d1432ca84ca49f35a6a2de03810135907333466e76fd", + "src/core/db/repo/message.py": "0d5610e60e516ac5cd87e4486605f0665b6394cacd2c13e2698ff314b282e3fc", + "src/core/db/repo/user.py": "f1d36be8530772e6a969687e78bc7bb9bfe7daf8be67d1e079acb1e6c9d7017b", + "src/core/db/session.py": "9d4c07446ccc0990843c7f978c487a9976f9d926bf1e69a57f88021f742c7c5f", + "src/core/db/types.py": "1e8890cfa43c31ce77ce0c95f0a8a535d0730835db16f33b086226bb189ad7aa", + "src/core/errors.py": "5f93764110b969832766be8a6302515edf2eecc44de4d43c4d350c9c20d31432", + "src/core/pagination.py": "3e1c7e5232dc27688f20c622f312ea10d5ce45e9d3960a4c1b61af3e885079c6", + "src/core/readiness.py": "4064b105e7157e5dfbf3591983e3d6cbf27daf418b764f9ea2ee5f3140772ee1", + "src/core/request_deadline.py": "908433803b2238b9b9bd004a5ca74010a05ee60fcb68b80f589bb3c7e1e3044a", + "src/core/request_limits.py": "69ce991f604b8c6f6a225c1f3c09002402c680ce89b2146fdedf5b816c7f836b", + "src/core/security.py": "64d6769b36090ab2824f19668f99d23669f838e82d6a785636c339b7c1876663", + "src/core/session_store.py": "874b3ffa5b52b5b6a4587dc785784f41b6958d1b3be5a6a62470623f2182a6c1", + "src/core/settings.py": "5a96b4a95d558982d4f7806b8957aa7b660ad899dc080a02f3a637b4e9a301e0", + "src/core/storage.py": "80b361c08a078574fa8204ddbda4b3806ccef9921d0744ba12c1bac4f6331d13", + "src/core/storage_bootstrap.py": "ea4ec70f9a3001c7c84f22bd414a2ad7e82866dc32de7a2ad02d0c5e2b1a5d39", + "src/core/upload_coordination.py": "9ee87e7cf79cad25af1e9454c7997f5d9312f1f978301ce801ef1596a7effe48", + "src/main.py": "8d3aae82b2a74a859ecd0d71bfe30dff85ea44e98d3aa1fedadaed0b41b2eba9", + "src/maintenance/__init__.py": "bd9fc4293e0380e6b62c869dfa75a798f83090c85490c9e6b42df87e8d344b71", + "src/maintenance/reconcile.py": "619a56167f1f72b7a3912be6d0e0a6d1453c1b27e775561515550de4e3f106e7", + "src/service/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/service/attachment.py": "d96e09f9a2419f0ffa1047a539297361241debf06bfe0964ed4a12a318c5b025", + "src/service/auth.py": "c979b1bdf157d7468ec584093e56a16abbb6b3fb25da0a1cce6eecac792db5ce", + "src/service/chat.py": "baa2b0eb570fa0965a0e4b929313ecb1c96464997b592872f4ed193e22c48489", + "src/service/dto.py": "c44fdd911f063348efff8471277d8dcb0ffaf91672e139ad1d97c5140b813a29", + "src/service/exceptions.py": "32a232596795b28c1ca5ebbd19ed938cc6086263ceaf476716e9ae310da9f685", + "src/service/message.py": "87ea10afea7ce0d2b666015135e052cfa58af39977965712d3ca8c940ff9e977", + "src/service/user.py": "44e561c97aff49d358e5f9ed02cfe6ae85abdd384423fe9dcc7b9b05f13f4bbb" + }, + "result": "PASS", + "temporary_project_and_volumes_removed": true, + "temporary_image_tags_removed": true +} diff --git a/evidence/lab4-final-attachments.txt b/evidence/lab4-final-attachments.txt new file mode 100644 index 00000000..426876b8 --- /dev/null +++ b/evidence/lab4-final-attachments.txt @@ -0,0 +1 @@ +PASS: PNG/JPEG bytes, metadata, ACL, chat boundaries, limits and idempotency diff --git a/evidence/lab4-final-clean-start.txt b/evidence/lab4-final-clean-start.txt new file mode 100644 index 00000000..3388de14 --- /dev/null +++ b/evidence/lab4-final-clean-start.txt @@ -0,0 +1,169 @@ +{ + "project": "lab4-clean-81041e6e", + "empty_volumes": true, + "source": "complete working snapshot including new files", + "build_cache": "API rebuilt with --no-cache; pinned MinIO build may use BuildKit cache", + "api_build": { + "seconds": 51.866, + "exit_code": 0 + }, + "minio_build": { + "seconds": 1.964, + "exit_code": 0 + }, + "schema_revision": "008", + "public_smoke": "PASS: lab4 public API scenario; infrastructure and grading evidence remain separate.", + "attachments": "PASS: PNG/JPEG bytes, metadata, ACL, chat boundaries, limits and idempotency", + "reconciler": { + "mode": "dry-run", + "bucket": "messenger-attachments", + "prefix": "originals/", + "grace_seconds": 300.0, + "counts": { + "objects_scanned": 11, + "protected_referenced": 11, + "attachments_scanned": 11, + "healthy": 11 + }, + "samples": [ + { + "action": "protected_referenced", + "object_key": "originals/0998d02e-da4c-4840-b0d7-3b823469000e" + }, + { + "action": "protected_referenced", + "object_key": "originals/0afe9186-dab8-458d-8013-1c1d8d79e613" + }, + { + "action": "protected_referenced", + "object_key": "originals/1390631b-9a1c-4dc8-b9c8-35762269ddad" + }, + { + "action": "protected_referenced", + "object_key": "originals/6e863904-e4e8-439d-94d5-520d88e0042a" + }, + { + "action": "protected_referenced", + "object_key": "originals/7b5c868c-4fc8-4268-a7b3-ef7fbffdcc3f" + }, + { + "action": "protected_referenced", + "object_key": "originals/7f672038-98bb-490b-8649-15ad9bd9ae88" + }, + { + "action": "protected_referenced", + "object_key": "originals/ab226893-27e5-45bc-a72a-0fcced3191af" + }, + { + "action": "protected_referenced", + "object_key": "originals/b95724e7-9ca4-4d11-9763-cb80b2ada04a" + }, + { + "action": "protected_referenced", + "object_key": "originals/d1be5f8e-a73a-4620-b333-e30f44f4c368" + }, + { + "action": "protected_referenced", + "object_key": "originals/d738c9d2-b106-4c92-862f-330f26f81150" + }, + { + "action": "protected_referenced", + "object_key": "originals/e0a838a7-d602-453c-a4d3-19944bd0e213" + }, + { + "action": "healthy", + "object_key": "originals/0998d02e-da4c-4840-b0d7-3b823469000e" + }, + { + "action": "healthy", + "object_key": "originals/0afe9186-dab8-458d-8013-1c1d8d79e613" + }, + { + "action": "healthy", + "object_key": "originals/1390631b-9a1c-4dc8-b9c8-35762269ddad" + }, + { + "action": "healthy", + "object_key": "originals/6e863904-e4e8-439d-94d5-520d88e0042a" + }, + { + "action": "healthy", + "object_key": "originals/7b5c868c-4fc8-4268-a7b3-ef7fbffdcc3f" + }, + { + "action": "healthy", + "object_key": "originals/7f672038-98bb-490b-8649-15ad9bd9ae88" + }, + { + "action": "healthy", + "object_key": "originals/ab226893-27e5-45bc-a72a-0fcced3191af" + }, + { + "action": "healthy", + "object_key": "originals/b95724e7-9ca4-4d11-9763-cb80b2ada04a" + }, + { + "action": "healthy", + "object_key": "originals/d1be5f8e-a73a-4620-b333-e30f44f4c368" + }, + { + "action": "healthy", + "object_key": "originals/d738c9d2-b106-4c92-862f-330f26f81150" + }, + { + "action": "healthy", + "object_key": "originals/e0a838a7-d602-453c-a4d3-19944bd0e213" + } + ], + "content_bytes_read": 0, + "result": "ok", + "elapsed_seconds": 0.126615, + "db_statements": 70, + "s3_requests": { + "VERSIONING": 1, + "LIST": 1, + "HEAD": 11 + }, + "process_peak_rss_kib": 79372 + }, + "services": [ + { + "service": "api", + "state": "running", + "health": "healthy" + }, + { + "service": "api", + "state": "running", + "health": "healthy" + }, + { + "service": "lb", + "state": "running", + "health": "" + }, + { + "service": "minio", + "state": "running", + "health": "healthy" + }, + { + "service": "postgres", + "state": "running", + "health": "healthy" + }, + { + "service": "reconciler", + "state": "running", + "health": "healthy" + }, + { + "service": "redis", + "state": "running", + "health": "healthy" + } + ], + "result": "PASS", + "temporary_project_and_volumes_removed": true, + "temporary_image_tags_removed": true +} diff --git a/evidence/lab4-final-course-files.txt b/evidence/lab4-final-course-files.txt new file mode 100644 index 00000000..b445bb9e --- /dev/null +++ b/evidence/lab4-final-course-files.txt @@ -0,0 +1 @@ +PASS: all 34 supplied lab4 files are unchanged diff --git a/evidence/lab4-final-format.txt b/evidence/lab4-final-format.txt new file mode 100644 index 00000000..aba47add --- /dev/null +++ b/evidence/lab4-final-format.txt @@ -0,0 +1 @@ +56 files already formatted diff --git a/evidence/lab4-final-idempotency.txt b/evidence/lab4-final-idempotency.txt new file mode 100644 index 00000000..7af5f170 --- /dev/null +++ b/evidence/lab4-final-idempotency.txt @@ -0,0 +1,10 @@ +{ + "parallel_repeats": 16, + "instances": [ + "87c60c75-1a12-40b1-b894-8ebbc04b2483", + "b5f5d168-fe8b-4054-b929-c9d27e2a1b9d" + ], + "messages_created": 1, + "checks": "normalization, conflict, key scope, invalid keys, access, logout, headers", + "result": "PASS" +} diff --git a/evidence/lab4-final-openapi.txt b/evidence/lab4-final-openapi.txt new file mode 100644 index 00000000..248343ee --- /dev/null +++ b/evidence/lab4-final-openapi.txt @@ -0,0 +1 @@ +PASS: full OpenAPI 3.1 and JSON Schema validation; application NOT tested. diff --git a/evidence/lab4-final-persistence-proof.txt b/evidence/lab4-final-persistence-proof.txt new file mode 100644 index 00000000..b17fead5 --- /dev/null +++ b/evidence/lab4-final-persistence-proof.txt @@ -0,0 +1,5 @@ +ДО: {"api": {"98f0f98b0a3204072109e7ac33d23328b3690741de6d0af66504456eca9f2e87": {"StartedAt": "2026-11-12T16:32:52.949322844Z", "Pid": 72655}, "3e2f859111ee06ecf7031a1e6278444a21fe86884a8d1fd6d892c090daf084e7": {"StartedAt": "2026-11-12T16:32:40.408286672Z", "Pid": 70767}}, "postgres": {"6a69cf97a9616755a9ab550c99f331bc44c1ed0f455ad54b5b1dd791f64f6659": {"StartedAt": "2026-11-12T16:06:49.350909551Z", "Pid": 27184}}, "redis": {"a250306cb10a275ec58b8193706aecd7d807aaaeb684e0f3ef58f21728994c07": {"StartedAt": "2026-11-12T16:06:49.304222759Z", "Pid": 27105}}, "minio": {"20ccbcfbb4d4d082ff34977ce7fb6165afeb22ebceee39d7898dee1715d77735": {"StartedAt": "2026-11-12T16:06:49.326347968Z", "Pid": 27181}}, "reconciler": {"5834498f828da11f7bad5ce7a81bdf733e421476b072fcf90e0889cf63c6f2b7": {"StartedAt": "2026-11-12T16:09:50.86824801Z", "Pid": 46678}}, "lb": {"fcd305f6da7afe13c8c928b4872ae34a376057f62ce0ad902e8d49919d94306a": {"StartedAt": "2026-11-12T16:07:02.572707168Z", "Pid": 28939}}} +Executing explicit persistence hook; hook output suppressed to avoid leaking secrets. +PASS: persistence preserved confirmed data and existing session. Hook scope needs operator evidence. +ПОСЛЕ: {"api": {"0a486aee12275d60ceecaf52c53cbecd6140c14da6ee1959a5622d06842f413c": {"StartedAt": "2026-11-12T16:33:08.707126296Z", "Pid": 74888}, "1ef42d31462e8faff07675f8e603062c06cb11a939c8bc37b74ed6c854a13b42": {"StartedAt": "2026-11-12T16:33:08.631547546Z", "Pid": 74834}}, "postgres": {"6a69cf97a9616755a9ab550c99f331bc44c1ed0f455ad54b5b1dd791f64f6659": {"StartedAt": "2026-11-12T16:33:02.306663876Z", "Pid": 74002}}, "redis": {"a250306cb10a275ec58b8193706aecd7d807aaaeb684e0f3ef58f21728994c07": {"StartedAt": "2026-11-12T16:33:02.349753418Z", "Pid": 74070}}, "minio": {"20ccbcfbb4d4d082ff34977ce7fb6165afeb22ebceee39d7898dee1715d77735": {"StartedAt": "2026-11-12T16:33:02.273735376Z", "Pid": 73962}}, "reconciler": {"5834498f828da11f7bad5ce7a81bdf733e421476b072fcf90e0889cf63c6f2b7": {"StartedAt": "2026-11-12T16:33:16.106929883Z", "Pid": 75892}}, "lb": {"fcd305f6da7afe13c8c928b4872ae34a376057f62ce0ad902e8d49919d94306a": {"StartedAt": "2026-11-12T16:33:15.070868049Z", "Pid": 75711}}} +PASS: StartedAt изменился у API, PostgreSQL, Redis, MinIO, reconciler и LB; прежний токен и данные сохранены diff --git a/evidence/lab4-final-public-smoke.txt b/evidence/lab4-final-public-smoke.txt new file mode 100644 index 00000000..c554fd6f --- /dev/null +++ b/evidence/lab4-final-public-smoke.txt @@ -0,0 +1 @@ +PASS: lab4 public API scenario; infrastructure and grading evidence remain separate. diff --git a/evidence/lab4-final-quality.txt b/evidence/lab4-final-quality.txt new file mode 100644 index 00000000..1f5f344d --- /dev/null +++ b/evidence/lab4-final-quality.txt @@ -0,0 +1 @@ +All checks passed! diff --git a/evidence/lab4-final-readiness-budget.txt b/evidence/lab4-final-readiness-budget.txt new file mode 100644 index 00000000..6de23eb0 --- /dev/null +++ b/evidence/lab4-final-readiness-budget.txt @@ -0,0 +1 @@ +PASS: bounded readiness response, one pending probe, recovery after cancellation diff --git a/evidence/lab4-final-reconciliation.txt b/evidence/lab4-final-reconciliation.txt new file mode 100644 index 00000000..2a644b3c --- /dev/null +++ b/evidence/lab4-final-reconciliation.txt @@ -0,0 +1,18 @@ +{"check": "direct unsigned GET of an existing S3 object returns 403", "result": "PASS"} +{"check": "deployed API cannot delete; reconciler cannot upload; both are confined to originals/", "result": "PASS"} +{"check": "real upload atomically commits Attachment and intent; image is referenced by a message", "result": "PASS"} +{"check": "S3 PUT failure leaves an accounted pending attempt, no ready attachment", "result": "PASS"} +Метаданные загрузки не подтверждены; требуется сверка S3/БД +{"check": "DB commit failure after S3 PUT leaves a durable discoverable orphan", "result": "PASS"} +{"check": "process death after real PUT preserves intent; PostgreSQL releases the upload lock", "result": "PASS"} +{"check": "dry-run changes neither DB records nor S3 objects", "result": "PASS"} +{"check": "apply cleans old orphan/empty attempt; preserves active, fresh, referenced and late-committed objects", "result": "PASS"} +{"check": "missing original is quarantined with 503; metadata and message link survive", "result": "PASS"} +{"check": "missing content blocks new links, but confirmed idempotency replays stay intact", "result": "PASS"} +{"check": "recovery requires exact SHA-256; repeat apply is safe", "result": "PASS"} +{"check": "S3 AccessDenied and unavailable DB abort safely, without false missing/deletion", "result": "PASS"} +{"check": "lost DELETE response is repaired on repeat; no live object is affected", "result": "PASS"} +{"check": "failed S3 DELETE preserves pending; recovery retries and actually removes the orphan", "result": "PASS"} +{"experiment": "scan_cost", "runs": [{"objects": 10, "repeat": 1, "seconds": 0.0219, "s3_requests": {"LIST": 1, "HEAD": 10}, "db_statements": 53}, {"objects": 10, "repeat": 2, "seconds": 0.0174, "s3_requests": {"LIST": 1, "HEAD": 10}, "db_statements": 53}, {"objects": 10, "repeat": 3, "seconds": 0.0181, "s3_requests": {"LIST": 1, "HEAD": 10}, "db_statements": 53}, {"objects": 100, "repeat": 1, "seconds": 0.1851, "s3_requests": {"LIST": 1, "HEAD": 100}, "db_statements": 503}, {"objects": 100, "repeat": 2, "seconds": 0.2289, "s3_requests": {"LIST": 1, "HEAD": 100}, "db_statements": 503}, {"objects": 100, "repeat": 3, "seconds": 0.1565, "s3_requests": {"LIST": 1, "HEAD": 100}, "db_statements": 503}, {"objects": 1005, "repeat": 1, "seconds": 2.0142, "s3_requests": {"LIST": 2, "HEAD": 1005}, "db_statements": 5028}, {"objects": 1005, "repeat": 2, "seconds": 2.2763, "s3_requests": {"LIST": 2, "HEAD": 1005}, "db_statements": 5028}, {"objects": 1005, "repeat": 3, "seconds": 1.7439, "s3_requests": {"LIST": 2, "HEAD": 1005}, "db_statements": 5028}]} +{"check": "1005 objects cross ListObjectsV2 pagination; cost measured at 3 sizes x 3 runs", "result": "PASS"} +{"result": "PASS", "checks": ["direct unsigned GET of an existing S3 object returns 403", "deployed API cannot delete; reconciler cannot upload; both are confined to originals/", "real upload atomically commits Attachment and intent; image is referenced by a message", "S3 PUT failure leaves an accounted pending attempt, no ready attachment", "DB commit failure after S3 PUT leaves a durable discoverable orphan", "process death after real PUT preserves intent; PostgreSQL releases the upload lock", "dry-run changes neither DB records nor S3 objects", "apply cleans old orphan/empty attempt; preserves active, fresh, referenced and late-committed objects", "missing original is quarantined with 503; metadata and message link survive", "missing content blocks new links, but confirmed idempotency replays stay intact", "recovery requires exact SHA-256; repeat apply is safe", "S3 AccessDenied and unavailable DB abort safely, without false missing/deletion", "lost DELETE response is repaired on repeat; no live object is affected", "failed S3 DELETE preserves pending; recovery retries and actually removes the orphan", "1005 objects cross ListObjectsV2 pagination; cost measured at 3 sizes x 3 runs"], "isolated_resources": true} diff --git a/evidence/lab4-final-request-deadline.txt b/evidence/lab4-final-request-deadline.txt new file mode 100644 index 00000000..7ddf43a0 --- /dev/null +++ b/evidence/lab4-final-request-deadline.txt @@ -0,0 +1 @@ +PASS: bounded response before slow rollback, retained capacity, no late response, recovery diff --git a/evidence/lab4-final-reviewer-cases.txt b/evidence/lab4-final-reviewer-cases.txt new file mode 100644 index 00000000..3902b64a --- /dev/null +++ b/evidence/lab4-final-reviewer-cases.txt @@ -0,0 +1,96 @@ +{ + "result": "PASS", + "checks": [ + { + "case": "username_control_characters", + "result": "PASS", + "status": 400 + }, + { + "case": "truncated_png", + "result": "PASS", + "status": 415 + }, + { + "case": "header_only_png", + "result": "PASS", + "status": 415 + }, + { + "case": "mismatched_mime", + "result": "PASS", + "status": 415 + }, + { + "case": "DEL_filename", + "result": "PASS", + "status": 400 + }, + { + "case": "missing_filename", + "result": "PASS", + "status": 400 + }, + { + "case": "pixels", + "dimensions": [ + 8000, + 5000 + ], + "result": "PASS", + "status": 201 + }, + { + "case": "pixels", + "dimensions": [ + 8000, + 5001 + ], + "result": "PASS", + "status": 413 + }, + { + "case": "pixels", + "dimensions": [ + 20000, + 10000 + ], + "result": "PASS", + "status": 413 + }, + { + "case": "API_cannot_create_foreign_bucket", + "result": "PASS" + }, + { + "case": "S3_credentials_confined_to_intended_services", + "result": "PASS" + }, + { + "case": "client_abort_and_oversized_chunked_body", + "result": "PASS", + "oversized_status": 413, + "durable_state_unchanged": true + }, + { + "case": "PostgreSQL_frozen_after_SQL_started", + "result": "PASS", + "history": { + "status": 503, + "seconds": 5.1996, + "request_id_present": true, + "instance_id_present": true + }, + "readiness": { + "status": 503, + "seconds": 2.0638, + "request_id_present": true, + "instance_id_present": true + } + }, + { + "case": "PostgreSQL_resume_without_API_restart", + "result": "PASS" + } + ] +} diff --git a/evidence/lab4-final-run.txt b/evidence/lab4-final-run.txt new file mode 100644 index 00000000..05a709a7 --- /dev/null +++ b/evidence/lab4-final-run.txt @@ -0,0 +1,17 @@ +Проверка: course-files +Проверка: quality +Проверка: format +Проверка: structure +Проверка: openapi +Проверка: request-deadline +Проверка: readiness-budget +Проверка: public-smoke +Проверка: attachments +Проверка: idempotency +Проверка: reviewer-cases +Проверка: reconciliation +Проверка: upload-memory +Проверка: uploader-failover +Проверка: persistence-proof +Проверка: clean-start +PASS: все итоговые проверки лабораторной 4 diff --git a/evidence/lab4-final-structure.txt b/evidence/lab4-final-structure.txt new file mode 100644 index 00000000..b62af9c5 --- /dev/null +++ b/evidence/lab4-final-structure.txt @@ -0,0 +1 @@ +PASS: offline skeleton structure, local refs and Python syntax; application NOT tested. diff --git a/evidence/lab4-final-summary.json b/evidence/lab4-final-summary.json new file mode 100644 index 00000000..5be4935b --- /dev/null +++ b/evidence/lab4-final-summary.json @@ -0,0 +1,101 @@ +{ + "result": "PASS", + "checks": [ + { + "check": "course-files", + "exit_code": 0, + "seconds": 0.036, + "evidence": "evidence/lab4-final-course-files.txt" + }, + { + "check": "quality", + "exit_code": 0, + "seconds": 0.04, + "evidence": "evidence/lab4-final-quality.txt" + }, + { + "check": "format", + "exit_code": 0, + "seconds": 0.04, + "evidence": "evidence/lab4-final-format.txt" + }, + { + "check": "structure", + "exit_code": 0, + "seconds": 0.075, + "evidence": "evidence/lab4-final-structure.txt" + }, + { + "check": "openapi", + "exit_code": 0, + "seconds": 0.442, + "evidence": "evidence/lab4-final-openapi.txt" + }, + { + "check": "request-deadline", + "exit_code": 0, + "seconds": 1.078, + "evidence": "evidence/lab4-final-request-deadline.txt" + }, + { + "check": "readiness-budget", + "exit_code": 0, + "seconds": 4.182, + "evidence": "evidence/lab4-final-readiness-budget.txt" + }, + { + "check": "public-smoke", + "exit_code": 0, + "seconds": 2.766, + "evidence": "evidence/lab4-final-public-smoke.txt" + }, + { + "check": "attachments", + "exit_code": 0, + "seconds": 3.092, + "evidence": "evidence/lab4-final-attachments.txt" + }, + { + "check": "idempotency", + "exit_code": 0, + "seconds": 1.767, + "evidence": "evidence/lab4-final-idempotency.txt" + }, + { + "check": "reviewer-cases", + "exit_code": 0, + "seconds": 14.156, + "evidence": "evidence/lab4-final-reviewer-cases.txt" + }, + { + "check": "reconciliation", + "exit_code": 0, + "seconds": 13.908, + "evidence": "evidence/lab4-final-reconciliation.txt" + }, + { + "check": "upload-memory", + "exit_code": 0, + "seconds": 38.052, + "evidence": "evidence/lab4-final-upload-memory.txt" + }, + { + "check": "uploader-failover", + "exit_code": 0, + "seconds": 12.548, + "evidence": "evidence/lab4-final-uploader-failover.txt" + }, + { + "check": "persistence-proof", + "exit_code": 0, + "seconds": 17.937, + "evidence": "evidence/lab4-final-persistence-proof.txt" + }, + { + "check": "clean-start", + "exit_code": 0, + "seconds": 80.091, + "evidence": "evidence/lab4-final-clean-start.txt" + } + ] +} diff --git a/evidence/lab4-final-upload-memory.txt b/evidence/lab4-final-upload-memory.txt new file mode 100644 index 00000000..6f05c50d --- /dev/null +++ b/evidence/lab4-final-upload-memory.txt @@ -0,0 +1 @@ +{"result": "PASS", "api_replicas": 2, "uploads_per_replica_limit": 5, "decode_concurrency_per_replica": 1, "temporary_storage_per_replica_bytes": 67108864, "profiles": [{"dimensions": [256, 256], "file_bytes": 197174, "concurrent_uploads": 10, "responses": [{"status": 201, "seconds": 0.6791}, {"status": 201, "seconds": 0.7479}, {"status": 201, "seconds": 0.6845}, {"status": 201, "seconds": 0.6778}, {"status": 201, "seconds": 0.7513}, {"status": 201, "seconds": 0.6638}, {"status": 201, "seconds": 0.4756}, {"status": 201, "seconds": 0.6777}, {"status": 201, "seconds": 0.6768}, {"status": 201, "seconds": 0.4765}]}, {"dimensions": [1280, 1280], "file_bytes": 4923511, "concurrent_uploads": 10, "responses": [{"status": 201, "seconds": 0.9695}, {"status": 201, "seconds": 1.0506}, {"status": 201, "seconds": 0.7052}, {"status": 201, "seconds": 1.0433}, {"status": 201, "seconds": 0.9752}, {"status": 201, "seconds": 0.8131}, {"status": 201, "seconds": 0.7254}, {"status": 201, "seconds": 0.6902}, {"status": 201, "seconds": 0.888}, {"status": 201, "seconds": 1.0417}]}], "memory": [{"baseline_bytes": 102842368, "sampled_peak_bytes": 137437184, "samples": 750, "interval_seconds": 0.02, "cgroup_limit_bytes": 536870912}, {"baseline_bytes": 108802048, "sampled_peak_bytes": 126369792, "samples": 750, "interval_seconds": 0.02, "cgroup_limit_bytes": 536870912}], "limitations": ["20ms sampling can miss short peaks", "two synthetic image sizes do not cover the worst-case 40MP input", "cgroup memory includes Python, image decoding and tmpfs; experiment is not a throughput benchmark", "deployment restores the default admission limit of 1 after this experiment"]} diff --git a/evidence/lab4-final-uploader-failover.txt b/evidence/lab4-final-uploader-failover.txt new file mode 100644 index 00000000..6ea8795c --- /dev/null +++ b/evidence/lab4-final-uploader-failover.txt @@ -0,0 +1 @@ +PASS: exact uploading replica stopped; another replica returns identical original diff --git a/evidence/lab4-public-artifacts.json b/evidence/lab4-public-artifacts.json new file mode 100644 index 00000000..1fcc1a8b --- /dev/null +++ b/evidence/lab4-public-artifacts.json @@ -0,0 +1,29 @@ +{ + "result": "PASS", + "files": { + "contracts/openapi.json": { + "sha256": "c5c0ebdcf205018126c5bb91e2512b11f543827e76baa21d776210d05a0b2cca", + "matches_course_lab4": true + }, + "tests/smoke.py": { + "sha256": "52ac38eb343ff7d43e7543588e1da58ca06c9fce74b2b0d0bf0e4982bc23c1db", + "matches_course_lab4": true + }, + "tests/client.py": { + "sha256": "8d50976fc7c7bbb81e88a152f613c61ab25eaf53dba33c6a9dfab19f868d546d", + "matches_course_lab4": true + }, + "tests/resilience.py": { + "sha256": "1f96663a174b3978d24eff66f2741f5f8c9b788d3242261d37a972720c52788b", + "matches_course_lab4": true + }, + "tests/load.py": { + "sha256": "6d3511ea719c7a7e841083e73d435c86dcbfd9f4e5c2a07d62eb9614b01d9933", + "matches_course_lab4": true + }, + "tests/fixtures/sample.png": { + "sha256": "99ea7533c441f79cd630d15ce4d58d1ec4e06f6f0efb3b77a5c088305cd1bd75", + "matches_course_lab4": true + } + } +} diff --git a/evidence/lab4-research/results.json b/evidence/lab4-research/results.json new file mode 100644 index 00000000..4c4ba0b3 --- /dev/null +++ b/evidence/lab4-research/results.json @@ -0,0 +1,225 @@ +{ + "scan_runs": [ + { + "objects": 10, + "repeat": 1, + "seconds": 0.0193, + "s3_requests": { + "LIST": 1, + "HEAD": 10 + }, + "db_statements": 53 + }, + { + "objects": 10, + "repeat": 2, + "seconds": 0.0181, + "s3_requests": { + "LIST": 1, + "HEAD": 10 + }, + "db_statements": 53 + }, + { + "objects": 10, + "repeat": 3, + "seconds": 0.0172, + "s3_requests": { + "LIST": 1, + "HEAD": 10 + }, + "db_statements": 53 + }, + { + "objects": 100, + "repeat": 1, + "seconds": 0.1674, + "s3_requests": { + "LIST": 1, + "HEAD": 100 + }, + "db_statements": 503 + }, + { + "objects": 100, + "repeat": 2, + "seconds": 0.1533, + "s3_requests": { + "LIST": 1, + "HEAD": 100 + }, + "db_statements": 503 + }, + { + "objects": 100, + "repeat": 3, + "seconds": 0.1559, + "s3_requests": { + "LIST": 1, + "HEAD": 100 + }, + "db_statements": 503 + }, + { + "objects": 1005, + "repeat": 1, + "seconds": 1.6628, + "s3_requests": { + "LIST": 2, + "HEAD": 1005 + }, + "db_statements": 5028 + }, + { + "objects": 1005, + "repeat": 2, + "seconds": 1.9679, + "s3_requests": { + "LIST": 2, + "HEAD": 1005 + }, + "db_statements": 5028 + }, + { + "objects": 1005, + "repeat": 3, + "seconds": 1.9842, + "s3_requests": { + "LIST": 2, + "HEAD": 1005 + }, + "db_statements": 5028 + } + ], + "upload_experiment": { + "result": "PASS", + "api_replicas": 2, + "uploads_per_replica_limit": 5, + "decode_concurrency_per_replica": 1, + "temporary_storage_per_replica_bytes": 67108864, + "profiles": [ + { + "dimensions": [ + 256, + 256 + ], + "file_bytes": 197105, + "concurrent_uploads": 10, + "responses": [ + { + "status": 201, + "seconds": 0.8672 + }, + { + "status": 201, + "seconds": 0.9497 + }, + { + "status": 201, + "seconds": 0.9495 + }, + { + "status": 201, + "seconds": 0.8663 + }, + { + "status": 201, + "seconds": 0.8577 + }, + { + "status": 201, + "seconds": 0.9492 + }, + { + "status": 201, + "seconds": 0.9498 + }, + { + "status": 201, + "seconds": 0.8513 + }, + { + "status": 201, + "seconds": 0.9494 + }, + { + "status": 201, + "seconds": 0.8673 + } + ] + }, + { + "dimensions": [ + 1280, + 1280 + ], + "file_bytes": 4923278, + "concurrent_uploads": 10, + "responses": [ + { + "status": 201, + "seconds": 1.0416 + }, + { + "status": 201, + "seconds": 1.1384 + }, + { + "status": 201, + "seconds": 0.8325 + }, + { + "status": 201, + "seconds": 0.994 + }, + { + "status": 201, + "seconds": 1.0969 + }, + { + "status": 201, + "seconds": 0.9037 + }, + { + "status": 201, + "seconds": 1.0042 + }, + { + "status": 201, + "seconds": 1.1211 + }, + { + "status": 201, + "seconds": 0.9889 + }, + { + "status": 201, + "seconds": 1.018 + } + ] + } + ], + "memory": [ + { + "baseline_bytes": 101765120, + "sampled_peak_bytes": 130772992, + "samples": 750, + "interval_seconds": 0.02, + "cgroup_limit_bytes": 536870912 + }, + { + "baseline_bytes": 96137216, + "sampled_peak_bytes": 135176192, + "samples": 750, + "interval_seconds": 0.02, + "cgroup_limit_bytes": 536870912 + } + ], + "limitations": [ + "20ms sampling can miss short peaks", + "two synthetic image sizes do not cover the worst-case 40MP input", + "cgroup memory includes Python, image decoding and tmpfs; experiment is not a throughput benchmark", + "deployment restores the default admission limit of 1 after this experiment" + ] + } +} diff --git a/evidence/lab4-research/results.png b/evidence/lab4-research/results.png new file mode 100644 index 0000000000000000000000000000000000000000..9b8a74841ea3b9aa112ec714e4c921c072b9eab3 GIT binary patch literal 66361 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 + + + + + + + 2026-11-12T19:15:00.578078 + image/svg+xml + + + Matplotlib v3.11.2, https://matplotlib.org/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/evidence/lab4-review-inflight-before.txt b/evidence/lab4-review-inflight-before.txt new file mode 100644 index 00000000..86c452c2 --- /dev/null +++ b/evidence/lab4-review-inflight-before.txt @@ -0,0 +1,3 @@ + Container mtusi2026lab1-postgres-1 Paused + Container mtusi2026lab1-postgres-1 Unpaused +FAIL: in-flight history did not return within 8 seconds while PostgreSQL was frozen diff --git a/evidence/lab4-s3-unavailable.txt b/evidence/lab4-s3-unavailable.txt new file mode 100644 index 00000000..25d9dd0e --- /dev/null +++ b/evidence/lab4-s3-unavailable.txt @@ -0,0 +1,2 @@ +PASS: unavailable S3 yields controlled readiness 503; liveness stays 200 +PASS: S3 recovery preserves original and existing session diff --git a/evidence/lab4-track2-environment.json b/evidence/lab4-track2-environment.json new file mode 100644 index 00000000..fd5fbe02 --- /dev/null +++ b/evidence/lab4-track2-environment.json @@ -0,0 +1 @@ +{"architecture":"aarch64","docker_cpus":10,"docker_memory_bytes":8218034176,"docker_version":"28.5.1"} diff --git a/infra/haproxy.cfg b/infra/haproxy.cfg new file mode 100644 index 00000000..5a96573b --- /dev/null +++ b/infra/haproxy.cfg @@ -0,0 +1,43 @@ +global + log stdout format raw local0 + maxconn 2048 + stats socket /tmp/haproxy.sock mode 600 level admin + stats socket ipv4@127.0.0.1:9999 level admin + +defaults + log global + mode http + option httplog + timeout connect 1s + timeout client 15s + timeout server 12s + timeout http-request 7s + timeout http-keep-alive 2s + timeout check 1s + # Не повторяем POST автоматически: неизвестный результат повторяет клиент + # с исходным Idempotency-Key. Соединения к недоступному API не ждут долго. + retries 0 + +resolvers docker + nameserver dns 127.0.0.11:53 + resolve_retries 3 + timeout resolve 1s + timeout retry 1s + hold valid 1s + hold obsolete 1s + hold nx 1s + hold timeout 1s + hold refused 1s + accepted_payload_size 8192 + +frontend public + bind :8080 + default_backend api_pool + +backend api_pool + 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 inter 1s fastinter 500ms downinter 1s fall 2 rise 2 + server-template api 1-16 api:8080 check resolvers docker resolve-prefer ipv4 init-addr none diff --git a/infra/minio/Dockerfile b/infra/minio/Dockerfile new file mode 100644 index 00000000..398ae8c4 --- /dev/null +++ b/infra/minio/Dockerfile @@ -0,0 +1,20 @@ +# MinIO community distribution is source-only; pin the reviewed release commit. +FROM golang:1.24.8-alpine3.22 AS build +RUN apk add --no-cache git +WORKDIR /source +RUN git init . \ + && git remote add origin https://github.com/minio/minio.git \ + && git fetch --depth 1 origin 9e49d5e7a648f00e26f2246f4dc28e6b07f8c84a \ + && git checkout --detach FETCH_HEAD +ENV CGO_ENABLED=0 GOMAXPROCS=2 +RUN go build -p 2 -trimpath -o /minio . + +FROM alpine:3.22.2 +RUN apk add --no-cache ca-certificates \ + && addgroup -S minio && adduser -S -G minio minio \ + && mkdir /data && chown minio:minio /data +COPY --from=build /minio /usr/local/bin/minio +USER minio +EXPOSE 9000 +ENTRYPOINT ["minio"] +CMD ["server", "/data", "--console-address", ":9001"] diff --git a/infra/s3/api-policy.json b/infra/s3/api-policy.json new file mode 100644 index 00000000..4f93ab24 --- /dev/null +++ b/infra/s3/api-policy.json @@ -0,0 +1,20 @@ +{ + "Version": "2012-10-17", + "Statement": [ + { + "Effect": "Allow", + "Action": ["s3:ListBucket", "s3:GetBucketLocation"], + "Resource": ["arn:aws:s3:::${bucket}"] + }, + { + "Effect": "Allow", + "Action": [ + "s3:GetObject", + "s3:PutObject", + "s3:AbortMultipartUpload", + "s3:ListMultipartUploadParts" + ], + "Resource": ["arn:aws:s3:::${bucket}/originals/*"] + } + ] +} diff --git a/infra/s3/reconciler-policy.json b/infra/s3/reconciler-policy.json new file mode 100644 index 00000000..a3a672ae --- /dev/null +++ b/infra/s3/reconciler-policy.json @@ -0,0 +1,15 @@ +{ + "Version": "2012-10-17", + "Statement": [ + { + "Effect": "Allow", + "Action": ["s3:ListBucket", "s3:GetBucketLocation", "s3:GetBucketVersioning"], + "Resource": ["arn:aws:s3:::${bucket}"] + }, + { + "Effect": "Allow", + "Action": ["s3:GetObject", "s3:DeleteObject"], + "Resource": ["arn:aws:s3:::${bucket}/originals/*"] + } + ] +} diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 00000000..16eaf7ee --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,34 @@ +import asyncio + +from alembic import context +from sqlalchemy import pool +from sqlalchemy.ext.asyncio import create_async_engine + +from src.core.db.models import Base +from src.core.settings import settings + +url = settings.sqlalchemy_database_url +target_metadata = Base.metadata + + +def run_migrations(connection): + context.configure(connection=connection, target_metadata=target_metadata, compare_type=True) + with context.begin_transaction(): + context.run_migrations() + + +async def run_online(): + engine = create_async_engine(url, poolclass=pool.NullPool) + try: + async with engine.connect() as connection: + await connection.run_sync(run_migrations) + finally: + await engine.dispose() + + +if context.is_offline_mode(): + context.configure(url=url, target_metadata=target_metadata, literal_binds=True) + with context.begin_transaction(): + context.run_migrations() +else: + asyncio.run(run_online()) diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 00000000..5449f624 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,17 @@ +"""${message}""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/001_initial.py b/migrations/versions/001_initial.py new file mode 100644 index 00000000..b8cef401 --- /dev/null +++ b/migrations/versions/001_initial.py @@ -0,0 +1,60 @@ +"""Пользователи, чаты, участники, сообщения и сессии.""" +from alembic import op +import sqlalchemy as sa + +revision = '001' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + op.create_table( + 'users', + sa.Column('id', sa.Uuid(), primary_key=True), + sa.Column('username', sa.String(32), nullable=False, unique=True), + sa.Column('display_name', sa.String(100), nullable=False), + sa.Column('password_hash', sa.Text(), nullable=False), + sa.Column('created_at', sa.DateTime(timezone=True), nullable=False), + sa.CheckConstraint("username ~ '^[a-z0-9_]{3,32}$'"), + sa.CheckConstraint('length(trim(display_name)) > 0'), + ) + op.create_table( + 'chats', + sa.Column('id', sa.Uuid(), primary_key=True), + sa.Column('title', sa.String(100), nullable=False), + sa.Column('created_at', sa.DateTime(timezone=True), nullable=False), + sa.CheckConstraint('length(trim(title)) > 0'), + ) + op.create_table( + 'chat_members', + sa.Column('chat_id', sa.Uuid(), sa.ForeignKey('chats.id', ondelete='CASCADE'), primary_key=True), + sa.Column('user_id', sa.Uuid(), sa.ForeignKey('users.id'), primary_key=True), + ) + op.create_index('chat_members_user_idx', 'chat_members', ['user_id', 'chat_id']) + op.create_table( + 'messages', + sa.Column('id', sa.Uuid(), primary_key=True), + sa.Column('chat_id', sa.Uuid(), sa.ForeignKey('chats.id'), nullable=False), + sa.Column('sender_id', sa.Uuid(), sa.ForeignKey('users.id'), nullable=False), + sa.Column('text', sa.String(4000), nullable=False), + sa.Column('created_at', sa.DateTime(timezone=True), nullable=False), + sa.ForeignKeyConstraint(['chat_id', 'sender_id'], ['chat_members.chat_id', 'chat_members.user_id']), + sa.CheckConstraint('length(trim(text)) > 0'), + ) + op.create_index('messages_history_idx', 'messages', ['chat_id', 'created_at', 'id']) + op.create_table( + 'sessions', + sa.Column('token_hash', sa.Text(), primary_key=True), + sa.Column('user_id', sa.Uuid(), sa.ForeignKey('users.id', ondelete='CASCADE'), nullable=False), + sa.Column('expires_at', sa.DateTime(timezone=True), nullable=False), + ) + op.create_index('sessions_expiry_idx', 'sessions', ['expires_at']) + + +def downgrade(): + op.drop_table('sessions') + op.drop_table('messages') + op.drop_table('chat_members') + op.drop_table('chats') + op.drop_table('users') diff --git a/migrations/versions/002_redis_sessions.py b/migrations/versions/002_redis_sessions.py new file mode 100644 index 00000000..109638b5 --- /dev/null +++ b/migrations/versions/002_redis_sessions.py @@ -0,0 +1,22 @@ +"""Сессии перенесены в Redis.""" +from alembic import op +import sqlalchemy as sa + +revision = '002' +down_revision = '001' +branch_labels = None +depends_on = None + + +def upgrade(): + op.drop_table('sessions') + + +def downgrade(): + op.create_table( + 'sessions', + sa.Column('token_hash', sa.Text(), primary_key=True), + sa.Column('user_id', sa.Uuid(), sa.ForeignKey('users.id', ondelete='CASCADE'), nullable=False), + sa.Column('expires_at', sa.DateTime(timezone=True), nullable=False), + ) + op.create_index('sessions_expiry_idx', 'sessions', ['expires_at']) diff --git a/migrations/versions/003_admin.py b/migrations/versions/003_admin.py new file mode 100644 index 00000000..7b57ee8c --- /dev/null +++ b/migrations/versions/003_admin.py @@ -0,0 +1,16 @@ +"""Признак системного администратора.""" +from alembic import op +import sqlalchemy as sa + +revision = '003' +down_revision = '002' +branch_labels = None +depends_on = None + + +def upgrade(): + op.add_column('users', sa.Column('is_admin', sa.Boolean(), nullable=False, server_default=sa.false())) + + +def downgrade(): + op.drop_column('users', 'is_admin') diff --git a/migrations/versions/004_idempotency.py b/migrations/versions/004_idempotency.py new file mode 100644 index 00000000..017366af --- /dev/null +++ b/migrations/versions/004_idempotency.py @@ -0,0 +1,25 @@ +"""Общая идемпотентность сообщений, совместимая с предыдущей схемой.""" + +from alembic import op +import sqlalchemy as sa + +revision = "004" +down_revision = "003" +branch_labels = None +depends_on = None + + +def upgrade(): + op.create_table( + "message_requests", + sa.Column("sender_id", sa.Uuid(), sa.ForeignKey("users.id"), primary_key=True), + sa.Column("chat_id", sa.Uuid(), sa.ForeignKey("chats.id"), primary_key=True), + sa.Column("key", sa.String(128), primary_key=True), + sa.Column("request_text", sa.String(4000), nullable=False), + sa.Column("message_id", sa.Uuid(), sa.ForeignKey("messages.id"), nullable=True), + sa.Column("expires_at", sa.DateTime(timezone=True), nullable=False), + ) + + +def downgrade(): + op.drop_table("message_requests") diff --git a/migrations/versions/005_message_unicode.py b/migrations/versions/005_message_unicode.py new file mode 100644 index 00000000..762803d8 --- /dev/null +++ b/migrations/versions/005_message_unicode.py @@ -0,0 +1,55 @@ +"""Сохранять весь допустимый Unicode сообщений, включая U+0000, без потерь.""" + +import sqlalchemy as sa +from alembic import op + +revision = "005" +down_revision = "004" +branch_labels = None +depends_on = None + + +def upgrade(): + op.drop_constraint("messages_text_check", "messages", type_="check") + op.alter_column( + "messages", + "text", + existing_type=sa.String(4000), + type_=sa.LargeBinary(), + existing_nullable=False, + postgresql_using="convert_to(text, 'UTF8')", + ) + op.alter_column( + "message_requests", + "request_text", + existing_type=sa.String(4000), + type_=sa.LargeBinary(), + existing_nullable=False, + postgresql_using="convert_to(request_text, 'UTF8')", + ) + op.create_check_constraint( + "messages_text_bytes_check", "messages", "octet_length(text) BETWEEN 1 AND 16000" + ) + + +def downgrade(): + # convert_from откажет при наличии U+0000: не удаляем символы или строки + # молча. Откат возможен только если все данные представимы в PostgreSQL text. + op.drop_constraint("messages_text_bytes_check", "messages", type_="check") + op.alter_column( + "messages", + "text", + existing_type=sa.LargeBinary(), + type_=sa.String(4000), + existing_nullable=False, + postgresql_using="convert_from(text, 'UTF8')", + ) + op.alter_column( + "message_requests", + "request_text", + existing_type=sa.LargeBinary(), + type_=sa.String(4000), + existing_nullable=False, + postgresql_using="convert_from(request_text, 'UTF8')", + ) + op.create_check_constraint("messages_text_check", "messages", "length(trim(text)) > 0") diff --git a/migrations/versions/006_unicode_names.py b/migrations/versions/006_unicode_names.py new file mode 100644 index 00000000..e60df496 --- /dev/null +++ b/migrations/versions/006_unicode_names.py @@ -0,0 +1,40 @@ +"""Сохранение допустимого Unicode имён и названий, включая U+0000.""" + +import sqlalchemy as sa +from alembic import op + +revision = "006" +down_revision = "005" +branch_labels = None +depends_on = None + + +def upgrade(): + for table, column in [("users", "display_name"), ("chats", "title")]: + op.drop_constraint(f"{table}_{column}_check", table, type_="check") + op.alter_column( + table, + column, + existing_type=sa.String(100), + type_=sa.LargeBinary(), + existing_nullable=False, + postgresql_using=f"convert_to({column}, 'UTF8')", + ) + op.create_check_constraint( + f"{table}_{column}_bytes_check", table, f"octet_length({column}) BETWEEN 1 AND 400" + ) + + +def downgrade(): + # PostgreSQL откажет при U+0000 и откатит транзакцию вместо потери символов. + for table, column in [("users", "display_name"), ("chats", "title")]: + op.drop_constraint(f"{table}_{column}_bytes_check", table, type_="check") + op.alter_column( + table, + column, + existing_type=sa.LargeBinary(), + type_=sa.String(100), + existing_nullable=False, + postgresql_using=f"convert_from({column}, 'UTF8')", + ) + op.create_check_constraint(f"{table}_{column}_check", table, f"length(trim({column})) > 0") diff --git a/migrations/versions/007_attachments.py b/migrations/versions/007_attachments.py new file mode 100644 index 00000000..e4682097 --- /dev/null +++ b/migrations/versions/007_attachments.py @@ -0,0 +1,65 @@ +"""Private S3 attachment metadata and ordered message links.""" + +from alembic import op +import sqlalchemy as sa + +revision = "007" +down_revision = "006" +branch_labels = None +depends_on = None + + +def upgrade(): + op.create_table( + "attachments", + sa.Column("id", sa.Uuid(), primary_key=True), + sa.Column("chat_id", sa.Uuid(), sa.ForeignKey("chats.id"), nullable=False), + sa.Column("owner_id", sa.Uuid(), sa.ForeignKey("users.id"), nullable=False), + sa.Column("filename", sa.String(255), nullable=False), + sa.Column("object_key", sa.Text(), nullable=False, unique=True), + sa.Column("content_type", sa.String(32), nullable=False), + sa.Column("size_bytes", sa.BigInteger(), nullable=False), + sa.Column("sha256", sa.String(64), nullable=False), + sa.Column("created_at", sa.DateTime(timezone=True), nullable=False), + sa.Column("updated_at", sa.DateTime(timezone=True), nullable=False), + sa.UniqueConstraint("chat_id", "id"), + sa.CheckConstraint("size_bytes BETWEEN 1 AND 10485760"), + sa.CheckConstraint("content_type IN ('image/png', 'image/jpeg')"), + ) + op.create_index("attachments_chat_idx", "attachments", ["chat_id"]) + op.create_unique_constraint("messages_chat_id_id_key", "messages", ["chat_id", "id"]) + op.create_table( + "message_attachments", + sa.Column("message_id", sa.Uuid(), primary_key=True), + sa.Column("attachment_id", sa.Uuid(), primary_key=True), + sa.Column("chat_id", sa.Uuid(), nullable=False), + sa.Column("position", sa.Integer(), nullable=False), + sa.ForeignKeyConstraint( + ["chat_id", "message_id"], ["messages.chat_id", "messages.id"], ondelete="CASCADE" + ), + sa.ForeignKeyConstraint( + ["chat_id", "attachment_id"], ["attachments.chat_id", "attachments.id"] + ), + sa.UniqueConstraint("message_id", "position"), + sa.CheckConstraint("position BETWEEN 0 AND 9"), + ) + op.add_column("message_requests", sa.Column( + "request_attachment_ids", sa.Text(), nullable=False, server_default="" + )) + op.drop_constraint("messages_text_bytes_check", "messages", type_="check") + op.create_check_constraint( + "messages_text_bytes_check", "messages", "octet_length(text) BETWEEN 0 AND 16000" + ) + + +def downgrade(): + # Refuse downgrade if attachment-only messages cannot satisfy the old schema. + op.drop_constraint("messages_text_bytes_check", "messages", type_="check") + op.create_check_constraint( + "messages_text_bytes_check", "messages", "octet_length(text) BETWEEN 1 AND 16000" + ) + op.drop_column("message_requests", "request_attachment_ids") + op.drop_table("message_attachments") + op.drop_constraint("messages_chat_id_id_key", "messages", type_="unique") + op.drop_index("attachments_chat_idx", "attachments") + op.drop_table("attachments") diff --git a/migrations/versions/008_reconciliation.py b/migrations/versions/008_reconciliation.py new file mode 100644 index 00000000..19afaf2f --- /dev/null +++ b/migrations/versions/008_reconciliation.py @@ -0,0 +1,37 @@ +"""Durable upload intents, missing-content marker and reconciliation observations.""" + +import sqlalchemy as sa +from alembic import op + +revision = "008" +down_revision = "007" +branch_labels = None +depends_on = None + + +def upgrade(): + op.add_column("attachments", sa.Column("storage_missing_since", sa.DateTime(timezone=True))) + op.create_table( + "upload_intents", + sa.Column("object_key", sa.Text(), primary_key=True), + sa.Column("state", sa.String(16), nullable=False), + sa.Column("created_at", sa.DateTime(timezone=True), nullable=False, + server_default=sa.func.now()), + sa.CheckConstraint("state IN ('pending', 'committed', 'abandoned')"), + ) + op.create_table( + "storage_findings", + sa.Column("object_key", sa.Text(), primary_key=True), + sa.Column("kind", sa.String(16), primary_key=True), + sa.Column("fingerprint", sa.Text()), + sa.Column("first_seen", sa.DateTime(timezone=True), nullable=False), + sa.Column("last_seen", sa.DateTime(timezone=True), nullable=False), + sa.Column("resolved_at", sa.DateTime(timezone=True)), + sa.CheckConstraint("kind IN ('orphan', 'missing')"), + ) + + +def downgrade(): + op.drop_table("storage_findings") + op.drop_table("upload_intents") + op.drop_column("attachments", "storage_missing_since") diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..f93433a7 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,8 @@ +[tool.ruff] +cache-dir = ".venv/.ruff_cache" +target-version = "py313" +line-length = 100 +include = ["src/**/*.py"] + +[tool.ruff.lint] +select = ["E4", "E7", "E9", "F", "I"] diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..d0eb8c30 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,21 @@ +annotated-doc==0.0.5 +annotated-types==0.8.0 +anyio==4.15.1 +click==8.5.0 +fastapi==0.141.1 +h11==0.16.0 +idna==3.20 +pydantic==2.13.5 +pydantic-core==2.46.5 +starlette==1.7.0 +typing-extensions==4.16.0 +typing-inspection==0.4.4 +uvicorn==0.53.0 +asyncpg==0.30.0 +redis==5.2.1 +argon2-cffi==25.1.0 +SQLAlchemy[asyncio]==2.0.44 +alembic==1.17.0 +pydantic-settings==2.15.0 +minio==7.2.20 +Pillow==13.0.0 diff --git a/scripts/export-submission.py b/scripts/export-submission.py new file mode 100644 index 00000000..9ba8ea27 --- /dev/null +++ b/scripts/export-submission.py @@ -0,0 +1,63 @@ +"""Export all public working files, including new files; exclude local secrets/state.""" +import hashlib +import json +import os +import tarfile +from pathlib import Path +import subprocess +import sys + +ROOT=Path(__file__).resolve().parents[1] +subprocess.run([sys.executable,str(ROOT/'scripts/check-course-files.py')],check=True) +paths=subprocess.check_output(['git','ls-files','--cached','--others','--exclude-standard','-z'],cwd=ROOT).split(b'\0') +files={} +for raw in paths: + if not raw:continue + name=os.fsdecode(raw) + if name=='SOURCE_MANIFEST.json':continue + path=ROOT/name + if path.is_file():files[name]=hashlib.sha256(path.read_bytes()).hexdigest() +# Actual non-example credentials must not occur in exported source/evidence. +from dotenv import dotenv_values +example=dotenv_values(ROOT/'student.env.example') +private=[v.encode() for k,v in dotenv_values(ROOT/'.env').items() + if v and len(v)>=12 and v!=example.get(k) + and any(word in k for word in ('PASSWORD','SECRET','TOKEN','API_KEY','DATABASE_URL'))] +unsafe=[] +for name in files: + path=ROOT/name + if name.startswith(('.env','secrets/','backups/','data/')) and name!='.env.example': + unsafe.append(name) + elif any(secret in path.read_bytes() for secret in private):unsafe.append(name) +if unsafe: + raise SystemExit('Не экспортированы файлы с приватными данными: '+', '.join(unsafe)) +proof=json.loads((ROOT/'evidence/lab4-clean-start.json').read_text()) +changed=[name for name,digest in proof['code_manifest'].items() if files.get(name)!=digest] +if changed:raise SystemExit('После clean-start изменился код: '+', '.join(changed)) +required=('Dockerfile','compose.yaml','src/core/request_deadline.py','src/maintenance/reconcile.py', + 'student.mk','student.env.example','requirements-student.txt','STUDENT_README.md', + 'STUDENT_REPORT.md','course-files.sha256.json','Dockerfile.dockerignore', + 'src/core/storage_bootstrap.py','infra/s3/api-policy.json','infra/s3/reconciler-policy.json', + 'migrations/versions/008_reconciliation.py', + 'scripts/setup-env.py','scripts/check-course-files.py','scripts/test-reconciliation.sh','tests/reconciliation.py', + 'tests/lab4_review.py','tests/fixtures/sample.png') +assert all(name in files for name in required),'Required source missing from export' +manifest={'format':1,'lab':4,'author':'Каменский Андрей, БПИ2301', + 'clean_start_code_matches':True,'private_credentials_scan':'PASS','files':files} +(ROOT/'SOURCE_MANIFEST.json').write_text(json.dumps(manifest,ensure_ascii=False,indent=2)+'\n') +destination=ROOT/'dist';destination.mkdir(exist_ok=True) +archive=destination/'mtusi2026lab4-submission.tar.gz' +with tarfile.open(archive,'w:gz') as output: + for name in sorted([*files,'SOURCE_MANIFEST.json']): + output.add(ROOT/name,arcname='mtusi2026lab4/'+name,recursive=False) +with tarfile.open(archive,'r:gz') as source: + bundled={member.name.removeprefix('mtusi2026lab4/') for member in source.getmembers()} +assert set(files).issubset(bundled) and 'SOURCE_MANIFEST.json' in bundled +assert '.env' not in bundled and not any(name.startswith(('.git/','.venv/')) for name in bundled) +receipt={'result':'PASS','archive':str(archive.relative_to(ROOT)), + 'sha256':hashlib.sha256(archive.read_bytes()).hexdigest(), + 'source_files':len(files),'required_files_present':True,'clean_start_code_matches':True, + 'private_credentials_scan':'PASS','local_env_excluded':True,'course_files_unchanged':True} +# Receipt is separate to avoid a circular archive hash in its own contents. +(destination/'submission-receipt.json').write_text(json.dumps(receipt,ensure_ascii=False,indent=2)+'\n') +print(json.dumps(receipt,ensure_ascii=False,indent=2)) diff --git a/scripts/plot-lab4.py b/scripts/plot-lab4.py new file mode 100644 index 00000000..95ab672c --- /dev/null +++ b/scripts/plot-lab4.py @@ -0,0 +1,38 @@ +"""Plot measured scan cost and per-container memory from final acceptance outputs.""" +import json +import statistics +from pathlib import Path +import matplotlib +matplotlib.use('Agg') +import matplotlib.pyplot as plt + +root=Path(__file__).resolve().parents[1] +def json_rows(name): + result=[] + for line in (root/'evidence'/name).read_text().splitlines(): + try:result.append(json.loads(line)) + except ValueError:pass + return result +runs=next(r['runs'] for r in json_rows('lab4-final-reconciliation.txt') if r.get('experiment')=='scan_cost') +memory=next(r for r in json_rows('lab4-final-upload-memory.txt') if r.get('result')=='PASS') +fig,axes=plt.subplots(1,2,figsize=(11,4),layout='constrained') +sizes=[10,100,1005] +medians=[statistics.median(r['seconds'] for r in runs if r['objects']==n) for n in sizes] +lows=[m-min(r['seconds'] for r in runs if r['objects']==n) for n,m in zip(sizes,medians)] +highs=[max(r['seconds'] for r in runs if r['objects']==n)-m for n,m in zip(sizes,medians)] +axes[0].bar([str(n) for n in sizes],medians,color='#3766a3',yerr=[lows,highs],capsize=5) +axes[0].set(title='Metadata scan: median and range of 3 runs',xlabel='Objects',ylabel='Seconds') +axes[0].grid(axis='y',alpha=.2) +base=[r['baseline_bytes']/1024**2 for r in memory['memory']] +peak=[r['sampled_peak_bytes']/1024**2 for r in memory['memory']] +axes[1].bar([-.18,.82],base,width=.36,label='Baseline',color='#9bb8d9') +axes[1].bar([.18,1.18],peak,width=.36,label='Sampled peak',color='#3766a3') +axes[1].set(xticks=[0,1],xticklabels=['API 1','API 2'],ylabel='Cgroup memory, MiB', + title='10 concurrent PNG uploads; 20 ms sampling',ylim=(0,max(peak)*1.3)) +axes[1].text(.02,.95,'Container limit: 512 MiB',transform=axes[1].transAxes,va='top') +axes[1].legend(loc='upper right');axes[1].grid(axis='y',alpha=.2) +output=root/'evidence/lab4-research';output.mkdir(exist_ok=True) +fig.savefig(output/'results.png',dpi=180) +fig.savefig(output/'results.svg') +(output/'results.json').write_text(json.dumps({'scan_runs':runs,'upload_experiment':memory},ensure_ascii=False,indent=2)+'\n') +print('Created evidence/lab4-research/results.png and results.json') diff --git a/scripts/replicas.py b/scripts/replicas.py new file mode 100644 index 00000000..8c2812be --- /dev/null +++ b/scripts/replicas.py @@ -0,0 +1,31 @@ +"""Управление только API-контейнерами текущего Compose-проекта.""" + +import json +import os +import subprocess +from pathlib import Path + +ROOT = Path(__file__).resolve().parents[1] + + +def docker(*args): + return subprocess.check_output(["docker", *args], cwd=ROOT, text=True).strip() + + +def compose(*args): + return docker("compose", "--env-file", os.environ.get("ENV_FILE", ".env"), *args) + + +def containers(): + return compose("ps", "--all", "-q", "api").split() + + +def describe(container): + # Никогда не выводим Config.Env: там credentials. + return json.loads(docker("inspect", "--format", "{{json .State}}", container)) + + +def instance_id(container): + code = "import urllib.request; r=urllib.request.urlopen('http://127.0.0.1:8080/health/ready', timeout=2); print(r.headers['X-Instance-Id'])" + return docker("exec", container, "python", "-c", code) + diff --git a/scripts/restart.sh b/scripts/restart.sh new file mode 100755 index 00000000..9115b2b4 --- /dev/null +++ b/scripts/restart.sh @@ -0,0 +1,7 @@ +#!/bin/sh +set -eu +cd "$(dirname "$0")/.." +# Полный restart работающих ролей; volumes не удаляются. +docker compose --env-file "${ENV_FILE:-.env}" restart postgres redis minio +docker compose --env-file "${ENV_FILE:-.env}" up -d --wait --force-recreate api +docker compose --env-file "${ENV_FILE:-.env}" restart reconciler lb diff --git a/scripts/setup-env.py b/scripts/setup-env.py new file mode 100644 index 00000000..11601cce --- /dev/null +++ b/scripts/setup-env.py @@ -0,0 +1,26 @@ +"""Create local synthetic credentials without overwriting an existing .env.""" +import argparse +import os +import secrets +from pathlib import Path + +root=Path(__file__).resolve().parents[1] +parser=argparse.ArgumentParser(description=__doc__) +parser.add_argument('--output',type=Path,default=root/'.env') +args=parser.parse_args() +values={ + 'POSTGRES_PASSWORD':secrets.token_hex(24), + 'ADMIN_PASSWORD':secrets.token_hex(24), + 'MINIO_ROOT_PASSWORD':secrets.token_hex(24), + 'S3_SECRET_ACCESS_KEY':secrets.token_hex(24), + 'S3_RECONCILE_SECRET_ACCESS_KEY':secrets.token_hex(24), +} +lines=(root/'student.env.example').read_text().splitlines() +content='\n'.join(key+'='+values[key] if '=' in line and (key:=line.split('=',1)[0]) in values else line for line in lines)+'\n' +try: + descriptor=os.open(args.output,os.O_WRONLY|os.O_CREAT|os.O_EXCL,0o600) +except FileExistsError: + parser.exit(1,'Файл уже существует; его настройки и пароли сохранены.\n') +with os.fdopen(descriptor,'w') as stream: + stream.write(content) +print('Создан файл локальных настроек с новыми паролями; значения не выводятся.') diff --git a/scripts/stop-one.py b/scripts/stop-one.py new file mode 100644 index 00000000..0430d67c --- /dev/null +++ b/scripts/stop-one.py @@ -0,0 +1,34 @@ +"""Сопоставить X-Instance-Id реальному контейнеру и оставить его остановленным.""" + +import json +import os +import time + +from replicas import containers, describe, docker, instance_id + +target = os.environ["TARGET_INSTANCE_ID"] +running = [c for c in containers() if describe(c)["Running"]] +if len(running) < 2: + raise SystemExit("Need at least two running API containers") +for container in running: + if instance_id(container) == target: + before = describe(container) + started = time.monotonic() + docker("stop", "--time", "10", container) + after = describe(container) + assert not after["Running"] + print( + json.dumps( + { + "container": container[:12], + "instance_id": target, + "started_at": before["StartedAt"], + "finished_at": after["FinishedAt"], + "stop_seconds": round(time.monotonic() - started, 3), + "exit_code": after["ExitCode"], + } + ) + ) + break +else: + raise SystemExit("Requested instance not found in this Compose project") diff --git a/scripts/stop-one.sh b/scripts/stop-one.sh new file mode 100755 index 00000000..383f91ed --- /dev/null +++ b/scripts/stop-one.sh @@ -0,0 +1,4 @@ +#!/bin/sh +set -eu +cd "$(dirname "$0")/.." +exec "${PYTHON:-python3}" scripts/stop-one.py diff --git a/scripts/test-clean-lab4.py b/scripts/test-clean-lab4.py new file mode 100644 index 00000000..08651585 --- /dev/null +++ b/scripts/test-clean-lab4.py @@ -0,0 +1,92 @@ +"""Build the complete source snapshot and boot a separate stack with empty volumes. + +The active project and its data are untouched. Credentials and source copies are +kept in a temporary directory; only our UUID-named test project is removed. +""" +import hashlib +import json +import os +import secrets +import shutil +import socket +import subprocess +import sys +import time +from pathlib import Path +from tempfile import TemporaryDirectory + +ROOT=Path(__file__).resolve().parents[1] +project='lab4-clean-'+secrets.token_hex(4) +with socket.socket() as sock: + sock.bind(('127.0.0.1',0));port=sock.getsockname()[1] +inventory=subprocess.run(['git','ls-files','--cached','--others','--exclude-standard','-z'],cwd=ROOT,capture_output=True) +if inventory.returncode==0: + files=inventory.stdout.split(b'\0') +else: + manifest_path=ROOT/'SOURCE_MANIFEST.json' + if not manifest_path.is_file(): + raise SystemExit('Нужен Git clone или архив с SOURCE_MANIFEST.json') + files=[os.fsencode(name) for name in json.loads(manifest_path.read_text())['files']] +proof={'project':project,'empty_volumes':True,'source':'complete working snapshot including new files', + 'build_cache':'API rebuilt with --no-cache; pinned MinIO build may use BuildKit cache'} +with TemporaryDirectory(prefix='lab4-clean-') as temporary: + source=Path(temporary)/'source';source.mkdir() + manifest={} + for raw in files: + if not raw:continue + relative=Path(os.fsdecode(raw)) + original=ROOT/relative + if not original.is_file():continue + target=source/relative;target.parent.mkdir(parents=True,exist_ok=True) + shutil.copy2(original,target) + if relative.parts[0] in ('src','migrations','infra') or str(relative) in ('Dockerfile','Dockerfile.dockerignore','requirements.txt','requirements-student.txt', + 'student.env.example','student.mk','compose.yaml','alembic.ini'): + manifest[str(relative)]=hashlib.sha256(original.read_bytes()).hexdigest() + subprocess.run([sys.executable,str(source/'scripts/setup-env.py')],cwd=source,check=True,capture_output=True) + env_file=source/'.env' + text=env_file.read_text().replace('APP_PORT=8080','APP_PORT='+str(port)) + env_file.write_text(text) + environment={**os.environ,'COMPOSE_PROJECT_NAME':project,'ENV_FILE':str(env_file), + 'APP_PORT':str(port),'APP_IMAGE':'mtusi-messenger:'+project, + 'MINIO_IMAGE':'mtusi-minio:'+project} + # A clean launch must not inherit deployment overrides from the current shell. + for name in ('POSTGRES_PASSWORD','POSTGRES_USER','POSTGRES_DB','MINIO_ROOT_USER', + 'MINIO_ROOT_PASSWORD','S3_ACCESS_KEY_ID','S3_SECRET_ACCESS_KEY','S3_RECONCILE_ACCESS_KEY_ID', + 'S3_RECONCILE_SECRET_ACCESS_KEY','UPLOAD_CONCURRENCY','API_REPLICAS','API_MEMORY'): + environment.pop(name,None) + command=['docker','compose','--env-file',str(env_file)] + def run(*args,timeout=300): + return subprocess.run(args,cwd=source,env=environment,text=True,check=True, + capture_output=True,timeout=timeout) + def run_build(*args): + started=time.perf_counter() + result=run(*command,'build',*args,timeout=900) + return {'seconds':round(time.perf_counter()-started,3),'exit_code':result.returncode} + try: + proof['api_build']=run_build('--no-cache','api') + proof['minio_build']=run_build('minio') + run(*command,'up','-d','--no-build','--wait',timeout=180) + version=run(*command,'exec','-T','postgres','sh','-c', + 'exec psql -U "$POSTGRES_USER" -d "$POSTGRES_DB" -Atc "SELECT version_num FROM alembic_version"').stdout.strip() + assert version=='008',version + proof['schema_revision']=version + proof['public_smoke']=run(sys.executable,'tests/smoke.py','--base-url',f'http://127.0.0.1:{port}').stdout.strip() + proof['attachments']=run(sys.executable,'tests/attachments.py','--base-url',f'http://127.0.0.1:{port}').stdout.strip() + proof['reconciler']=json.loads(run(*command,'exec','-T','reconciler','python','-m','src.maintenance.reconcile').stdout) + assert proof['reconciler']['result']=='ok' + rows=run(*command,'ps','--format','json').stdout + proof['services']=[{'service':r['Service'],'state':r['State'],'health':r.get('Health','')} + for r in (json.loads(line) for line in rows.splitlines() if line.strip())] + proof['code_manifest']=manifest + proof['result']='PASS' + except subprocess.CalledProcessError as error: + # Never dump compose config/environment; build/application outputs exclude credentials. + print((error.stdout+error.stderr)[-4000:]) + raise + finally: + run(*command,'down','--volumes','--remove-orphans',timeout=90) + proof['temporary_project_and_volumes_removed']=True + run('docker','image','rm',environment['APP_IMAGE'],environment['MINIO_IMAGE'],timeout=60) + proof['temporary_image_tags_removed']=True + (ROOT/'evidence/lab4-clean-start.json').write_text(json.dumps(proof,ensure_ascii=False,indent=2)+'\n') + print(json.dumps({k:v for k,v in proof.items() if k!='code_manifest'},ensure_ascii=False,indent=2)) diff --git a/scripts/test-expiry.sh b/scripts/test-expiry.sh new file mode 100755 index 00000000..1c479ec8 --- /dev/null +++ b/scripts/test-expiry.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -eu +cd "$(dirname "$0")/.." +# Сохраняет обычный TTL и восстанавливает API даже при падении проверки. +restore() { docker compose up -d --wait --force-recreate api; } +trap restore EXIT +SESSION_TTL_SECONDS=2 docker compose up -d --wait --force-recreate api +"${PYTHON:-python3}" tests/expiry.py diff --git a/scripts/test-persistence.py b/scripts/test-persistence.py new file mode 100644 index 00000000..69ca1863 --- /dev/null +++ b/scripts/test-persistence.py @@ -0,0 +1,46 @@ +"""Исходный persistence-сценарий плюс доказательство рестарта API и всех хранилищ.""" +import argparse +import json +from pathlib import Path +import subprocess +import sys + +ROOT = Path(__file__).resolve().parents[1] + + +def states(): + result = {} + for service in ('api', 'postgres', 'redis', 'minio', 'reconciler', 'lb'): + ids = subprocess.check_output(['docker', 'compose', 'ps', '-q', service], cwd=ROOT, text=True).split() + if not ids: + raise RuntimeError('Не запущен сервис ' + service) + result[service] = {} + for container in ids: + state = json.loads(subprocess.check_output(['docker', 'inspect', '--format', '{{json .State}}', container], cwd=ROOT, text=True)) + result[service][container] = {'StartedAt': state['StartedAt'], 'Pid': state['Pid']} + return result + + +def main(): + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument('--base-url', default='http://localhost:8080') + parser.add_argument('--action-script', required=True) + parser.add_argument('--ca-file') + args = parser.parse_args() + before = states() + print('ДО: ' + json.dumps(before), flush=True) + command = [sys.executable, str(ROOT / 'tests/resilience.py'), '--mode', 'persistence', + '--action-script', args.action_script, '--base-url', args.base_url] + if args.ca_file: + command += ['--ca-file', args.ca_file] + subprocess.run(command, cwd=ROOT, check=True) + after = states() + print('ПОСЛЕ: ' + json.dumps(after), flush=True) + for service in before: + if before[service] == after[service]: + raise AssertionError('Сервис не перезапущен: ' + service) + print('PASS: StartedAt изменился у API, PostgreSQL, Redis, MinIO, reconciler и LB; прежний токен и данные сохранены') + + +if __name__ == '__main__': + main() diff --git a/scripts/test-reconciliation.sh b/scripts/test-reconciliation.sh new file mode 100755 index 00000000..982c5d79 --- /dev/null +++ b/scripts/test-reconciliation.sh @@ -0,0 +1,7 @@ +#!/bin/sh +set -eu +cd "$(dirname "$0")/.." +# Pass the DB address via environment, without printing it or placing it in argv. +api_container_id=$(docker compose ps -q api | head -n 1) +test_database_url=$(docker exec "$api_container_id" python -c 'import os; print(os.environ["DATABASE_URL"])') +DATABASE_URL="$test_database_url" docker compose run --rm --no-deps -T -e DATABASE_URL s3-bootstrap python < tests/reconciliation.py diff --git a/scripts/test-upload-memory.sh b/scripts/test-upload-memory.sh new file mode 100755 index 00000000..ee80ef32 --- /dev/null +++ b/scripts/test-upload-memory.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -eu +cd "$(dirname "$0")/.." +# Temporary profile: 5 admitted uploads per replica, serialized image decoding. +# Restore the ordinary project configuration even when the experiment fails. +restore_upload_profile() { + docker compose up -d --wait api >/dev/null 2>&1 +} +trap restore_upload_profile EXIT INT TERM +UPLOAD_CONCURRENCY=5 docker compose up -d --wait api >/dev/null 2>&1 +"${PYTHON:-python3}" tests/upload_memory.py diff --git a/scripts/verify-lab4.py b/scripts/verify-lab4.py new file mode 100644 index 00000000..0e5b5e63 --- /dev/null +++ b/scripts/verify-lab4.py @@ -0,0 +1,51 @@ +"""Sequential acceptance checks, reviewer cases, research and reproducible clean startup.""" +import json +import os +import subprocess +import sys +import time +from pathlib import Path +from dotenv import dotenv_values + +ROOT=Path(__file__).resolve().parents[1] +EVIDENCE=ROOT/'evidence' +EVIDENCE.mkdir(exist_ok=True) +python=sys.executable +port=os.environ.get('APP_PORT') or dotenv_values(ROOT/'.env').get('APP_PORT') or '8080' +base_url=os.environ.get('BASE_URL') or 'http://127.0.0.1:'+str(port) +api=subprocess.check_output(['docker','compose','ps','-q','api'],cwd=ROOT,text=True).split()[0] +checks=[ + ('course-files',[python,'scripts/check-course-files.py'],None), + ('quality',[python,'-m','ruff','check','src'],None), + ('format',[python,'-m','ruff','format','--check','src'],None), + ('structure',[python,'scripts/check_contract.py'],None), + ('openapi',[python,'scripts/validate_openapi.py'],None), + ('request-deadline',['docker','exec','-i',api,'python'],'tests/request_deadline.py'), + ('readiness-budget',['docker','exec','-i',api,'python'],'tests/readiness.py'), + ('public-smoke',[python,'tests/smoke.py'],None), + ('attachments',[python,'tests/attachments.py'],None), + ('idempotency',[python,'tests/idempotency.py'],None), + ('reviewer-cases',[python,'tests/lab4_review.py'],None), + ('reconciliation',['scripts/test-reconciliation.sh'],None), + ('upload-memory',['scripts/test-upload-memory.sh'],None), + ('uploader-failover',[python,'tests/attachment_failover.py'],None), + ('persistence-proof',[python,'scripts/test-persistence.py','--action-script','scripts/restart.sh','--base-url',base_url],None), + ('clean-start',[python,'scripts/test-clean-lab4.py'],None), +] +summary=[] +for name,command,input_file in checks: + print('Проверка: '+name,flush=True) + started=time.perf_counter() + source=open(ROOT/input_file,'rb') if input_file else None + try: + with (EVIDENCE/('lab4-final-'+name+'.txt')).open('wb') as output: + result=subprocess.run(command,cwd=ROOT,env={**os.environ,'PYTHON':python,'BASE_URL':base_url},stdin=source, + stdout=output,stderr=subprocess.STDOUT,timeout=1000 if name=='clean-start' else 180) + summary.append({'check':name,'exit_code':result.returncode,'seconds':round(time.perf_counter()-started,3), + 'evidence':'evidence/lab4-final-'+name+'.txt'}) + if result.returncode: + raise RuntimeError('Не прошла проверка '+name+'; см. '+summary[-1]['evidence']) + finally: + if source:source.close() +(EVIDENCE/'lab4-final-summary.json').write_text(json.dumps({'result':'PASS','checks':summary},ensure_ascii=False,indent=2)+'\n') +print('PASS: все итоговые проверки лабораторной 4',flush=True) diff --git a/src/__init__.py b/src/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/__main__.py b/src/__main__.py new file mode 100644 index 00000000..da5d2b9b --- /dev/null +++ b/src/__main__.py @@ -0,0 +1,13 @@ +import uvicorn + +from src.core.settings import settings + +if __name__ == "__main__": + uvicorn.run( + "src.main:app", + host=settings.app_host, + port=settings.app_port, + workers=settings.app_workers, + log_level=settings.log_level.lower(), + timeout_graceful_shutdown=settings.shutdown_timeout_seconds, + ) diff --git a/src/api/__init__.py b/src/api/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/api/dependencies.py b/src/api/dependencies.py new file mode 100644 index 00000000..d04ea93d --- /dev/null +++ b/src/api/dependencies.py @@ -0,0 +1,106 @@ +import base64 +import binascii +import re +from typing import Annotated + +from fastapi import Depends, Request +from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer +from fastapi.security.http import HTTPBase, HTTPBasicCredentials +from sqlalchemy.ext.asyncio import AsyncSession + +from src.core.db.session import get_db_session +from src.core.errors import ApiError +from src.core.settings import settings +from src.service.auth import AuthService +from src.service.chat import ChatService +from src.service.dto import UserDTO +from src.service.exceptions import InvalidSessionException +from src.service.message import MessageService +from src.service.user import UserService + +bearer_scheme = HTTPBearer( + scheme_name="bearerAuth", + description="Вставьте токен из ответа на вход, без префикса Bearer.", + auto_error=False, +) +basic_scheme = HTTPBase(scheme="basic", scheme_name="basicAuth", auto_error=False) + + +async def get_basic_credentials( + request: Request, + credentials: Annotated[HTTPAuthorizationCredentials | None, Depends(basic_scheme)], +) -> HTTPBasicCredentials: + if await request.body(): + raise ApiError(400, "invalid_request", "Вход не принимает тело запроса") + try: + authorization = request.headers.getlist("authorization") + if len(authorization) != 1 or len(authorization[0]) > settings.authorization_max_length: + raise ValueError + if credentials is None or credentials.scheme.lower() != "basic": + raise ValueError + decoded = base64.b64decode(credentials.credentials, validate=True).decode("utf-8") + username, separator, password = decoded.partition(":") + if ( + not separator + or re.fullmatch(r"[a-z0-9_]{3,32}", username) is None + or not 12 <= len(password) <= 128 + or not password.strip() + ): + raise ValueError + except (ValueError, UnicodeError, binascii.Error): + raise ApiError(401, "unauthorized", "Неверный логин или пароль") from None + return HTTPBasicCredentials(username=username, password=password) + + +def get_user_service( + db_session: Annotated[AsyncSession, Depends(get_db_session, scope="function")], +) -> UserService: + return UserService(db_session=db_session) + + +def get_chat_service( + db_session: Annotated[AsyncSession, Depends(get_db_session, scope="function")], +) -> ChatService: + return ChatService(db_session=db_session) + + +def get_message_service( + db_session: Annotated[AsyncSession, Depends(get_db_session, scope="function")], +) -> MessageService: + return MessageService(db_session=db_session) + + +def get_auth_service( + db_session: Annotated[AsyncSession, Depends(get_db_session, scope="function")], +) -> AuthService: + return AuthService( + db_session=db_session, + session_ttl_seconds=settings.session_ttl_seconds, + ) + + +def get_bearer_token( + request: Request, + credentials: Annotated[HTTPAuthorizationCredentials | None, Depends(bearer_scheme)], +) -> str: + if credentials is None or len(request.headers.getlist("authorization")) != 1: + raise ApiError(401, "unauthorized", "Требуется Bearer-токен") + token = credentials.credentials + if ( + credentials.scheme.lower() != "bearer" + or not token + or len(token) > 512 + or any(c.isspace() for c in token) + ): + raise ApiError(401, "unauthorized", "Требуется Bearer-токен") + return token + + +async def get_current_user( + auth: Annotated[AuthService, Depends(get_auth_service)], + token: Annotated[str, Depends(get_bearer_token)], +) -> UserDTO: + try: + return await auth.get_user(token=token) + except InvalidSessionException as error: + raise ApiError(401, "unauthorized", str(error)) from error diff --git a/src/api/router.py b/src/api/router.py new file mode 100644 index 00000000..71710124 --- /dev/null +++ b/src/api/router.py @@ -0,0 +1,17 @@ +from fastapi import APIRouter + +from src.api.v1.routers.attachments import router as attachments_router +from src.api.v1.routers.auth.router import router as auth_router +from src.api.v1.routers.chats.router import router as chats_router +from src.api.v1.routers.messages.router import router as messages_router +from src.api.v1.routers.users.router import router as users_router + +router = APIRouter(prefix="/api/v1", tags=["Версия 1"]) + +router.include_router(users_router) +router.include_router(chats_router) +router.include_router(messages_router) + +router.include_router(auth_router) + +router.include_router(attachments_router) diff --git a/src/api/v1/__init__.py b/src/api/v1/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/api/v1/routers/__init__.py b/src/api/v1/routers/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/api/v1/routers/attachments.py b/src/api/v1/routers/attachments.py new file mode 100644 index 00000000..9f0e6549 --- /dev/null +++ b/src/api/v1/routers/attachments.py @@ -0,0 +1,118 @@ +from datetime import datetime +from typing import Annotated, Literal +from uuid import UUID + +from anyio import to_thread +from fastapi import APIRouter, Depends, Query, Request +from fastapi.responses import StreamingResponse +from pydantic import BaseModel, Field +from sqlalchemy.ext.asyncio import AsyncSession + +from src.api.dependencies import get_current_user +from src.core.db.models import Attachment +from src.core.db.session import get_db_session +from src.core.errors import ApiError +from src.core.settings import settings +from src.core.storage import STORAGE_ERRORS, get_storage, unavailable +from src.service.attachment import AttachmentService +from src.service.dto import UserDTO + +router = APIRouter(tags=["Вложения"]) + + +class AttachmentOut(BaseModel): + id: UUID + chat_id: UUID + owner_id: UUID + filename: str + content_type: str + size_bytes: int + sha256: str + status: Literal["ready"] = "ready" + variants: list = Field(default_factory=list) + error_code: None = None + created_at: datetime + updated_at: datetime + + +def to_output(attachment: Attachment) -> AttachmentOut: + return AttachmentOut.model_validate(attachment, from_attributes=True) + + +def get_service( + session: Annotated[AsyncSession, Depends(get_db_session, scope="function")], +) -> AttachmentService: + return AttachmentService(session) + + +@router.post( + "/chats/{chat_id}/attachments", + status_code=201, + openapi_extra={ + "requestBody": { + "required": True, + "content": { + mime: {"schema": {"type": "string", "format": "binary"}} + for mime in ("image/png", "image/jpeg") + }, + } + }, +) +async def upload_attachment( + chat_id: UUID, + request: Request, + user: Annotated[UserDTO, Depends(get_current_user)], + service: Annotated[AttachmentService, Depends(get_service)], + filename: Annotated[str, Query(min_length=1, max_length=255)], +) -> AttachmentOut: + if len(request.query_params.getlist("filename")) != 1: + raise ApiError(400, "invalid_request", "Неоднозначное имя файла") + return to_output(await service.upload(request, chat_id, user.id, filename)) + + +@router.get("/attachments/{attachment_id}") +async def get_attachment( + attachment_id: UUID, + user: Annotated[UserDTO, Depends(get_current_user)], + service: Annotated[AttachmentService, Depends(get_service)], +) -> AttachmentOut: + return to_output(await service.get(attachment_id, user.id)) + + +@router.get("/attachments/{attachment_id}/content") +async def download_attachment( + attachment_id: UUID, + request: Request, + user: Annotated[UserDTO, Depends(get_current_user)], + service: Annotated[AttachmentService, Depends(get_service)], + variant: str = "original", +): + attachment = await service.get(attachment_id, user.id) + if len(request.query_params.getlist("variant")) > 1: + raise ApiError(400, "invalid_request", "Неоднозначный вариант") + if variant not in {"original", "thumbnail", "crop", "optimized"}: + raise ApiError(400, "invalid_request", "Некорректный вариант") + if variant != "original": + raise ApiError(404, "not_found", "Вариант не найден") + try: + response = await to_thread.run_sync( + lambda: get_storage().get_object(settings.s3_bucket, attachment.object_key) + ) + except STORAGE_ERRORS as error: + raise unavailable(error) from error + + async def content(): + try: + while chunk := await to_thread.run_sync(response.read, 64 * 1024): + yield chunk + finally: + response.close() + response.release_conn() + + return StreamingResponse( + content(), + media_type=attachment.content_type, + headers={ + "Content-Length": str(attachment.size_bytes), + }, + ) diff --git a/src/api/v1/routers/auth/__init__.py b/src/api/v1/routers/auth/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/api/v1/routers/auth/callback.py b/src/api/v1/routers/auth/callback.py new file mode 100644 index 00000000..45334b8b --- /dev/null +++ b/src/api/v1/routers/auth/callback.py @@ -0,0 +1,31 @@ +import logging + +from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker + +from src.core.db.repo.auth import fetch_user_credentials +from src.core.security import verify_password_async +from src.core.settings import settings +from src.service.user import UserService + +logger = logging.getLogger(__name__) + + +async def create_admin(session_factory: async_sessionmaker[AsyncSession]) -> None: + async with session_factory.begin() as session: + admin = await UserService(db_session=session).create_admin( + username=settings.admin_username, + display_name=settings.admin_display_name, + password=settings.admin_password.get_secret_value(), + ) + if admin is None and settings.app_env == "production": + credentials = await fetch_user_credentials(session, settings.admin_username) + if credentials is None or not await verify_password_async( + settings.admin_password.get_secret_value(), credentials.password_hash + ): + raise RuntimeError( + "Пароль существующего администратора не совпадает с настройкой production" + ) + if admin is None: + logger.info("Администратор уже существует") + else: + logger.info("Администратор создан: пользователь=%s", admin.id) diff --git a/src/api/v1/routers/auth/router.py b/src/api/v1/routers/auth/router.py new file mode 100644 index 00000000..49076ecd --- /dev/null +++ b/src/api/v1/routers/auth/router.py @@ -0,0 +1,50 @@ +from dataclasses import asdict +from typing import Annotated + +from fastapi import APIRouter, Depends, Response +from fastapi.security import HTTPBasicCredentials + +from src.api.dependencies import ( + get_auth_service, + get_basic_credentials, + get_bearer_token, + get_current_user, +) +from src.api.v1.routers.auth.schemas import SessionOut +from src.api.v1.routers.users.schemas import UserOut +from src.core.errors import ApiError +from src.service.auth import AuthService +from src.service.dto import UserDTO +from src.service.exceptions import InvalidCredentialsException + +router = APIRouter(prefix="/auth/sessions", tags=["Сессии"]) + + +@router.post("", status_code=201, response_model=SessionOut) +async def login( + credentials: Annotated[HTTPBasicCredentials, Depends(get_basic_credentials)], + auth: Annotated[AuthService, Depends(get_auth_service)], +) -> SessionOut: + try: + result = await auth.login( + username=credentials.username, + password=credentials.password, + ) + except InvalidCredentialsException as error: + raise ApiError(401, "unauthorized", str(error)) from error + return SessionOut( + token=result.token, + token_type=result.token_type, + expires_at=result.expires_at, + user=UserOut(**asdict(result.user)), + ) + + +@router.delete("/current", status_code=204) +async def logout( + current_user: Annotated[UserDTO, Depends(get_current_user)], + token: Annotated[str, Depends(get_bearer_token)], + auth: Annotated[AuthService, Depends(get_auth_service)], +) -> Response: + await auth.logout(token=token) + return Response(status_code=204) diff --git a/src/api/v1/routers/auth/schemas.py b/src/api/v1/routers/auth/schemas.py new file mode 100644 index 00000000..cdeff562 --- /dev/null +++ b/src/api/v1/routers/auth/schemas.py @@ -0,0 +1,13 @@ +from datetime import datetime +from typing import Literal + +from pydantic import BaseModel + +from src.api.v1.routers.users.schemas import UserOut + + +class SessionOut(BaseModel): + token: str + token_type: Literal["Bearer"] + expires_at: datetime + user: UserOut diff --git a/src/api/v1/routers/chats/__init__.py b/src/api/v1/routers/chats/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/api/v1/routers/chats/router.py b/src/api/v1/routers/chats/router.py new file mode 100644 index 00000000..d0718393 --- /dev/null +++ b/src/api/v1/routers/chats/router.py @@ -0,0 +1,86 @@ +from typing import Annotated +from uuid import UUID + +from fastapi import APIRouter, Depends, Query, status + +from src.api.dependencies import get_chat_service, get_current_user +from src.api.v1.routers.chats.schemas import ChatOut, CreateChatIn, GetChatOut +from src.api.v1.schemas import PaginationQuery +from src.core.errors import ApiError +from src.core.pagination import decode_cursor, encode_cursor +from src.service.chat import ChatService +from src.service.dto import ChatDTO, UserDTO +from src.service.exceptions import ChatNotFoundException, InvalidChatMembersException + +router = APIRouter(prefix="/chats", tags=["Чаты"]) + + +def _to_chat_out(chat: ChatDTO) -> ChatOut: + return ChatOut( + id=chat.id, + title=chat.title, + member_ids=list(chat.member_ids), + created_at=chat.created_at, + ) + + +@router.post("", status_code=status.HTTP_201_CREATED) +async def create_chat( + chat_in: CreateChatIn, + current_user: Annotated[UserDTO, Depends(get_current_user)], + chat_service: Annotated[ChatService, Depends(get_chat_service)], +) -> ChatOut: + try: + chat = await chat_service.create_chat( + title=chat_in.title, + member_ids=chat_in.member_ids, + current_user_id=current_user.id, + ) + except InvalidChatMembersException as error: + raise ApiError(400, "invalid_request", str(error)) from error + return _to_chat_out(chat) + + +@router.get("", status_code=status.HTTP_200_OK) +async def get_chats( + pagination: Annotated[PaginationQuery, Query()], + current_user: Annotated[UserDTO, Depends(get_current_user)], + chat_service: Annotated[ChatService, Depends(get_chat_service)], +) -> GetChatOut: + after = None + if pagination.cursor is not None: + after = decode_cursor( + pagination.cursor, + expected_kind="chats", + expected_owner_id=current_user.id, + ) + chats = await chat_service.get_chats( + current_user_id=current_user.id, limit=pagination.limit + 1, after=after + ) + + page = chats[: pagination.limit] + next_cursor = None + if len(chats) > pagination.limit: + last = page[-1] + next_cursor = encode_cursor("chats", current_user.id, last.created_at, last.id) + + return GetChatOut( + items=[_to_chat_out(chat) for chat in page], + next_cursor=next_cursor, + ) + + +@router.get("/{chat_id}", summary="Получить доступный чат") +async def get_chat( + chat_id: UUID, + current_user: Annotated[UserDTO, Depends(get_current_user)], + chat_service: Annotated[ChatService, Depends(get_chat_service)], +) -> ChatOut: + try: + chat = await chat_service.get_chat( + chat_id=chat_id, + current_user_id=current_user.id, + ) + except ChatNotFoundException as error: + raise ApiError(404, "not_found", str(error)) from error + return _to_chat_out(chat) diff --git a/src/api/v1/routers/chats/schemas.py b/src/api/v1/routers/chats/schemas.py new file mode 100644 index 00000000..b51b7f88 --- /dev/null +++ b/src/api/v1/routers/chats/schemas.py @@ -0,0 +1,42 @@ +from datetime import datetime +from uuid import UUID + +from pydantic import BaseModel, ConfigDict, Field, field_validator + + +class CreateChatIn(BaseModel): + model_config = ConfigDict(extra="forbid") + + title: str = Field(min_length=1, max_length=100) + member_ids: list[UUID] = Field(min_length=1, max_length=100) + + @field_validator("title") + @classmethod + def title_must_not_be_blank(cls, value: str) -> str: + value.encode("utf-8") + if not value.strip(): + raise ValueError("title не может состоять только из пробелов") + return value + + @field_validator("member_ids") + @classmethod + def member_ids_must_be_unique(cls, value: list[UUID]) -> list[UUID]: + if len(value) != len(set(value)): + raise ValueError("member_ids не должен содержать дубликаты") + return value + + +class ChatOut(BaseModel): + model_config = ConfigDict(extra="forbid") + + id: UUID + title: str + member_ids: list[UUID] + created_at: datetime + + +class GetChatOut(BaseModel): + model_config = ConfigDict(extra="forbid") + + items: list[ChatOut] + next_cursor: str | None diff --git a/src/api/v1/routers/messages/__init__.py b/src/api/v1/routers/messages/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/api/v1/routers/messages/router.py b/src/api/v1/routers/messages/router.py new file mode 100644 index 00000000..68f92659 --- /dev/null +++ b/src/api/v1/routers/messages/router.py @@ -0,0 +1,96 @@ +import re +from typing import Annotated +from uuid import UUID + +from fastapi import APIRouter, Depends, Header, Query, Request, status + +from src.api.dependencies import get_current_user, get_message_service +from src.api.v1.routers.messages.schemas import ( + CreateMessageIn, + MessageOut, + MessagePageOut, +) +from src.api.v1.schemas import PaginationQuery +from src.core.errors import ApiError +from src.core.pagination import decode_cursor, encode_cursor +from src.service.dto import MessageDTO, UserDTO +from src.service.exceptions import ChatNotFoundException, IdempotencyConflictException +from src.service.message import MessageService + +router = APIRouter(prefix="/chats", tags=["Сообщения"]) + + +def _to_message_out(message: MessageDTO) -> MessageOut: + return MessageOut( + id=message.id, + chat_id=message.chat_id, + sender_id=message.sender_id, + text=message.text, + attachment_ids=list(message.attachment_ids), + created_at=message.created_at, + ) + + +@router.post("/{chat_id}/messages", status_code=status.HTTP_201_CREATED) +async def create_message( + chat_id: UUID, + message_in: CreateMessageIn, + request: Request, + current_user: Annotated[UserDTO, Depends(get_current_user)], + message_service: Annotated[MessageService, Depends(get_message_service)], + idempotency_key: Annotated[str, Header()], +) -> MessageOut: + if ( + len(request.headers.getlist("idempotency-key")) != 1 + or re.fullmatch(r"[A-Za-z0-9._:-]{1,128}", idempotency_key) is None + ): + raise ApiError(400, "invalid_request", "Требуется корректный Idempotency-Key") + try: + message = await message_service.create_message( + chat_id=chat_id, + sender_id=current_user.id, + text=message_in.text, + attachment_ids=message_in.attachment_ids, + idempotency_key=idempotency_key, + ) + except ChatNotFoundException as error: + raise ApiError(404, "not_found", str(error)) from error + except IdempotencyConflictException as error: + raise ApiError(409, "conflict", "Ключ уже использован для другого сообщения") from error + return _to_message_out(message) + + +@router.get("/{chat_id}/messages", status_code=status.HTTP_200_OK) +async def get_messages( + chat_id: UUID, + pagination: Annotated[PaginationQuery, Query()], + current_user: Annotated[UserDTO, Depends(get_current_user)], + message_service: Annotated[MessageService, Depends(get_message_service)], +) -> MessagePageOut: + after = None + if pagination.cursor is not None: + after = decode_cursor( + pagination.cursor, + expected_kind="messages", + expected_owner_id=chat_id, + ) + try: + messages = await message_service.get_messages( + chat_id=chat_id, + current_user_id=current_user.id, + limit=pagination.limit + 1, + after=after, + ) + except ChatNotFoundException as error: + raise ApiError(404, "not_found", str(error)) from error + + page = messages[: pagination.limit] + next_cursor = None + if len(messages) > pagination.limit: + last = page[-1] + next_cursor = encode_cursor("messages", chat_id, last.created_at, last.id) + + return MessagePageOut( + items=[_to_message_out(message) for message in page], + next_cursor=next_cursor, + ) diff --git a/src/api/v1/routers/messages/schemas.py b/src/api/v1/routers/messages/schemas.py new file mode 100644 index 00000000..1a0c821a --- /dev/null +++ b/src/api/v1/routers/messages/schemas.py @@ -0,0 +1,43 @@ +from datetime import datetime +from uuid import UUID + +from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator + + +class CreateMessageIn(BaseModel): + model_config = ConfigDict(extra="forbid") + + text: str = Field(max_length=4000) + attachment_ids: list[UUID] = Field(default_factory=list, max_length=10) + + @field_validator("text") + @classmethod + def text_must_not_be_blank(cls, value: str) -> str: + value.encode("utf-8") + return value + + @model_validator(mode="after") + def validate_message(self): + if not self.text.strip() and not self.attachment_ids: + raise ValueError("Требуется текст или вложение") + if len(set(self.attachment_ids)) != len(self.attachment_ids): + raise ValueError("Вложения не должны повторяться") + return self + + +class MessageOut(BaseModel): + model_config = ConfigDict(extra="forbid") + + id: UUID + chat_id: UUID + sender_id: UUID + text: str + attachment_ids: list[UUID] + created_at: datetime + + +class MessagePageOut(BaseModel): + model_config = ConfigDict(extra="forbid") + + items: list[MessageOut] + next_cursor: str | None diff --git a/src/api/v1/routers/users/__init__.py b/src/api/v1/routers/users/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/api/v1/routers/users/router.py b/src/api/v1/routers/users/router.py new file mode 100644 index 00000000..cbe37264 --- /dev/null +++ b/src/api/v1/routers/users/router.py @@ -0,0 +1,44 @@ +from typing import Annotated + +from fastapi import APIRouter, Depends, status + +from src.api.dependencies import get_current_user, get_user_service +from src.api.v1.routers.users.schemas import CreateUserIn, UserOut +from src.core.errors import ApiError +from src.service.dto import UserDTO +from src.service.exceptions import UserAlreadyExistsException +from src.service.user import UserService + +router = APIRouter(prefix="/users", tags=["Пользователи"]) + + +def _to_user_out(user: UserDTO) -> UserOut: + return UserOut( + id=user.id, + username=user.username, + display_name=user.display_name, + created_at=user.created_at, + ) + + +@router.post("", status_code=status.HTTP_201_CREATED) +async def create_user( + user_in: CreateUserIn, + user_service: Annotated[UserService, Depends(get_user_service)], +) -> UserOut: + try: + user = await user_service.create_user( + password=user_in.password, + username=user_in.username, + display_name=user_in.display_name, + ) + except UserAlreadyExistsException as error: + raise ApiError(409, "conflict", str(error)) from error + return _to_user_out(user) + + +@router.get("/me", status_code=status.HTTP_200_OK) +async def get_me( + current_user: Annotated[UserDTO, Depends(get_current_user)], +) -> UserOut: + return _to_user_out(current_user) diff --git a/src/api/v1/routers/users/schemas.py b/src/api/v1/routers/users/schemas.py new file mode 100644 index 00000000..7cac9dae --- /dev/null +++ b/src/api/v1/routers/users/schemas.py @@ -0,0 +1,29 @@ +from datetime import datetime +from uuid import UUID + +from pydantic import BaseModel, ConfigDict, Field, field_validator + + +class CreateUserIn(BaseModel): + model_config = ConfigDict(extra="forbid") + + username: str = Field(pattern=r"^[a-z0-9_]{3,32}$") + password: str = Field(min_length=12, max_length=128) + display_name: str = Field(min_length=1, max_length=100) + + @field_validator("display_name", "password") + @classmethod + def required_string_must_not_be_blank(cls, value: str) -> str: + value.encode("utf-8") + if not value.strip(): + raise ValueError("Обязательная строка не может состоять только из пробелов") + return value + + +class UserOut(BaseModel): + model_config = ConfigDict(extra="forbid") + + id: UUID + username: str + display_name: str + created_at: datetime diff --git a/src/api/v1/schemas.py b/src/api/v1/schemas.py new file mode 100644 index 00000000..63106894 --- /dev/null +++ b/src/api/v1/schemas.py @@ -0,0 +1,21 @@ +import re + +from pydantic import BaseModel, ConfigDict, Field, field_validator + +from src.core.settings import settings + + +class PaginationQuery(BaseModel): + model_config = ConfigDict(extra="forbid") + + limit: int = Field(default=50, ge=1, le=100) + cursor: str | None = Field(default=None, min_length=1, max_length=settings.cursor_max_length) + + @field_validator("limit", mode="before") + @classmethod + def limit_must_be_integer(cls, value): + if isinstance(value, bool) or isinstance(value, float): + raise ValueError("limit должен быть целым числом") + if isinstance(value, str) and re.fullmatch(r"[0-9]+", value) is None: + raise ValueError("limit должен содержать десятичные цифры") + return value diff --git a/src/core/__init__.py b/src/core/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/core/cache.py b/src/core/cache.py new file mode 100644 index 00000000..19444bfe --- /dev/null +++ b/src/core/cache.py @@ -0,0 +1,68 @@ +"""Клиент Redis и необязательный кэш профилей пользователей.""" + +import logging + +from redis.asyncio import Redis +from redis.exceptions import RedisError + +from src.core.settings import settings + +logger = logging.getLogger(__name__) +cache: Redis | None = None + + +def open_cache(): + global cache + cache = Redis.from_url( + settings.redis_url.get_secret_value(), + decode_responses=True, + max_connections=settings.redis_max_connections, + socket_connect_timeout=settings.redis_connect_timeout_seconds, + socket_timeout=settings.redis_read_timeout_seconds, + retry_on_timeout=settings.redis_retry_on_timeout, + ) + + +async def close_cache(): + global cache + if cache is not None: + await cache.aclose() + cache = None + + +async def get(key: str) -> str | None: + if cache is None: + return None + try: + return await cache.get(key) + except UnicodeError: + logger.warning("Повреждённый UTF-8 в кэше профиля; читаем PostgreSQL") + await delete(key) + return None + except (RedisError, OSError): + logger.warning("Redis недоступен; читаем профиль из PostgreSQL") + return None + + +async def set(key: str, value: str): + if cache is None: + return + try: + await cache.set(key, value, ex=settings.profile_cache_ttl_seconds) + except (RedisError, OSError): + logger.warning("Redis недоступен; пропускаем запись кэша") + + +async def delete(key: str) -> None: + if cache is None: + return + try: + await cache.delete(key) + except (RedisError, OSError): + logger.warning("Redis недоступен; пропускаем удаление кэша профиля") + + +def get_client() -> Redis: + if cache is None: + raise RedisError("Клиент Redis не настроен") + return cache diff --git a/src/core/callback.py b/src/core/callback.py new file mode 100644 index 00000000..3cf0cff6 --- /dev/null +++ b/src/core/callback.py @@ -0,0 +1,24 @@ +from collections.abc import AsyncIterator +from contextlib import asynccontextmanager + +from fastapi import FastAPI + +from src.api.v1.routers.auth.callback import create_admin +from src.core import readiness +from src.core.db import session as database + +STARTUP_CALLBACKS = (create_admin,) + + +@asynccontextmanager +async def lifespan(app: FastAPI) -> AsyncIterator[None]: + async with database.database_lifespan(app): + session_factory = database.session_factory + if session_factory is None: + raise RuntimeError("Фабрика сессий не запущена") + for callback in STARTUP_CALLBACKS: + await callback(session_factory) + try: + yield + finally: + await readiness.close() diff --git a/src/core/db/__init__.py b/src/core/db/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/core/db/models.py b/src/core/db/models.py new file mode 100644 index 00000000..116e6fd6 --- /dev/null +++ b/src/core/db/models.py @@ -0,0 +1,160 @@ +from datetime import datetime +from uuid import UUID + +from sqlalchemy import ( + BigInteger, + Boolean, + CheckConstraint, + DateTime, + ForeignKey, + ForeignKeyConstraint, + Index, + Integer, + String, + Text, + UniqueConstraint, + false, +) +from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column, relationship + +from src.core.db.types import Utf8Text + + +class Base(DeclarativeBase): + pass + + +class User(Base): + __tablename__ = "users" + __table_args__ = ( + CheckConstraint("username ~ '^[a-z0-9_]{3,32}$'"), + CheckConstraint( + "octet_length(display_name) BETWEEN 1 AND 400", name="users_display_name_bytes_check" + ), + ) + + id: Mapped[UUID] = mapped_column(primary_key=True) + username: Mapped[str] = mapped_column(String(32), unique=True) + display_name: Mapped[str] = mapped_column(Utf8Text()) + password_hash: Mapped[str] = mapped_column(Text) + is_admin: Mapped[bool] = mapped_column(Boolean, default=False, server_default=false()) + created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True)) + + +class Chat(Base): + __tablename__ = "chats" + __table_args__ = ( + CheckConstraint("octet_length(title) BETWEEN 1 AND 400", name="chats_title_bytes_check"), + ) + + id: Mapped[UUID] = mapped_column(primary_key=True) + title: Mapped[str] = mapped_column(Utf8Text()) + created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True)) + members: Mapped[list["ChatMember"]] = relationship(order_by="ChatMember.user_id") + + +class ChatMember(Base): + __tablename__ = "chat_members" + __table_args__ = (Index("chat_members_user_idx", "user_id", "chat_id"),) + + chat_id: Mapped[UUID] = mapped_column( + ForeignKey("chats.id", ondelete="CASCADE"), primary_key=True + ) + user_id: Mapped[UUID] = mapped_column(ForeignKey("users.id"), primary_key=True) + + +class Message(Base): + __tablename__ = "messages" + __table_args__ = ( + ForeignKeyConstraint( + ["chat_id", "sender_id"], ["chat_members.chat_id", "chat_members.user_id"] + ), + CheckConstraint("octet_length(text) BETWEEN 0 AND 16000", name="messages_text_bytes_check"), + UniqueConstraint("chat_id", "id"), + Index("messages_history_idx", "chat_id", "created_at", "id"), + ) + + id: Mapped[UUID] = mapped_column(primary_key=True) + chat_id: Mapped[UUID] = mapped_column(ForeignKey("chats.id")) + sender_id: Mapped[UUID] = mapped_column(ForeignKey("users.id")) + attachments: Mapped[list["MessageAttachment"]] = relationship( + lazy="selectin", order_by="MessageAttachment.position" + ) + text: Mapped[str] = mapped_column(Utf8Text()) + created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True)) + + +class MessageRequest(Base): + # Таблица обслуживает только POST /chats/{chat_id}/messages: метод и путь + # однозначно заданы таблицей и chat_id. Общая область ключа: sender/chat/key. + __tablename__ = "message_requests" + + sender_id: Mapped[UUID] = mapped_column(ForeignKey("users.id"), primary_key=True) + chat_id: Mapped[UUID] = mapped_column(ForeignKey("chats.id"), primary_key=True) + key: Mapped[str] = mapped_column(String(128), primary_key=True) + request_text: Mapped[str] = mapped_column(Utf8Text()) + request_attachment_ids: Mapped[str] = mapped_column(Text, default="", server_default="") + message_id: Mapped[UUID | None] = mapped_column(ForeignKey("messages.id")) + expires_at: Mapped[datetime] = mapped_column(DateTime(timezone=True)) + + +class Attachment(Base): + __tablename__ = "attachments" + __table_args__ = ( + UniqueConstraint("chat_id", "id"), + CheckConstraint("size_bytes BETWEEN 1 AND 10485760"), + CheckConstraint("content_type IN ('image/png', 'image/jpeg')"), + Index("attachments_chat_idx", "chat_id"), + ) + + id: Mapped[UUID] = mapped_column(primary_key=True) + chat_id: Mapped[UUID] = mapped_column(ForeignKey("chats.id")) + owner_id: Mapped[UUID] = mapped_column(ForeignKey("users.id")) + filename: Mapped[str] = mapped_column(String(255)) + object_key: Mapped[str] = mapped_column(Text, unique=True) + content_type: Mapped[str] = mapped_column(String(32)) + size_bytes: Mapped[int] = mapped_column(BigInteger) + sha256: Mapped[str] = mapped_column(String(64)) + created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True)) + updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True)) + storage_missing_since: Mapped[datetime | None] = mapped_column(DateTime(timezone=True)) + + +class MessageAttachment(Base): + __tablename__ = "message_attachments" + __table_args__ = ( + ForeignKeyConstraint( + ["chat_id", "message_id"], ["messages.chat_id", "messages.id"], ondelete="CASCADE" + ), + ForeignKeyConstraint( + ["chat_id", "attachment_id"], ["attachments.chat_id", "attachments.id"] + ), + UniqueConstraint("message_id", "position"), + CheckConstraint("position BETWEEN 0 AND 9"), + ) + + message_id: Mapped[UUID] = mapped_column(primary_key=True) + attachment_id: Mapped[UUID] = mapped_column(primary_key=True) + chat_id: Mapped[UUID] = mapped_column() + position: Mapped[int] = mapped_column(Integer) + + +class UploadIntent(Base): + __tablename__ = "upload_intents" + __table_args__ = (CheckConstraint("state IN ('pending', 'committed', 'abandoned')"),) + + object_key: Mapped[str] = mapped_column(Text, primary_key=True) + state: Mapped[str] = mapped_column(String(16)) + created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True)) + + +class StorageFinding(Base): + __tablename__ = "storage_findings" + __table_args__ = (CheckConstraint("kind IN ('orphan', 'missing')"),) + + object_key: Mapped[str] = mapped_column(Text, primary_key=True) + kind: Mapped[str] = mapped_column(String(16), primary_key=True) + fingerprint: Mapped[str | None] = mapped_column(Text) + first_seen: Mapped[datetime] = mapped_column(DateTime(timezone=True)) + last_seen: Mapped[datetime] = mapped_column(DateTime(timezone=True)) + resolved_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True)) diff --git a/src/core/db/repo/__init__.py b/src/core/db/repo/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/core/db/repo/auth.py b/src/core/db/repo/auth.py new file mode 100644 index 00000000..2497013b --- /dev/null +++ b/src/core/db/repo/auth.py @@ -0,0 +1,16 @@ +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession + +from src.core.db.models import User +from src.core.db.repo.user import to_user +from src.service.dto import UserCredentialsDTO + + +async def fetch_user_credentials( + session: AsyncSession, + username: str, +) -> UserCredentialsDTO | None: + user = await session.scalar(select(User).where(User.username == username)) + if user is None: + return None + return UserCredentialsDTO(user=to_user(user), password_hash=user.password_hash) diff --git a/src/core/db/repo/chat.py b/src/core/db/repo/chat.py new file mode 100644 index 00000000..aa887703 --- /dev/null +++ b/src/core/db/repo/chat.py @@ -0,0 +1,59 @@ +from datetime import datetime +from uuid import UUID + +from sqlalchemy import select, tuple_ +from sqlalchemy.ext.asyncio import AsyncSession +from sqlalchemy.orm import selectinload + +from src.core.db.models import Chat, ChatMember +from src.service.dto import ChatDTO + + +def to_chat(chat: Chat) -> ChatDTO: + return ChatDTO( + chat.id, chat.title, tuple(member.user_id for member in chat.members), chat.created_at + ) + + +async def fetch_chat_by_id(session: AsyncSession, chat_id: UUID) -> ChatDTO | None: + chat = await session.scalar( + select(Chat).options(selectinload(Chat.members)).where(Chat.id == chat_id), + ) + return to_chat(chat) if chat else None + + +async def fetch_chats( + session: AsyncSession, + user_id: UUID, + limit: int, + after: tuple[datetime, UUID] | None = None, +) -> list[ChatDTO]: + query = ( + select(Chat) + .options(selectinload(Chat.members)) + .join(ChatMember) + .where(ChatMember.user_id == user_id) + ) + if after is not None: + query = query.where(tuple_(Chat.created_at, Chat.id) > after) + chats = await session.scalars(query.order_by(Chat.created_at, Chat.id).limit(limit)) + return [to_chat(chat) for chat in chats] + + +async def create_chat( + session: AsyncSession, + chat_id: UUID, + title: str, + member_ids: list[UUID], + created_at: datetime, +) -> ChatDTO: + chat = Chat( + id=chat_id, + title=title, + created_at=created_at, + members=[ChatMember(user_id=user_id) for user_id in member_ids], + ) + session.add(chat) + # ORM сохраняет чат и участников в транзакции текущего запроса. + await session.flush() + return to_chat(chat) diff --git a/src/core/db/repo/message.py b/src/core/db/repo/message.py new file mode 100644 index 00000000..e8578edb --- /dev/null +++ b/src/core/db/repo/message.py @@ -0,0 +1,148 @@ +from datetime import datetime +from uuid import UUID + +from sqlalchemy import select, tuple_ +from sqlalchemy.ext.asyncio import AsyncSession + +from src.core.db.models import Attachment, Message, MessageAttachment, MessageRequest +from src.service.dto import MessageDTO + + +def to_message(message: Message) -> MessageDTO: + return MessageDTO( + message.id, + message.chat_id, + message.sender_id, + message.text, + message.created_at, + tuple(link.attachment_id for link in message.attachments), + ) + + +def history_query(chat_id: UUID, limit: int, after: tuple[datetime, UUID] | None = None): + query = select(Message).where(Message.chat_id == chat_id) + if after is not None: + query = query.where(tuple_(Message.created_at, Message.id) > after) + return query.order_by(Message.created_at, Message.id).limit(limit) + + +async def fetch_messages_by_chat_id( + session: AsyncSession, + chat_id: UUID, + limit: int, + after: tuple[datetime, UUID] | None = None, +) -> list[MessageDTO]: + messages = await session.scalars(history_query(chat_id, limit, after)) + return [to_message(message) for message in messages] + + +async def create_message( + session: AsyncSession, + message_id: UUID, + chat_id: UUID, + sender_id: UUID, + text: str, + created_at: datetime, + attachment_ids: list[UUID] | None = None, +) -> MessageDTO: + message = Message( + id=message_id, + chat_id=chat_id, + sender_id=sender_id, + text=text, + created_at=created_at, + attachments=[ + MessageAttachment(chat_id=chat_id, attachment_id=aid, position=i) + for i, aid in enumerate(attachment_ids or []) + ], + ) + session.add(message) + await session.flush() + return to_message(message) + + +async def create_idempotent_message( + session: AsyncSession, + message_id: UUID, + chat_id: UUID, + sender_id: UUID, + text: str, + created_at: datetime, + idempotency_key: str, + attachment_ids: list[UUID] | None = None, +) -> MessageDTO: + from sqlalchemy import func, update + from sqlalchemy import text as sql_text + from sqlalchemy.dialects.postgresql import insert + + from src.core.errors import ApiError + from src.service.exceptions import IdempotencyConflictException + + attachment_ids = attachment_ids or [] + request_attachments = ",".join(str(aid) for aid in attachment_ids) + if attachment_ids: + found = set( + await session.scalars( + select(Attachment.id).where( + Attachment.chat_id == chat_id, Attachment.id.in_(attachment_ids) + ) + ) + ) + if found != set(attachment_ids): + raise ApiError(404, "not_found", "Вложение не найдено") + + identity = ( + MessageRequest.sender_id == sender_id, + MessageRequest.chat_id == chat_id, + MessageRequest.key == idempotency_key, + ) + # UNIQUE/UPSERT сериализует конкурентные повторы даже на разных процессах. + # Проигравший ждёт COMMIT; при rollback он сам получает право на создание. + values = dict( + sender_id=sender_id, + chat_id=chat_id, + key=idempotency_key, + request_text=text, + request_attachment_ids=request_attachments, + message_id=None, + expires_at=func.clock_timestamp() + sql_text("interval '24 hours'"), + ) + claim = ( + insert(MessageRequest) + .values(**values) + .on_conflict_do_update( + index_elements=["sender_id", "chat_id", "key"], + set_={ + k: v + for k, v in values.items() + if k in {"request_text", "request_attachment_ids", "message_id", "expires_at"} + }, + where=MessageRequest.expires_at <= func.clock_timestamp(), + ) + .returning(MessageRequest.key) + ) + owned = await session.scalar(claim) + if owned is None: + existing = (await session.execute(select(MessageRequest).where(*identity))).scalar_one() + if existing.request_text != text or existing.request_attachment_ids != request_attachments: + raise IdempotencyConflictException + message = await session.get(Message, existing.message_id) + if message is None: + raise RuntimeError("Нарушена атомарность результата идемпотентности") + return to_message(message) + + if attachment_ids: + missing = await session.scalar( + select(Attachment.id) + .where(Attachment.id.in_(attachment_ids), Attachment.storage_missing_since.is_not(None)) + .limit(1) + ) + if missing is not None: + raise ApiError(409, "conflict", "Оригинал вложения недоступен") + + message = await create_message( + session, message_id, chat_id, sender_id, text, created_at, attachment_ids + ) + await session.execute(update(MessageRequest).where(*identity).values(message_id=message.id)) + # COMMIT сообщения и ключа выполняется вместе в get_db_session до HTTP 201. + return message diff --git a/src/core/db/repo/user.py b/src/core/db/repo/user.py new file mode 100644 index 00000000..6f10eed6 --- /dev/null +++ b/src/core/db/repo/user.py @@ -0,0 +1,120 @@ +import json +import re +from dataclasses import asdict +from datetime import datetime, timezone +from uuid import UUID + +from sqlalchemy import func, select +from sqlalchemy.dialects.postgresql import insert +from sqlalchemy.ext.asyncio import AsyncSession + +from src.core import cache +from src.core.db.models import User +from src.service.dto import UserDTO + + +def to_user(user: User) -> UserDTO: + return UserDTO(user.id, user.username, user.display_name, user.created_at) + + +async def fetch_user_by_id(session: AsyncSession, user_id: UUID) -> UserDTO | None: + key = f"user:v1:{user_id}" + cached = await cache.get(key) + if cached is not None: + try: + data = json.loads(cached) + if ( + not isinstance(data, dict) + or set(data) != {"id", "username", "display_name", "created_at"} + or not all(isinstance(value, str) for value in data.values()) + ): + raise ValueError + created_at = datetime.fromisoformat(data["created_at"]) + if created_at.tzinfo is None: + raise ValueError + data["display_name"].encode("utf-8") + user = UserDTO( + UUID(data["id"]), + data["username"], + data["display_name"], + created_at.astimezone(timezone.utc), + ) + if ( + user.id != user_id + or re.fullmatch(r"[a-z0-9_]{3,32}", user.username) is None + or not 1 <= len(user.display_name) <= 100 + or not user.display_name.strip() + or user.created_at.tzinfo is None + ): + raise ValueError + return user + except (ValueError, KeyError, TypeError, OverflowError): + await cache.delete(key) + model = await session.get(User, user_id) + user = to_user(model) if model else None + if user: + await cache.set(key, json.dumps(asdict(user), default=str)) + return user + + +async def fetch_user_by_username(session: AsyncSession, username: str) -> UserDTO | None: + model = await session.scalar(select(User).where(User.username == username)) + return to_user(model) if model else None + + +async def create_user( + session: AsyncSession, + user_id: UUID, + username: str, + display_name: str, + created_at: datetime, + password_hash: str, +) -> UserDTO: + user = User( + id=user_id, + username=username, + display_name=display_name, + created_at=created_at, + password_hash=password_hash, + ) + session.add(user) + await session.flush() + return to_user(user) + + +async def users_exist(session: AsyncSession, user_ids: list[UUID]) -> bool: + count = await session.scalar( + select(func.count()).select_from(User).where(User.id.in_(user_ids)) + ) + return count == len(user_ids) + + +async def create_admin( + session: AsyncSession, + user_id: UUID, + username: str, + display_name: str, + password_hash: str, + created_at: datetime, +) -> UserDTO | None: + user = await session.scalar( + insert(User) + .values( + id=user_id, + username=username, + display_name=display_name, + password_hash=password_hash, + created_at=created_at, + is_admin=True, + ) + .on_conflict_do_nothing(index_elements=[User.username]) + .returning(User) + ) + return to_user(user) if user else None + + +async def admin_exists(session: AsyncSession, username: str) -> bool: + user_id = await session.scalar( + select(User.id).where(User.username == username, User.is_admin.is_(True)) + ) + return user_id is not None diff --git a/src/core/db/session.py b/src/core/db/session.py new file mode 100644 index 00000000..e4aaeb05 --- /dev/null +++ b/src/core/db/session.py @@ -0,0 +1,48 @@ +from contextlib import asynccontextmanager + +from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine + +from src.core.cache import close_cache, open_cache +from src.core.settings import settings + +session_factory: async_sessionmaker[AsyncSession] | None = None + + +def create_engine(): + return create_async_engine( + settings.sqlalchemy_database_url, + pool_size=settings.database_pool_size, + max_overflow=settings.database_max_overflow, + pool_timeout=settings.database_pool_timeout_seconds, + pool_pre_ping=settings.database_pool_pre_ping, + hide_parameters=True, + connect_args={ + "timeout": settings.database_connect_timeout_seconds, + "command_timeout": settings.database_command_timeout_seconds, + "server_settings": {"statement_timeout": str(settings.database_statement_timeout_ms)}, + }, + ) + + +@asynccontextmanager +async def database_lifespan(app): + global session_factory + engine = create_engine() + session_factory = async_sessionmaker(engine, expire_on_commit=False) + open_cache() + try: + yield + finally: + await close_cache() + await engine.dispose() + session_factory = None + + +async def get_db_session(): + if session_factory is None: + raise RuntimeError("Фабрика сессий не запущена") + async with session_factory() as session: + # Одна транзакция на запрос: аутентификация и бизнес-операция вместе. + # Depends(scope='function') завершает COMMIT до отправки ответа. + async with session.begin(): + yield session diff --git a/src/core/db/types.py b/src/core/db/types.py new file mode 100644 index 00000000..36501fdc --- /dev/null +++ b/src/core/db/types.py @@ -0,0 +1,15 @@ +"""Unicode-строки в UTF-8 bytea: PostgreSQL text не допускает U+0000.""" + +from sqlalchemy import LargeBinary +from sqlalchemy.types import TypeDecorator + + +class Utf8Text(TypeDecorator[str]): + impl = LargeBinary + cache_ok = True + + def process_bind_param(self, value: str | None, dialect) -> bytes | None: + return None if value is None else value.encode("utf-8") + + def process_result_value(self, value: bytes | None, dialect) -> str | None: + return None if value is None else value.decode("utf-8") diff --git a/src/core/errors.py b/src/core/errors.py new file mode 100644 index 00000000..70a62c9b --- /dev/null +++ b/src/core/errors.py @@ -0,0 +1,29 @@ +from fastapi import Request +from fastapi.responses import JSONResponse + + +class ApiError(Exception): + def __init__(self, status_code: int, code: str, message: str) -> None: + self.status_code = status_code + self.code = code + self.message = message + super().__init__(message) + + +def error_response( + request: Request, + status_code: int, + code: str, + message: str, +) -> JSONResponse: + request_id = getattr(request.state, "request_id", "неизвестен") + return JSONResponse( + status_code=status_code, + content={ + "error": { + "code": code, + "message": message, + "request_id": request_id, + } + }, + ) diff --git a/src/core/pagination.py b/src/core/pagination.py new file mode 100644 index 00000000..d49e7b7c --- /dev/null +++ b/src/core/pagination.py @@ -0,0 +1,43 @@ +import base64 +import json +from datetime import datetime, timezone +from uuid import UUID + +from src.core.errors import ApiError + + +def encode_cursor(kind: str, owner_id: UUID, created_at: datetime, item_id: UUID) -> str: + payload = { + "kind": kind, + "owner_id": str(owner_id), # id чата + "created_at": created_at.isoformat(), # его время + "item_id": str(item_id), # id сообщения + } + raw = json.dumps(payload, separators=(",", ":")).encode("utf-8") + return base64.urlsafe_b64encode(raw).decode("ascii").rstrip("=") + + +def decode_cursor( + cursor: str, expected_kind: str, expected_owner_id: UUID +) -> tuple[datetime, UUID]: + try: + padding = "=" * (-len(cursor) % 4) + raw = base64.b64decode(cursor + padding, altchars=b"-_", validate=True) + payload = json.loads(raw.decode("utf-8")) + if ( + not isinstance(payload, dict) + or set(payload) != {"kind", "owner_id", "created_at", "item_id"} + or not all(isinstance(value, str) for value in payload.values()) + ): + raise ValueError + if payload["kind"] != expected_kind: + raise ValueError + if UUID(payload["owner_id"]) != expected_owner_id: + raise ValueError + created_at = datetime.fromisoformat(payload["created_at"]) + item_id = UUID(payload["item_id"]) + if created_at.tzinfo is None: + raise ValueError + return created_at.astimezone(timezone.utc), item_id + except (KeyError, TypeError, ValueError, UnicodeError, OverflowError): + raise ApiError(400, "invalid_request", "Некорректный курсор") from None diff --git a/src/core/readiness.py b/src/core/readiness.py new file mode 100644 index 00000000..133c3db9 --- /dev/null +++ b/src/core/readiness.py @@ -0,0 +1,89 @@ +"""Ограниченная проверка обязательного пути, включая повреждение схемы. + +Отмена asyncpg может ждать ответа замороженного PostgreSQL. HTTP readiness +не должна ждать завершения такого rollback; незавершённая проба остаётся одной +на процесс и до её завершения сервер считается неготовым. +""" + +import asyncio + +from anyio import to_thread +from sqlalchemy import select + +from src.core import cache +from src.core.db import session as database +from src.core.db.models import ( + Attachment, + Chat, + ChatMember, + Message, + MessageAttachment, + MessageRequest, + StorageFinding, + UploadIntent, + User, +) +from src.core.errors import ApiError +from src.core.settings import settings +from src.core.storage import STORAGE_ERRORS, get_storage, unavailable + +_pending: asyncio.Task[None] | None = None + + +async def _probe() -> None: + factory = database.session_factory + if factory is None: + raise ApiError(503, "unavailable", "Хранилище временно недоступно") + async with factory() as session: + for model in ( + User, + Chat, + ChatMember, + Message, + MessageRequest, + Attachment, + StorageFinding, + UploadIntent, + MessageAttachment, + ): + await session.execute(select(model).limit(0)) + await cache.get_client().ping() + try: + exists = await to_thread.run_sync( + lambda: get_storage().bucket_exists(settings.s3_bucket) + ) + except STORAGE_ERRORS as error: + raise unavailable(error) from error + if not exists: + raise ApiError(503, "unavailable", "Хранилище файлов не готово") + + +def _consume_result(task: asyncio.Task[None]) -> None: + if not task.cancelled(): + task.exception() + + +async def check() -> None: + global _pending + if _pending is None or _pending.done(): + _pending = asyncio.create_task(_probe()) + _pending.add_done_callback(_consume_result) + task = _pending + # wait(), в отличие от wait_for(), не ждёт завершения отмены драйвером. + done, _ = await asyncio.wait({task}, timeout=settings.healthcheck_timeout_seconds) + if not done: + if not task.cancelling(): + task.cancel() + raise ApiError(503, "unavailable", "Проверка готовности превысила время ожидания") + if task.cancelled(): + raise ApiError(503, "unavailable", "Хранилище временно недоступно") + task.result() + + +async def close() -> None: + global _pending + if _pending is not None and not _pending.done(): + if not _pending.cancelling(): + _pending.cancel() + await asyncio.wait({_pending}, timeout=settings.healthcheck_timeout_seconds) + _pending = None diff --git a/src/core/request_deadline.py b/src/core/request_deadline.py new file mode 100644 index 00000000..b79939ad --- /dev/null +++ b/src/core/request_deadline.py @@ -0,0 +1,77 @@ +"""Bound the time to response headers, including slow DB cancellation/rollback. + +A timed-out handler is cancelled but not awaited: asyncpg can wait for a frozen +server during rollback. Such handlers retain their slot until they actually end. +This prevents an outage from accumulating unbounded background handlers. +""" + +import asyncio +import logging +import re + +from starlette.requests import Request + +from src.core.errors import error_response +from src.core.settings import settings + +logger = logging.getLogger(__name__) + + +class RequestDeadlineMiddleware: + def __init__(self, app): + self.app = app + self.pending = set() + + def completed(self, task): + self.pending.discard(task) + if not task.cancelled(): + error = task.exception() + if error is not None: + logger.warning("Обработчик запроса завершился с ошибкой: %s", type(error).__name__) + + async def __call__(self, scope, receive, send): + if scope["type"] != "http" or not scope["path"].startswith("/api/v1/"): + await self.app(scope, receive, send) + return + if len(self.pending) >= settings.http_concurrency_limit: + await error_response(Request(scope), 503, "unavailable", "Сервис перегружен")( + scope, receive, send + ) + return + started = asyncio.Event() + expired = False + + async def guarded_send(message): + if expired: + return + if message["type"] == "http.response.start": + started.set() + await send(message) + + task = asyncio.create_task(self.app(scope, receive, guarded_send)) + self.pending.add(task) + task.add_done_callback(self.completed) + start_waiter = asyncio.create_task(started.wait()) + timeout = settings.http_request_timeout_seconds + if scope["method"] == "POST" and re.fullmatch( + r"/api/v1/chats/[^/]+/attachments/?", scope["path"] + ): + # File transfer has its own byte/time bounds; allow its receive and + # S3 stages before applying the final response-header deadline. + timeout += settings.upload_timeout_seconds + 2 * settings.s3_timeout_seconds + try: + done, _ = await asyncio.wait({task, start_waiter}, timeout=timeout) + if done: + await task + else: + expired = True + task.cancel() + await error_response( + Request(scope), 503, "unavailable", "Истекло время обработки запроса" + )(scope, receive, send) + except asyncio.CancelledError: + expired = True + task.cancel() + raise + finally: + start_waiter.cancel() diff --git a/src/core/request_limits.py b/src/core/request_limits.py new file mode 100644 index 00000000..ddf7b63b --- /dev/null +++ b/src/core/request_limits.py @@ -0,0 +1,132 @@ +"""Ограниченный приём тела до валидации FastAPI, включая chunked-запросы.""" + +import asyncio +import json +import re + +from anyio import CapacityLimiter, WouldBlock +from starlette.requests import Request +from starlette.types import ASGIApp, Message, Receive, Scope, Send + +from src.core.errors import error_response +from src.core.settings import settings + + +def unique_object(pairs: list[tuple[str, object]]) -> dict[str, object]: + result = {} + for key, value in pairs: + if key in result: + raise ValueError("Повторяющийся ключ JSON") + result[key] = value + return result + + +def reject_constant(value: str) -> None: + raise ValueError("Недопустимое значение JSON") + + +class RequestLimitsMiddleware: + def __init__(self, app: ASGIApp) -> None: + self.app = app + self.limiter = CapacityLimiter(settings.http_concurrency_limit) + + async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: + if scope["type"] != "http" or not scope["path"].startswith("/api/v1/"): + await self.app(scope, receive, send) + return + try: + self.limiter.acquire_nowait() + except WouldBlock: + await error_response(Request(scope), 503, "unavailable", "Сервис перегружен")( + scope, receive, send + ) + return + try: + await self.handle_request(scope, receive, send) + finally: + self.limiter.release() + + async def handle_request(self, scope: Scope, receive: Receive, send: Send) -> None: + request = Request(scope) + if len(request.headers.getlist("content-type")) > 1 or any( + len(request.query_params.getlist(name)) > 1 for name in ("limit", "cursor") + ): + await error_response( + request, 400, "invalid_request", "Неоднозначные параметры запроса" + )(scope, receive, send) + return + # Binary uploads enforce their own streaming limit after authentication. + # Do not buffer them or apply the JSON-only 64 KiB limit. + upload = ( + request.method == "POST" + and re.fullmatch(r"/api/v1/chats/[^/]+/attachments/?", scope["path"]) is not None + ) + if upload: + await self.app(scope, receive, send) + return + content_type = request.headers.get("content-type", "").split(";", 1)[0].strip().lower() + json_body = ( + request.method == "POST" and scope["path"].rstrip("/") != "/api/v1/auth/sessions" + ) + if json_body and content_type != "application/json": + await error_response( + request, 415, "unsupported_media_type", "Требуется application/json" + )(scope, receive, send) + return + try: + length = int(request.headers.get("content-length", "0")) + if length < 0: + raise ValueError + except ValueError: + await error_response(request, 400, "invalid_request", "Неверная длина тела")( + scope, receive, send + ) + return + body = bytearray() + too_large = length > settings.http_max_body_bytes + if not too_large: + try: + async with asyncio.timeout(settings.http_body_timeout_seconds): + while True: + message = await receive() + if message["type"] == "http.disconnect": + return + chunk = message.get("body", b"") + if len(body) + len(chunk) > settings.http_max_body_bytes: + too_large = True + break + body.extend(chunk) + if not message.get("more_body", False): + break + except TimeoutError: + await error_response(request, 408, "invalid_request", "Истекло время приёма тела")( + scope, receive, send + ) + return + if too_large: + await error_response(request, 413, "payload_too_large", "Превышен размер тела запроса")( + scope, receive, send + ) + return + if json_body: + try: + json.loads( + body.decode("utf-8"), + object_pairs_hook=unique_object, + parse_constant=reject_constant, + ) + except (ValueError, UnicodeError, RecursionError): + await error_response(request, 400, "invalid_request", "Некорректный JSON UTF-8")( + scope, receive, send + ) + return + delivered = False + + async def buffered_receive() -> Message: + nonlocal delivered + if delivered: + return await receive() + delivered = True + return {"type": "http.request", "body": bytes(body), "more_body": False} + + await self.app(scope, buffered_receive, send) diff --git a/src/core/security.py b/src/core/security.py new file mode 100644 index 00000000..210710c5 --- /dev/null +++ b/src/core/security.py @@ -0,0 +1,42 @@ +"""Пароли: Argon2id. Токены: SHA-256 от случайного секрета.""" + +import hashlib + +from anyio import CapacityLimiter, to_thread +from argon2 import PasswordHasher, Type +from argon2.exceptions import InvalidHashError, VerificationError + +from src.core.settings import settings + +password_hasher = PasswordHasher( + time_cost=settings.argon2_time_cost, + memory_cost=settings.argon2_memory_cost, + parallelism=settings.argon2_parallelism, + salt_len=settings.argon2_salt_len, + hash_len=settings.argon2_hash_len, + type=Type.ID, +) +password_limiter = CapacityLimiter(settings.password_hash_concurrency) + + +async def hash_password_async(password: str) -> str: + return await to_thread.run_sync(hash_password, password, limiter=password_limiter) + + +async def verify_password_async(password: str, stored: str) -> bool: + return await to_thread.run_sync(verify_password, password, stored, limiter=password_limiter) + + +def hash_password(password: str) -> str: + return password_hasher.hash(password) + + +def verify_password(password: str, stored: str) -> bool: + try: + return password_hasher.verify(stored, password) + except (VerificationError, InvalidHashError): + return False + + +def hash_token(token: str) -> str: + return hashlib.sha256(token.encode("utf-8")).hexdigest() diff --git a/src/core/session_store.py b/src/core/session_store.py new file mode 100644 index 00000000..1d7083fa --- /dev/null +++ b/src/core/session_store.py @@ -0,0 +1,55 @@ +"""Сессии в Redis: абсолютный срок жизни, без продления при чтении.""" + +import json +from dataclasses import asdict +from datetime import datetime, timezone +from uuid import UUID + +from redis.exceptions import ResponseError + +from src.core import cache +from src.service.dto import StoredSessionDTO + + +def session_key(token_hash: str) -> str: + return f"session:v1:{token_hash}" + + +async def create_session(token_hash: str, session: StoredSessionDTO) -> None: + await cache.get_client().set( + session_key(token_hash), + json.dumps(asdict(session), default=str), + pxat=int(session.expires_at.timestamp() * 1000), + ) + + +async def fetch_session(token_hash: str) -> StoredSessionDTO | None: + key = session_key(token_hash) + try: + raw = await cache.get_client().get(key) + if raw is None: + return None + data = json.loads(raw) + if ( + not isinstance(data, dict) + or set(data) != {"user_id", "expires_at"} + or not all(isinstance(value, str) for value in data.values()) + ): + raise ValueError + session = StoredSessionDTO( + UUID(data["user_id"]), datetime.fromisoformat(data["expires_at"]) + ) + if session.expires_at.tzinfo is None or session.expires_at <= datetime.now(timezone.utc): + raise ValueError + return session + except ResponseError as error: + if not str(error).startswith("WRONGTYPE"): + raise + except (ValueError, KeyError, TypeError, UnicodeError): + pass + await cache.get_client().delete(key) + return None + + +async def delete_session(token_hash: str) -> None: + await cache.get_client().delete(session_key(token_hash)) diff --git a/src/core/settings.py b/src/core/settings.py new file mode 100644 index 00000000..cbaa7325 --- /dev/null +++ b/src/core/settings.py @@ -0,0 +1,112 @@ +from typing import Literal, Self + +from pydantic import Field, SecretStr, field_validator, model_validator +from pydantic_settings import BaseSettings, SettingsConfigDict + + +class AppSettings(BaseSettings): + model_config = SettingsConfigDict( + env_file=".env", + env_file_encoding="utf-8", + extra="ignore", + hide_input_in_errors=True, + ) + + app_host: str = "0.0.0.0" + app_port: int = Field(default=8080, ge=1, le=65535) + app_env: Literal["lab", "production"] = "lab" + app_workers: int = Field(default=1, ge=1) + shutdown_timeout_seconds: int = Field(default=10, gt=0) + healthcheck_timeout_seconds: float = Field(default=2, gt=0) + http_max_body_bytes: int = Field(default=65536, ge=65536) + http_request_timeout_seconds: float = Field(default=5, gt=0) + http_body_timeout_seconds: float = Field(default=5, gt=0) + http_concurrency_limit: int = Field(default=64, gt=0) + authorization_max_length: int = Field(default=2048, ge=1024) + cursor_max_length: int = Field(default=1024, ge=512) + password_hash_concurrency: int = Field(default=2, gt=0) + + s3_endpoint: str = "http://minio:9000" + s3_region: str = "us-east-1" + s3_bucket: str = "messenger-attachments" + s3_access_key_id: SecretStr = SecretStr("messenger-api") + s3_secret_access_key: SecretStr = SecretStr("local-messenger-api-password") + minio_root_user: SecretStr = SecretStr("messenger") + minio_root_password: SecretStr = SecretStr("local-messenger-s3-password") + s3_reconcile_access_key_id: SecretStr = SecretStr("messenger-reconciler") + s3_reconcile_secret_access_key: SecretStr = SecretStr("local-messenger-reconciler-password") + reconcile_grace_seconds: int = Field(default=300, ge=1) + s3_timeout_seconds: float = Field(default=5, gt=0) + max_upload_bytes: int = Field(default=10485760, gt=0, le=10485760) + max_image_pixels: int = Field(default=40000000, gt=0, le=40000000) + upload_concurrency: int = Field(default=1, gt=0) + upload_timeout_seconds: float = Field(default=30, gt=0) + + database_url: SecretStr + database_pool_size: int = Field(default=10, gt=0) + database_max_overflow: int = Field(default=0, ge=0) + database_pool_timeout_seconds: float = Field(default=5, gt=0) + database_connect_timeout_seconds: float = Field(default=5, gt=0) + database_command_timeout_seconds: float = Field(default=5, gt=0) + database_statement_timeout_ms: int = Field(default=5000, gt=0) + database_pool_pre_ping: bool = True + + redis_url: SecretStr + redis_max_connections: int = Field(default=10, gt=0) + redis_connect_timeout_seconds: float = Field(default=0.3, gt=0) + redis_read_timeout_seconds: float = Field(default=0.3, gt=0) + redis_retry_on_timeout: bool = False + profile_cache_ttl_seconds: int = Field(default=60, gt=0) + + admin_username: str = Field(default="admin", pattern=r"^[a-z0-9_]{3,32}$") + admin_password: SecretStr = Field( + default=SecretStr("admin-password-123"), + min_length=12, + max_length=128, + ) + admin_display_name: str = Field(default="Администратор", min_length=1, max_length=100) + + session_ttl_seconds: int = Field(default=3600, gt=0) + session_token_bytes: int = Field(default=32, ge=32) + argon2_time_cost: int = Field(default=3, gt=0) + argon2_memory_cost: int = Field(default=65536, ge=8192) + argon2_parallelism: int = Field(default=4, gt=0) + argon2_salt_len: int = Field(default=16, ge=16) + argon2_hash_len: int = Field(default=32, ge=32) + + log_level: Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"] = "INFO" + log_format: str = "%(asctime)s %(levelname)s %(name)s: %(message)s" + + @field_validator("admin_password") + @classmethod + def admin_password_must_not_be_blank(cls, value: SecretStr) -> SecretStr: + if not value.get_secret_value().strip(): + raise ValueError("Пароль администратора не может быть пробельным") + value.get_secret_value().encode("utf-8") + return value + + @field_validator("admin_display_name") + @classmethod + def admin_display_name_must_be_valid(cls, value: str) -> str: + if not value.strip() or "\x00" in value: + raise ValueError("Некорректное имя администратора") + return value + + @model_validator(mode="after") + def production_must_use_custom_password(self) -> Self: + if self.app_env == "production" and self.admin_password.get_secret_value() == ( + "admin-password-123" + ): + raise ValueError("Для production требуется собственный ADMIN_PASSWORD") + return self + + @property + def sqlalchemy_database_url(self) -> str: + return self.database_url.get_secret_value().replace( + "postgresql://", + "postgresql+asyncpg://", + 1, + ) + + +settings = AppSettings() diff --git a/src/core/storage.py b/src/core/storage.py new file mode 100644 index 00000000..facb134f --- /dev/null +++ b/src/core/storage.py @@ -0,0 +1,77 @@ +"""S3 clients with separate roles, bounded socket timeouts and request metrics.""" + +from collections import Counter +from dataclasses import dataclass, field +from functools import lru_cache +from urllib.parse import parse_qs, urlsplit + +import urllib3 +from minio import Minio +from minio.error import InvalidResponseError, S3Error, ServerError + +from src.core.errors import ApiError +from src.core.settings import settings + + +@dataclass +class StorageMetrics: + requests: Counter = field(default_factory=Counter) + + +class StoragePool(urllib3.PoolManager): + def __init__(self, *args, metrics=None, **kwargs): + super().__init__(*args, **kwargs) + self.metrics = metrics + + def urlopen(self, method, url, *args, **kwargs): + if self.metrics is not None: + query = parse_qs(urlsplit(url).query, keep_blank_values=True) + operation = ( + "LIST" + if "list-type" in query + else ("VERSIONING" if "versioning" in query else method) + ) + self.metrics.requests[operation] += 1 + return super().urlopen(method, url, *args, **kwargs) + + +def make_storage(*, role="api", metrics=None) -> Minio: + endpoint = urlsplit(settings.s3_endpoint) + if endpoint.scheme not in {"http", "https"} or not endpoint.netloc: + raise ValueError("S3_ENDPOINT должен быть HTTP(S) URL") + credentials = { + "api": (settings.s3_access_key_id, settings.s3_secret_access_key), + "reconciler": ( + settings.s3_reconcile_access_key_id, + settings.s3_reconcile_secret_access_key, + ), + "bootstrap": (settings.minio_root_user, settings.minio_root_password), + } + access_key, secret_key = credentials[role] + return Minio( + endpoint.netloc, + access_key=access_key.get_secret_value(), + secret_key=secret_key.get_secret_value(), + secure=endpoint.scheme == "https", + region=settings.s3_region, + http_client=StoragePool( + metrics=metrics, + timeout=urllib3.Timeout( + connect=settings.s3_timeout_seconds, read=settings.s3_timeout_seconds + ), + retries=False, + maxsize=8, + ), + ) + + +@lru_cache(maxsize=1) +def get_storage() -> Minio: + return make_storage() + + +def unavailable(error: Exception) -> ApiError: + return ApiError(503, "unavailable", "Хранилище файлов временно недоступно") + + +STORAGE_ERRORS = (S3Error, InvalidResponseError, ServerError, urllib3.exceptions.HTTPError, OSError) diff --git a/src/core/storage_bootstrap.py b/src/core/storage_bootstrap.py new file mode 100644 index 00000000..01c8f764 --- /dev/null +++ b/src/core/storage_bootstrap.py @@ -0,0 +1,89 @@ +"""Подготовка приватного bucket и отдельных пользователей MinIO.""" + +import json +from pathlib import Path +from string import Template +from urllib.parse import urlsplit + +import urllib3 +from minio import Minio +from minio.credentials import StaticProvider +from minio.minioadmin import MinioAdmin +from pydantic import SecretStr + +from src.core.settings import settings +from src.core.storage import make_storage + +POLICY_DIRECTORY = Path(__file__).resolve().parents[2] / "infra" / "s3" + + +def create_admin_client() -> MinioAdmin: + endpoint = urlsplit(settings.s3_endpoint) + return MinioAdmin( + endpoint=endpoint.netloc, + secure=endpoint.scheme == "https", + region=settings.s3_region, + credentials=StaticProvider( + settings.minio_root_user.get_secret_value(), + settings.minio_root_password.get_secret_value(), + ), + http_client=urllib3.PoolManager( + timeout=urllib3.Timeout( + connect=settings.s3_timeout_seconds, read=settings.s3_timeout_seconds + ), + retries=False, + ), + ) + + +def ensure_private_bucket(storage: Minio) -> None: + if not storage.bucket_exists(settings.s3_bucket): + storage.make_bucket(settings.s3_bucket, location=settings.s3_region) + storage.delete_bucket_policy(settings.s3_bucket) + + +def load_policy(filename: str) -> dict: + template = Template((POLICY_DIRECTORY / filename).read_text(encoding="utf-8")) + return json.loads(template.substitute(bucket=settings.s3_bucket)) + + +def configure_user( + admin: MinioAdmin, + *, + access_key: SecretStr, + secret_key: SecretStr, + policy_name: str, + policy: dict, +) -> None: + username = access_key.get_secret_value() + if username == settings.minio_root_user.get_secret_value(): + raise ValueError("Пользователь приложения не должен совпадать с владельцем MinIO") + admin.user_add(username, secret_key.get_secret_value()) + admin.policy_add(policy_name, policy=policy) + admin.policy_set(policy_name, user=username) + + +def main() -> None: + storage = make_storage(role="bootstrap") + admin = create_admin_client() + ensure_private_bucket(storage) + + configure_user( + admin, + access_key=settings.s3_access_key_id, + secret_key=settings.s3_secret_access_key, + policy_name="messenger-api", + policy=load_policy("api-policy.json"), + ) + configure_user( + admin, + access_key=settings.s3_reconcile_access_key_id, + secret_key=settings.s3_reconcile_secret_access_key, + policy_name="messenger-reconciler", + policy=load_policy("reconciler-policy.json"), + ) + print("MinIO настроен: приватный bucket, пользователи API и reconciler") + + +if __name__ == "__main__": + main() diff --git a/src/core/upload_coordination.py b/src/core/upload_coordination.py new file mode 100644 index 00000000..b177d674 --- /dev/null +++ b/src/core/upload_coordination.py @@ -0,0 +1,21 @@ +"""One transaction-scoped PostgreSQL lock for all actions on an S3 key. + +All writers must register an intent and use this protocol. The lock is released +by PostgreSQL on commit, rollback, lost connection or process death. +""" + +import hashlib + +from sqlalchemy import func, select +from sqlalchemy.ext.asyncio import AsyncSession + + +def lock_id(key: str) -> int: + return int.from_bytes(hashlib.sha256(key.encode()).digest()[:8], "big", signed=True) + + +async def lock_object(session: AsyncSession, key: str, *, wait: bool = False) -> bool: + if wait: + await session.execute(select(func.pg_advisory_xact_lock(lock_id(key)))) + return True + return bool(await session.scalar(select(func.pg_try_advisory_xact_lock(lock_id(key))))) diff --git a/src/main.py b/src/main.py new file mode 100644 index 00000000..e7759f0e --- /dev/null +++ b/src/main.py @@ -0,0 +1,116 @@ +import logging +import time +import uuid + +from fastapi import FastAPI, Request +from fastapi.exceptions import RequestValidationError +from fastapi.responses import JSONResponse +from redis.exceptions import RedisError +from sqlalchemy.exc import DBAPIError +from sqlalchemy.exc import TimeoutError as DatabaseTimeoutError +from starlette.exceptions import HTTPException as StarletteHTTPException + +from src.api.router import router as api_router +from src.core import readiness +from src.core.callback import lifespan +from src.core.errors import ApiError, error_response +from src.core.request_deadline import RequestDeadlineMiddleware +from src.core.request_limits import RequestLimitsMiddleware +from src.core.settings import settings + +logging.basicConfig(level=settings.log_level, format=settings.log_format) + +INSTANCE_ID = str(uuid.uuid4()) + +app = FastAPI(lifespan=lifespan) +app.add_middleware(RequestLimitsMiddleware) +app.add_middleware(RequestDeadlineMiddleware) +app.include_router(api_router) +logger = logging.getLogger(__name__) + + +@app.middleware("http") +async def add_request_id(request: Request, call_next): + request_id = str(uuid.uuid4()) + request.state.request_id = request_id + started_at = time.perf_counter() + + try: + response = await call_next(request) + except Exception: + logger.exception( + "Необработанная ошибка запроса", + extra={"request_id": request_id}, + ) + + response = JSONResponse( + status_code=500, + content={ + "error": { + "code": "internal_error", + "message": "Внутренняя ошибка сервера", + "request_id": request_id, + } + }, + ) + + response.headers["X-Request-Id"] = request_id + response.headers["X-Instance-Id"] = INSTANCE_ID + if request.url.path.startswith("/api/v1/"): + response.headers["Cache-Control"] = "no-store" + response.headers["X-Content-Type-Options"] = "nosniff" + logger.info( + "ид_запроса=%s метод=%s путь=%r статус=%s длительность_мс=%.3f", + request_id, + request.method, + request.url.path, + response.status_code, + (time.perf_counter() - started_at) * 1000, + ) + return response + + +@app.exception_handler(ApiError) +async def handle_api_error(request: Request, exc: ApiError) -> JSONResponse: + response = error_response(request, exc.status_code, exc.code, exc.message) + if exc.status_code == 401: + response.headers["WWW-Authenticate"] = ( + 'Basic realm="messenger", charset="UTF-8"' + if request.url.path == "/api/v1/auth/sessions" + else 'Bearer realm="messenger"' + ) + return response + + +@app.exception_handler(RequestValidationError) +async def handle_validation_error(request: Request, exc: RequestValidationError) -> JSONResponse: + return error_response(request, 400, "invalid_request", "Некорректные параметры запроса") + + +@app.exception_handler(StarletteHTTPException) +async def handle_http_error(request: Request, exc: StarletteHTTPException) -> JSONResponse: + code = "not_found" if exc.status_code == 404 else "invalid_request" + message = "Объект не найден" if exc.status_code == 404 else "Некорректный запрос" + return error_response(request, exc.status_code, code, message) + + +@app.get("/health/live") +async def get_health(): + return { + "status": "ok", + } + + +@app.get("/health/ready") +async def get_ready(): + await readiness.check() + return {"status": "ok"} + + +async def handle_database_error(request: Request, exc: Exception) -> JSONResponse: + logger.warning("Хранилище временно недоступно: тип_ошибки=%s", type(exc).__name__) + return error_response(request, 503, "unavailable", "Хранилище временно недоступно") + + +for error_type in (RedisError, DBAPIError, DatabaseTimeoutError, OSError, TimeoutError): + app.add_exception_handler(error_type, handle_database_error) diff --git a/src/maintenance/__init__.py b/src/maintenance/__init__.py new file mode 100644 index 00000000..42c06c7a --- /dev/null +++ b/src/maintenance/__init__.py @@ -0,0 +1 @@ +"""Operator maintenance commands; no public HTTP endpoints.""" diff --git a/src/maintenance/reconcile.py b/src/maintenance/reconcile.py new file mode 100644 index 00000000..f01762b4 --- /dev/null +++ b/src/maintenance/reconcile.py @@ -0,0 +1,357 @@ +"""Bounded, repeatable S3/PostgreSQL reconciliation. Default mode is dry-run.""" + +import argparse +import asyncio +import hashlib +import json +import resource +import time +from collections import Counter +from datetime import timedelta +from uuid import UUID + +from anyio import to_thread +from minio.error import S3Error +from sqlalchemy import event, func, select +from sqlalchemy.ext.asyncio import async_sessionmaker + +from src.core.db.models import Attachment, StorageFinding, UploadIntent +from src.core.db.session import create_engine +from src.core.settings import settings +from src.core.storage import StorageMetrics, make_storage +from src.core.upload_coordination import lock_object + + +class Reconciler: + def __init__( + self, + factory, + storage, + *, + apply=False, + grace_seconds=300, + prefix="originals/", + sample_limit=50, + ): + if not prefix.startswith("originals/") or not prefix.endswith("/"): + raise ValueError("Scope must be originals/ or a narrower prefix ending with /") + if grace_seconds < 1: + raise ValueError("Grace period must be positive") + self.factory = factory + self.storage = storage + self.apply = apply + self.grace = timedelta(seconds=grace_seconds) + self.prefix = prefix + self.sample_limit = sample_limit + self.counts = Counter() + self.samples = [] + self.content_bytes_read = 0 + + def note(self, action, key): + self.counts[action] += 1 + if len(self.samples) < self.sample_limit: + self.samples.append({"action": action, "object_key": key}) + + async def stat(self, key): + try: + return await to_thread.run_sync( + lambda: self.storage.stat_object(settings.s3_bucket, key) + ) + except S3Error as error: + # Bucket absence, AccessDenied, timeout and server failure must abort. + if error.code not in {"NoSuchKey", "NoSuchObject"}: + raise + return None + + async def observe(self, session, key, kind, now, fingerprint=None): + finding = await session.get(StorageFinding, (key, kind)) + if ( + finding is None + or finding.resolved_at is not None + or (kind == "orphan" and finding.fingerprint != fingerprint) + ): + if not self.apply: + return None + if finding is None: + finding = StorageFinding(object_key=key, kind=kind) + session.add(finding) + finding.first_seen = now + finding.resolved_at = None + finding.fingerprint = fingerprint + if self.apply: + finding.last_seen = now + return finding + + async def resolve(self, session, key, kind, now): + if self.apply: + finding = await session.get(StorageFinding, (key, kind)) + if finding is not None and finding.resolved_at is None: + finding.resolved_at = now + finding.last_seen = now + + async def orphan(self, key): + async with self.factory.begin() as session: + if not await lock_object(session, key): + self.note("protected_active", key) + return + now = await session.scalar(select(func.clock_timestamp())) + attachment = await session.scalar( + select(Attachment.id).where(Attachment.object_key == key) + ) + if attachment is not None: + self.note("protected_referenced", key) + await self.resolve(session, key, "orphan", now) + return + obj = await self.stat(key) + if obj is None: + await self.resolve(session, key, "orphan", now) + return + # Opaque ETag identifies a changed object; it is NOT treated as SHA-256. + fingerprint = f"{obj.etag}:{obj.size}:{obj.last_modified.isoformat()}" + finding = await self.observe(session, key, "orphan", now, fingerprint) + intent = await session.get(UploadIntent, key) + cutoff = now - self.grace + if obj.last_modified > cutoff or (intent is not None and intent.created_at > cutoff): + self.note("protected_fresh", key) + return + if not self.apply: + self.note("would_delete_orphan", key) + return + # Registration, PUT, publication and cleanup all take this same lock. + # Tombstone also prevents a delayed pending uploader from publishing. + if intent is not None: + intent.state = "abandoned" + await session.flush() + await to_thread.run_sync(lambda: self.storage.remove_object(settings.s3_bucket, key)) + finding.resolved_at = now + self.note("deleted_orphan", key) + + async def content_matches(self, attachment): + def verify(): + response = self.storage.get_object(settings.s3_bucket, attachment.object_key) + digest = hashlib.sha256() + size = 0 + try: + while chunk := response.read(65536): + size += len(chunk) + if size > attachment.size_bytes: + return False, size + digest.update(chunk) + finally: + response.close() + response.release_conn() + return size == attachment.size_bytes and digest.hexdigest() == attachment.sha256, size + + valid, size = await to_thread.run_sync(verify) + self.content_bytes_read += size + return valid + + async def check_attachment(self, attachment_id, key): + async with self.factory.begin() as session: + if not await lock_object(session, key): + self.note("protected_active", key) + return + attachment = await session.get(Attachment, attachment_id) + if attachment is None or attachment.object_key != key: + return + now = await session.scalar(select(func.clock_timestamp())) + obj = await self.stat(key) + if obj is None: + await self.observe(session, key, "missing", now) + if attachment.storage_missing_since is None: + if self.apply: + attachment.storage_missing_since = now + self.note("marked_missing" if self.apply else "would_mark_missing", key) + else: + self.note("missing_unchanged", key) + return + if attachment.storage_missing_since is not None: + if obj.size != attachment.size_bytes or not await self.content_matches(attachment): + self.note("restore_checksum_mismatch", key) + return + if self.apply: + attachment.storage_missing_since = None + self.note("recovered" if self.apply else "would_recover", key) + else: + self.note("healthy", key) + await self.resolve(session, key, "missing", now) + + async def stale_intent(self, key): + async with self.factory.begin() as session: + if not await lock_object(session, key): + self.note("protected_active_intent", key) + return + intent = await session.get(UploadIntent, key) + if intent is None or intent.state != "pending": + return + now = await session.scalar(select(func.clock_timestamp())) + if intent.created_at > now - self.grace: + return + attached = await session.scalar( + select(Attachment.id).where(Attachment.object_key == key) + ) + if attached is not None: + if self.apply: + intent.state = "committed" + self.note("intent_has_attachment", key) + elif await self.stat(key) is None: + await self.resolve(session, key, "orphan", now) + if self.apply: + intent.state = "abandoned" + self.note("abandoned_empty_intent" if self.apply else "would_abandon_intent", key) + + async def run(self): + # SDK lazily fetches ListObjectsV2 pages; never collect the whole bucket. + objects = self.storage.list_objects(settings.s3_bucket, prefix=self.prefix, recursive=True) + sentinel = object() + while True: + obj = await to_thread.run_sync(lambda: next(objects, sentinel)) + if obj is sentinel: + break + self.counts["objects_scanned"] += 1 + await self.orphan(obj.object_name) + + after: UUID | None = None + while True: + async with self.factory() as session: + query = ( + select(Attachment.id, Attachment.object_key) + .where(Attachment.object_key.startswith(self.prefix, autoescape=True)) + .order_by(Attachment.id) + .limit(200) + ) + if after is not None: + query = query.where(Attachment.id > after) + batch = (await session.execute(query)).all() + if not batch: + break + for aid, key in batch: + self.counts["attachments_scanned"] += 1 + await self.check_attachment(aid, key) + after = batch[-1].id + + # Pending attempts without any visible object also need bounded cleanup. + after_key = "" + while True: + async with self.factory() as session: + batch = list( + await session.scalars( + select(UploadIntent.object_key) + .where( + UploadIntent.state == "pending", + UploadIntent.object_key > after_key, + UploadIntent.object_key.startswith(self.prefix, autoescape=True), + ) + .order_by(UploadIntent.object_key) + .limit(200) + ) + ) + if not batch: + break + for key in batch: + self.counts["pending_intents_scanned"] += 1 + await self.stale_intent(key) + after_key = batch[-1] + + after_key = "" + while True: + async with self.factory() as session: + batch = list( + await session.scalars( + select(StorageFinding.object_key) + .where( + StorageFinding.kind == "orphan", + StorageFinding.resolved_at.is_(None), + StorageFinding.first_seen <= func.clock_timestamp() - self.grace, + StorageFinding.object_key > after_key, + StorageFinding.object_key.startswith(self.prefix, autoescape=True), + ) + .order_by(StorageFinding.object_key) + .limit(200) + ) + ) + if not batch: + break + for key in batch: + await self.orphan(key) + after_key = batch[-1] + + return { + "mode": "apply" if self.apply else "dry-run", + "bucket": settings.s3_bucket, + "prefix": self.prefix, + "grace_seconds": self.grace.total_seconds(), + "counts": dict(self.counts), + "samples": self.samples, + "content_bytes_read": self.content_bytes_read, + } + + +async def execute(args): + engine = create_engine() + db_statements = 0 + + @event.listens_for(engine.sync_engine, "before_cursor_execute") + def count_statements(*_): + nonlocal db_statements + db_statements += 1 + + storage_metrics = StorageMetrics() + storage = make_storage(role="reconciler", metrics=storage_metrics) + factory = async_sessionmaker(engine, expire_on_commit=False) + try: + while True: + started = time.perf_counter() + db_statements = 0 + storage_metrics.requests.clear() + report = {"mode": "apply" if args.apply else "dry-run", "prefix": args.prefix} + try: + # This implementation intentionally supports an unversioned bucket. + versioning = await to_thread.run_sync( + lambda: storage.get_bucket_versioning(settings.s3_bucket) + ) + if versioning.status in {"Enabled", "Suspended"}: + raise ValueError("Versioned buckets require version-aware reconciliation") + report = await Reconciler( + factory, + storage, + apply=args.apply, + grace_seconds=args.grace_seconds, + prefix=args.prefix, + ).run() + report["result"] = "ok" + except Exception as error: + # Do not print connection strings, SDK bodies or credentials. + report.update(result="error", error_type=type(error).__name__) + report.update( + elapsed_seconds=round(time.perf_counter() - started, 6), + db_statements=db_statements, + s3_requests=dict(storage_metrics.requests), + process_peak_rss_kib=resource.getrusage(resource.RUSAGE_SELF).ru_maxrss, + ) + print(json.dumps(report, ensure_ascii=False), flush=True) + if not args.interval: + return 0 if report["result"] == "ok" else 1 + await asyncio.sleep(args.interval) + finally: + await engine.dispose() + + +def main(): + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument( + "--apply", action="store_true", help="Apply safe repairs; otherwise dry-run" + ) + parser.add_argument("--prefix", default="originals/") + parser.add_argument("--grace-seconds", type=int, default=settings.reconcile_grace_seconds) + parser.add_argument( + "--interval", type=int, default=0, help="Repeat every N seconds; 0 runs once" + ) + args = parser.parse_args() + if args.interval < 0: + parser.error("interval must be nonnegative") + raise SystemExit(asyncio.run(execute(args))) + + +if __name__ == "__main__": + main() diff --git a/src/service/__init__.py b/src/service/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/service/attachment.py b/src/service/attachment.py new file mode 100644 index 00000000..c1e4a9e4 --- /dev/null +++ b/src/service/attachment.py @@ -0,0 +1,188 @@ +"""Validate originals without re-encoding; keep only metadata in PostgreSQL.""" + +import asyncio +import hashlib +import logging +import unicodedata +import warnings +from datetime import datetime, timezone +from tempfile import TemporaryFile +from uuid import UUID, uuid4 + +from anyio import CapacityLimiter, WouldBlock, to_thread +from fastapi import Request +from PIL import Image, UnidentifiedImageError +from sqlalchemy import func, select +from sqlalchemy.ext.asyncio import AsyncSession +from starlette.requests import ClientDisconnect + +from src.core.db.models import Attachment, ChatMember, UploadIntent +from src.core.errors import ApiError +from src.core.settings import settings +from src.core.storage import STORAGE_ERRORS, get_storage, unavailable +from src.core.upload_coordination import lock_object + +logger = logging.getLogger(__name__) +_upload_limiter = CapacityLimiter(settings.upload_concurrency) +_decode_limiter = CapacityLimiter(1) +# The explicit dimensions check below is authoritative; convert Pillow warnings +# to errors as an additional guard before decoding malicious image headers. +Image.MAX_IMAGE_PIXELS = settings.max_image_pixels + + +def validate_filename(filename: str) -> None: + if not 1 <= len(filename) <= 255 or any( + c in "/\\" or unicodedata.category(c) == "Cc" or 0xD800 <= ord(c) <= 0xDFFF + for c in filename + ): + raise ApiError(400, "invalid_request", "Некорректное имя файла") + + +def validate_image(file, content_type: str) -> None: + try: + with warnings.catch_warnings(): + warnings.simplefilter("error", Image.DecompressionBombWarning) + file.seek(0) + with Image.open(file) as image: + actual_type = {"PNG": "image/png", "JPEG": "image/jpeg"}.get(image.format) + if actual_type != content_type: + raise ApiError(415, "unsupported_media_type", "Тип изображения не совпадает") + if image.width * image.height > settings.max_image_pixels: + raise ApiError(413, "payload_too_large", "Превышен размер изображения") + image.verify() + file.seek(0) + with Image.open(file) as image: + image.load() + except (Image.DecompressionBombError, Image.DecompressionBombWarning) as error: + raise ApiError(413, "payload_too_large", "Превышен размер изображения") from error + except (UnidentifiedImageError, OSError, ValueError, SyntaxError, EOFError) as error: + raise ApiError(415, "unsupported_media_type", "Повреждённое изображение") from error + finally: + file.seek(0) + + +async def require_chat_member(session: AsyncSession, chat_id: UUID, user_id: UUID) -> None: + member = await session.scalar( + select(ChatMember.user_id).where( + ChatMember.chat_id == chat_id, ChatMember.user_id == user_id + ) + ) + if member is None: + raise ApiError(404, "not_found", "Объект не найден") + + +class AttachmentService: + def __init__(self, session: AsyncSession): + self.session = session + + async def get(self, attachment_id: UUID, user_id: UUID) -> Attachment: + attachment = await self.session.scalar( + select(Attachment) + .join(ChatMember, ChatMember.chat_id == Attachment.chat_id) + .where(Attachment.id == attachment_id, ChatMember.user_id == user_id) + ) + if attachment is None: + raise ApiError(404, "not_found", "Вложение не найдено") + if attachment.storage_missing_since is not None: + raise ApiError(503, "unavailable", "Оригинал вложения временно недоступен") + return attachment + + async def upload( + self, request: Request, chat_id: UUID, user_id: UUID, filename: str + ) -> Attachment: + await require_chat_member(self.session, chat_id, user_id) + validate_filename(filename) + content_type = request.headers.get("content-type", "").strip().lower() + if content_type not in {"image/png", "image/jpeg"}: + raise ApiError(415, "unsupported_media_type", "Требуется PNG или JPEG") + try: + length = int(request.headers.get("content-length", "0")) + if length < 0: + raise ValueError + except ValueError: + raise ApiError(400, "invalid_request", "Некорректная длина тела") from None + if length > settings.max_upload_bytes: + raise ApiError(413, "payload_too_large", "Превышен размер файла") + try: + _upload_limiter.acquire_nowait() + except WouldBlock: + raise ApiError(503, "unavailable", "Слишком много загрузок") from None + try: + return await self._upload(request, chat_id, user_id, filename, content_type) + finally: + _upload_limiter.release() + + async def _upload(self, request, chat_id, user_id, filename, content_type): + size = 0 + digest = hashlib.sha256() + with TemporaryFile() as file: + try: + async with asyncio.timeout(settings.upload_timeout_seconds): + async for chunk in request.stream(): + size += len(chunk) + if size > settings.max_upload_bytes: + raise ApiError(413, "payload_too_large", "Превышен размер файла") + digest.update(chunk) + await to_thread.run_sync(file.write, chunk) + except ClientDisconnect: + raise ApiError(400, "invalid_request", "Передача файла прервана") from None + except TimeoutError: + raise ApiError(408, "invalid_request", "Истекло время приёма файла") from None + await to_thread.run_sync(validate_image, file, content_type, limiter=_decode_limiter) + attachment_id = uuid4() + object_key = f"originals/{attachment_id}" + # Durable registration is independent of the HTTP transaction. If the + # process dies after PUT, the reconciler still knows this key. + async with AsyncSession(bind=self.session.bind) as registration: + async with registration.begin(): + await lock_object(registration, object_key, wait=True) + registration.add( + UploadIntent( + object_key=object_key, + state="pending", + created_at=await registration.scalar(select(func.clock_timestamp())), + ) + ) + await lock_object(self.session, object_key, wait=True) + intent = await self.session.get(UploadIntent, object_key) + if intent is None or intent.state != "pending": + raise ApiError(503, "unavailable", "Попытка загрузки уже закрыта") + storage = get_storage() + try: + await to_thread.run_sync( + lambda: storage.put_object( + settings.s3_bucket, + object_key, + file, + size, + content_type=content_type, + num_parallel_uploads=1, + ) + ) + except STORAGE_ERRORS as error: + raise unavailable(error) from error + now = datetime.now(timezone.utc) + attachment = Attachment( + id=attachment_id, + chat_id=chat_id, + owner_id=user_id, + filename=filename, + object_key=object_key, + content_type=content_type, + size_bytes=size, + sha256=digest.hexdigest(), + created_at=now, + updated_at=now, + ) + try: + self.session.add(attachment) + # Intent completion and Attachment publication are one DB commit. + # Keep the advisory lock from before PUT through this commit. + intent.state = "committed" + await self.session.commit() + except Exception: + # A failed COMMIT can have an unknown outcome. Keep the object rather + # than deleting bytes that a committed Attachment might reference. + logger.warning("Метаданные загрузки не подтверждены; требуется сверка S3/БД") + raise + return attachment diff --git a/src/service/auth.py b/src/service/auth.py new file mode 100644 index 00000000..425f2856 --- /dev/null +++ b/src/service/auth.py @@ -0,0 +1,74 @@ +import logging +import secrets +from datetime import datetime, timedelta, timezone + +from sqlalchemy.ext.asyncio import AsyncSession + +from src.core import session_store +from src.core.db.repo import auth as auth_repo +from src.core.db.repo import user as user_repo +from src.core.security import hash_password, hash_token, verify_password_async +from src.core.settings import settings +from src.service.dto import AuthSessionDTO, StoredSessionDTO, UserDTO +from src.service.exceptions import InvalidCredentialsException, InvalidSessionException + +logger = logging.getLogger(__name__) +# Для неизвестного логина тоже выполняем Argon2, чтобы не отвечать заметно быстрее. +_DUMMY_PASSWORD_HASH = hash_password("dummy-password-for-timing") + + +class AuthService: + def __init__( + self, + db_session: AsyncSession, + *, + session_ttl_seconds: int, + ) -> None: + self._db_session = db_session + self._session_ttl = timedelta(seconds=session_ttl_seconds) + + async def login(self, *, username: str, password: str) -> AuthSessionDTO: + credentials = await auth_repo.fetch_user_credentials( + session=self._db_session, + username=username, + ) + password_hash = credentials.password_hash if credentials else _DUMMY_PASSWORD_HASH + password_valid = await verify_password_async(password, password_hash) + if credentials is None or not password_valid: + logger.warning("Вход отклонён: неверный логин или пароль") + raise InvalidCredentialsException("Неверный логин или пароль") + + user = credentials.user + token = secrets.token_urlsafe(settings.session_token_bytes) + expires_at = datetime.now(timezone.utc) + self._session_ttl + await session_store.create_session( + token_hash=hash_token(token), + session=StoredSessionDTO(user_id=user.id, expires_at=expires_at), + ) + logger.info("Сессия создана: пользователь=%s", user.id) + return AuthSessionDTO( + token=token, + expires_at=expires_at, + user=user, + ) + + async def get_user(self, *, token: str) -> UserDTO: + session = await session_store.fetch_session(token_hash=hash_token(token)) + if session is None: + logger.info("Доступ отклонён: сессия отсутствует или истекла") + raise InvalidSessionException("Нет действующей сессии") + + user = await user_repo.fetch_user_by_id( + session=self._db_session, + user_id=session.user_id, + ) + if user is None: + logger.warning("Доступ отклонён: пользователь сессии не найден") + raise InvalidSessionException("Нет действующей сессии") + + logger.debug("Сессия подтверждена: пользователь=%s", user.id) + return user + + async def logout(self, *, token: str) -> None: + await session_store.delete_session(token_hash=hash_token(token)) + logger.info("Сессия завершена") diff --git a/src/service/chat.py b/src/service/chat.py new file mode 100644 index 00000000..97ce519c --- /dev/null +++ b/src/service/chat.py @@ -0,0 +1,61 @@ +from datetime import datetime, timezone +from uuid import UUID, uuid4 + +from sqlalchemy.ext.asyncio import AsyncSession + +from src.core.db.repo import chat as chat_repo +from src.core.db.repo import user as user_repo +from src.service.dto import ChatDTO +from src.service.exceptions import ChatNotFoundException, InvalidChatMembersException + + +class ChatService: + def __init__(self, db_session: AsyncSession) -> None: + self._db_session = db_session + + async def create_chat( + self, + *, + title: str, + member_ids: list[UUID], + current_user_id: UUID, + ) -> ChatDTO: + if current_user_id not in member_ids: + raise InvalidChatMembersException("Создатель должен быть в списке member_ids") + if not await user_repo.users_exist( + session=self._db_session, + user_ids=member_ids, + ): + raise InvalidChatMembersException("Указан неизвестный пользователь") + + return await chat_repo.create_chat( + session=self._db_session, + chat_id=uuid4(), + title=title, + member_ids=member_ids, + created_at=datetime.now(timezone.utc), + ) + + async def get_chat(self, *, chat_id: UUID, current_user_id: UUID) -> ChatDTO: + chat = await chat_repo.fetch_chat_by_id( + session=self._db_session, + chat_id=chat_id, + ) + self._check_access(chat=chat, user_id=current_user_id) + return chat + + async def get_chats( + self, + *, + current_user_id: UUID, + limit: int, + after: tuple[datetime, UUID] | None = None, + ) -> list[ChatDTO]: + return await chat_repo.fetch_chats( + session=self._db_session, user_id=current_user_id, limit=limit, after=after + ) + + @staticmethod + def _check_access(*, chat: ChatDTO | None, user_id: UUID) -> None: + if chat is None or user_id not in chat.member_ids: + raise ChatNotFoundException("Чат не найден") diff --git a/src/service/dto.py b/src/service/dto.py new file mode 100644 index 00000000..ed799ffe --- /dev/null +++ b/src/service/dto.py @@ -0,0 +1,50 @@ +from dataclasses import dataclass, field +from datetime import datetime +from typing import Literal +from uuid import UUID + + +@dataclass(frozen=True, slots=True) +class UserDTO: + id: UUID + username: str + display_name: str + created_at: datetime + + +@dataclass(frozen=True, slots=True) +class ChatDTO: + id: UUID + title: str + member_ids: tuple[UUID, ...] + created_at: datetime + + +@dataclass(frozen=True, slots=True) +class MessageDTO: + id: UUID + chat_id: UUID + sender_id: UUID + text: str + created_at: datetime + attachment_ids: tuple[UUID, ...] = () + + +@dataclass(frozen=True, slots=True) +class AuthSessionDTO: + token: str = field(repr=False) + expires_at: datetime + user: UserDTO + token_type: Literal["Bearer"] = "Bearer" + + +@dataclass(frozen=True, slots=True) +class StoredSessionDTO: + user_id: UUID + expires_at: datetime + + +@dataclass(frozen=True, slots=True) +class UserCredentialsDTO: + user: UserDTO + password_hash: str = field(repr=False) diff --git a/src/service/exceptions.py b/src/service/exceptions.py new file mode 100644 index 00000000..4c682db7 --- /dev/null +++ b/src/service/exceptions.py @@ -0,0 +1,30 @@ +class IdempotencyConflictException(Exception): + pass + + +class ServiceException(Exception): + pass + + +class UserAlreadyExistsException(ServiceException): + pass + + +class UserNotFoundException(ServiceException): + pass + + +class InvalidChatMembersException(ServiceException): + pass + + +class ChatNotFoundException(ServiceException): + pass + + +class InvalidCredentialsException(ServiceException): + pass + + +class InvalidSessionException(ServiceException): + pass diff --git a/src/service/message.py b/src/service/message.py new file mode 100644 index 00000000..e10ffb0d --- /dev/null +++ b/src/service/message.py @@ -0,0 +1,64 @@ +from datetime import datetime, timezone +from uuid import UUID, uuid4 + +from sqlalchemy.ext.asyncio import AsyncSession + +from src.core.db.repo import chat as chat_repo +from src.core.db.repo import message as message_repo +from src.service.dto import ChatDTO, MessageDTO +from src.service.exceptions import ChatNotFoundException + + +class MessageService: + def __init__(self, db_session: AsyncSession) -> None: + self._db_session = db_session + + async def create_message( + self, + *, + chat_id: UUID, + sender_id: UUID, + text: str, + idempotency_key: str, + attachment_ids: list[UUID] | None = None, + ) -> MessageDTO: + chat = await chat_repo.fetch_chat_by_id( + session=self._db_session, + chat_id=chat_id, + ) + self._check_access(chat=chat, user_id=sender_id) + return await message_repo.create_idempotent_message( + session=self._db_session, + message_id=uuid4(), + idempotency_key=idempotency_key, + chat_id=chat_id, + sender_id=sender_id, + text=text, + attachment_ids=attachment_ids or [], + created_at=datetime.now(timezone.utc), + ) + + async def get_messages( + self, + *, + chat_id: UUID, + current_user_id: UUID, + limit: int, + after: tuple[datetime, UUID] | None = None, + ) -> list[MessageDTO]: + chat = await chat_repo.fetch_chat_by_id( + session=self._db_session, + chat_id=chat_id, + ) + self._check_access(chat=chat, user_id=current_user_id) + return await message_repo.fetch_messages_by_chat_id( + session=self._db_session, + chat_id=chat_id, + limit=limit, + after=after, + ) + + @staticmethod + def _check_access(*, chat: ChatDTO | None, user_id: UUID) -> None: + if chat is None or user_id not in chat.member_ids: + raise ChatNotFoundException("Чат не найден") diff --git a/src/service/user.py b/src/service/user.py new file mode 100644 index 00000000..05b6882e --- /dev/null +++ b/src/service/user.py @@ -0,0 +1,63 @@ +from datetime import datetime, timezone +from uuid import UUID, uuid4 + +from sqlalchemy.exc import IntegrityError +from sqlalchemy.ext.asyncio import AsyncSession + +from src.core.db.repo import user as user_repo +from src.core.security import hash_password_async +from src.service.dto import UserDTO +from src.service.exceptions import UserAlreadyExistsException, UserNotFoundException + + +class UserService: + def __init__(self, db_session: AsyncSession) -> None: + self._db_session = db_session + + async def create_user(self, *, username: str, display_name: str, password: str) -> UserDTO: + password_hash = await hash_password_async(password) + try: + return await user_repo.create_user( + session=self._db_session, + user_id=uuid4(), + username=username, + display_name=display_name, + created_at=datetime.now(timezone.utc), + password_hash=password_hash, + ) + except IntegrityError as error: + if getattr(error.orig, "sqlstate", None) != "23505": + raise + raise UserAlreadyExistsException("Пользователь с таким именем уже существует") from None + + async def create_admin( + self, + *, + username: str, + display_name: str, + password: str, + ) -> UserDTO | None: + password_hash = await hash_password_async(password) + user = await user_repo.create_admin( + session=self._db_session, + user_id=uuid4(), + username=username, + display_name=display_name, + password_hash=password_hash, + created_at=datetime.now(timezone.utc), + ) + if user is None and not await user_repo.admin_exists( + session=self._db_session, + username=username, + ): + raise UserAlreadyExistsException("Имя администратора занято обычным пользователем") + return user + + async def get_user_by_id(self, *, user_id: UUID) -> UserDTO: + user = await user_repo.fetch_user_by_id( + session=self._db_session, + user_id=user_id, + ) + if user is None: + raise UserNotFoundException("Пользователь не найден") + return user diff --git a/student.env.example b/student.env.example new file mode 100644 index 00000000..02291547 --- /dev/null +++ b/student.env.example @@ -0,0 +1,46 @@ +APP_HOST=0.0.0.0 +APP_PORT=8080 +APP_ENV=lab +POSTGRES_DB=messenger +POSTGRES_USER=messenger +# Задай свой локальный пароль перед запуском. Не добавляй .env в Git. +POSTGRES_PASSWORD= +SESSION_TTL_SECONDS=3600 +# REDIS_URL задаётся в compose.yaml; Redis хранит сессии с TTL и кэш профилей на 60 секунд. +LOG_LEVEL=INFO +# DATABASE_URL и REDIS_URL передаёт Compose. При ручном запуске задай их в окружении. +# Остальные параметры и значения по умолчанию: src/core/settings.py (AppSettings). + +# Стартовый администратор; повторный запуск не меняет существующий пароль. +ADMIN_USERNAME=admin +ADMIN_PASSWORD=admin-password-123 +ADMIN_DISPLAY_NAME=Администратор + +# APP_ENV=production запрещает учебный ADMIN_PASSWORD. Пароль существующего +# администратора должен совпадать с настройкой; автоматического сброса нет. +# HTTP_MAX_BODY_BYTES=65536 +# HTTP_BODY_TIMEOUT_SECONDS=5 +# HTTP_REQUEST_TIMEOUT_SECONDS=5 +# HTTP_CONCURRENCY_LIMIT=64 +# PASSWORD_HASH_CONCURRENCY=2 + +# Lab3: число реплик и лимиты каждой API-реплики. Наружу доступен только LB. +API_REPLICAS=2 +API_CPUS=0.5 +API_MEMORY=512m +DATABASE_POOL_SIZE=10 +POSTGRES_CPUS=1.0 + +# Lab4. Local synthetic credentials; MinIO is accessible only inside Compose. +MINIO_ROOT_USER=messenger +MINIO_ROOT_PASSWORD=local-messenger-s3-password +S3_ACCESS_KEY_ID=messenger-api +S3_SECRET_ACCESS_KEY=local-messenger-api-password +S3_BUCKET=messenger-attachments +UPLOAD_CONCURRENCY=1 +# Manual API startup additionally needs S3_ENDPOINT=http://host:9000. + +# Automatic reconciliation runs every 300 seconds; default grace is five minutes. +S3_RECONCILE_ACCESS_KEY_ID=messenger-reconciler +S3_RECONCILE_SECRET_ACCESS_KEY=local-messenger-reconciler-password +RECONCILE_GRACE_SECONDS=300 diff --git a/tests/attachment_failover.py b/tests/attachment_failover.py new file mode 100644 index 00000000..77e9379c --- /dev/null +++ b/tests/attachment_failover.py @@ -0,0 +1,44 @@ +"""Stop the exact API replica which accepted the image; preserve original bytes.""" +import os +import subprocess +import time +from pathlib import Path + +from client import Client, Failure, arguments, check, run + + +def main(): + args = arguments('Attachment download after stopping the uploading replica') + c = Client(args.base_url, args.ca_file) + alice, bob, _, chat = c.bootstrap() + content = (Path(__file__).parent / 'fixtures/sample.png').read_bytes() + uploaded = c.call('POST', '/api/v1/chats/' + chat['id'] + '/attachments?filename=failover.png', + 201, actor=alice, raw=content, headers={'Content-Type': 'image/png'}, + schema='Attachment') + att = uploaded['json'] + c.message(alice, chat, '', attachments=[att['id']]) + target = uploaded['headers']['X-Instance-Id'] + subprocess.run(['scripts/stop-one.sh'], check=True, + env=dict(os.environ, TARGET_INSTANCE_ID=target), + stdout=subprocess.DEVNULL) + deadline = time.monotonic() + 15 + try: + while True: + try: + downloaded = c.call('GET', '/api/v1/attachments/' + att['id'] + '/content', actor=bob) + break + except Failure: + if time.monotonic() >= deadline: + raise + time.sleep(.2) + check(downloaded['bytes'] == content, 'original lost after uploader replica stopped') + check(downloaded['headers']['X-Instance-Id'] != target, 'download used stopped replica') + print('PASS: exact uploading replica stopped; another replica returns identical original') + finally: + # Restore the two-replica development stack for subsequent work. + subprocess.run(['docker', 'compose', 'up', '-d', '--wait', 'api'], check=True, + stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + + +if __name__ == '__main__': + run(main) diff --git a/tests/attachments.py b/tests/attachments.py new file mode 100644 index 00000000..65dbef64 --- /dev/null +++ b/tests/attachments.py @@ -0,0 +1,98 @@ +"""Lab4 black-box checks against the running Compose stack.""" +import hashlib +import io +import struct +import zlib +from concurrent.futures import ThreadPoolExecutor +import uuid +from pathlib import Path + +from PIL import Image +from client import Client, arguments, check, run + + +def main(): + args = arguments('Attachment originals, ACL, validation and message limits') + c = Client(args.base_url, args.ca_file) + alice, bob, eve, chat = c.bootstrap() + path = '/api/v1/chats/' + chat['id'] + content = (Path(__file__).parent / 'fixtures/sample.png').read_bytes() + + def upload(data=content, name='photo.png', mime='image/png', status=201, actor=alice): + return c.call('POST', path + '/attachments?filename=' + name, status, + actor=actor, raw=data, headers={'Content-Type': mime}, + schema='Attachment' if status == 201 else None)['json'] + + first = upload() + second = upload() # Same display name must not overwrite the first object. + check(first['id'] != second['id'], 'same filename overwrote attachment') + jpg = io.BytesIO() + Image.new('RGB', (31, 17), 'red').save(jpg, format='JPEG') + jpeg = upload(jpg.getvalue(), 'photo.jpg', 'image/jpeg') + for att, original in [(first, content), (second, content), (jpeg, jpg.getvalue())]: + check(att['sha256'] == hashlib.sha256(original).hexdigest(), 'incorrect digest') + check(att['status'] == 'ready' and att['variants'] == [], 'incorrect ready metadata') + for suffix in ('', '/content'): + c.call('GET', '/api/v1/attachments/' + att['id'] + suffix, 404, actor=eve) + downloaded = c.call('GET', '/api/v1/attachments/' + att['id'] + '/content', actor=bob) + check(downloaded['bytes'] == original, 'original changed') + + ids = [first['id'], second['id'], jpeg['id']] + key = uuid.uuid4().hex + message = c.message(alice, chat, '', key=key, attachments=ids)['json'] + check(message['attachment_ids'] == ids, 'attachment order lost') + check(c.message(alice, chat, '', key=key, attachments=ids)['json'] == message, + 'idempotency replay changed message') + c.call('POST', path + '/messages', 409, actor=alice, + body={'text': '', 'attachment_ids': ids[:1]}, headers={'Idempotency-Key': key}) + page = c.call('GET', path + '/messages', actor=bob, schema='MessagePage')['json'] + check(any(m == message for m in page['items']), 'history lost attachments') + # The contract permits referencing the same accessible chat attachment again. + c.message(bob, chat, 'same image', attachments=[first['id']]) + + for body in ({'text': '', 'attachment_ids': []}, + {'text': '', 'attachment_ids': [first['id']] * 2}, + {'text': '', 'attachment_ids': [str(uuid.uuid4()) for _ in range(11)]}): + c.call('POST', path + '/messages', 400, actor=alice, body=body, + headers={'Idempotency-Key': uuid.uuid4().hex}) + c.call('POST', path + '/messages', 404, actor=alice, + body={'text': '', 'attachment_ids': [str(uuid.uuid4())]}, + headers={'Idempotency-Key': uuid.uuid4().hex}) + other = c.call('POST', '/api/v1/chats', 201, actor=alice, + body={'title': 'Другой чат', 'member_ids': [alice['id'], bob['id']]}, + schema='Chat')['json'] + c.call('POST', '/api/v1/chats/' + other['id'] + '/messages', 404, actor=alice, + body={'text': '', 'attachment_ids': ids}, + headers={'Idempotency-Key': uuid.uuid4().hex}) + upload(actor=eve, status=404) + upload(name='..%2Fphoto.png', status=400) + upload(name='a%00b.png', status=400) + upload(data=b'not a PNG', status=415) + upload(data=content[:30], status=415) + upload(mime='image/jpeg', status=415) + upload(mime='application/octet-stream', status=415) + # Oversized dimensions with a valid PNG header; no huge bitmap allocation. + header = struct.pack('>IIBBBBB', 10000, 5000, 8, 2, 0, 0, 0) + bomb = (content[:8] + struct.pack('>I', len(header)) + b'IHDR' + header + + struct.pack('>I', zlib.crc32(b'IHDR' + header)) + content[33:]) + upload(data=bomb, status=413) + upload(data=b'x' * (10485760 + 1), status=413) + c.call('POST', path + '/attachments?filename=a.png', 401, + raw=content, headers={'Content-Type': 'image/png'}) + + # Exactly 10 distinct attachments must remain valid, including after reading history. + ten = ids + [upload()['id'] for _ in range(7)] + check(len(c.message(alice, chat, '', attachments=ten)['json']['attachment_ids']) == 10, + '10 attachments rejected') + replay_key = uuid.uuid4().hex + with ThreadPoolExecutor(max_workers=8) as pool: + responses = list(pool.map(lambda _: Client(args.base_url, args.ca_file).message( + alice, chat, 'Concurrent image', key=replay_key, attachments=ids + ), range(8))) + check(all(r['json'] == responses[0]['json'] for r in responses), + 'concurrent attachment retries differ') + print('PASS: PNG/JPEG bytes, metadata, ACL, chat boundaries, limits and idempotency') + + +if __name__ == '__main__': + run(main) diff --git a/tests/auth_logging.py b/tests/auth_logging.py new file mode 100644 index 00000000..66160eaf --- /dev/null +++ b/tests/auth_logging.py @@ -0,0 +1,36 @@ +"""Проверка русских событий авторизации и отсутствия секретов в логах Compose.""" +import subprocess +import base64 +from datetime import datetime, timezone +from pathlib import Path + +from client import Client, arguments, check, run + + +def main(): + args = arguments('Проверка логов авторизации') + started = datetime.now(timezone.utc).isoformat().replace('+00:00', 'Z') + client = Client(args.base_url, args.ca_file) + actor = client.user('auth_logs') + username = actor['registration']['username'] + wrong_password = 'wrong-password-for-logging' + client.call('POST', '/api/v1/auth/sessions', 401, headers={'Authorization': 'Basic ' + base64.b64encode((username + ':' + wrong_password).encode()).decode()}) + missing_username = 'missing_' + actor['id'].replace('-', '')[:12] + client.call('POST', '/api/v1/auth/sessions', 401, headers={'Authorization': 'Basic ' + base64.b64encode((missing_username + ':' + wrong_password).encode()).decode()}) + client.call('DELETE', '/api/v1/auth/sessions/current', 204, actor=actor) + client.call('GET', '/api/v1/users/me', 401, actor=actor) + result = subprocess.run( + ['docker', 'compose', 'logs', '--no-color', '--since', started, 'api'], + cwd=Path(__file__).resolve().parents[1], check=True, capture_output=True, text=True, + ) + logs = result.stdout + result.stderr + check('src.service.auth' in logs, 'Не используется обычный логгер модуля') + for message in ('Сессия создана', 'Вход отклонён', 'Сессия завершена', 'Доступ отклонён'): + check(message in logs, 'В логах отсутствует событие авторизации') + for secret in (actor['token'], actor['registration']['password'], wrong_password): + check(secret not in logs, 'В логах обнаружены credentials') + print('PASS: русские события входа/отказа/logout; пароли и токены не попали в логи') + + +if __name__ == '__main__': + run(main) diff --git a/tests/callbacks.py b/tests/callbacks.py new file mode 100644 index 00000000..264ca119 --- /dev/null +++ b/tests/callbacks.py @@ -0,0 +1,107 @@ +"""docker compose exec -T api python < tests/callbacks.py.""" +import asyncio +import base64 +import json +from uuid import uuid4 +from urllib.error import HTTPError +from urllib.request import Request, urlopen +from unittest.mock import patch + +from pydantic import SecretStr + +from sqlalchemy import delete, func, select +from sqlalchemy.ext.asyncio import async_sessionmaker + +from src.api.v1.routers.auth.callback import create_admin +from src.core.db.models import User +from src.core.db.session import create_engine +from src.core.settings import settings +from src.service.exceptions import UserAlreadyExistsException +from src.service.user import UserService + + +def call(method, path, expected, headers=None, body=None): + data = None if body is None else json.dumps(body).encode() + request_headers = dict(headers or {}) + if body is not None: + request_headers['Content-Type'] = 'application/json' + request = Request(f'http://127.0.0.1:{settings.app_port}' + path, + method=method, headers=request_headers, data=data) + try: + response = urlopen(request, timeout=10) + except HTTPError as error: + response = error + with response: + assert response.status == expected, response.status + return json.load(response) if response.status != 204 else None + + +async def main(): + engine = create_engine() + factory = async_sessionmaker(engine, expire_on_commit=False) + try: + async with factory() as session: + admin = await session.scalar(select(User).where(User.username == settings.admin_username)) + assert admin is not None and admin.is_admin + identity = (admin.id, admin.password_hash, admin.created_at) + await asyncio.gather(create_admin(factory), create_admin(factory)) + async with factory() as session: + admin = await session.scalar(select(User).where(User.username == settings.admin_username)) + assert (admin.id, admin.password_hash, admin.created_at) == identity + assert await session.scalar(select(func.count()).select_from(User).where( + User.username == settings.admin_username, + )) == 1 + print('PASS: стартовый администратор создан; повторные callbacks не дублируют и не меняют пароль') + with patch.object(settings, 'app_env', 'production'), patch.object( + settings, 'admin_password', SecretStr('different-production-password-123') + ): + try: + await create_admin(factory) + except RuntimeError: + pass + else: + raise AssertionError('Production запущен с несовпадающим паролем в БД') + print('PASS: production не принимает старый пароль администратора при изменённой конфигурации') + + credential = base64.b64encode((settings.admin_username + ':' + settings.admin_password.get_secret_value()).encode()).decode() + result = call('POST', '/api/v1/auth/sessions', 201, headers={'Authorization': 'Basic ' + credential}) + bearer = {'Authorization': 'Bearer ' + result['token']} + me = call('GET', '/api/v1/users/me', 200, bearer) + assert me['id'] == str(identity[0]) + call('DELETE', '/api/v1/auth/sessions/current', 204, bearer) + print('PASS: администратор входит через Basic, читает профиль через Bearer и выходит') + + username = 'seed_test_' + uuid4().hex[:12] + password = 'valid-password-for-seed-test' + normal = call('POST', '/api/v1/users', 201, body={ + 'username': username, 'display_name': 'Обычный пользователь', 'password': password, + }) + try: + try: + async with factory.begin() as session: + await UserService(session).create_admin( + username=username, display_name='Администратор', password=password, + ) + except UserAlreadyExistsException: + pass + else: + raise AssertionError('Обычный пользователь стал администратором') + async with factory() as session: + assert not await session.scalar(select(User.is_admin).where(User.username == username)) + finally: + from uuid import UUID + async with factory.begin() as session: + await session.execute(delete(User).where(User.id == UUID(normal['id']))) + print('PASS: callback не повышает права обычного пользователя с совпавшим username') + + base = {'username': 'constraints_' + uuid4().hex[:12], 'display_name': 'Проверка', + 'password': password} + call('POST', '/api/v1/users', 400, body={**base, 'username': 'user@example.com'}) + call('POST', '/api/v1/users', 400, body={**base, 'password': 'admin'}) + call('POST', '/api/v1/users', 400, body={**base, 'is_admin': True}) + print('PASS: ограничения username/password сохранены; is_admin нельзя передать при регистрации') + finally: + await engine.dispose() + + +asyncio.run(main()) diff --git a/tests/database.py b/tests/database.py new file mode 100644 index 00000000..253fedf1 --- /dev/null +++ b/tests/database.py @@ -0,0 +1,87 @@ +"""docker compose exec -T api python < tests/database.py.""" +import asyncio +import subprocess +import sys +from datetime import datetime, timedelta, timezone +from uuid import uuid4 + +from sqlalchemy import Column, MetaData, String, Table, func, insert, select, text +from sqlalchemy.exc import IntegrityError +from sqlalchemy.ext.asyncio import async_sessionmaker + +from src.core.db.models import Chat, ChatMember, Message, User +from src.core.db.repo.chat import create_chat +from src.core.db.repo.message import history_query +from src.core.db.session import create_engine + + +async def main(): + engine = create_engine() + factory = async_sessionmaker(engine, expire_on_commit=False) + try: + async def counts(): + async with factory() as session: + return [await session.scalar(select(func.count()).select_from(model)) + for model in (User, Chat, ChatMember, Message)] + + before = await counts() + for _ in range(2): + subprocess.run([sys.executable, '-m', 'alembic', 'upgrade', 'head'], check=True) + assert before == await counts(), 'Повтор миграций изменил данные' + versions = Table('alembic_version', MetaData(), Column('version_num', String(32), primary_key=True)) + async with factory() as session: + assert (await session.scalars(select(versions.c.version_num))).all() == ['006'] + print('PASS: два повторных запуска миграций не изменили данные; версия 006 одна') + + user_id, chat_id = uuid4(), uuid4() + now = datetime.now(timezone.utc) + try: + async with factory.begin() as session: + await create_chat(session, chat_id, 'rollback', [user_id], now) + except IntegrityError as error: + assert getattr(error.orig, 'sqlstate', None) == '23503' + else: + raise AssertionError('Ожидался отказ внешнего ключа') + async with factory() as session: + assert await session.get(Chat, chat_id) is None + assert await session.scalar( + select(func.count()).select_from(ChatMember).where(ChatMember.chat_id == chat_id) + ) == 0 + print('PASS: ошибка участника откатила INSERT чата и участников') + + async with factory() as session: + try: + session.add(User(id=user_id, username='plan_' + uuid4().hex[:16], + display_name='EXPLAIN', password_hash='test-not-for-login', created_at=now)) + await session.flush() + await create_chat(session, chat_id, 'EXPLAIN', [user_id], now) + await session.execute(insert(Message), [ + dict(id=uuid4(), chat_id=chat_id, sender_id=user_id, text=f'message {n}', + created_at=now + timedelta(milliseconds=n)) for n in range(1, 10001) + ]) + # ANALYZE и EXPLAIN — диагностические команды PostgreSQL, не запросы репозитория. + await session.execute(text('ANALYZE messages')) + count = await session.scalar( + select(func.count()).select_from(Message).where(Message.chat_id == chat_id) + ) + print('Сообщений в исследуемом чате:', count) + after = (await session.execute( + select(Message.created_at, Message.id).where(Message.chat_id == chat_id) + .order_by(Message.created_at, Message.id).offset(8999).limit(1) + )).one() + # Исследуется именно выражение SQLAlchemy, используемое в репозитории. + compiled = history_query(chat_id, 51, tuple(after)).compile( + dialect=engine.dialect, compile_kwargs={'literal_binds': True}, + ) + rows = await session.execute(text('EXPLAIN (ANALYZE, BUFFERS) ' + str(compiled))) + plan = '\n'.join(row[0] for row in rows) + assert 'messages_history_idx' in plan, plan + print(plan) + print('PASS: индекс истории используется для глубокой страницы из 10000 сообщений') + finally: + await session.rollback() + finally: + await engine.dispose() + + +asyncio.run(main()) diff --git a/tests/dependencies.py b/tests/dependencies.py new file mode 100644 index 00000000..73df39ba --- /dev/null +++ b/tests/dependencies.py @@ -0,0 +1,160 @@ +"""Проверка отказов только локального Compose-стенда; сервисы восстанавливаются.""" + +import hashlib +import json +import subprocess +import time +from pathlib import Path + +from client import Client, Failure, arguments, run + +ROOT = Path(__file__).resolve().parents[1] + + +def compose(*args): + subprocess.run( + ["docker", "compose", *args], cwd=ROOT, check=True, stdout=subprocess.DEVNULL, timeout=60 + ) + + +def main(): + args = arguments("Отказы Redis и PostgreSQL") + c = Client(args.base_url, args.ca_file) + actor = c.user("outage") + c.call("GET", "/api/v1/users/me", actor=actor, schema="User") + key = "user:v1:" + actor["id"] + + def redis(*args): + return subprocess.check_output( + ["docker", "compose", "exec", "-T", "redis", "redis-cli", "--raw", *args], + cwd=ROOT, + text=True, + timeout=10, + ).strip() + + assert redis("EXISTS", key) == "1", "Профиль не попал в Redis" + assert 0 < int(redis("TTL", key)) <= 60 + + def hits(): + return int( + next( + line.split(":")[1] + for line in redis("INFO", "stats").splitlines() + if line.startswith("keyspace_hits:") + ) + ) + + before = hits() + c.call("GET", "/api/v1/users/me", actor=actor, schema="User") + assert hits() > before, "Повторное чтение не использовало Redis" + redis("DEL", key) + c.call("GET", "/api/v1/users/me", actor=actor, schema="User") + assert redis("EXISTS", key) == "1", "Кэш не восстановился из PostgreSQL" + token_key = "session:v1:" + hashlib.sha256(actor["token"].encode()).hexdigest() + assert redis("EXISTS", token_key) == "1", "Сессия отсутствует в Redis" + ttl_before = int(redis("PTTL", token_key)) + c.call("GET", "/api/v1/users/me", actor=actor, schema="User") + assert 0 < int(redis("PTTL", token_key)) <= ttl_before, "Чтение продлило сессию" + print("PASS: сессия хранится в Redis с TTL; чтение не продлевает срок") + print( + "PASS: профиль кэшируется с TTL<=60; повторный GET даёт cache hit; потеря ключа восполняется" + ) + lost = c.user("lost") + c.call("GET", "/api/v1/users/me", actor=lost, schema="User") + lost_key = "session:v1:" + hashlib.sha256(lost["token"].encode()).hexdigest() + redis("DEL", lost_key) + c.call("GET", "/api/v1/users/me", 401, actor=lost) + assert redis("EXISTS", lost_key) == "0", "Удалённая сессия воскресла" + print("PASS: отсутствующая сессия не восстанавливается из профиля/БД; Redis — источник истины") + # При общей неисправности LB исключает все API. Проверку отдельного + # процесса выполняем из контейнера; внешние API-порты не открываем. + container = subprocess.check_output( + ["docker", "compose", "ps", "-q", "api"], cwd=ROOT, text=True + ).split()[0] + + def probe(method, path, expected=200, actor=None, body=None, schema=None): + code = r""" +import json, sys, urllib.request, urllib.error +p=json.load(sys.stdin) +h={"Content-Type":"application/json"} +if p["actor"]: h["Authorization"]="Bearer "+p["actor"]["token"] +r=urllib.request.Request("http://127.0.0.1:8080"+p["path"], method=p["method"], headers=h, + data=json.dumps(p["body"]).encode() if p["body"] is not None else None) +try: response=urllib.request.urlopen(r, timeout=6) +except urllib.error.HTTPError as e: response=e +with response: + assert response.headers.get("X-Request-Id") and response.headers.get("X-Instance-Id") + print(response.status) +""" + result = subprocess.check_output( + ["docker", "exec", "-i", container, "python", "-c", code], + cwd=ROOT, + text=True, + input=json.dumps(dict(method=method, path=path, actor=actor, body=body)), + ) + assert int(result.strip()) == expected, (method, path, expected, result) + + def wait_lb(): + deadline = time.monotonic() + 30 + while True: + try: + c.call("GET", "/health/ready", schema="Health") + return + except Failure: + if time.monotonic() > deadline: + raise + time.sleep(0.25) + + try: + compose("stop", "redis") + probe("GET", "/health/live", schema="Health") + probe("GET", "/api/v1/users/me", 503, actor=actor) + probe("DELETE", "/api/v1/auth/sessions/current", 503, actor=actor) + probe("GET", "/health/ready", 503) + probe("GET", "/api/v1/users/me", 503, actor={"token": "invalid-token"}) + probe("GET", "/api/v1/users/me", 401) + print( + "PASS: Redis выключен; live=200, ready=503; проверка сессий недоступна, доступ не выдаётся" + ) + finally: + compose("up", "-d", "--wait", "redis") + wait_lb() + probe("GET", "/api/v1/users/me", actor=actor, schema="User") + print("PASS: сессия сохранилась после перезапуска Redis") + revoked = c.user("revoked") + probe("GET", "/api/v1/users/me", actor=revoked, schema="User") + probe("DELETE", "/api/v1/auth/sessions/current", 204, actor=revoked) + compose("restart", "redis") + compose("up", "-d", "--wait", "redis") + probe("GET", "/api/v1/users/me", 401, actor=revoked) + probe( + "POST", + "/api/v1/chats", + 401, + actor=revoked, + body={"title": "Нет доступа", "member_ids": [revoked["id"]]}, + ) + print( + "PASS: logout при отказе Redis возвращает 503; успешный отзыв переживает AOF-рестарт и не даёт доступ" + ) + try: + compose("stop", "postgres") + probe("GET", "/health/live", schema="Health") + probe("GET", "/health/ready", 503) + probe("GET", "/api/v1/chats", 503, actor=actor) + probe("GET", "/api/v1/users/me", 401) + probe("GET", "/api/v1/users/me", 401, actor={"token": "invalid-token"}) + probe("GET", "/api/v1/users/me", actor=actor, schema="User") + print( + "PASS: PostgreSQL выключен; live=200, ready=503, чаты=503; действующая сессия и прогретый профиль доступны в Redis" + ) + finally: + compose("up", "-d", "--wait", "postgres") + probe("GET", "/api/v1/users/me", actor=actor, schema="User") + wait_lb() + c.call("GET", "/api/v1/users/me", actor=actor, schema="User") + print("PASS: после восстановления БД прежняя сессия снова работает через HAProxy") + + +if __name__ == "__main__": + run(main) diff --git a/tests/error_headers.py b/tests/error_headers.py new file mode 100644 index 00000000..025d2366 --- /dev/null +++ b/tests/error_headers.py @@ -0,0 +1,53 @@ +"""Неожиданное исключение не раскрывает детали и сохраняет обязательные headers. +Маршрут добавлен только в этот изолированный процесс, не в работающий API. +""" + +import asyncio +import json + +from src.main import INSTANCE_ID, app + + +@app.get("/_audit_unexpected_error") +async def unexpected(): + raise RuntimeError("audit-internal-detail") + + +async def main(): + messages = [] + + async def receive(): + await asyncio.Event().wait() + + async def send(message): + messages.append(message) + + scope = { + "type": "http", + "asgi": {"version": "3.0", "spec_version": "2.4"}, + "http_version": "1.1", + "method": "GET", + "scheme": "http", + "path": "/_audit_unexpected_error", + "raw_path": b"/_audit_unexpected_error", + "query_string": b"", + "root_path": "", + "headers": [], + "server": ("localhost", 80), + "client": ("127.0.0.1", 1), + } + await app(scope, receive, send) + start = next(m for m in messages if m["type"] == "http.response.start") + payload = json.loads( + b"".join(m.get("body", b"") for m in messages if m["type"] == "http.response.body") + ) + headers = dict(start["headers"]) + assert start["status"] == 500 + assert headers[b"x-instance-id"].decode() == INSTANCE_ID + assert payload["error"]["request_id"] == headers[b"x-request-id"].decode() + assert payload["error"]["code"] == "internal_error" + assert "audit-internal-detail" not in json.dumps(payload) + print("PASS: 500 has X-Request-Id/X-Instance-Id and hides internal exception details") + + +asyncio.run(main()) diff --git a/tests/expiry.py b/tests/expiry.py new file mode 100644 index 00000000..c5bc8b09 --- /dev/null +++ b/tests/expiry.py @@ -0,0 +1,17 @@ +"""Отдельный стенд/запуск с SESSION_TTL_SECONDS=2, не обычный smoke.""" +import time +from client import Client, arguments, run + + +def main(): + args = arguments('Истечение короткой сессии') + c = Client(args.base_url, args.ca_file) + actor = c.user('expiry') + c.call('GET', '/api/v1/users/me', actor=actor, schema='User') + time.sleep(3) + c.call('GET', '/api/v1/users/me', 401, actor=actor) + print('PASS: действующая сессия стала 401 через 3 секунды при TTL=2') + + +if __name__ == '__main__': + run(main) diff --git a/tests/extra.py b/tests/extra.py new file mode 100644 index 00000000..bce67089 --- /dev/null +++ b/tests/extra.py @@ -0,0 +1,111 @@ +from concurrent.futures import ThreadPoolExecutor +import json +import base64 +import uuid +from urllib.parse import quote + +from client import Client, arguments, check, run + + +def main(): + args = arguments("Собственные тесты мессенджера") + client = Client(args.base_url, args.ca_file) + alice, bob, eve, chat = client.bootstrap() + chat_path = "/api/v1/chats/" + chat["id"] + + client.call( + "POST", + "/api/v1/users", + 400, + raw=b'{"username":', + headers={"Content-Type": "application/json"}, + ) + client.call("POST", "/api/v1/users", 409, body=alice["registration"]) + client.call( + "POST", + chat_path + "/messages", + 400, + actor=alice, + body={"text": " "}, + ) + client.call("GET", chat_path, 404, actor=eve) + + # Уникальность защищена ограничением БД, в том числе при гонке. + registration = { + 'username': 'race_' + uuid.uuid4().hex[:16], + 'display_name': 'Гонка регистрации', + 'password': 'Пароль:с-двоеточием-123', + } + def register(_): + local = Client(args.base_url, args.ca_file) + return local.call('POST', '/api/v1/users', [201, 409], body=registration)['status'] + with ThreadPoolExecutor(max_workers=6) as pool: + statuses = list(pool.map(register, range(6))) + check(statuses.count(201) == 1 and statuses.count(409) == 5, 'гонка регистрации не защищена') + session = client.call('POST', '/api/v1/auth/sessions', 201, + headers={'Authorization': 'Basic ' + base64.b64encode((registration['username'] + ':' + registration['password']).encode()).decode()}, schema='Session')['json'] + actor = {'token': session['token']} + client.call('GET', '/api/v1/users/me', actor=actor, schema='User') + client.call('DELETE', '/api/v1/auth/sessions/current', 204, actor=actor) + # Даже прогретый Redis не должен разрешать отозванную сессию. + client.call('GET', '/api/v1/users/me', 401, actor=actor) + + def send_batch(worker_id): + local = Client(args.base_url, args.ca_file) + result = [] + for index in range(10): + response = local.message( + alice, + chat, + "параллельное-%d-%d" % (worker_id, index), + )["json"] + result.append(response["id"]) + return result + + with ThreadPoolExecutor(max_workers=10) as pool: + created_ids = [ + message_id + for batch in pool.map(send_batch, range(10)) + for message_id in batch + ] + + check(len(created_ids) == 100, "не все параллельные запросы вернули ответ") + check(len(set(created_ids)) == 100, "параллельные запросы вернули повторяющиеся ID") + + received = [] + cursor = None + while True: + path = chat_path + "/messages?limit=17" + if cursor is not None: + path += "&cursor=" + quote(cursor, safe="") + page = client.call("GET", path, actor=bob, schema="MessagePage")["json"] + received.extend(page["items"]) + cursor = page["next_cursor"] + if cursor is None: + break + + concurrent_messages = [ + message for message in received if message["text"].startswith("параллельное-") + ] + received_ids = [message["id"] for message in concurrent_messages] + check(len(received_ids) == 100, "в истории нет ровно 100 параллельно созданных сообщений") + check(len(set(received_ids)) == 100, "в истории есть повторяющиеся сообщения") + check(set(received_ids) == set(created_ids), "ID созданных и прочитанных сообщений не совпадают") + + print( + json.dumps( + { + "результат": "ПРОЙДЕНО", + "гонка_регистрации": "1 создан, 5 конфликтов", + "unicode_пароль_и_logout_с_кэшем": "ПРОЙДЕНО", + "параллельных_клиентов": 10, + "создано_сообщений": len(created_ids), + "уникальных_сообщений": len(set(received_ids)), + }, + ensure_ascii=False, + ) + ) + + +if __name__ == "__main__": + run(main) diff --git a/tests/idempotency_db.py b/tests/idempotency_db.py new file mode 100644 index 00000000..2d0d6d00 --- /dev/null +++ b/tests/idempotency_db.py @@ -0,0 +1,79 @@ +"""Запуск внутри API: rollback и 24h expiry без ожидания суток.""" + +import asyncio +from datetime import datetime, timezone +from uuid import uuid4 + +from sqlalchemy import delete, select, text, update +from sqlalchemy.ext.asyncio import async_sessionmaker + +from src.core.db.models import Chat, ChatMember, Message, MessageRequest, User +from src.core.db.repo.message import create_idempotent_message +from src.core.db.session import create_engine + + +async def main(): + engine = create_engine() + factory = async_sessionmaker(engine, expire_on_commit=False) + user_id, chat_id = uuid4(), uuid4() + now = datetime.now(timezone.utc) + async with factory.begin() as s: + s.add( + User( + id=user_id, + username="idem_" + user_id.hex[:20], + display_name="Fixture", + password_hash="not-for-login", + created_at=now, + ) + ) + await s.flush() + s.add(Chat(id=chat_id, title="Idempotency fixture", created_at=now)) + await s.flush() + s.add(ChatMember(chat_id=chat_id, user_id=user_id)) + try: + try: + async with factory.begin() as s: + await create_idempotent_message( + s, uuid4(), chat_id, user_id, "rollback", now, "same" + ) + raise RuntimeError("simulated failure before COMMIT") + except RuntimeError: + pass + async with factory() as s: + assert not list(await s.scalars(select(Message).where(Message.chat_id == chat_id))) + assert not list( + await s.scalars(select(MessageRequest).where(MessageRequest.chat_id == chat_id)) + ) + async with factory.begin() as s: + first = await create_idempotent_message( + s, uuid4(), chat_id, user_id, "committed", now, "same" + ) + async with factory.begin() as s: + replay = await create_idempotent_message( + s, uuid4(), chat_id, user_id, "committed", now, "same" + ) + assert replay == first + await s.execute( + update(MessageRequest) + .where(MessageRequest.chat_id == chat_id) + .values(expires_at=text("clock_timestamp() - interval '1 second'")) + ) + async with factory.begin() as s: + fresh = await create_idempotent_message( + s, uuid4(), chat_id, user_id, "new after expiry", now, "same" + ) + assert fresh.id != first.id + print( + "PASS: rollback removes both message/key; committed result replays; expired key can be reused" + ) + finally: + async with factory.begin() as s: + await s.execute(delete(MessageRequest).where(MessageRequest.chat_id == chat_id)) + await s.execute(delete(Message).where(Message.chat_id == chat_id)) + await s.execute(delete(Chat).where(Chat.id == chat_id)) + await s.execute(delete(User).where(User.id == user_id)) + await engine.dispose() + + +asyncio.run(main()) diff --git a/tests/lab4_review.py b/tests/lab4_review.py new file mode 100644 index 00000000..7e20d262 --- /dev/null +++ b/tests/lab4_review.py @@ -0,0 +1,208 @@ +"""Replay concrete reviewer cases through real HTTP and controlled dependency freezes.""" +import io +import json +import struct +import subprocess +import time +import zlib +from concurrent.futures import ThreadPoolExecutor +from pathlib import Path + +from client import Client, arguments, check, run + +ROOT=Path(__file__).resolve().parents[1] + + +def compose(*args): + return subprocess.check_output(['docker','compose',*args],cwd=ROOT,text=True,stderr=subprocess.DEVNULL).strip() + + +def png(width,height): + # Complete PNG, including all scanlines and CRCs, without allocating a bitmap. + def chunk(kind,data): + return struct.pack('>I',len(data))+kind+data+struct.pack('>I',zlib.crc32(kind+data)) + compressor=zlib.compressobj() + packed=io.BytesIO() + row=b'\0'*(width+1) + for _ in range(height): packed.write(compressor.compress(row)) + packed.write(compressor.flush()) + return (b'\x89PNG\r\n\x1a\n'+chunk(b'IHDR',struct.pack('>IIBBBBB',width,height,8,0,0,0,0)) + +chunk(b'IDAT',packed.getvalue())+chunk(b'IEND',b'')) + + +DIRECT='''import json,sys,time,urllib.request,urllib.error +p=json.load(sys.stdin);h={} +if p.get('token'):h['Authorization']='Bearer '+p['token'] +r=urllib.request.Request('http://127.0.0.1:8080'+p['path'],headers=h) +t=time.monotonic() +try:r=urllib.request.urlopen(r,timeout=10) +except urllib.error.HTTPError as e:r=e +with r: + data=json.load(r) + if r.code>=400: + assert data['error']['request_id']==r.headers['X-Request-Id'] + assert data['error']['code']=='unavailable' + print(json.dumps({'status':r.code,'seconds':round(time.monotonic()-t,4), + 'request_id_present':bool(r.headers.get('X-Request-Id')),'instance_id_present':bool(r.headers.get('X-Instance-Id'))})) +''' +LOCKER='''import asyncio,sys,asyncpg +from src.core.settings import settings +async def f(): + c=await asyncpg.connect(settings.database_url.get_secret_value()) + await c.execute('BEGIN; LOCK TABLE messages IN ACCESS EXCLUSIVE MODE') + print('LOCKED',flush=True) + await asyncio.to_thread(sys.stdin.readline) + await c.execute('ROLLBACK');await c.close() +asyncio.run(f()) +''' +PENDING='''import asyncio,asyncpg +from src.core.settings import settings +async def f(): + c=await asyncpg.connect(settings.database_url.get_secret_value()) + print(await c.fetchval("SELECT count(*) FROM pg_stat_activity WHERE wait_event_type='Lock' AND query LIKE '%FROM messages%'")) + await c.close() +asyncio.run(f()) +''' + + +def main(): + args=arguments('Lab4 reviewer regression scenarios') + c=Client(args.base_url,args.ca_file,timeout=15) + alice,bob,_,chat=c.bootstrap() + history='/api/v1/chats/'+chat['id']+'/messages' + c.message(alice,chat,'Контроль до отказов') + results=[] + for name in ('review123\n','review123\r','review123\x00','review123\t'): + c.call('POST','/api/v1/users',400,body={'username':name,'display_name':'Review','password':'valid-password-123'}) + results.append({'case':'username_control_characters','result':'PASS','status':400}) + data=(ROOT/'tests/fixtures/sample.png').read_bytes() + upload='/api/v1/chats/'+chat['id']+'/attachments' + for label,filename,payload,mime,status in [ + ('truncated_png','sample.png',data[:-12],'image/png',415), + ('header_only_png','sample.png',data[:33],'image/png',415), + ('mismatched_mime','sample.png',data,'image/jpeg',415), + ('DEL_filename','a%7F.png',data,'image/png',400), + ('missing_filename',None,data,'image/png',400), + ]: + c.call('POST',upload+('' if filename is None else '?filename='+filename),status, + actor=alice,raw=payload,headers={'Content-Type':mime}) + results.append({'case':label,'result':'PASS','status':status}) + for width,height,status in ((8000,5000,201),(8000,5001,413),(20000,10000,413)): + payload=png(width,height) + reply=c.call('POST',upload+'?filename=dimensions.png',status,actor=alice,raw=payload, + headers={'Content-Type':'image/png'},schema='Attachment' if status==201 else None) + if status==201: + check(c.call('GET','/api/v1/attachments/'+reply['json']['id']+'/content',actor=bob)['bytes']==payload, + '40 MP original changed') + results.append({'case':'pixels','dimensions':[width,height],'result':'PASS','status':status}) + api=compose('ps','-q','api').split()[0] + # Actual application credentials must not permit creating unrelated buckets. + code='''from src.core.storage import get_storage +from minio.error import S3Error +import uuid +s=get_storage();b='forbidden-'+uuid.uuid4().hex +try:s.make_bucket(b) +except S3Error as e:assert e.code=='AccessDenied';print('PASS') +else:s.remove_bucket(b);raise AssertionError('API can create foreign buckets') +''' + check(subprocess.check_output(['docker','exec',api,'python','-c',code],text=True).strip()=='PASS', + 'API has excessive S3 rights') + results.append({'case':'API_cannot_create_foreign_bucket','result':'PASS'}) + ids=compose('ps','-a','-q','api','reconciler','migration').split() + containers=json.loads(subprocess.check_output(['docker','inspect',*ids],text=True)) + for container in containers: + service=container['Config']['Labels']['com.docker.compose.service'] + environment=dict(value.split('=',1) for value in container['Config']['Env'] if '=' in value) + forbidden=['MINIO_ROOT_USER','MINIO_ROOT_PASSWORD'] + if service in ('api','migration'): + forbidden+=['S3_RECONCILE_ACCESS_KEY_ID','S3_RECONCILE_SECRET_ACCESS_KEY'] + if service in ('reconciler','migration'): + forbidden+=['S3_ACCESS_KEY_ID','S3_SECRET_ACCESS_KEY'] + for key in forbidden: + check(not environment.get(key),service+' inherited an unnecessary S3 credential: '+key) + results.append({'case':'S3_credentials_confined_to_intended_services','result':'PASS'}) + + def direct(path,token=None): + reply=subprocess.run(['docker','exec','-i',api,'python','-c',DIRECT], + input=json.dumps({'path':path,'token':token}),text=True,capture_output=True,timeout=13,check=True) + return json.loads(reply.stdout) + transfer_code="""import asyncio,http.client,json,sys,time +from sqlalchemy import func,select +from sqlalchemy.ext.asyncio import async_sessionmaker +from src.core.db.session import create_engine +from src.core.db.models import Attachment,UploadIntent +p=json.load(sys.stdin) +async def counts(): + e=create_engine();f=async_sessionmaker(e) + try: + async with f() as s: + return [await s.scalar(select(func.count()).select_from(m)) for m in (Attachment,UploadIntent)] + finally:await e.dispose() +before=asyncio.run(counts()) +c=http.client.HTTPConnection('127.0.0.1',8080,timeout=8) +c.putrequest('POST',p['path']) +c.putheader('Authorization','Bearer '+p['token']) +c.putheader('Content-Type','image/png');c.putheader('Content-Length','1000');c.endheaders() +c.send(b'\\x89PNG\\r\\n\\x1a\\nshort');c.close();time.sleep(.3) +assert before==asyncio.run(counts()),'interrupted client created durable state' +c=http.client.HTTPConnection('127.0.0.1',8080,timeout=8) +c.request('POST',p['path'],body=(b'x'*65536 for _ in range(161)), + headers={'Authorization':'Bearer '+p['token'],'Content-Type':'image/png'},encode_chunked=True) +r=c.getresponse();body=json.loads(r.read()) +assert r.status==413 and body['error']['code']=='payload_too_large' +assert body['error']['request_id']==r.getheader('X-Request-Id') +c.close();assert before==asyncio.run(counts()),'oversized chunked body created durable state' +print('PASS') +""" + transfer=subprocess.run(['docker','exec','-i',api,'python','-c',transfer_code], + input=json.dumps({'path':upload+'?filename=interrupted.png','token':alice['token']}), + text=True,capture_output=True,timeout=20,check=True) + check(transfer.stdout.strip()=='PASS','transfer limits failed') + results.append({'case':'client_abort_and_oversized_chunked_body','result':'PASS', + 'oversized_status':413,'durable_state_unchanged':True}) + direct(history,alice['token']) + # Start an actual history SELECT, hold it on a table lock, then freeze PG. + locker=subprocess.Popen(['docker','exec','-i',api,'python','-u','-c',LOCKER], + stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE,text=True) + check(locker.stdout.readline().strip()=='LOCKED','test table lock was not acquired') + paused=False + pool=ThreadPoolExecutor(max_workers=2) + query=pool.submit(direct,history,alice['token']) + try: + deadline=time.monotonic()+2 + while True: + pending=int(subprocess.check_output(['docker','exec',api,'python','-c',PENDING],text=True)) + if pending:break + check(time.monotonic()deadline:raise + time.sleep(.2) + results.append({'case':'PostgreSQL_resume_without_API_restart','result':'PASS'}) + print(json.dumps({'result':'PASS','checks':results},ensure_ascii=False,indent=2)) + + +if __name__=='__main__': + run(main) diff --git a/tests/passwords.py b/tests/passwords.py new file mode 100644 index 00000000..3e7fe8d3 --- /dev/null +++ b/tests/passwords.py @@ -0,0 +1,68 @@ +"""docker compose exec -T api python < tests/passwords.py.""" +import asyncio +import base64 +import json +from datetime import datetime, timezone +from uuid import uuid4 +from urllib.error import HTTPError +from urllib.request import Request, urlopen + +from sqlalchemy import delete, select +from sqlalchemy.ext.asyncio import async_sessionmaker + +from src.core import cache, session_store +from src.core.db.models import User +from src.core.db.session import create_engine +from src.core.security import hash_password, hash_token, verify_password + + +def login(username, password, expected): + credential = base64.b64encode((username + ':' + password).encode()).decode() + request = Request('http://127.0.0.1:8080/api/v1/auth/sessions', method='POST', + headers={'Authorization': 'Basic ' + credential}) + try: + response = urlopen(request, timeout=10) + except HTTPError as error: + response = error + with response: + assert response.status == expected, response.status + return json.load(response) + + +async def main(): + password = 'Я:' + 'ю' * 126 + hashed = hash_password(password) + assert hashed.startswith('$argon2id$') + assert hash_password(password) != hashed + assert verify_password(password, hashed) + assert not verify_password('неверный-пароль', hashed) + assert not verify_password(password, 'unsupported$hash') + print('PASS: только Argon2id, случайная соль, Unicode 128 символов, неверный пароль') + engine = create_engine() + factory = async_sessionmaker(engine, expire_on_commit=False) + user_id, username = uuid4(), 'password_' + uuid4().hex[:16] + tokens = [] + cache.open_cache() + try: + async with factory.begin() as session: + session.add(User(id=user_id, username=username, display_name='Password test', + password_hash=hashed, created_at=datetime.now(timezone.utc))) + login(username, 'неверный-пароль', 401) + for _ in range(2): + result = login(username, password, 201) + tokens.append(result['token']) + stored = await session_store.fetch_session(hash_token(result['token'])) + assert stored is not None and stored.user_id == user_id + async with factory() as session: + assert await session.scalar(select(User.password_hash).where(User.id == user_id)) == hashed + print('PASS: повторный вход с Argon2id; сессии находятся в Redis; хеш пароля не изменяется') + finally: + for token in tokens: + await session_store.delete_session(hash_token(token)) + await cache.close_cache() + async with factory.begin() as session: + await session.execute(delete(User).where(User.id == user_id)) + await engine.dispose() + + +asyncio.run(main()) diff --git a/tests/production.py b/tests/production.py new file mode 100644 index 00000000..7176b1d3 --- /dev/null +++ b/tests/production.py @@ -0,0 +1,187 @@ +"""Негативные HTTP/Redis проверки для production-аудита; только локальный Compose.""" +import base64 +from concurrent.futures import ThreadPoolExecutor +import hashlib +import http.client +import json +from pathlib import Path +import subprocess +import threading +import uuid +from urllib.parse import urlsplit, quote + +from client import Client, arguments, check, run + +ROOT = Path(__file__).resolve().parents[1] + + +def redis(*args, raw=None): + command = ['docker', 'compose', 'exec', '-T', 'redis', 'redis-cli', '--raw'] + if raw is not None: + command += ['-x'] + return subprocess.check_output(command + list(args), cwd=ROOT, input=raw, timeout=10).rstrip(b'\n') + + +def main(): + args = arguments('Production-аудит входных данных, Redis и изоляции сессий') + c = Client(args.base_url, args.ca_file) + alice, bob, _, chat = c.bootstrap() + path = '/api/v1/chats/' + chat['id'] + '/messages' + failures = [] + def expect(label, method, path, status, **kwargs): + response = c.call(method, path, [200, 201, 400, 401, 413, 415, 500, 503], **kwargs) + if response['status'] != status: + failures.append(f'{label}: ожидался {status}, получен {response["status"]}') + return response + + payload = {'kind': 'messages', 'owner_id': chat['id'], + 'created_at': '2026-01-01T00:00:00+00:00', 'item_id': str(uuid.uuid4())} + for field, value in [('owner_id', 123), ('item_id', 123), ('owner_id', []), + ('created_at', '9999-12-31T23:59:59-23:59')]: + cursor = base64.urlsafe_b64encode(json.dumps({**payload, field: value}).encode()).decode() + expect('Типы/диапазон курсора ' + field, 'GET', path + '?cursor=' + cursor, 400, actor=alice) + expect('Длина курсора', 'GET', path + '?cursor=' + 'a' * 5000, 400, actor=alice) + for text in ('\ud800', '\udfff'): + expect('Непредставимый текст PostgreSQL', 'POST', path, 400, actor=alice, + raw=json.dumps({'text': 'valid' + text}).encode(), headers={'Content-Type': 'application/json'}) + registration = {'username': 'unicode_' + uuid.uuid4().hex[:16], + 'password': 'valid-password-123', 'display_name': 'Valid'} + for field, value in [('display_name', '\ud800'), + ('password', 'secret-audit-\ud800')]: + expect('Непредставимая строка ' + field, 'POST', '/api/v1/users', 400, + raw=json.dumps({**registration, field: value}).encode(), headers={'Content-Type': 'application/json'}) + expect('Большое тело с допустимым коротким текстом', 'POST', path, 413, actor=alice, + raw=b'{"text":"valid"}' + b' ' * 70000, headers={'Content-Type': 'application/json'}) + expect('Повторяющиеся ключи JSON', 'POST', path, 400, actor=alice, + raw=b'{"text":"first","text":"second"}', headers={'Content-Type': 'application/json'}) + expect('JSON не в UTF-8', 'POST', path, 400, actor=alice, + raw='{"text":"valid"}'.encode('utf-16'), headers={'Content-Type': 'application/json'}) + expect('Нестандартный NaN', 'POST', path, 400, actor=alice, + raw=b'{"text":"valid","extra":NaN}', headers={'Content-Type': 'application/json'}) + expect('Глубокий JSON', 'POST', path, 400, actor=alice, + raw=b'[' * 1200 + b'0' + b']' * 1200, headers={'Content-Type': 'application/json'}) + + # Максимально допустимый текст остаётся допустимым и в escaped JSON. + emoji = '😀' * 4000 + maximum = c.call('POST', path, 201, actor=alice, schema='Message', + raw=json.dumps({'text': emoji}, ensure_ascii=True).encode(), + headers={'Content-Type': 'application/json', 'Idempotency-Key':uuid.uuid4().hex}) + check(maximum['json']['text'] == emoji, 'Лимит тела отверг/исказил 4000 Unicode-символов') + check(maximum['headers'].get('Cache-Control') == 'no-store', 'Ответ API может попасть в кэш') + check(maximum['headers'].get('X-Content-Type-Options') == 'nosniff', 'Нет nosniff') + + parsed = urlsplit(c.base) + check(parsed.scheme == 'http', 'Сетевые проверки этого Compose-сценария рассчитаны на localhost HTTP') + def wire(duplicate=False, chunked=False, slow=False, started=None): + connection = http.client.HTTPConnection(parsed.hostname, parsed.port, timeout=10) + try: + if chunked: + connection.request('POST', path, body=iter([b'{"text":"valid"}', b' ' * 40000, b' ' * 40000]), + headers={'Authorization': 'Bearer ' + alice['token'], + 'Content-Type': 'application/json'}, encode_chunked=True) + elif slow: + connection.putrequest('POST', path) + connection.putheader('Authorization', 'Bearer ' + alice['token']) + connection.putheader('Content-Type', 'application/json') + connection.putheader('Content-Length', '100') + connection.endheaders(b'{\"text\":') + started.set() + else: + connection.putrequest('GET', '/api/v1/users/me') + connection.putheader('Authorization', 'Bearer ' + alice['token']) + if duplicate: + connection.putheader('Authorization', 'Bearer ' + bob['token']) + connection.endheaders() + response = connection.getresponse() + data = json.loads(response.read()) + check(data['error']['request_id'] == response.getheader('X-Request-Id'), 'Сетевой запрос потерял request_id') + return response.status + finally: + connection.close() + check(wire(chunked=True) == 413, 'Chunked обходит лимит размера тела') + check(wire(duplicate=True) == 401, 'Два Authorization принимаются неоднозначно') + print('PASS: реальный chunked=413, два Authorization=401, no-store; 4000 emoji в escaped JSON допустимы') + started = threading.Event() + with ThreadPoolExecutor(max_workers=1) as pool: + pending = pool.submit(wire, slow=True, started=started) + check(started.wait(2), 'Не началась медленная передача') + health = c.call('GET', '/health/live', schema='Health') + check(health['elapsed'] < 2, 'Медленная передача заблокировала event loop') + check(pending.result(timeout=10) == 408, 'У медленной передачи нет deadline') + print('PASS: реальное незавершённое тело получает 408; health работает во время ожидания') + + + created = [chat] + for index in range(12): + created.append(c.call('POST', '/api/v1/chats', 201, actor=alice, schema='Chat', + body={'title': 'SQL-page-' + str(index), 'member_ids': [alice['id']]})['json']) + chats, cursor = [], None + while True: + url = '/api/v1/chats?limit=3' + ('&cursor=' + quote(cursor, safe='') if cursor else '') + page = c.call('GET', url, actor=alice, schema='ChatPage')['json'] + chats.extend(item['id'] for item in page['items']) + cursor = page['next_cursor'] + if cursor is None: + break + c.call('GET', '/api/v1/chats?cursor=' + quote(cursor, safe=''), 400, actor=bob) + check(len(chats) <= len(created), 'Зациклилась пагинация чатов') + check(chats == [item['id'] for item in sorted(created, key=lambda x: (x['created_at'], uuid.UUID(x['id']).int))], + 'SQL-пагинация чатов потеряла/повторила объекты') + bob_chats = c.call('GET', '/api/v1/chats', actor=bob, schema='ChatPage')['json'] + check([item['id'] for item in bob_chats['items']] == [chat['id']], 'В список попали чужие чаты') + print('PASS: SQL-пагинация 13 чатов по 3; курсор принадлежит пользователю, чужие чаты скрыты') + + profile_key = 'user:v1:' + alice['id'] + for raw in (b'\xff\xfe', b'null', b'{"id":123}'): + redis('SET', profile_key, raw=raw) + expect('Повреждённый профиль Redis', 'GET', '/api/v1/users/me', 200, actor=alice) + session_key = 'session:v1:' + hashlib.sha256(alice['token'].encode()).hexdigest() + saved = redis('GET', session_key) + ttl = int(redis('PTTL', session_key)) + for raw in (b'\xff', json.dumps({'user_id': 123, 'expires_at': '2099-01-01T00:00:00+00:00'}).encode(), + b'[]', b'null', json.dumps({'user_id': alice['id'], 'expires_at': '2020-01-01T00:00:00+00:00'}).encode()): + try: + redis('SET', session_key, raw=raw) + redis('PEXPIRE', session_key, str(ttl)) + expect('Повреждённая/истёкшая сессия Redis', 'GET', '/api/v1/users/me', 401, actor=alice) + finally: + redis('SET', session_key, raw=saved) + redis('PEXPIRE', session_key, str(ttl)) + c.call('GET', '/api/v1/users/me', actor=alice, schema='User') + + # NUL недопустим в PostgreSQL text, но пароль хранится как Argon2-хеш. + special = {**registration, 'username': 'nulpass_' + uuid.uuid4().hex[:16], + 'password': ' пароль:\x00с пробелами '} + c.call('POST', '/api/v1/users', 201, body=special, schema='User') + special_basic = 'Basic ' + base64.b64encode((special['username'] + ':' + special['password']).encode()).decode() + special_session = c.call('POST', '/api/v1/auth/sessions', 201, + headers={'Authorization': special_basic}, schema='Session')['json'] + c.call('DELETE', '/api/v1/auth/sessions/current', 204, actor={'token': special_session['token']}) + print('PASS: пароль с Unicode, пробелами, двоеточием и NUL не усекается') + + basic = 'Basic ' + base64.b64encode((alice['registration']['username'] + ':' + alice['registration']['password']).encode()).decode() + another = c.call('POST', '/api/v1/auth/sessions', 201, headers={'Authorization': basic}, schema='Session')['json'] + check(another['token'] != alice['token'], 'Повторный вход вернул старый токен') + def get_profile(_): + return Client(args.base_url, args.ca_file).call('GET', '/api/v1/users/me', actor=alice, schema='User') + with ThreadPoolExecutor(max_workers=8) as pool: + profiles = list(pool.map(get_profile, range(24))) + check(all(p['json']['id'] == alice['id'] for p in profiles), 'Смешаны пользователи конкурентных запросов') + check(len({p['headers']['X-Request-Id'] for p in profiles}) == 24, 'Повторяется request_id') + with ThreadPoolExecutor(max_workers=4) as pool: + list(pool.map(lambda _: Client(args.base_url, args.ca_file).call( + 'DELETE', '/api/v1/auth/sessions/current', [204, 401], actor=alice), range(4))) + c.call('GET', '/api/v1/users/me', 401, actor=alice) + c.call('GET', '/api/v1/users/me', actor={'token': another['token']}, schema='User') + c.call('GET', '/api/v1/users/me', actor=bob, schema='User') + c.call('DELETE', '/api/v1/auth/sessions/current', 204, actor={'token': another['token']}) + print('PASS: независимые токены, конкурентные logout/GET, уникальные request_id') + if failures: + for failure in failures: + print('FAIL:', failure) + check(False, 'Production-аудит нашёл ошибки: ' + str(len(failures))) + print('PASS: типы/диапазон курсора, Unicode, размер/формат JSON и повреждённый Redis') + + +if __name__ == '__main__': + run(main) diff --git a/tests/production_limits.py b/tests/production_limits.py new file mode 100644 index 00000000..94e9cdec --- /dev/null +++ b/tests/production_limits.py @@ -0,0 +1,137 @@ +"""Изолированные проверки ASGI-лимитов и реального пула Argon2 в образе API.""" +import asyncio +import errno +import json +import os +from pathlib import Path +from tempfile import TemporaryDirectory +import threading +import time +from unittest.mock import patch + +from src.core import security +from src.core.request_limits import RequestLimitsMiddleware +from src.core.settings import settings + + +def scope(path='/api/v1/users', headers=()): + return {'type': 'http', 'asgi': {'version': '3.0'}, 'http_version': '1.1', + 'method': 'POST', 'scheme': 'http', 'path': path, 'raw_path': path.encode(), + 'query_string': b'', 'headers': [(b'content-type', b'application/json'), *headers], + 'state': {'request_id': 'limit-test'}, 'server': ('localhost', 80), 'client': ('localhost', 1)} + + +async def invoke(app, messages=(), path='/api/v1/users', headers=(), delay=0): + sent = [] + pending = iter(messages or [{'type': 'http.request', 'body': b'{}', 'more_body': False}]) + async def receive(): + if delay: + await asyncio.sleep(delay) + return next(pending) + async def send(message): + sent.append(message) + await app(scope(path, headers), receive, send) + if not sent: + return None + status = next(m['status'] for m in sent if m['type'] == 'http.response.start') + data = json.loads(b''.join(m.get('body', b'') for m in sent if m['type'] == 'http.response.body')) + if status >= 400: + assert data['error']['request_id'] == 'limit-test' + return status, data + + +async def main(): + assert os.geteuid() != 0, 'API работает от root' + status = Path('/proc/self/status').read_text() + assert 'NoNewPrivs:\t1' in status + assert 'CapEff:\t0000000000000000' in status + probe = Path('/app/.production-write-probe') + try: + probe.write_text('probe') + except OSError as error: + assert error.errno == errno.EROFS, error.errno + else: + probe.unlink() + raise AssertionError('Корневая файловая система API доступна для записи') + with TemporaryDirectory() as directory: + Path(directory, 'probe').write_text('temporary') + print('PASS: non-root, read-only rootfs, пустые capabilities, no-new-privileges; /tmp доступен') + called = 0 + async def endpoint(scope, receive, send): + nonlocal called + called += 1 + message = await receive() + await send({'type': 'http.response.start', 'status': 200, 'headers': []}) + await send({'type': 'http.response.body', 'body': json.dumps({'bytes': len(message['body'])}).encode()}) + app = RequestLimitsMiddleware(endpoint) + maximum = settings.http_max_body_bytes + assert (await invoke(app, headers=[(b'content-length', str(maximum+1).encode())]))[0] == 413 + assert called == 0 + chunks = [{'type': 'http.request', 'body': b' ' * 40000, 'more_body': True}, + {'type': 'http.request', 'body': b' ' * 40000, 'more_body': False}] + assert (await invoke(app, messages=chunks))[0] == 413 + assert (await invoke(app, messages=chunks, headers=[(b'content-length', b'1')]))[0] == 413 + assert (await invoke(app, headers=[(b'content-length', b'-1')]))[0] == 400 + with patch.object(settings, 'http_body_timeout_seconds', 0.02): + assert (await invoke(app, delay=0.1))[0] == 408 + assert await invoke(app, messages=[{'type': 'http.disconnect'}]) is None + assert called == 0 + assert (await invoke(app))[0] == 200 + assert app.limiter.borrowed_tokens == 0 + print('PASS: Content-Length/chunked/ложный размер, timeout, disconnect; слот всегда освобождается') + + gate = asyncio.Event() + entered = asyncio.Event() + active = 0 + async def blocked(scope, receive, send): + nonlocal active + if scope['path'].startswith('/api/'): + active += 1 + if active == 2: + entered.set() + await gate.wait() + await endpoint(scope, receive, send) + with patch.object(settings, 'http_concurrency_limit', 2): + limited = RequestLimitsMiddleware(blocked) + tasks = [asyncio.create_task(invoke(limited)) for _ in range(2)] + try: + await asyncio.wait_for(entered.wait(), 1) + assert (await invoke(limited))[0] == 503 + assert (await invoke(limited, path='/health/live'))[0] == 200 + tasks[0].cancel() + await asyncio.gather(tasks[0], return_exceptions=True) + assert limited.limiter.borrowed_tokens == 1 + gate.set() + assert (await tasks[1])[0] == 200 + assert (await invoke(limited))[0] == 200 + finally: + gate.set() + for task in tasks: + task.cancel() + await asyncio.gather(*tasks, return_exceptions=True) + assert limited.limiter.borrowed_tokens == 0 + print('PASS: перегрузка=503 в общем JSON, health доступен, отмена запроса не теряет слот') + + lock = threading.Lock() + active = peak = 0 + def slow_hash(password): + nonlocal active, peak + with lock: + active += 1 + peak = max(peak, active) + try: + time.sleep(0.03) + return 'hashed-' + password + finally: + with lock: + active -= 1 + count = settings.password_hash_concurrency * 4 + with patch.object(security, 'hash_password', slow_hash): + result = await asyncio.gather(*(security.hash_password_async(str(i)) for i in range(count))) + assert result == ['hashed-' + str(i) for i in range(count)] + assert peak == settings.password_hash_concurrency, peak + assert security.password_limiter.borrowed_tokens == 0 + print('PASS: очередь Argon2 соблюдает лимит параллелизма; результаты не смешиваются') + + +asyncio.run(main()) diff --git a/tests/readiness.py b/tests/readiness.py new file mode 100644 index 00000000..177efc06 --- /dev/null +++ b/tests/readiness.py @@ -0,0 +1,53 @@ +"""Изолированная проверка HTTP-бюджета readiness при медленной отмене драйвера.""" + +import asyncio +import time +from unittest.mock import patch + +from src.core import readiness +from src.core.errors import ApiError +from src.core.settings import settings + + +async def main(): + cancelled = asyncio.Event() + release = asyncio.Event() + calls = 0 + + async def stalled_driver(): + nonlocal calls + calls += 1 + try: + await asyncio.Event().wait() + except asyncio.CancelledError: + cancelled.set() + await release.wait() + + with ( + patch.object(settings, "healthcheck_timeout_seconds", 0.03), + patch.object(readiness, "_probe", stalled_driver), + ): + for _ in range(3): + began = time.monotonic() + try: + await readiness.check() + except ApiError as error: + assert error.status_code == 503 + else: + raise AssertionError("Stalled dependency was declared ready") + assert time.monotonic() - began < 0.15, "HTTP waited for slow driver cancellation" + assert cancelled.is_set() and calls == 1, "Readiness spawned accumulating probes" + release.set() + await asyncio.sleep(0) + await readiness.close() + + async def healthy(): + pass + + with patch.object(readiness, "_probe", healthy): + await readiness.check() + await readiness.close() + print("PASS: bounded readiness response, one pending probe, recovery after cancellation") + + +asyncio.run(main()) diff --git a/tests/reconciliation.py b/tests/reconciliation.py new file mode 100644 index 00000000..5113c975 --- /dev/null +++ b/tests/reconciliation.py @@ -0,0 +1,418 @@ +"""Integration research on isolated PostgreSQL schema and private MinIO bucket. + +Run through scripts/test-reconciliation.sh; credentials stay in environment. +Only UUID-named test resources are removed on completion. +""" +import asyncio +import hashlib +import io +import json +import subprocess +import sys +import time +from concurrent.futures import ThreadPoolExecutor +from datetime import datetime, timedelta, timezone +from unittest.mock import patch +from uuid import uuid4 + +from minio import Minio +from minio.error import S3Error +from urllib.parse import urlsplit +from PIL import Image +from sqlalchemy import event, func, select, text +from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine + +from src.core.db.models import ( + Attachment, Base, Chat, ChatMember, Message, MessageAttachment, + StorageFinding, UploadIntent, User, +) +from src.core.errors import ApiError +from src.core.db.repo.message import create_idempotent_message +from src.core.settings import settings +from src.core.storage import StorageMetrics, make_storage +from src.core.upload_coordination import lock_object +from src.maintenance.reconcile import Reconciler +from src.service.attachment import AttachmentService + +schema = 'reconcile_' + uuid4().hex +bucket = 'reconcile-' + uuid4().hex +original_bucket = settings.s3_bucket +root = make_storage(role='bootstrap') +content_buffer = io.BytesIO() +Image.new('RGB', (32, 24), 'green').save(content_buffer, format='PNG') +content = content_buffer.getvalue() +user_id, chat_id = uuid4(), uuid4() +checks = [] + + +def passed(name): + checks.append(name) + print(json.dumps({'check': name, 'result': 'PASS'}), flush=True) + + +def fake_request(): + from starlette.requests import Request + delivered = False + async def receive(): + nonlocal delivered + if delivered: + return {'type': 'http.disconnect'} + delivered = True + return {'type': 'http.request', 'body': content, 'more_body': False} + return Request({'type':'http', 'method':'POST', 'path':'/', + 'headers':[(b'content-type', b'image/png'), + (b'content-length', str(len(content)).encode())]}, receive) + + +def error(code): + return S3Error(None, code, 'injected', 'test-resource', 'test-request', 'test-host') + + +class FailPut: + def put_object(self, *args, **kwargs): + raise OSError('injected S3 failure') + + +class FailCommit(AsyncSession): + async def commit(self): + raise OSError('injected commit failure') + + +async def snapshot(factory): + async with factory() as s: + attachments = [(str(a.id), a.object_key, str(a.storage_missing_since)) + for a in (await s.scalars(select(Attachment).order_by(Attachment.id)))] + intents = [(a.object_key,a.state) for a in (await s.scalars(select(UploadIntent).order_by(UploadIntent.object_key)))] + findings = [(f.object_key,f.kind,str(f.first_seen),str(f.last_seen),str(f.resolved_at),f.fingerprint) + for f in (await s.scalars(select(StorageFinding).order_by(StorageFinding.object_key,StorageFinding.kind)))] + objects = sorted((o.object_name,o.etag) for o in root.list_objects(bucket,recursive=True)) + return attachments,intents,findings,objects + + +async def main(): + global schema, bucket + admin_engine = create_async_engine(settings.sqlalchemy_database_url) + async with admin_engine.begin() as conn: + await conn.execute(text(f'CREATE SCHEMA {schema}')) + engine = create_async_engine(settings.sqlalchemy_database_url, + connect_args={'server_settings': {'search_path':schema}}) + factory = async_sessionmaker(engine, expire_on_commit=False) + # Verify the deployed application's credentials against its actual bucket. + api_client=make_storage(role='api') + cleaner_client=make_storage(role='reconciler') + probe='originals/permission-probe/'+uuid4().hex + outside='outside/'+uuid4().hex + root.put_object(original_bucket,probe,io.BytesIO(content),len(content)) + root.put_object(original_bucket,outside,io.BytesIO(content),len(content)) + try: + response=api_client.get_object(original_bucket,probe) + assert response.read()==content + response.close();response.release_conn() + for operation in [ + lambda: api_client.remove_object(original_bucket,probe), + lambda: api_client.get_object(original_bucket,outside), + lambda: cleaner_client.put_object(original_bucket,probe,io.BytesIO(content),len(content)), + lambda: cleaner_client.remove_object(original_bucket,outside), + ]: + try: operation() + except S3Error as exc: assert exc.code=='AccessDenied' + else: raise AssertionError('role/prefix policy allowed a forbidden operation') + endpoint=urlsplit(settings.s3_endpoint) + anonymous=Minio(endpoint.netloc,secure=endpoint.scheme=='https',region=settings.s3_region) + try: anonymous.get_object(original_bucket,probe) + except S3Error as exc: assert exc.code=='AccessDenied' and exc.response.status==403 + else: raise AssertionError('private bucket allowed an anonymous read') + passed('direct unsigned GET of an existing S3 object returns 403') + cleaner_client.remove_object(original_bucket,probe) + passed('deployed API cannot delete; reconciler cannot upload; both are confined to originals/') + finally: + root.remove_object(original_bucket,probe) + root.remove_object(original_bucket,outside) + root.make_bucket(bucket) + settings.s3_bucket = bucket + try: + async with engine.begin() as conn: + await conn.run_sync(Base.metadata.create_all) + now = datetime.now(timezone.utc) + async with factory.begin() as s: + s.add(User(id=user_id,username='test_user',display_name='Test',password_hash='test',is_admin=False,created_at=now)) + await s.flush() + s.add(Chat(id=chat_id,title='Test',created_at=now)) + await s.flush() + s.add(ChatMember(chat_id=chat_id,user_id=user_id)) + with patch('src.service.attachment.get_storage', return_value=root): + async with factory.begin() as s: + good = await AttachmentService(s).upload(fake_request(),chat_id,user_id,'photo.png') + async with factory.begin() as s: + intent = await s.get(UploadIntent,good.object_key) + assert intent.state=='committed' + s.add(Message(id=uuid4(),chat_id=chat_id,sender_id=user_id,text='',created_at=now, + attachments=[MessageAttachment(attachment_id=good.id,chat_id=chat_id,position=0)])) + passed('real upload atomically commits Attachment and intent; image is referenced by a message') + async with factory.begin() as s: + confirmed_message=await create_idempotent_message(s,message_id=uuid4(),chat_id=chat_id, + sender_id=user_id,text='confirmed',created_at=now,idempotency_key='confirmed-image', + attachment_ids=[good.id]) + + + # Failure on S3 side: durable intent remains, no ready attachment is published. + with patch('src.service.attachment.get_storage', return_value=FailPut()): + try: + async with factory.begin() as s: + await AttachmentService(s).upload(fake_request(),chat_id,user_id,'fail.png') + except ApiError as exc: + assert exc.status_code==503 + else: + raise AssertionError('S3 failure accepted') + async with factory() as s: + failed_put_key = await s.scalar(select(UploadIntent.object_key).where(UploadIntent.state=='pending')) + assert failed_put_key + passed('S3 PUT failure leaves an accounted pending attempt, no ready attachment') + + # Failure on DB side AFTER the actual S3 PUT; registration uses independent session. + broken_factory = async_sessionmaker(engine, class_=FailCommit, expire_on_commit=False) + with patch('src.service.attachment.get_storage', return_value=root): + try: + async with broken_factory.begin() as s: + await AttachmentService(s).upload(fake_request(),chat_id,user_id,'db-fail.png') + except OSError: + pass + else: + raise AssertionError('DB failure accepted') + async with factory() as s: + pending = list(await s.scalars(select(UploadIntent.object_key).where(UploadIntent.state=='pending'))) + db_fail_key = next(k for k in pending if k!=failed_put_key) + assert root.stat_object(bucket,db_fail_key).size==len(content) + passed('DB commit failure after S3 PUT leaves a durable discoverable orphan') + # Kill the actual upload implementation after PUT, before its final COMMIT. + import base64 + child = """ +import asyncio,base64,json,os,sys +from unittest.mock import patch +from starlette.requests import Request +from sqlalchemy.ext.asyncio import AsyncSession,async_sessionmaker,create_async_engine +from src.core.settings import settings +from src.core.storage import make_storage +from src.service.attachment import AttachmentService +from uuid import UUID +p=json.load(sys.stdin) +settings.s3_bucket=p['bucket'] +class CrashSession(AsyncSession): + async def commit(self): os._exit(23) +async def main(): + engine=create_async_engine(settings.sqlalchemy_database_url,connect_args={'server_settings':{'search_path':p['schema']}}) + factory=async_sessionmaker(engine,class_=CrashSession,expire_on_commit=False) + data=base64.b64decode(p['content']) + async def receive(): return {'type':'http.request','body':data,'more_body':False} + request=Request({'type':'http','method':'POST','path':'/','headers':[(b'content-type',b'image/png')]},receive) + with patch('src.service.attachment.get_storage',return_value=make_storage(role='bootstrap')): + async with factory.begin() as s: + await AttachmentService(s).upload(request,UUID(p['chat']),UUID(p['user']),'crash.png') +asyncio.run(main()) +""" + crash = subprocess.run([sys.executable,'-c',child],input=json.dumps({ + 'bucket':bucket,'schema':schema,'chat':str(chat_id),'user':str(user_id), + 'content':base64.b64encode(content).decode()}),text=True,capture_output=True) + assert crash.returncode==23, 'upload child did not reach the injected crash' + async with factory() as s: + crashed_keys=set(await s.scalars(select(UploadIntent.object_key).where(UploadIntent.state=='pending')))-set(pending) + assert len(crashed_keys)==1 + assert root.stat_object(bucket,crashed_keys.pop()).size==len(content) + passed('process death after real PUT preserves intent; PostgreSQL releases the upload lock') + + + # Existing journal plus old object, with a live writer's lock. + active_key='originals/active-'+uuid4().hex + late_key='originals/late-'+uuid4().hex + orphan_key='originals/orphan-'+uuid4().hex + for key in (active_key,late_key,orphan_key): + root.put_object(bucket,key,io.BytesIO(content),len(content)) + async with factory.begin() as s: + for key in (active_key,late_key): + s.add(UploadIntent(object_key=key,state='pending',created_at=now-timedelta(hours=1))) + root.put_object(bucket,'outside/keep',io.BytesIO(b'keep'),4) + await asyncio.sleep(1.2) + before=await snapshot(factory) + report=await Reconciler(factory,root,grace_seconds=1).run() + assert before==await snapshot(factory) + assert report['counts']['would_delete_orphan']>=3 + passed('dry-run changes neither DB records nor S3 objects') + + # Publish one candidate after dry-run, before apply. Cleaner must recheck. + async with factory.begin() as s: + s.add(Attachment(id=uuid4(),chat_id=chat_id,owner_id=user_id,filename='late.png', + object_key=late_key,content_type='image/png',size_bytes=len(content), + sha256=hashlib.sha256(content).hexdigest(),created_at=now,updated_at=now)) + (await s.get(UploadIntent,late_key)).state='committed' + fresh_key='originals/fresh-'+uuid4().hex + root.put_object(bucket,fresh_key,io.BytesIO(content),len(content)) + async with factory.begin() as s: + s.add(UploadIntent(object_key=fresh_key,state='pending',created_at=datetime.now(timezone.utc))) + async with factory.begin() as held: + await lock_object(held,active_key,wait=True) + report=await Reconciler(factory,root,apply=True,grace_seconds=1).run() + assert report['counts']['protected_active']>=1 + assert report['counts']['protected_fresh']>=1 + assert report['counts']['deleted_orphan']>=2 + assert root.stat_object(bucket,active_key) + assert root.stat_object(bucket,good.object_key) + assert root.stat_object(bucket,late_key) + assert root.stat_object(bucket,fresh_key) + assert root.stat_object(bucket,'outside/keep') + async with factory() as s: + assert (await s.get(UploadIntent,failed_put_key)).state=='abandoned' + passed('apply cleans old orphan/empty attempt; preserves active, fresh, referenced and late-committed objects') + async with factory.begin() as s: + s.add(Attachment(id=uuid4(),chat_id=chat_id,owner_id=user_id,filename='fresh.png', + object_key=fresh_key,content_type='image/png',size_bytes=len(content), + sha256=hashlib.sha256(content).hexdigest(),created_at=now,updated_at=now)) + (await s.get(UploadIntent,fresh_key)).state='committed' + + + # Missing metadata counterpart: do not delete messages or fabricate bytes. + root.remove_object(bucket,good.object_key) + before=await snapshot(factory) + report=await Reconciler(factory,root,grace_seconds=1).run() + assert report['counts']['would_mark_missing']==1 + assert before==await snapshot(factory) + await Reconciler(factory,root,apply=True,grace_seconds=1).run() + async with factory() as s: + assert (await s.get(Attachment,good.id)).storage_missing_since is not None + assert await s.scalar(select(func.count()).select_from(MessageAttachment))==2 + try: + await AttachmentService(s).get(good.id,user_id) + except ApiError as exc: + assert exc.status_code==503 + else: + raise AssertionError('missing original reported ready') + passed('missing original is quarantined with 503; metadata and message link survive') + async with factory.begin() as s: + replay=await create_idempotent_message(s,message_id=uuid4(),chat_id=chat_id, + sender_id=user_id,text='confirmed',created_at=now,idempotency_key='confirmed-image', + attachment_ids=[good.id]) + assert replay==confirmed_message + try: + async with factory.begin() as s: + await create_idempotent_message(s,message_id=uuid4(),chat_id=chat_id, + sender_id=user_id,text='new',created_at=now,idempotency_key='new-missing-image', + attachment_ids=[good.id]) + except ApiError as exc: assert exc.status_code==409 + else: raise AssertionError('new message accepted a missing attachment') + passed('missing content blocks new links, but confirmed idempotency replays stay intact') + + + root.put_object(bucket,good.object_key,io.BytesIO(b'x'*len(content)),len(content)) + report=await Reconciler(factory,root,apply=True,grace_seconds=1).run() + assert report['counts']['restore_checksum_mismatch']==1 + root.put_object(bucket,good.object_key,io.BytesIO(content),len(content)) + report=await Reconciler(factory,root,apply=True,grace_seconds=1).run() + assert report['counts']['recovered']==1 + async with factory() as s: + assert (await AttachmentService(s).get(good.id,user_id)).storage_missing_since is None + report=await Reconciler(factory,root,apply=True,grace_seconds=1).run() + assert report['counts'].get('recovered',0)==0 + assert report['counts'].get('deleted_orphan',0)==0 + passed('recovery requires exact SHA-256; repeat apply is safe') + + # Authorization failure is not absence. No metadata quarantine or deletions. + class DeniedHead: + def list_objects(self,*args,**kwargs): return iter(()) + def stat_object(self,*args,**kwargs): raise error('AccessDenied') + before=await snapshot(factory) + try: + await Reconciler(factory,DeniedHead(),apply=True,grace_seconds=1).run() + except S3Error as exc: + assert exc.code=='AccessDenied' + else: raise AssertionError('AccessDenied was interpreted as missing') + assert before==await snapshot(factory) + with patch('src.maintenance.reconcile.lock_object',side_effect=OSError('DB unavailable')): + try: + await Reconciler(factory,root,apply=True,grace_seconds=1).run() + except OSError: pass + else: raise AssertionError('DB unavailable did not stop repair') + assert before==await snapshot(factory) + passed('S3 AccessDenied and unavailable DB abort safely, without false missing/deletion') + + # Lost DELETE response: S3 changed, DB transaction rolls back. Next scan resolves it. + lost_key='originals/delete-loss/'+uuid4().hex + root.put_object(bucket,lost_key,io.BytesIO(content),len(content)) + async with factory.begin() as s: + s.add(UploadIntent(object_key=lost_key,state='pending',created_at=now-timedelta(hours=1))) + await asyncio.sleep(1.2) + class LostDelete: + def __getattr__(self,name): return getattr(root,name) + def remove_object(self,*args,**kwargs): + root.remove_object(*args,**kwargs) + raise OSError('injected lost DELETE response') + try: + await Reconciler(factory,LostDelete(),apply=True,grace_seconds=1,prefix='originals/delete-loss/').run() + except OSError: pass + else: raise AssertionError('lost DELETE response was ignored') + await Reconciler(factory,root,apply=True,grace_seconds=1,prefix='originals/delete-loss/').run() + async with factory() as s: + assert (await s.get(UploadIntent,lost_key)).state=='abandoned' + passed('lost DELETE response is repaired on repeat; no live object is affected') + + # Failure BEFORE deletion must retain the ability to retry after recovery. + retry_key='originals/delete-retry/'+uuid4().hex + root.put_object(bucket,retry_key,io.BytesIO(content),len(content)) + async with factory.begin() as s: + s.add(UploadIntent(object_key=retry_key,state='pending',created_at=now-timedelta(hours=1))) + await asyncio.sleep(1.2) + class FailedDelete: + def __getattr__(self,name): return getattr(root,name) + def remove_object(self,*args,**kwargs): raise OSError('injected S3 delete outage') + try: + await Reconciler(factory,FailedDelete(),apply=True,grace_seconds=1,prefix='originals/delete-retry/').run() + except OSError: pass + else: raise AssertionError('failed delete was reported successful') + assert root.stat_object(bucket,retry_key) + async with factory() as s: + assert (await s.get(UploadIntent,retry_key)).state=='pending' + await Reconciler(factory,root,apply=True,grace_seconds=1,prefix='originals/delete-retry/').run() + async with factory() as s: + assert (await s.get(UploadIntent,retry_key)).state=='abandoned' + try: root.stat_object(bucket,retry_key) + except S3Error as exc: assert exc.code=='NoSuchKey' + else: raise AssertionError('delete was not retried after S3 recovery') + passed('failed S3 DELETE preserves pending; recovery retries and actually removes the orphan') + + # Cost experiment: bounded listing must cross the 1000-object page boundary. + metrics=StorageMetrics() + measured=make_storage(role='bootstrap',metrics=metrics) + statement_count=0 + @event.listens_for(engine.sync_engine,'before_cursor_execute') + def count(*_): + nonlocal statement_count + statement_count+=1 + results=[] + for n in (10,100,1005): + prefix=f'originals/benchmark/{n}/' + def put(i): + root.put_object(bucket,prefix+f'{i:06}',io.BytesIO(content),len(content)) + with ThreadPoolExecutor(max_workers=16) as pool: + list(pool.map(put,range(n))) + for repeat in range(3): + metrics.requests.clear(); statement_count=0; started=time.perf_counter() + report=await Reconciler(factory,measured,prefix=prefix,grace_seconds=300,sample_limit=0).run() + elapsed=time.perf_counter()-started + assert report['counts']['objects_scanned']==n + assert metrics.requests['LIST']==(2 if n>1000 else 1) + results.append({'objects':n,'repeat':repeat+1,'seconds':round(elapsed,4), + 's3_requests':dict(metrics.requests),'db_statements':statement_count}) + print(json.dumps({'experiment':'scan_cost','runs':results}),flush=True) + passed('1005 objects cross ListObjectsV2 pagination; cost measured at 3 sizes x 3 runs') + print(json.dumps({'result':'PASS','checks':checks,'isolated_resources':True}),flush=True) + finally: + # These resources belong exclusively to this test run. + for obj in root.list_objects(bucket,recursive=True): + root.remove_object(bucket,obj.object_name) + root.remove_bucket(bucket) + settings.s3_bucket=original_bucket + await engine.dispose() + async with admin_engine.begin() as conn: + await conn.execute(text(f'DROP SCHEMA {schema} CASCADE')) + await admin_engine.dispose() + + +asyncio.run(main()) diff --git a/tests/regressions.py b/tests/regressions.py new file mode 100644 index 00000000..d336a637 --- /dev/null +++ b/tests/regressions.py @@ -0,0 +1,163 @@ +"""Проверки замечаний преподавателя: HTTP, повреждённый Redis и точный курсор.""" +import base64 +import json +import subprocess +import uuid +from pathlib import Path +from urllib.parse import quote + +from client import Client, arguments, check, run + +ROOT = Path(__file__).resolve().parents[1] + + +def database(code): + container = subprocess.check_output(['docker', 'compose', 'ps', '-q', 'api'], cwd=ROOT, text=True).split()[0] + result = subprocess.run(['docker', 'exec', '-i', container, 'python'], + input=code, cwd=ROOT, text=True, capture_output=True, timeout=30) + check(result.returncode == 0, 'Ошибка подготовки/удаления ORM-фикстуры') + return json.loads(result.stdout) if result.stdout.strip() else None + + +def main(): + args = arguments('Регрессии по замечаниям преподавателя') + c = Client(args.base_url, args.ca_file) + alice, bob, eve, chat = c.bootstrap() + path = '/api/v1/chats/' + chat['id'] + '/messages' + registration = {**alice['registration'], 'username': 'blank_' + uuid.uuid4().hex[:16]} + for field, value in [('password', ' ' * 12), ('password', '\t\n' * 6), + ('display_name', ' \t\n')]: + c.call('POST', '/api/v1/users', 400, body={**registration, field: value}) + for body in ({'title': ' \t\n', 'member_ids': [alice['id']]}, + {'title': 'Duplicate', 'member_ids': [alice['id'], alice['id']]}, + {'title': 'Unknown', 'member_ids': [alice['id'], str(uuid.uuid4())]}, + {'title': 'Missing actor', 'member_ids': [bob['id']]}): + c.call('POST', '/api/v1/chats', 400, actor=alice, body=body) + basic = {'Authorization': 'Basic ' + base64.b64encode(( + alice['registration']['username'] + ':' + alice['registration']['password'] + ).encode()).decode()} + for raw in (b'{"extra":"forbidden"}', b'{}', b'null', b' ', b'{'): + c.call('POST', '/api/v1/auth/sessions', 400, headers=basic, raw=raw) + c.call('POST', '/api/v1/auth/sessions', 401) + for credential in ('Basic !!!', 'Basic /w==', 'Bearer something', + 'Basic ' + base64.b64encode(b'no-colon').decode()): + c.call('POST', '/api/v1/auth/sessions', 401, headers={'Authorization': credential}) + for payload in ('null', '[]', '{}', '123', '{broken'): + cursor = base64.urlsafe_b64encode(payload.encode()).decode().rstrip('=') + c.call('GET', path + '?cursor=' + quote(cursor, safe=''), 400, actor=alice) + for endpoint, body, actor in ( + ('/api/v1/users', registration, None), + ('/api/v1/chats', {'title': 'MIME', 'member_ids': [alice['id']]}, alice), + (path, {'text': 'valid'}, alice), + ): + response = c.call('POST', endpoint, 415, actor=actor, body=body, + headers={'Content-Type': 'text/plain'}) + check(response['json']['error']['code'] == 'unsupported_media_type', 'Неверный код MIME-ошибки') + for raw in (b'{"text":"valid"}}', b'{"text":"valid"}]', b'{"text":"valid"}{}'): + c.call('POST', path, 400, actor=alice, raw=raw, headers={'Content-Type': 'application/json'}) + for body in ({'text': ' ' * 12}, {'text': ' ' + 'a' * 4000}, {'text': 123}, + {'text': 'valid', 'sender_id': eve['id']}): + c.call('POST', path, 400, actor=alice, body=body) + check(c.call('GET', path, actor=alice, schema='MessagePage')['json']['items'] == [], + 'Отклонённый запрос сохранил сообщение') + print('PASS: обязательные пробельные строки, malformed JSON, типы/лишние поля, MIME 415, Basic без тела') + + # Создаём только синтетические строки через SQLAlchemy; пароли/токены в команды не передаются. + fixture = database(f''' +import asyncio, json +from datetime import datetime, timezone +from uuid import UUID, uuid4 +from sqlalchemy.ext.asyncio import async_sessionmaker +from src.core.db.session import create_engine +from src.core.db.models import User, Message +async def main(): + engine = create_engine() + ids = [uuid4() for _ in range(100)] + base = uuid4().int & ~65535 + message_ids = [UUID(int=base+4), UUID(int=base+3), UUID(int=base+2), UUID(int=base+1)] + times = [100000, 200000, 200000, 200000] + async with async_sessionmaker(engine).begin() as session: + session.add_all([User(id=i, username='fixture_' + i.hex[:20], display_name='Fixture', + password_hash='not-for-login', created_at=datetime.now(timezone.utc)) for i in ids]) + session.add_all([Message(id=i, chat_id=UUID('{chat['id']}'), sender_id=UUID('{alice['id']}'), + text='precision', created_at=datetime(2026, 1, 1, 0, 0, 0, us, timezone.utc)) + for i, us in zip(message_ids, times)]) + await engine.dispose() + print(json.dumps({{'users': [str(i) for i in ids], 'messages': [str(i) for i in message_ids]}})) +asyncio.run(main()) +''') + try: + c.call('POST', '/api/v1/chats', 400, actor=alice, + body={'title': '101 участников', 'member_ids': [alice['id'], *fixture['users']]}) + hundred = c.call('POST', '/api/v1/chats', 201, actor=alice, schema='Chat', + body={'title': '100 участников', + 'member_ids': [alice['id'], *fixture['users'][:99]]})['json'] + check(len(hundred['member_ids']) == 100, 'Допустимые 100 участников не сохранены') + received = [] + cursor = None + while True: + url = path + '?limit=1' + ('&cursor=' + quote(cursor, safe='') if cursor else '') + page = c.call('GET', url, actor=bob, schema='MessagePage')['json'] + received.extend(item['id'] for item in page['items']) + if cursor is None: + first_cursor = page['next_cursor'] + cursor = page['next_cursor'] + if cursor is None: + break + check(len(received) <= 4, 'Курсор зациклился') + expected = [fixture['messages'][0], *reversed(fixture['messages'][1:])] + check(received == expected, 'Потеря/повтор сообщений при микросекундах или равном времени') + other = c.call('POST', '/api/v1/chats', 201, actor=alice, + body={'title': 'Other', 'member_ids': [alice['id']]}, schema='Chat')['json'] + c.call('GET', '/api/v1/chats/' + other['id'] + '/messages?cursor=' + quote(first_cursor, safe=''), + 400, actor=alice) + print('PASS: 101 существующий участник отклонён; курсор сохраняет микросекунды и UUID-порядок, привязан к чату') + finally: + database(f''' +import asyncio +from uuid import UUID +from sqlalchemy import delete, select +from sqlalchemy.ext.asyncio import async_sessionmaker +from src.core.db.session import create_engine +from src.core.db.models import User, Chat, ChatMember, Message +async def main(): + engine = create_engine() + ids = [UUID(i) for i in {fixture['users']!r}] + async with async_sessionmaker(engine).begin() as session: + chats = list(await session.scalars(select(ChatMember.chat_id).where(ChatMember.user_id.in_(ids)))) + await session.execute(delete(Message).where(Message.chat_id.in_(chats))) + await session.execute(delete(Chat).where(Chat.id.in_(chats))) + await session.execute(delete(User).where(User.id.in_(ids))) + await engine.dispose() +asyncio.run(main()) +''') + text = ' строка\nс пробелами ' + saved = c.message(alice, chat, text)['json'] + check(saved['text'] == text, 'Текст обрезан до сохранения') + history = c.call('GET', path, actor=alice, schema='MessagePage')['json'] + check(next(m for m in history['items'] if m['id'] == saved['id'])['text'] == text, + 'Сохранённый текст изменён') + print('PASS: исходный текст и его длина сохраняются без strip') + + key = 'user:v1:' + alice['id'] + def redis(*args): + return subprocess.check_output(['docker', 'compose', 'exec', '-T', 'redis', + 'redis-cli', '--raw', *args], cwd=ROOT, text=True, timeout=10).strip() + for corrupted in ('null', '[]', '{}', '{broken', '"text"', '{"id":123}', + json.dumps({**alice['user'], 'id': bob['id']})): + redis('SET', key, corrupted) + me = c.call('GET', '/api/v1/users/me', actor=alice, schema='User')['json'] + check(me == alice['user'], 'Повреждённый профиль отвергает сессию или меняет пользователя') + check(json.loads(redis('GET', key))['id'] == alice['id'], 'Повреждённый кэш не заменён') + check(0 < int(redis('TTL', key)) <= 60, 'Восстановленному профилю не назначен TTL') + print('PASS: null/повреждённый/чужой профиль заменяется из PostgreSQL с TTL; сессия работает') + + spec = json.loads(c.call('GET', '/openapi.json')['bytes']) + login = spec['paths']['/api/v1/auth/sessions']['post'] + check('requestBody' not in login and {'basicAuth': []} in login['security'], 'Swagger вход не Basic') + check({'bearerAuth': []} in spec['paths']['/api/v1/users/me']['get']['security'], 'Swagger не передаёт Bearer') + print('PASS: Swagger объявляет Basic для входа и Bearer для защищённых методов') + + +if __name__ == '__main__': + run(main) diff --git a/tests/request_deadline.py b/tests/request_deadline.py new file mode 100644 index 00000000..b215b061 --- /dev/null +++ b/tests/request_deadline.py @@ -0,0 +1,47 @@ +"""The HTTP budget must not await a stuck driver's cancellation/rollback.""" +import asyncio +from unittest.mock import patch +from src.core.request_deadline import RequestDeadlineMiddleware +from src.core.settings import settings + + +async def main(): + release=asyncio.Event() + calls=0 + async def stuck(scope,receive,send): + nonlocal calls + calls+=1 + try: + await asyncio.Event().wait() + except asyncio.CancelledError: + await release.wait() + # A misbehaving cancelled handler must not emit a late success. + await send({'type':'http.response.start','status':201,'headers':[]}) + await send({'type':'http.response.body','body':b'late'}) + middleware=RequestDeadlineMiddleware(stuck) + scope={'type':'http','method':'GET','path':'/api/v1/chats','headers':[], 'query_string':b''} + async def receive(): + return {'type':'http.request','body':b'','more_body':False} + responses=[] + async def send(message): responses.append(message) + with patch.object(settings,'http_request_timeout_seconds',.02),patch.object(settings,'http_concurrency_limit',2): + for _ in range(3): + await asyncio.wait_for(middleware(scope,receive,send),timeout=.15) + assert calls==2 and len(middleware.pending)==2 + assert [m['status'] for m in responses if m['type']=='http.response.start']==[503]*3 + release.set() + await asyncio.gather(*middleware.pending) + await asyncio.sleep(0) + assert not middleware.pending + assert [m['status'] for m in responses if m['type']=='http.response.start']==[503]*3 + assert all(m.get('body')!=b'late' for m in responses) + async def healthy(scope,receive,send): + await send({'type':'http.response.start','status':200,'headers':[]}) + await send({'type':'http.response.body','body':b'ok'}) + middleware.app=healthy + responses.clear() + await middleware(scope,receive,send) + assert responses[-1]['body']==b'ok' + print('PASS: bounded response before slow rollback, retained capacity, no late response, recovery') + +asyncio.run(main()) diff --git a/tests/settings.py b/tests/settings.py new file mode 100644 index 00000000..fbe60761 --- /dev/null +++ b/tests/settings.py @@ -0,0 +1,53 @@ +"""docker compose exec -T api python < tests/settings.py.""" +import os +from pathlib import Path +from tempfile import TemporaryDirectory +from unittest.mock import patch + +from pydantic import ValidationError + +from src.core.settings import AppSettings + +# Только искусственные значения, соединения с этими адресами не открываются. +with patch.dict(os.environ, { + 'DATABASE_URL': 'postgresql://settings_user:settings_test_password@postgres/settings_db', + 'REDIS_URL': 'redis://redis:6379/0', +}, clear=True): + with TemporaryDirectory() as directory: + path = Path(directory) / '.env' + path.write_text('SESSION_TTL_SECONDS=2\nDATABASE_POOL_SIZE=3\n', encoding='utf-8') + config = AppSettings(_env_file=path) + assert config.session_ttl_seconds == 2 + assert config.database_pool_size == 3 + assert config.sqlalchemy_database_url.startswith('postgresql+asyncpg://') + assert 'settings_test_password' not in repr(config) + with patch.dict(os.environ, {'SESSION_TTL_SECONDS': '4'}): + assert AppSettings(_env_file=path).session_ttl_seconds == 4 + print('PASS: AppSettings читает .env, окружение имеет приоритет, URL скрыт в repr') + + for values, expected_field in ( + ({'session_ttl_seconds': 0}, 'session_ttl_seconds'), + ({'session_ttl_seconds': 'invalid'}, 'session_ttl_seconds'), + ({'database_pool_size': 0}, 'database_pool_size'), + ({'redis_read_timeout_seconds': -1}, 'redis_read_timeout_seconds'), + ({'session_token_bytes': 16}, 'session_token_bytes'), + ): + try: + AppSettings(_env_file=None, **values) + except ValidationError as error: + assert any(item['loc'] == (expected_field,) for item in error.errors()) + else: + raise AssertionError('Некорректная настройка принята: ' + expected_field) + print('PASS: Pydantic отклоняет неверные TTL, pool, timeout и недостаточную длину токена') + for values in ({'app_env': 'production'}, {'admin_password': ' ' * 12}, + {'admin_display_name': 'bad\x00'}): + try: + AppSettings(_env_file=None, **values) + except ValidationError as error: + assert 'settings_test_password' not in str(error) + assert 'input_value' not in str(error) + else: + raise AssertionError('Небезопасная конфигурация принята') + assert AppSettings(_env_file=None, app_env='production', + admin_password='custom-production-password-123').app_env == 'production' + print('PASS: production отвергает учебный пароль; ошибки конфигурации скрывают входные значения') diff --git a/tests/upload_memory.py b/tests/upload_memory.py new file mode 100644 index 00000000..50209a57 --- /dev/null +++ b/tests/upload_memory.py @@ -0,0 +1,78 @@ +"""10 simultaneous binary uploads; sample per-container cgroup memory including tmpfs.""" +import hashlib +import io +import json +import os +import subprocess +import threading +import time +from concurrent.futures import ThreadPoolExecutor + +from PIL import Image +from client import Client, arguments, check, run + + +def main(): + args=arguments('Upload concurrency and memory experiment') + c=Client(args.base_url,args.ca_file,timeout=30) + alice,bob,_,chat=c.bootstrap() + containers=subprocess.check_output(['docker','compose','ps','-q','api'],text=True).split() + check(len(containers)==2,'experiment requires two API replicas') + # One sampler process per container, not one docker invocation per sample. + sampler='''import json,time +from pathlib import Path +values=[] +for _ in range(750): + values.append(int(Path('/sys/fs/cgroup/memory.current').read_text())) + time.sleep(.02) +print(json.dumps({'baseline_bytes':values[0],'sampled_peak_bytes':max(values),'samples':len(values),'interval_seconds':.02,'cgroup_limit_bytes':int(Path('/sys/fs/cgroup/memory.max').read_text())})) +''' + samplers=[subprocess.Popen(['docker','exec',cid,'python','-c',sampler],stdout=subprocess.PIPE,text=True) + for cid in containers] + time.sleep(.2) + results=[] + try: + for side in (256,1280): + source=io.BytesIO() + Image.frombytes('RGB',(side,side),os.urandom(side*side*3)).save(source,format='PNG') + content=source.getvalue() + barrier=threading.Barrier(10) + def upload(_): + local=Client(args.base_url,args.ca_file,timeout=30) + barrier.wait() + started=time.perf_counter() + response=local.call('POST','/api/v1/chats/'+chat['id']+'/attachments?filename=memory.png', + expected=[201,503],actor=alice,raw=content,headers={'Content-Type':'image/png'}) + if response['status']==201: + att=json.loads(response['bytes']) + check(att['sha256']==hashlib.sha256(content).hexdigest(),'upload checksum differs') + downloaded=local.call('GET','/api/v1/attachments/'+att['id']+'/content',actor=bob) + check(downloaded['bytes']==content,'concurrent upload lost original') + return {'status':response['status'],'seconds':round(time.perf_counter()-started,4)} + with ThreadPoolExecutor(max_workers=10) as pool: + responses=list(pool.map(upload,range(10))) + check(all(r['status']==201 for r in responses),'configured 10-upload profile rejected a request') + results.append({'dimensions':[side,side],'file_bytes':len(content), + 'concurrent_uploads':10,'responses':responses}) + memory=[] + for process in samplers: + output,_=process.communicate(timeout=25) + check(process.returncode==0,'memory sampler failed') + memory.append(json.loads(output)) + check(all(m['sampled_peak_bytes']