forked from mtusi2026/mtusi2026lab4
ЛР 4 - БПИ2302 - Щербацевич - на 4
This commit is contained in:
+28
@@ -0,0 +1,28 @@
|
||||
FROM python:3.13.16-slim-bookworm@sha256:a1165e272e578941b84abc79e4ab38a0305cd12803a5c4247979ac7655f4d641
|
||||
|
||||
ENV PYTHONDONTWRITEBYTECODE=1 \
|
||||
PYTHONUNBUFFERED=1 \
|
||||
PIP_DISABLE_PIP_VERSION_CHECK=1 \
|
||||
PYTHONPATH=/app/src \
|
||||
APP_HOST=0.0.0.0 \
|
||||
APP_PORT=8080 \
|
||||
APP_ENV=lab
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
RUN useradd --create-home --uid 10001 --shell /usr/sbin/nologin appuser
|
||||
|
||||
COPY requirements.txt /app/requirements.txt
|
||||
RUN pip install --no-cache-dir -r /app/requirements.txt
|
||||
|
||||
COPY src /app/src
|
||||
COPY migrations /app/migrations
|
||||
|
||||
USER appuser
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
HEALTHCHECK --interval=5s --timeout=3s --start-period=40s --retries=12 \
|
||||
CMD ["python", "-c", "import os,urllib.request; p=os.environ.get('APP_PORT','8080'); urllib.request.urlopen('http://127.0.0.1:%s/health/ready'%p, timeout=2).read()"]
|
||||
|
||||
CMD ["python", "-m", "app"]
|
||||
@@ -1,37 +1,81 @@
|
||||
# Отчёт — лабораторная 4
|
||||
|
||||
- Автор, группа: TODO
|
||||
- Целевая оценка; выбранный трек 5, если нужен: TODO
|
||||
- Автор, группа: Щербацевич Владислав Сергеевич БПИ2302
|
||||
- Целевая оценка; выбранный трек 5, если нужен: 4
|
||||
- Commit/PR: TODO после публикации
|
||||
- Использованные источники, библиотеки и помощь ИИ: TODO
|
||||
- Использованные источники, библиотеки и помощь ИИ: контракт курса; MinIO; boto3; Pillow; FastAPI/SQLAlchemy из lab3; помощь ИИ при реализации стенда и вложений.
|
||||
|
||||
## Запуск из чистого clone
|
||||
|
||||
TODO: версии runtime/образов, prerequisites, команды создания локальных secrets/.env, build, миграций, запуска, ожидания готовности, тестов и остановки. Указать необходимые действия оператора. Не вставлять секреты. Отдельно указать безопасную остановку и команду намеренного удаления учебных данных.
|
||||
Требования: Docker Compose v2, Python 3.11+, PowerShell или POSIX shell. Образы закреплены тегами/digest в `compose.yaml` и `Dockerfile` (`python:3.13.16-slim-bookworm`, `postgres:16.10-bookworm`, `redis:7.4.6-alpine`, `haproxy:3.2-bookworm`, `minio/minio:RELEASE.2024-11-07T00-52-20Z`).
|
||||
|
||||
```powershell
|
||||
# Windows
|
||||
powershell -File scripts/bootstrap.ps1
|
||||
docker compose --env-file .env up -d --build --scale api=2
|
||||
```
|
||||
|
||||
```sh
|
||||
# POSIX
|
||||
sh scripts/bootstrap.sh
|
||||
docker compose --env-file .env up -d --build --scale api=2
|
||||
```
|
||||
|
||||
Дождаться `GET http://127.0.0.1:8080/health/ready` = 200. Затем:
|
||||
|
||||
```sh
|
||||
python tests/smoke.py --base-url http://127.0.0.1:8080
|
||||
python student-tests/attachments.py
|
||||
python student-tests/s3_private.py
|
||||
python student-tests/upload_mem.py
|
||||
python student-tests/gc_orphans.py
|
||||
python student-tests/level3.py
|
||||
python student-tests/level4.py
|
||||
python tests/resilience.py --mode persistence --action-script scripts/restart.cmd
|
||||
python tests/resilience.py --mode failover --action-script scripts/stop-one.cmd
|
||||
```
|
||||
|
||||
На POSIX вместо `.cmd` используйте `scripts/restart.sh` и `scripts/stop-one.sh`.
|
||||
|
||||
Остановка без удаления данных: `docker compose --env-file .env down`. Намеренное удаление учебных volumes: `docker compose --env-file .env down -v` (секреты в `secrets/` удаляйте отдельно). Секреты не коммитятся.
|
||||
|
||||
## Архитектура и решения
|
||||
|
||||
TODO: схема процессов/хранилищ, источник истины, транзакционные границы, ограничения. Что перенесено из lab3, что изменено в этой работе. Соответствие переменных из .env.example реальной конфигурации.
|
||||
Клиент → HAProxy (`lb`, :8080) → API × 2 → PostgreSQL (метаданные) + Redis (сессии, AOF always) + MinIO (байты). Консоль MinIO не публикуется; S3 API слушает только `127.0.0.1:9000` для проверки private bucket. API ходит во внутренний `http://minio:9000` с отдельным ключом `messengerapi` и политикой `infra/minio-policy.json` (object/list на один bucket). Root MinIO только у `minio-init`.
|
||||
|
||||
Вложение: лимит тела 10 MiB до полной буферизации; MIME по magic bytes; пиксели по заголовку изображения (Pillow `MAX_IMAGE_PIXELS`); object key `att/<uuid>`. 201 только после PUT в S3 и COMMIT в PostgreSQL. Если INSERT не удался — best-effort `DeleteObject`. Обрывы HTTP не доходят до S3. Остатки после краша между PUT и COMMIT убирает `gc` после `ATTACHMENT_GC_GRACE_SECONDS` (по умолчанию 900 с), не трогая ключи из таблицы `attachments`.
|
||||
|
||||
Текстовые POST без `attachment_ids` остаются валидными. Пустой `text` разрешён только с вложениями этого чата.
|
||||
|
||||
Соответствие `.env.example`: `S3_ENDPOINT=http://minio:9000`, секреты через `*_FILE`.
|
||||
|
||||
## Доказательства критериев
|
||||
|
||||
| Критерий README | Команда/сценарий | Наблюдаемый результат | Файл доказательства |
|
||||
| --- | --- | --- | --- |
|
||||
| Публичный smoke | make test | TODO | TODO |
|
||||
| Остальные пункты уровня 3 | TODO | TODO | TODO |
|
||||
| Все пункты уровня 4, если заявлен | TODO | TODO | TODO |
|
||||
| Выбранный трек 5, если заявлен | TODO | TODO | TODO |
|
||||
|
||||
TODO: добавить отдельную строку для каждого заявленного критерия. PASS без команды и наблюдения не является доказательством. Проверка инфраструктурного hook требует подтверждения, какие реальные процессы/хранилища перезапущены.
|
||||
| Публичный smoke | `python tests/smoke.py --base-url http://127.0.0.1:8080` | TODO | evidence/ (вывод команды) |
|
||||
| Upload 201 ready, checksum, чужой 404 | smoke + `student-tests/attachments.py` | TODO | evidence/attachments.json |
|
||||
| Failover другой реплики | `python tests/resilience.py --mode failover --action-script scripts/stop-one.cmd` | TODO | вывод команды |
|
||||
| Restart volumes | `python tests/resilience.py --mode persistence --action-script scripts/restart.cmd` | TODO | вывод команды |
|
||||
| Негативные файлы / чужой chat | `python student-tests/attachments.py` | 413/415/400/404, не 500 | evidence/attachments.json |
|
||||
| Orphan GC | `python student-tests/gc_orphans.py` | orphan удалён, живое вложение нет | evidence/gc_orphans.json |
|
||||
| 10 параллельных upload + RSS | `python student-tests/upload_mem.py` | TODO MiB | evidence/upload_mem.json |
|
||||
| Private bucket | `python student-tests/s3_private.py` | anonymous 403/404 | evidence/s3_private.json |
|
||||
| lab3 replicas/idempotency | `python student-tests/level3.py` | ≥2 instance id | evidence/level3.json |
|
||||
| lab2/3 level4 checks | `python student-tests/level4.py` | 3 миграции | evidence/level4.json |
|
||||
|
||||
## Эксперименты и отказы
|
||||
|
||||
TODO: гипотеза, hardware/лимиты, версии, объём данных, профиль нагрузки, concurrency/arrival rate, длительность/прогрев, повторы, успешные RPS, ошибки, p50/p95/p99, CPU/RAM. Сохранить raw summary без tokens и объяснить ограничения измерения.
|
||||
Гипотеза: одна загрузка ограничена 10 MiB, поэтому 10 одновременных PNG не разгоняют RSS реплики без верхней границы. Методика: `student-tests/upload_mem.py`, `docker stats`, стенд `--scale api=2`, лимит контейнера API 512 MiB.
|
||||
|
||||
| Воздействие | Что ожидаем | Что наблюдали | Время восстановления / потеря данных |
|
||||
| --- | --- | --- | --- |
|
||||
| TODO | TODO | TODO | TODO |
|
||||
| stop одной API | X-Instance-Id цели исчезает, download через другую | TODO | TODO |
|
||||
| restart postgres+redis+minio+api | сессия и файл на месте | TODO | TODO |
|
||||
| stop minio | `/health/ready` 503, live 200 | TODO | после start minio ready возвращается |
|
||||
| S3 PUT без COMMIT | объект удаляется после grace | `gc_orphans.py` | живые ключи не удаляются |
|
||||
| anonymous GET :9000 | 403/404 | `s3_private.py` | API download без изменений |
|
||||
|
||||
## Ограничения и следующие шаги
|
||||
|
||||
TODO: какие отказы выдерживаются и какие нет; что не реализовано; где учебное упрощение; какое улучшение подтверждено, а какое пока гипотеза.
|
||||
Отказ Docker-host и одиночного PostgreSQL/MinIO не маскируется. Буфер загрузки в RAM до 10 MiB на запрос — это верхняя граница, не zero-copy multipart. Presigned upload и асинхронные варианты — lab5/трек 5, не реализованы. GC не удаляет объекты моложе grace, поэтому кратковременный orphan допустим.
|
||||
|
||||
+277
@@ -0,0 +1,277 @@
|
||||
# Учебный стенд лабораторной 4. Секреты создаёт scripts/bootstrap, не этот файл.
|
||||
# Две API-реплики: docker compose --env-file .env up -d --build --scale api=2
|
||||
name: mtusi-lab4
|
||||
|
||||
x-api-environment: &api-environment
|
||||
APP_HOST: 0.0.0.0
|
||||
APP_PORT: "8080"
|
||||
APP_ENV: lab
|
||||
APP_ROLE: api
|
||||
RUN_MIGRATIONS: "0"
|
||||
SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-3600}
|
||||
IDEMPOTENCY_TTL_SECONDS: ${IDEMPOTENCY_TTL_SECONDS:-86400}
|
||||
SESSION_STORE: redis
|
||||
DATABASE_URL_FILE: /run/secrets/database_url
|
||||
CACHE_URL_FILE: /run/secrets/cache_url
|
||||
S3_ENDPOINT: ${S3_ENDPOINT:-http://minio:9000}
|
||||
S3_REGION: ${S3_REGION:-us-east-1}
|
||||
S3_BUCKET: ${S3_BUCKET:-messenger-attachments}
|
||||
S3_ACCESS_KEY_ID_FILE: /run/secrets/s3_access_key_id
|
||||
S3_SECRET_ACCESS_KEY_FILE: /run/secrets/s3_secret_access_key
|
||||
MAX_UPLOAD_BYTES: ${MAX_UPLOAD_BYTES:-10485760}
|
||||
MAX_IMAGE_PIXELS: ${MAX_IMAGE_PIXELS:-40000000}
|
||||
ATTACHMENT_GC_GRACE_SECONDS: ${ATTACHMENT_GC_GRACE_SECONDS:-900}
|
||||
AWS_REQUEST_CHECKSUM_CALCULATION: when_required
|
||||
AWS_RESPONSE_CHECKSUM_VALIDATION: when_required
|
||||
DB_POOL_SIZE: ${DB_POOL_SIZE:-10}
|
||||
DB_MAX_OVERFLOW: ${DB_MAX_OVERFLOW:-10}
|
||||
DB_POOL_TIMEOUT_SECONDS: "5"
|
||||
DB_CONNECT_TIMEOUT_SECONDS: "2"
|
||||
DB_COMMAND_TIMEOUT_SECONDS: "5"
|
||||
REDIS_SOCKET_TIMEOUT_SECONDS: "1"
|
||||
REDIS_MAX_CONNECTIONS: "50"
|
||||
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:16.10-bookworm@sha256:38471f330eb885e04de130b768d6db4e10469e2311879c7e5c699f6d2d8a1c74
|
||||
environment:
|
||||
POSTGRES_USER: messenger
|
||||
POSTGRES_DB: messenger
|
||||
POSTGRES_PASSWORD_FILE: /run/secrets/postgres_password
|
||||
secrets:
|
||||
- postgres_password
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
ports:
|
||||
- "127.0.0.1:5433:5432"
|
||||
networks:
|
||||
- lab
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U messenger -d messenger"]
|
||||
interval: 2s
|
||||
timeout: 3s
|
||||
retries: 30
|
||||
start_period: 5s
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
cpus: "1.00"
|
||||
memory: 512M
|
||||
restart: unless-stopped
|
||||
|
||||
redis:
|
||||
image: redis:7.4.6-alpine@sha256:3b73847e72874be07e6657b129a94761662b79bc0f679273757d4218573b2a98
|
||||
command:
|
||||
- redis-server
|
||||
- --appendonly
|
||||
- yes
|
||||
- --appendfsync
|
||||
- always
|
||||
- --dir
|
||||
- /data
|
||||
volumes:
|
||||
- redis_data:/data
|
||||
ports:
|
||||
- "127.0.0.1:6379:6379"
|
||||
networks:
|
||||
- lab
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
interval: 2s
|
||||
timeout: 3s
|
||||
retries: 30
|
||||
start_period: 3s
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
cpus: "0.50"
|
||||
memory: 128M
|
||||
restart: unless-stopped
|
||||
|
||||
minio:
|
||||
image: minio/minio:RELEASE.2024-11-07T00-52-20Z
|
||||
command: ["server", "/data", "--address", ":9000", "--console-address", ":9001"]
|
||||
environment:
|
||||
MINIO_ROOT_USER_FILE: /run/secrets/minio_root_user
|
||||
MINIO_ROOT_PASSWORD_FILE: /run/secrets/minio_root_password
|
||||
MINIO_BROWSER: "off"
|
||||
secrets:
|
||||
- minio_root_user
|
||||
- minio_root_password
|
||||
volumes:
|
||||
- minio_data:/data
|
||||
ports:
|
||||
- "127.0.0.1:9000:9000"
|
||||
networks:
|
||||
- lab
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://127.0.0.1:9000/minio/health/live"]
|
||||
interval: 3s
|
||||
timeout: 5s
|
||||
retries: 20
|
||||
start_period: 10s
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
cpus: "0.50"
|
||||
memory: 256M
|
||||
restart: unless-stopped
|
||||
|
||||
minio-init:
|
||||
image: minio/mc:RELEASE.2024-11-05T11-29-37Z
|
||||
environment:
|
||||
S3_BUCKET: ${S3_BUCKET:-messenger-attachments}
|
||||
secrets:
|
||||
- minio_root_user
|
||||
- minio_root_password
|
||||
- s3_access_key_id
|
||||
- s3_secret_access_key
|
||||
volumes:
|
||||
- ./infra/minio-bootstrap.sh:/bootstrap.sh:ro
|
||||
- ./infra/minio-policy.json:/policy.json:ro
|
||||
networks:
|
||||
- lab
|
||||
depends_on:
|
||||
minio:
|
||||
condition: service_started
|
||||
entrypoint: ["/bin/sh", "/bootstrap.sh"]
|
||||
restart: "no"
|
||||
|
||||
migrate:
|
||||
build: .
|
||||
environment:
|
||||
APP_ROLE: migrate
|
||||
RUN_MIGRATIONS: "1"
|
||||
APP_ENV: lab
|
||||
DATABASE_URL_FILE: /run/secrets/database_url
|
||||
secrets:
|
||||
- database_url
|
||||
networks:
|
||||
- lab
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
command: ["python", "-m", "app.migrate"]
|
||||
restart: "no"
|
||||
deploy:
|
||||
replicas: 1
|
||||
resources:
|
||||
limits:
|
||||
cpus: "0.25"
|
||||
memory: 128M
|
||||
|
||||
api:
|
||||
build: .
|
||||
environment: *api-environment
|
||||
secrets:
|
||||
- database_url
|
||||
- cache_url
|
||||
- s3_access_key_id
|
||||
- s3_secret_access_key
|
||||
networks:
|
||||
- lab
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
redis:
|
||||
condition: service_healthy
|
||||
migrate:
|
||||
condition: service_completed_successfully
|
||||
minio-init:
|
||||
condition: service_completed_successfully
|
||||
healthcheck:
|
||||
test:
|
||||
[
|
||||
"CMD",
|
||||
"python",
|
||||
"-c",
|
||||
"import os,urllib.request; p=os.environ.get('APP_PORT','8080'); urllib.request.urlopen('http://127.0.0.1:%s/health/ready'%p, timeout=2).read()",
|
||||
]
|
||||
interval: 2s
|
||||
timeout: 2s
|
||||
retries: 16
|
||||
start_period: 20s
|
||||
stop_grace_period: 8s
|
||||
stop_signal: SIGTERM
|
||||
deploy:
|
||||
replicas: ${API_REPLICAS:-2}
|
||||
resources:
|
||||
limits:
|
||||
cpus: "0.50"
|
||||
memory: 512M
|
||||
restart: unless-stopped
|
||||
|
||||
gc:
|
||||
build: .
|
||||
environment:
|
||||
<<: *api-environment
|
||||
APP_ROLE: gc
|
||||
secrets:
|
||||
- database_url
|
||||
- s3_access_key_id
|
||||
- s3_secret_access_key
|
||||
networks:
|
||||
- lab
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
migrate:
|
||||
condition: service_completed_successfully
|
||||
minio-init:
|
||||
condition: service_completed_successfully
|
||||
command: ["python", "-m", "app.gc"]
|
||||
restart: unless-stopped
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
cpus: "0.25"
|
||||
memory: 128M
|
||||
|
||||
lb:
|
||||
image: haproxy:3.2-bookworm@sha256:baecd003ae5c2376e58d04a5b2ffc7d82d30e9bebe2869f76222b819f719dee3
|
||||
volumes:
|
||||
- ./infra/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro
|
||||
ports:
|
||||
- "127.0.0.1:8080:8080"
|
||||
- "[::1]:8080:8080"
|
||||
networks:
|
||||
- lab
|
||||
depends_on:
|
||||
api:
|
||||
condition: service_healthy
|
||||
healthcheck:
|
||||
test: ["CMD", "haproxy", "-c", "-f", "/usr/local/etc/haproxy/haproxy.cfg"]
|
||||
interval: 5s
|
||||
timeout: 2s
|
||||
retries: 5
|
||||
start_period: 3s
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
cpus: "0.25"
|
||||
memory: 64M
|
||||
restart: unless-stopped
|
||||
|
||||
secrets:
|
||||
postgres_password:
|
||||
file: ./secrets/postgres_password
|
||||
database_url:
|
||||
file: ./secrets/database_url
|
||||
cache_url:
|
||||
file: ./secrets/cache_url
|
||||
minio_root_user:
|
||||
file: ./secrets/minio_root_user
|
||||
minio_root_password:
|
||||
file: ./secrets/minio_root_password
|
||||
s3_access_key_id:
|
||||
file: ./secrets/s3_access_key_id
|
||||
s3_secret_access_key:
|
||||
file: ./secrets/s3_secret_access_key
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
redis_data:
|
||||
minio_data:
|
||||
|
||||
networks:
|
||||
lab:
|
||||
@@ -0,0 +1,39 @@
|
||||
global
|
||||
log stdout format raw local0
|
||||
maxconn 256
|
||||
|
||||
defaults
|
||||
log global
|
||||
mode http
|
||||
option httplog
|
||||
option dontlognull
|
||||
option redispatch
|
||||
timeout connect 3s
|
||||
timeout client 60s
|
||||
timeout server 60s
|
||||
timeout http-request 30s
|
||||
retries 2
|
||||
|
||||
resolvers docker
|
||||
nameserver dns 127.0.0.11:53
|
||||
resolve_retries 3
|
||||
timeout resolve 1s
|
||||
timeout retry 1s
|
||||
hold valid 5s
|
||||
hold other 5s
|
||||
hold refused 5s
|
||||
hold nx 5s
|
||||
hold timeout 5s
|
||||
hold obsolete 5s
|
||||
|
||||
frontend public
|
||||
bind :8080
|
||||
default_backend api
|
||||
|
||||
backend api
|
||||
balance roundrobin
|
||||
option httpchk
|
||||
http-check send meth GET uri /health/ready ver HTTP/1.1 hdr Host api
|
||||
http-check expect status 200
|
||||
default-server inter 1s fall 2 rise 2 resolvers docker init-addr last,libc,none resolve-prefer ipv4
|
||||
server-template api 8 api:8080 check
|
||||
@@ -0,0 +1,36 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
ROOT_USER=$(cat /run/secrets/minio_root_user)
|
||||
ROOT_PASS=$(cat /run/secrets/minio_root_password)
|
||||
API_KEY=$(cat /run/secrets/s3_access_key_id)
|
||||
API_SECRET=$(cat /run/secrets/s3_secret_access_key)
|
||||
BUCKET=${S3_BUCKET:-messenger-attachments}
|
||||
|
||||
i=0
|
||||
while [ "$i" -lt 40 ]; do
|
||||
if mc alias set local http://minio:9000 "$ROOT_USER" "$ROOT_PASS" >/dev/null 2>&1; then
|
||||
break
|
||||
fi
|
||||
i=$((i + 1))
|
||||
sleep 1
|
||||
done
|
||||
mc alias set local http://minio:9000 "$ROOT_USER" "$ROOT_PASS"
|
||||
|
||||
mc mb --ignore-existing "local/${BUCKET}"
|
||||
mc anonymous set none "local/${BUCKET}"
|
||||
|
||||
if ! mc admin user info local "$API_KEY" >/dev/null 2>&1; then
|
||||
mc admin user add local "$API_KEY" "$API_SECRET"
|
||||
else
|
||||
mc admin user add local "$API_KEY" "$API_SECRET" >/dev/null 2>&1 || true
|
||||
fi
|
||||
|
||||
if ! mc admin policy info local messenger-objects >/dev/null 2>&1; then
|
||||
mc admin policy create local messenger-objects /policy.json
|
||||
else
|
||||
mc admin policy create local messenger-objects /policy.json >/dev/null 2>&1 || true
|
||||
fi
|
||||
mc admin policy attach local messenger-objects --user "$API_KEY" >/dev/null 2>&1 || true
|
||||
|
||||
echo "minio bootstrap complete bucket=${BUCKET}"
|
||||
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"Version": "2012-10-17",
|
||||
"Statement": [
|
||||
{
|
||||
"Sid": "ApiObjectAccess",
|
||||
"Effect": "Allow",
|
||||
"Action": [
|
||||
"s3:GetObject",
|
||||
"s3:PutObject",
|
||||
"s3:DeleteObject",
|
||||
"s3:AbortMultipartUpload",
|
||||
"s3:ListBucket",
|
||||
"s3:GetBucketLocation"
|
||||
],
|
||||
"Resource": [
|
||||
"arn:aws:s3:::messenger-attachments",
|
||||
"arn:aws:s3:::messenger-attachments/*"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
-- Пользователи, чаты, состав и сообщения. Пароли и тексты сообщений
|
||||
-- не пишутся приложением в логи. password_hash — только Argon2id.
|
||||
-- Сессии в этой схеме нет: их источник истины — Redis (см. compose.yaml).
|
||||
|
||||
CREATE TABLE users (
|
||||
id UUID PRIMARY KEY,
|
||||
username TEXT NOT NULL,
|
||||
display_name TEXT NOT NULL,
|
||||
password_hash TEXT NOT NULL,
|
||||
created_at TIMESTAMPTZ NOT NULL,
|
||||
CONSTRAINT uq_users_username UNIQUE (username),
|
||||
CONSTRAINT ck_users_username_format CHECK (username ~ '^[a-z0-9_]{3,32}$'),
|
||||
CONSTRAINT ck_users_display_name_len CHECK (
|
||||
char_length(btrim(display_name)) >= 1 AND char_length(display_name) <= 100
|
||||
),
|
||||
CONSTRAINT ck_users_password_hash_len CHECK (char_length(password_hash) >= 20)
|
||||
);
|
||||
|
||||
CREATE TABLE chats (
|
||||
id UUID PRIMARY KEY,
|
||||
title TEXT NOT NULL,
|
||||
created_at TIMESTAMPTZ NOT NULL,
|
||||
CONSTRAINT ck_chats_title CHECK (char_length(btrim(title)) >= 1 AND char_length(title) <= 100)
|
||||
);
|
||||
|
||||
-- Состав чата пишется в той же транзакции, что и строка chats.
|
||||
-- Откат до COMMIT не оставляет чат без участников.
|
||||
CREATE TABLE chat_members (
|
||||
chat_id UUID NOT NULL REFERENCES chats (id),
|
||||
user_id UUID NOT NULL REFERENCES users (id),
|
||||
ordinal SMALLINT NOT NULL,
|
||||
PRIMARY KEY (chat_id, user_id),
|
||||
CONSTRAINT ck_chat_members_ordinal CHECK (ordinal >= 0 AND ordinal < 100)
|
||||
);
|
||||
|
||||
-- Список чатов пользователя: фильтр по user_id, затем порядок (created_at, id) чата.
|
||||
CREATE INDEX ix_chat_members_user ON chat_members (user_id, chat_id);
|
||||
|
||||
CREATE TABLE messages (
|
||||
id UUID PRIMARY KEY,
|
||||
chat_id UUID NOT NULL REFERENCES chats (id),
|
||||
sender_id UUID NOT NULL REFERENCES users (id),
|
||||
body TEXT NOT NULL,
|
||||
created_at TIMESTAMPTZ NOT NULL,
|
||||
CONSTRAINT ck_messages_text CHECK (char_length(btrim(body)) >= 1 AND char_length(body) <= 4000)
|
||||
);
|
||||
|
||||
-- История: WHERE chat_id = $1 AND (created_at, id) > ($2, $3)
|
||||
-- ORDER BY created_at, id LIMIT $4.
|
||||
-- Ведущий chat_id отсекает чужие чаты, пара (created_at, id) продолжает
|
||||
-- keyset с cursor и не читает предыдущие строки этой истории.
|
||||
CREATE INDEX ix_messages_history ON messages (chat_id, created_at, id);
|
||||
@@ -0,0 +1,22 @@
|
||||
-- Общая идемпотентность POST сообщения для всех API-реплик.
|
||||
-- Результат пишется в той же транзакции, что и messages: 5xx не сохраняется.
|
||||
|
||||
CREATE TABLE idempotency_records (
|
||||
user_id UUID NOT NULL REFERENCES users (id),
|
||||
method TEXT NOT NULL,
|
||||
request_path TEXT NOT NULL,
|
||||
idempotency_key TEXT NOT NULL,
|
||||
request_hash TEXT NOT NULL,
|
||||
status_code SMALLINT NOT NULL,
|
||||
message_id UUID NOT NULL REFERENCES messages (id),
|
||||
created_at TIMESTAMPTZ NOT NULL,
|
||||
PRIMARY KEY (user_id, method, request_path, idempotency_key),
|
||||
CONSTRAINT ck_idem_method CHECK (method = 'POST'),
|
||||
CONSTRAINT ck_idem_status CHECK (status_code = 201),
|
||||
CONSTRAINT ck_idem_key CHECK (idempotency_key ~ '^[A-Za-z0-9._:-]{1,128}$'),
|
||||
CONSTRAINT ck_idem_path CHECK (char_length(request_path) BETWEEN 1 AND 300),
|
||||
CONSTRAINT ck_idem_hash CHECK (char_length(request_hash) = 64)
|
||||
);
|
||||
|
||||
CREATE INDEX ix_idempotency_message ON idempotency_records (message_id);
|
||||
CREATE INDEX ix_idempotency_created ON idempotency_records (created_at);
|
||||
@@ -0,0 +1,39 @@
|
||||
-- Вложения: метаданные в PostgreSQL, байты в S3. Пустой text сообщения
|
||||
-- допускается только вместе с attachment_ids (проверяет приложение).
|
||||
|
||||
ALTER TABLE messages DROP CONSTRAINT ck_messages_text;
|
||||
ALTER TABLE messages ADD CONSTRAINT ck_messages_text CHECK (char_length(body) <= 4000);
|
||||
|
||||
CREATE TABLE attachments (
|
||||
id UUID PRIMARY KEY,
|
||||
chat_id UUID NOT NULL REFERENCES chats (id),
|
||||
owner_id UUID NOT NULL REFERENCES users (id),
|
||||
filename TEXT NOT NULL,
|
||||
content_type TEXT NOT NULL,
|
||||
size_bytes INTEGER NOT NULL,
|
||||
sha256 TEXT NOT NULL,
|
||||
object_key TEXT NOT NULL,
|
||||
status TEXT NOT NULL,
|
||||
error_code TEXT,
|
||||
created_at TIMESTAMPTZ NOT NULL,
|
||||
updated_at TIMESTAMPTZ NOT NULL,
|
||||
CONSTRAINT uq_attachments_object_key UNIQUE (object_key),
|
||||
CONSTRAINT ck_attachments_filename CHECK (char_length(filename) BETWEEN 1 AND 255),
|
||||
CONSTRAINT ck_attachments_content_type CHECK (content_type IN ('image/png', 'image/jpeg')),
|
||||
CONSTRAINT ck_attachments_size CHECK (size_bytes >= 1 AND size_bytes <= 10485760),
|
||||
CONSTRAINT ck_attachments_sha256 CHECK (sha256 ~ '^[a-f0-9]{64}$'),
|
||||
CONSTRAINT ck_attachments_status CHECK (status = 'ready'),
|
||||
CONSTRAINT ck_attachments_error CHECK (error_code IS NULL)
|
||||
);
|
||||
|
||||
CREATE INDEX ix_attachments_chat ON attachments (chat_id, created_at, id);
|
||||
|
||||
CREATE TABLE message_attachments (
|
||||
message_id UUID NOT NULL REFERENCES messages (id),
|
||||
attachment_id UUID NOT NULL REFERENCES attachments (id),
|
||||
ordinal SMALLINT NOT NULL,
|
||||
PRIMARY KEY (message_id, attachment_id),
|
||||
CONSTRAINT ck_message_attachments_ordinal CHECK (ordinal >= 0 AND ordinal < 10)
|
||||
);
|
||||
|
||||
CREATE INDEX ix_message_attachments_attachment ON message_attachments (attachment_id);
|
||||
@@ -0,0 +1,9 @@
|
||||
fastapi==0.115.12
|
||||
uvicorn==0.34.2
|
||||
sqlalchemy==2.0.40
|
||||
asyncpg==0.30.0
|
||||
redis==5.2.1
|
||||
pydantic==2.11.3
|
||||
argon2-cffi==23.1.0
|
||||
boto3==1.37.28
|
||||
pillow==11.2.1
|
||||
@@ -0,0 +1,37 @@
|
||||
$ErrorActionPreference = "Stop"
|
||||
$Root = Split-Path -Parent $PSScriptRoot
|
||||
Set-Location $Root
|
||||
New-Item -ItemType Directory -Force -Path (Join-Path $Root "secrets") | Out-Null
|
||||
|
||||
function Write-Secret([string]$Name, [string]$Value) {
|
||||
$path = Join-Path $Root "secrets\$Name"
|
||||
if (-not (Test-Path $path)) {
|
||||
[System.IO.File]::WriteAllText($path, $Value)
|
||||
}
|
||||
}
|
||||
|
||||
function Random-Text([int]$Length) {
|
||||
$bytes = New-Object byte[] $Length
|
||||
[System.Security.Cryptography.RandomNumberGenerator]::Create().GetBytes($bytes)
|
||||
return -join ($bytes | ForEach-Object { $_.ToString("x2") })
|
||||
}
|
||||
|
||||
$pg = Random-Text 16
|
||||
Write-Secret "postgres_password" $pg
|
||||
Write-Secret "database_url" "postgresql+asyncpg://messenger:${pg}@postgres:5432/messenger"
|
||||
Write-Secret "host_database_url" "postgresql+asyncpg://messenger:${pg}@127.0.0.1:5433/messenger"
|
||||
Write-Secret "cache_url" "redis://redis:6379/0"
|
||||
Write-Secret "host_cache_url" "redis://127.0.0.1:6379/0"
|
||||
Write-Secret "minio_root_user" "minioadmin"
|
||||
Write-Secret "minio_root_password" (Random-Text 16)
|
||||
Write-Secret "s3_access_key_id" "messengerapi"
|
||||
Write-Secret "s3_secret_access_key" (Random-Text 16)
|
||||
Write-Secret "host_s3_endpoint" "http://127.0.0.1:9000"
|
||||
|
||||
$envFile = Join-Path $Root ".env"
|
||||
if (-not (Test-Path $envFile)) {
|
||||
Copy-Item (Join-Path $Root ".env.example") $envFile
|
||||
}
|
||||
|
||||
Write-Host "secrets and .env are ready"
|
||||
Write-Host "next: docker compose --env-file .env up -d --build --scale api=2"
|
||||
@@ -0,0 +1,36 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
ROOT=$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)
|
||||
mkdir -p "$ROOT/secrets"
|
||||
|
||||
write_secret() {
|
||||
name=$1
|
||||
value=$2
|
||||
path="$ROOT/secrets/$name"
|
||||
if [ ! -f "$path" ]; then
|
||||
printf '%s' "$value" > "$path"
|
||||
fi
|
||||
}
|
||||
|
||||
rand() {
|
||||
python3 -c 'import secrets; print(secrets.token_hex(16))'
|
||||
}
|
||||
|
||||
pg=$(rand)
|
||||
write_secret postgres_password "$pg"
|
||||
write_secret database_url "postgresql+asyncpg://messenger:${pg}@postgres:5432/messenger"
|
||||
write_secret host_database_url "postgresql+asyncpg://messenger:${pg}@127.0.0.1:5433/messenger"
|
||||
write_secret cache_url "redis://redis:6379/0"
|
||||
write_secret host_cache_url "redis://127.0.0.1:6379/0"
|
||||
write_secret minio_root_user minioadmin
|
||||
write_secret minio_root_password "$(rand)"
|
||||
write_secret s3_access_key_id messengerapi
|
||||
write_secret s3_secret_access_key "$(rand)"
|
||||
write_secret host_s3_endpoint "http://127.0.0.1:9000"
|
||||
|
||||
if [ ! -f "$ROOT/.env" ]; then
|
||||
cp "$ROOT/.env.example" "$ROOT/.env"
|
||||
fi
|
||||
|
||||
echo "secrets and .env are ready"
|
||||
echo "next: docker compose --env-file .env up -d --build --scale api=2"
|
||||
@@ -0,0 +1,5 @@
|
||||
@echo off
|
||||
setlocal
|
||||
cd /d "%~dp0.."
|
||||
docker compose --env-file .env restart postgres redis minio api gc lb
|
||||
exit /b %ERRORLEVEL%
|
||||
@@ -0,0 +1,5 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
ROOT=$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)
|
||||
cd "$ROOT"
|
||||
docker compose --env-file .env restart postgres redis minio api gc lb
|
||||
@@ -0,0 +1,21 @@
|
||||
@echo off
|
||||
setlocal EnableDelayedExpansion
|
||||
cd /d "%~dp0.."
|
||||
if "%TARGET_INSTANCE_ID%"=="" (
|
||||
echo TARGET_INSTANCE_ID is required >&2
|
||||
exit /b 1
|
||||
)
|
||||
for /f "usebackq delims=" %%I in (`docker compose --env-file .env ps -q api`) do (
|
||||
for /f "usebackq delims=" %%H in (`docker inspect -f "{{.Config.Hostname}}" %%I`) do (
|
||||
if "%%H"=="%TARGET_INSTANCE_ID%" (
|
||||
docker stop %%I >nul
|
||||
exit /b 0
|
||||
)
|
||||
)
|
||||
if "%%I"=="%TARGET_INSTANCE_ID%" (
|
||||
docker stop %%I >nul
|
||||
exit /b 0
|
||||
)
|
||||
)
|
||||
echo no api replica matched TARGET_INSTANCE_ID >&2
|
||||
exit /b 1
|
||||
@@ -0,0 +1,21 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
ROOT=$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)
|
||||
cd "$ROOT"
|
||||
: "${TARGET_INSTANCE_ID:?TARGET_INSTANCE_ID is required}"
|
||||
|
||||
found=
|
||||
for id in $(docker compose --env-file .env ps -q api); do
|
||||
hostname=$(docker inspect -f '{{.Config.Hostname}}' "$id")
|
||||
instance=$(docker inspect -f '{{range .Config.Env}}{{println .}}{{end}}' "$id" | awk -F= '$1=="INSTANCE_ID"{print $2}')
|
||||
if [ "$hostname" = "$TARGET_INSTANCE_ID" ] || [ "${instance:-}" = "$TARGET_INSTANCE_ID" ] || [ "$id" = "$TARGET_INSTANCE_ID" ]; then
|
||||
docker stop "$id" >/dev/null
|
||||
found=1
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -z "$found" ]; then
|
||||
echo "no api replica matched TARGET_INSTANCE_ID" >&2
|
||||
exit 1
|
||||
fi
|
||||
@@ -0,0 +1,40 @@
|
||||
import logging
|
||||
import sys
|
||||
|
||||
import uvicorn
|
||||
|
||||
from app.config import load_settings
|
||||
|
||||
|
||||
def main() -> None:
|
||||
settings = load_settings()
|
||||
logging.basicConfig(
|
||||
level=logging.INFO,
|
||||
format="%(asctime)s %(levelname)s %(name)s %(message)s",
|
||||
stream=sys.stdout,
|
||||
force=True,
|
||||
)
|
||||
logging.getLogger("sqlalchemy.engine").setLevel(logging.WARNING)
|
||||
logging.getLogger("sqlalchemy.pool").setLevel(logging.WARNING)
|
||||
logging.getLogger("asyncpg").setLevel(logging.WARNING)
|
||||
logging.getLogger("app").info(
|
||||
"starting host=%s port=%s env=%s instance_id=%s",
|
||||
settings.host,
|
||||
settings.port,
|
||||
settings.env,
|
||||
settings.instance_id,
|
||||
)
|
||||
uvicorn.run(
|
||||
"app.main:app",
|
||||
host=settings.host,
|
||||
port=settings.port,
|
||||
workers=1,
|
||||
access_log=False,
|
||||
timeout_keep_alive=5,
|
||||
timeout_graceful_shutdown=5,
|
||||
log_config=None,
|
||||
)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -0,0 +1,14 @@
|
||||
from fastapi import APIRouter
|
||||
|
||||
from app.api.attachments import router as attachments_router
|
||||
from app.api.auth import router as auth_router
|
||||
from app.api.chats import router as chats_router
|
||||
from app.api.messages import router as messages_router
|
||||
from app.api.users import router as users_router
|
||||
|
||||
api_router = APIRouter(prefix="/api/v1")
|
||||
api_router.include_router(users_router)
|
||||
api_router.include_router(auth_router)
|
||||
api_router.include_router(chats_router)
|
||||
api_router.include_router(messages_router)
|
||||
api_router.include_router(attachments_router)
|
||||
@@ -0,0 +1,73 @@
|
||||
from uuid import UUID
|
||||
|
||||
from fastapi import APIRouter, Depends, Query, Request
|
||||
from fastapi.responses import Response
|
||||
|
||||
from app.crud.attachments import create_attachment, get_for_member, metadata_for_member
|
||||
from app.deps import get_current_user
|
||||
from app.errors import AppError
|
||||
from app.present import PublicUser
|
||||
from app.runtime import require_settings, require_store
|
||||
from app.schemas.attachment import AttachmentOut
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
async def read_limited_body(request: Request) -> bytes:
|
||||
limit = require_settings().max_upload_bytes
|
||||
raw_length = request.headers.get("content-length")
|
||||
if raw_length is not None:
|
||||
try:
|
||||
announced = int(raw_length)
|
||||
except ValueError:
|
||||
raise AppError(400, "invalid_request", "Некорректный запрос") from None
|
||||
if announced > limit:
|
||||
raise AppError(413, "payload_too_large", "Файл слишком большой")
|
||||
chunks: list[bytes] = []
|
||||
total = 0
|
||||
async for chunk in request.stream():
|
||||
total += len(chunk)
|
||||
if total > limit:
|
||||
raise AppError(413, "payload_too_large", "Файл слишком большой")
|
||||
if chunk:
|
||||
chunks.append(chunk)
|
||||
return b"".join(chunks)
|
||||
|
||||
|
||||
@router.post("/chats/{chat_id}/attachments", status_code=201, response_model=AttachmentOut)
|
||||
async def upload_attachment(
|
||||
chat_id: UUID,
|
||||
request: Request,
|
||||
filename: str = Query(min_length=1, max_length=255),
|
||||
user: PublicUser = Depends(get_current_user),
|
||||
) -> dict:
|
||||
payload = await read_limited_body(request)
|
||||
created = await create_attachment(
|
||||
chat_id,
|
||||
user.id,
|
||||
filename,
|
||||
request.headers.get("content-type"),
|
||||
payload,
|
||||
)
|
||||
return created.to_dict()
|
||||
|
||||
|
||||
@router.get("/attachments/{attachment_id}", response_model=AttachmentOut)
|
||||
async def get_attachment(
|
||||
attachment_id: UUID,
|
||||
user: PublicUser = Depends(get_current_user),
|
||||
) -> dict:
|
||||
return (await metadata_for_member(attachment_id, user.id)).to_dict()
|
||||
|
||||
|
||||
@router.get("/attachments/{attachment_id}/content")
|
||||
async def download_attachment(
|
||||
attachment_id: UUID,
|
||||
user: PublicUser = Depends(get_current_user),
|
||||
variant: str = Query(default="original"),
|
||||
) -> Response:
|
||||
if variant != "original":
|
||||
raise AppError(404, "not_found", "Объект не найден")
|
||||
row = await get_for_member(attachment_id, user.id)
|
||||
payload = await require_store().get(row.object_key)
|
||||
return Response(content=payload, media_type=row.content_type)
|
||||
@@ -0,0 +1,37 @@
|
||||
from fastapi import APIRouter, Depends, Header
|
||||
from starlette.responses import Response
|
||||
|
||||
from app.crud.users import authenticate
|
||||
from app.deps import BASIC_CHALLENGE, BEARER_CHALLENGE, require_token, unauthorized
|
||||
from app.schemas.session import SessionOut
|
||||
from app.security import parse_basic, verify_password
|
||||
from app.sessions import create_session, revoke_session
|
||||
from app.timeutil import format_time
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@router.post("/auth/sessions", status_code=201, response_model=SessionOut)
|
||||
async def create_session_route(authorization: str | None = Header(default=None)) -> dict:
|
||||
parsed = parse_basic(authorization or "")
|
||||
if parsed is None:
|
||||
verify_password("invalid-basic-auth", None)
|
||||
raise unauthorized(BASIC_CHALLENGE)
|
||||
username, password = parsed
|
||||
user = await authenticate(username, password)
|
||||
if user is None:
|
||||
raise unauthorized(BASIC_CHALLENGE)
|
||||
token, expires_at = await create_session(user.id)
|
||||
return {
|
||||
"token": token,
|
||||
"token_type": "Bearer",
|
||||
"expires_at": format_time(expires_at),
|
||||
"user": user.to_dict(),
|
||||
}
|
||||
|
||||
|
||||
@router.delete("/auth/sessions/current", status_code=204)
|
||||
async def revoke_current_session(token: str = Depends(require_token)) -> Response:
|
||||
if not await revoke_session(token):
|
||||
raise unauthorized(BEARER_CHALLENGE)
|
||||
return Response(status_code=204)
|
||||
@@ -0,0 +1,31 @@
|
||||
from uuid import UUID
|
||||
|
||||
from fastapi import APIRouter, Depends, Query
|
||||
|
||||
from app.crud.chats import chat_for_member, chats_for_user, create_chat as save_chat
|
||||
from app.deps import get_current_user
|
||||
from app.present import PublicUser
|
||||
from app.schemas.chat import ChatOut, ChatPage, CreateChat
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@router.post("/chats", status_code=201, response_model=ChatOut)
|
||||
async def create_chat(body: CreateChat, user: PublicUser = Depends(get_current_user)) -> dict:
|
||||
chat = await save_chat(user.id, body.title, tuple(body.member_ids))
|
||||
return chat.to_dict()
|
||||
|
||||
|
||||
@router.get("/chats", response_model=ChatPage)
|
||||
async def list_chats(
|
||||
user: PublicUser = Depends(get_current_user),
|
||||
limit: int = Query(default=50, ge=1, le=100),
|
||||
cursor: str | None = Query(default=None, min_length=1),
|
||||
) -> dict:
|
||||
return await chats_for_user(user.id, limit, cursor)
|
||||
|
||||
|
||||
@router.get("/chats/{chat_id}", response_model=ChatOut)
|
||||
async def get_chat(chat_id: UUID, user: PublicUser = Depends(get_current_user)) -> dict:
|
||||
chat = await chat_for_member(chat_id, user.id)
|
||||
return chat.to_dict()
|
||||
@@ -0,0 +1,43 @@
|
||||
import logging
|
||||
|
||||
from fastapi import APIRouter, Request
|
||||
from pydantic import BaseModel
|
||||
from sqlalchemy import text
|
||||
|
||||
from app.db import is_dependency_error
|
||||
from app.errors import AppError
|
||||
|
||||
router = APIRouter()
|
||||
logger = logging.getLogger("app.health")
|
||||
|
||||
|
||||
class HealthOut(BaseModel):
|
||||
status: str
|
||||
|
||||
|
||||
@router.get("/health/live", response_model=HealthOut)
|
||||
async def live() -> dict:
|
||||
return {"status": "ok"}
|
||||
|
||||
|
||||
@router.get("/health/ready", response_model=HealthOut)
|
||||
async def ready(request: Request) -> dict:
|
||||
if not getattr(request.app.state, "accepting", False):
|
||||
raise AppError(503, "unavailable", "Сервер не готов")
|
||||
engine = getattr(request.app.state, "engine", None)
|
||||
redis = getattr(request.app.state, "redis", None)
|
||||
store = getattr(request.app.state, "store", None)
|
||||
if engine is None or redis is None or store is None:
|
||||
raise AppError(503, "unavailable", "Сервис временно недоступен")
|
||||
try:
|
||||
async with engine.connect() as conn:
|
||||
await conn.execute(text("SELECT 1"))
|
||||
await redis.ping()
|
||||
await store.ping()
|
||||
except AppError:
|
||||
raise
|
||||
except Exception as exc:
|
||||
if not is_dependency_error(exc):
|
||||
logger.warning("readiness check failed type=%s", type(exc).__name__)
|
||||
raise AppError(503, "unavailable", "Сервис временно недоступен") from None
|
||||
return {"status": "ok"}
|
||||
@@ -0,0 +1,43 @@
|
||||
import re
|
||||
from uuid import UUID
|
||||
|
||||
from fastapi import APIRouter, Depends, Query, Request
|
||||
|
||||
from app.crud.messages import create_message as save_message
|
||||
from app.crud.messages import messages_for_member
|
||||
from app.deps import get_current_user
|
||||
from app.errors import AppError
|
||||
from app.present import PublicUser
|
||||
from app.schemas.message import CreateMessage, MessageOut, MessagePage
|
||||
|
||||
router = APIRouter()
|
||||
_IDEMPOTENCY_KEY = re.compile(r"^[A-Za-z0-9._:-]{1,128}$")
|
||||
|
||||
|
||||
def require_idempotency_key(request: Request) -> str:
|
||||
value = request.headers.get("idempotency-key")
|
||||
if value is None or _IDEMPOTENCY_KEY.fullmatch(value) is None:
|
||||
raise AppError(400, "invalid_request", "Некорректный Idempotency-Key")
|
||||
return value
|
||||
|
||||
|
||||
@router.post("/chats/{chat_id}/messages", status_code=201, response_model=MessageOut)
|
||||
async def create_message(
|
||||
chat_id: UUID,
|
||||
body: CreateMessage,
|
||||
request: Request,
|
||||
user: PublicUser = Depends(get_current_user),
|
||||
) -> dict:
|
||||
key = require_idempotency_key(request)
|
||||
message = await save_message(chat_id, user.id, body.text, key, body.attachment_ids)
|
||||
return message.to_dict()
|
||||
|
||||
|
||||
@router.get("/chats/{chat_id}/messages", response_model=MessagePage)
|
||||
async def list_messages(
|
||||
chat_id: UUID,
|
||||
user: PublicUser = Depends(get_current_user),
|
||||
limit: int = Query(default=50, ge=1, le=100),
|
||||
cursor: str | None = Query(default=None, min_length=1),
|
||||
) -> dict:
|
||||
return await messages_for_member(chat_id, user.id, limit, cursor)
|
||||
@@ -0,0 +1,19 @@
|
||||
from fastapi import APIRouter, Depends
|
||||
|
||||
from app.crud.users import create_user
|
||||
from app.deps import get_current_user
|
||||
from app.present import PublicUser
|
||||
from app.schemas.user import CreateUser, UserOut
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@router.post("/users", status_code=201, response_model=UserOut)
|
||||
async def register(body: CreateUser) -> dict:
|
||||
user = await create_user(body.username, body.display_name, body.password)
|
||||
return user.to_dict()
|
||||
|
||||
|
||||
@router.get("/users/me", response_model=UserOut)
|
||||
async def me(user: PublicUser = Depends(get_current_user)) -> dict:
|
||||
return user.to_dict()
|
||||
@@ -0,0 +1,157 @@
|
||||
import os
|
||||
import socket
|
||||
from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class Settings:
|
||||
host: str
|
||||
port: int
|
||||
env: str
|
||||
app_role: str
|
||||
instance_id: str
|
||||
run_migrations: bool
|
||||
session_ttl_seconds: int
|
||||
idempotency_ttl_seconds: int
|
||||
database_url: str
|
||||
cache_url: str
|
||||
s3_endpoint: str
|
||||
s3_region: str
|
||||
s3_bucket: str
|
||||
s3_access_key_id: str
|
||||
s3_secret_access_key: str
|
||||
max_upload_bytes: int
|
||||
max_image_pixels: int
|
||||
attachment_gc_grace_seconds: int
|
||||
migrations_dir: Path
|
||||
db_pool_size: int
|
||||
db_max_overflow: int
|
||||
db_pool_timeout_seconds: float
|
||||
db_connect_timeout_seconds: float
|
||||
db_command_timeout_seconds: float
|
||||
redis_socket_timeout_seconds: float
|
||||
redis_max_connections: int
|
||||
|
||||
|
||||
def _int(name: str, default: int, low: int, high: int) -> int:
|
||||
raw = os.environ.get(name, str(default)).strip()
|
||||
try:
|
||||
value = int(raw)
|
||||
except ValueError as exc:
|
||||
raise SystemExit(f"{name} must be an integer") from exc
|
||||
if not low <= value <= high:
|
||||
raise SystemExit(f"{name} is out of range")
|
||||
return value
|
||||
|
||||
|
||||
def _float(name: str, default: float, low: float, high: float) -> float:
|
||||
raw = os.environ.get(name, str(default)).strip()
|
||||
try:
|
||||
value = float(raw)
|
||||
except ValueError as exc:
|
||||
raise SystemExit(f"{name} must be a number") from exc
|
||||
if not low <= value <= high:
|
||||
raise SystemExit(f"{name} is out of range")
|
||||
return value
|
||||
|
||||
|
||||
def _secret(direct_name: str, file_name: str) -> str:
|
||||
direct = os.environ.get(direct_name, "").strip()
|
||||
if direct:
|
||||
return direct
|
||||
path = os.environ.get(file_name, "").strip()
|
||||
if not path:
|
||||
raise SystemExit(f"set {direct_name} or {file_name}")
|
||||
try:
|
||||
value = Path(path).read_text(encoding="utf-8").strip()
|
||||
except OSError as exc:
|
||||
raise SystemExit(f"cannot read {file_name}") from exc
|
||||
if not value:
|
||||
raise SystemExit(f"{file_name} is empty")
|
||||
return value
|
||||
|
||||
|
||||
def _migrations_dir() -> Path:
|
||||
configured = os.environ.get("MIGRATIONS_DIR", "").strip()
|
||||
if configured:
|
||||
return Path(configured)
|
||||
return Path(__file__).resolve().parents[2] / "migrations"
|
||||
|
||||
|
||||
def _flag(name: str, default: bool) -> bool:
|
||||
raw = os.environ.get(name, "1" if default else "0").strip().lower()
|
||||
if raw in {"1", "true", "yes", "on"}:
|
||||
return True
|
||||
if raw in {"0", "false", "no", "off"}:
|
||||
return False
|
||||
raise SystemExit(f"{name} must be a boolean")
|
||||
|
||||
|
||||
def _instance_id() -> str:
|
||||
configured = os.environ.get("INSTANCE_ID", "").strip()
|
||||
if configured:
|
||||
return configured
|
||||
host = os.environ.get("HOSTNAME", "").strip() or socket.gethostname()
|
||||
if not host:
|
||||
raise SystemExit("INSTANCE_ID is empty")
|
||||
return host
|
||||
|
||||
|
||||
def load_settings() -> Settings:
|
||||
host = os.environ.get("APP_HOST", "0.0.0.0").strip() or "0.0.0.0"
|
||||
env_name = os.environ.get("APP_ENV", "lab").strip() or "lab"
|
||||
role = os.environ.get("APP_ROLE", "api").strip() or "api"
|
||||
if role not in {"api", "migrate", "gc"}:
|
||||
raise SystemExit("APP_ROLE must be api, migrate or gc")
|
||||
port = _int("APP_PORT", 8080, 1, 65535)
|
||||
database_url = _secret("DATABASE_URL", "DATABASE_URL_FILE")
|
||||
cache_url = ""
|
||||
s3_endpoint = ""
|
||||
s3_region = os.environ.get("S3_REGION", "us-east-1").strip() or "us-east-1"
|
||||
s3_bucket = os.environ.get("S3_BUCKET", "messenger-attachments").strip() or "messenger-attachments"
|
||||
s3_access_key_id = ""
|
||||
s3_secret_access_key = ""
|
||||
if role != "migrate":
|
||||
if role == "api":
|
||||
cache_url = _secret("REDIS_URL", "CACHE_URL_FILE")
|
||||
if not cache_url.startswith(("redis://", "rediss://")):
|
||||
raise SystemExit("REDIS_URL must start with redis:// or rediss://")
|
||||
s3_endpoint = os.environ.get("S3_ENDPOINT", "").strip()
|
||||
if not s3_endpoint:
|
||||
raise SystemExit("S3_ENDPOINT is required")
|
||||
s3_access_key_id = _secret("S3_ACCESS_KEY_ID", "S3_ACCESS_KEY_ID_FILE")
|
||||
s3_secret_access_key = _secret("S3_SECRET_ACCESS_KEY", "S3_SECRET_ACCESS_KEY_FILE")
|
||||
if not database_url.startswith("postgresql+asyncpg://"):
|
||||
raise SystemExit("DATABASE_URL must start with postgresql+asyncpg://")
|
||||
migrations = _migrations_dir()
|
||||
if not migrations.is_dir():
|
||||
raise SystemExit("migrations directory is missing")
|
||||
return Settings(
|
||||
host=host,
|
||||
port=port,
|
||||
env=env_name,
|
||||
app_role=role,
|
||||
instance_id=_instance_id(),
|
||||
run_migrations=_flag("RUN_MIGRATIONS", True),
|
||||
session_ttl_seconds=_int("SESSION_TTL_SECONDS", 3600, 1, 30 * 24 * 3600),
|
||||
idempotency_ttl_seconds=_int("IDEMPOTENCY_TTL_SECONDS", 86400, 60, 30 * 24 * 3600),
|
||||
database_url=database_url,
|
||||
cache_url=cache_url,
|
||||
s3_endpoint=s3_endpoint,
|
||||
s3_region=s3_region,
|
||||
s3_bucket=s3_bucket,
|
||||
s3_access_key_id=s3_access_key_id,
|
||||
s3_secret_access_key=s3_secret_access_key,
|
||||
max_upload_bytes=_int("MAX_UPLOAD_BYTES", 10 * 1024 * 1024, 1024, 10 * 1024 * 1024),
|
||||
max_image_pixels=_int("MAX_IMAGE_PIXELS", 40_000_000, 1, 40_000_000),
|
||||
attachment_gc_grace_seconds=_int("ATTACHMENT_GC_GRACE_SECONDS", 900, 30, 24 * 3600),
|
||||
migrations_dir=migrations,
|
||||
db_pool_size=_int("DB_POOL_SIZE", 10, 1, 50),
|
||||
db_max_overflow=_int("DB_MAX_OVERFLOW", 10, 0, 50),
|
||||
db_pool_timeout_seconds=_float("DB_POOL_TIMEOUT_SECONDS", 5, 0.1, 30),
|
||||
db_connect_timeout_seconds=_float("DB_CONNECT_TIMEOUT_SECONDS", 2, 0.1, 30),
|
||||
db_command_timeout_seconds=_float("DB_COMMAND_TIMEOUT_SECONDS", 5, 0.1, 60),
|
||||
redis_socket_timeout_seconds=_float("REDIS_SOCKET_TIMEOUT_SECONDS", 1, 0.1, 30),
|
||||
redis_max_connections=_int("REDIS_MAX_CONNECTIONS", 50, 1, 200),
|
||||
)
|
||||
@@ -0,0 +1 @@
|
||||
"""Чтение и изменение PostgreSQL. Сессии живут в Redis, не в этих таблицах."""
|
||||
@@ -0,0 +1,136 @@
|
||||
import hashlib
|
||||
import logging
|
||||
from uuid import UUID, uuid4
|
||||
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
|
||||
from app.db import map_integrity, session_scope
|
||||
from app.errors import AppError
|
||||
from app.images import declared_content_type, inspect_image
|
||||
from app.models import Attachment, ChatMember
|
||||
from app.present import PublicAttachment
|
||||
from app.runtime import require_settings, require_store
|
||||
from app.timeutil import utcnow
|
||||
|
||||
logger = logging.getLogger("app.attachments")
|
||||
|
||||
|
||||
def validate_filename(filename: str | None) -> str:
|
||||
if filename is None or filename.strip() == "":
|
||||
raise AppError(400, "invalid_request", "Некорректное имя файла")
|
||||
if len(filename) > 255:
|
||||
raise AppError(400, "invalid_request", "Некорректное имя файла")
|
||||
for char in filename:
|
||||
code = ord(char)
|
||||
if char in {"/", "\\", "\x00"} or code < 32 or code == 127:
|
||||
raise AppError(400, "invalid_request", "Некорректное имя файла")
|
||||
return filename
|
||||
|
||||
|
||||
def _public(row: Attachment) -> PublicAttachment:
|
||||
return PublicAttachment(
|
||||
id=row.id,
|
||||
chat_id=row.chat_id,
|
||||
owner_id=row.owner_id,
|
||||
filename=row.filename,
|
||||
content_type=row.content_type,
|
||||
size_bytes=row.size_bytes,
|
||||
sha256=row.sha256,
|
||||
status=row.status,
|
||||
error_code=row.error_code,
|
||||
created_at=row.created_at,
|
||||
updated_at=row.updated_at,
|
||||
)
|
||||
|
||||
|
||||
async def _require_member(session, 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 AppError(404, "not_found", "Объект не найден")
|
||||
|
||||
|
||||
async def create_attachment(
|
||||
chat_id: UUID,
|
||||
owner_id: UUID,
|
||||
filename: str,
|
||||
content_type_header: str | None,
|
||||
payload: bytes,
|
||||
) -> PublicAttachment:
|
||||
settings = require_settings()
|
||||
store = require_store()
|
||||
filename = validate_filename(filename)
|
||||
declared = declared_content_type(content_type_header)
|
||||
if not payload:
|
||||
raise AppError(415, "unsupported_media_type", "Неподдерживаемый тип изображения")
|
||||
inspect_image(payload, declared, settings.max_image_pixels)
|
||||
digest = hashlib.sha256(payload).hexdigest()
|
||||
attachment_id = uuid4()
|
||||
object_key = "att/%s" % attachment_id
|
||||
created_at = utcnow()
|
||||
async with session_scope() as session:
|
||||
async with session.begin():
|
||||
await _require_member(session, chat_id, owner_id)
|
||||
await store.put(object_key, payload, declared)
|
||||
try:
|
||||
async with session_scope() as session:
|
||||
try:
|
||||
async with session.begin():
|
||||
session.add(
|
||||
Attachment(
|
||||
id=attachment_id,
|
||||
chat_id=chat_id,
|
||||
owner_id=owner_id,
|
||||
filename=filename,
|
||||
content_type=declared,
|
||||
size_bytes=len(payload),
|
||||
sha256=digest,
|
||||
object_key=object_key,
|
||||
status="ready",
|
||||
error_code=None,
|
||||
created_at=created_at,
|
||||
updated_at=created_at,
|
||||
)
|
||||
)
|
||||
await session.flush()
|
||||
except IntegrityError as exc:
|
||||
raise map_integrity(exc, "Конфликт записи") from None
|
||||
except Exception:
|
||||
await store.delete(object_key)
|
||||
raise
|
||||
return PublicAttachment(
|
||||
id=attachment_id,
|
||||
chat_id=chat_id,
|
||||
owner_id=owner_id,
|
||||
filename=filename,
|
||||
content_type=declared,
|
||||
size_bytes=len(payload),
|
||||
sha256=digest,
|
||||
status="ready",
|
||||
error_code=None,
|
||||
created_at=created_at,
|
||||
updated_at=created_at,
|
||||
)
|
||||
|
||||
|
||||
async def get_for_member(attachment_id: UUID, user_id: UUID) -> Attachment:
|
||||
async with session_scope() as session:
|
||||
async with session.begin():
|
||||
row = await session.get(Attachment, attachment_id)
|
||||
if row is None:
|
||||
raise AppError(404, "not_found", "Объект не найден")
|
||||
await _require_member(session, row.chat_id, user_id)
|
||||
return row
|
||||
|
||||
|
||||
async def metadata_for_member(attachment_id: UUID, user_id: UUID) -> PublicAttachment:
|
||||
return _public(await get_for_member(attachment_id, user_id))
|
||||
|
||||
|
||||
async def known_object_keys() -> set[str]:
|
||||
async with session_scope() as session:
|
||||
async with session.begin():
|
||||
rows = (await session.scalars(select(Attachment.object_key))).all()
|
||||
return set(rows)
|
||||
@@ -0,0 +1,101 @@
|
||||
from uuid import UUID, uuid4
|
||||
|
||||
from sqlalchemy import select, tuple_
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
|
||||
from app.db import map_integrity, session_scope
|
||||
from app.errors import AppError
|
||||
from app.models import Chat, ChatMember, User
|
||||
from app.pagination import decode_position, slice_page
|
||||
from app.present import PublicChat
|
||||
from app.timeutil import utcnow
|
||||
|
||||
|
||||
def _invalid_members() -> AppError:
|
||||
return AppError(400, "invalid_request", "Некорректный список участников")
|
||||
|
||||
|
||||
async def create_chat(
|
||||
owner_id: UUID,
|
||||
title: str,
|
||||
member_ids: tuple[UUID, ...],
|
||||
*,
|
||||
fail_after_insert: bool = False,
|
||||
) -> PublicChat:
|
||||
if (
|
||||
not member_ids
|
||||
or len(member_ids) > 100
|
||||
or len(set(member_ids)) != len(member_ids)
|
||||
or owner_id not in member_ids
|
||||
):
|
||||
raise _invalid_members()
|
||||
chat_id = uuid4()
|
||||
created_at = utcnow()
|
||||
async with session_scope() as session:
|
||||
try:
|
||||
async with session.begin():
|
||||
found = set((await session.scalars(select(User.id).where(User.id.in_(member_ids)))).all())
|
||||
if found != set(member_ids):
|
||||
raise _invalid_members()
|
||||
session.add(Chat(id=chat_id, title=title, created_at=created_at))
|
||||
await session.flush()
|
||||
# Точка для проверки отката: строка чата уже вставлена, COMMIT ещё нет.
|
||||
if fail_after_insert:
|
||||
raise RuntimeError("rollback-check")
|
||||
for ordinal, member_id in enumerate(member_ids):
|
||||
session.add(ChatMember(chat_id=chat_id, user_id=member_id, ordinal=ordinal))
|
||||
await session.flush()
|
||||
except IntegrityError as exc:
|
||||
raise map_integrity(exc, "Конфликт записи") from None
|
||||
return PublicChat(id=chat_id, title=title, member_ids=tuple(member_ids), created_at=created_at)
|
||||
|
||||
|
||||
async def _member_ids(session, chat_id: UUID) -> tuple[UUID, ...]:
|
||||
rows = await session.execute(
|
||||
select(ChatMember.user_id).where(ChatMember.chat_id == chat_id).order_by(ChatMember.ordinal)
|
||||
)
|
||||
return tuple(row[0] for row in rows)
|
||||
|
||||
|
||||
async def chat_for_member(chat_id: UUID, user_id: UUID) -> PublicChat:
|
||||
async with session_scope() as session:
|
||||
async with session.begin():
|
||||
member = await session.scalar(
|
||||
select(ChatMember.user_id).where(ChatMember.chat_id == chat_id, ChatMember.user_id == user_id)
|
||||
)
|
||||
chat = await session.get(Chat, chat_id)
|
||||
if member is None or chat is None:
|
||||
raise AppError(404, "not_found", "Объект не найден")
|
||||
return PublicChat(
|
||||
id=chat.id,
|
||||
title=chat.title,
|
||||
member_ids=await _member_ids(session, chat.id),
|
||||
created_at=chat.created_at,
|
||||
)
|
||||
|
||||
|
||||
async def chats_for_user(user_id: UUID, limit: int, cursor: str | None) -> dict:
|
||||
position = decode_position(cursor, "c", user_id) if cursor else None
|
||||
async with session_scope() as session:
|
||||
async with session.begin():
|
||||
stmt = (
|
||||
select(Chat)
|
||||
.join(ChatMember, ChatMember.chat_id == Chat.id)
|
||||
.where(ChatMember.user_id == user_id)
|
||||
)
|
||||
if position is not None:
|
||||
created_at, cursor_id = position
|
||||
stmt = stmt.where(tuple_(Chat.created_at, Chat.id) > tuple_(created_at, cursor_id))
|
||||
stmt = stmt.order_by(Chat.created_at.asc(), Chat.id.asc()).limit(limit + 1)
|
||||
chats = (await session.scalars(stmt)).unique().all()
|
||||
public = []
|
||||
for chat in chats:
|
||||
public.append(
|
||||
PublicChat(
|
||||
id=chat.id,
|
||||
title=chat.title,
|
||||
member_ids=await _member_ids(session, chat.id),
|
||||
created_at=chat.created_at,
|
||||
)
|
||||
)
|
||||
return slice_page(public, limit, "c", user_id)
|
||||
@@ -0,0 +1,196 @@
|
||||
import hashlib
|
||||
import json
|
||||
from datetime import timedelta
|
||||
from uuid import UUID, uuid4
|
||||
|
||||
from sqlalchemy import delete, select, text, tuple_
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
|
||||
from app.db import map_integrity, session_scope
|
||||
from app.errors import AppError
|
||||
from app.models import Attachment, ChatMember, IdempotencyRecord, Message, MessageAttachment
|
||||
from app.pagination import decode_position, slice_page
|
||||
from app.present import PublicMessage
|
||||
from app.runtime import require_settings
|
||||
from app.timeutil import utcnow
|
||||
|
||||
|
||||
def message_path(chat_id: UUID) -> str:
|
||||
return "/api/v1/chats/%s/messages" % chat_id
|
||||
|
||||
|
||||
def request_fingerprint(text_value: str, attachment_ids: list[UUID]) -> str:
|
||||
payload = json.dumps(
|
||||
{
|
||||
"attachment_ids": [str(item) for item in attachment_ids],
|
||||
"text": text_value,
|
||||
},
|
||||
ensure_ascii=False,
|
||||
separators=(",", ":"),
|
||||
sort_keys=True,
|
||||
)
|
||||
return hashlib.sha256(payload.encode("utf-8")).hexdigest()
|
||||
|
||||
|
||||
def _lock_keys(scope: str) -> tuple[int, int]:
|
||||
digest = hashlib.sha256(scope.encode("utf-8")).digest()
|
||||
first = int.from_bytes(digest[:4], "big", signed=True)
|
||||
second = int.from_bytes(digest[4:8], "big", signed=True)
|
||||
return first, second
|
||||
|
||||
|
||||
def _public(row: Message, attachment_ids: list[UUID]) -> PublicMessage:
|
||||
return PublicMessage(
|
||||
id=row.id,
|
||||
chat_id=row.chat_id,
|
||||
sender_id=row.sender_id,
|
||||
text=row.text,
|
||||
created_at=row.created_at,
|
||||
attachment_ids=tuple(attachment_ids),
|
||||
)
|
||||
|
||||
|
||||
async def _require_member(session, 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 AppError(404, "not_found", "Объект не найден")
|
||||
|
||||
|
||||
async def _attachment_map(session, message_ids: list[UUID]) -> dict[UUID, list[UUID]]:
|
||||
grouped: dict[UUID, list[UUID]] = {message_id: [] for message_id in message_ids}
|
||||
if not message_ids:
|
||||
return grouped
|
||||
rows = (
|
||||
await session.execute(
|
||||
select(MessageAttachment.message_id, MessageAttachment.attachment_id)
|
||||
.where(MessageAttachment.message_id.in_(message_ids))
|
||||
.order_by(MessageAttachment.message_id, MessageAttachment.ordinal)
|
||||
)
|
||||
).all()
|
||||
for message_id, attachment_id in rows:
|
||||
grouped.setdefault(message_id, []).append(attachment_id)
|
||||
return grouped
|
||||
|
||||
|
||||
async def create_message(
|
||||
chat_id: UUID,
|
||||
sender_id: UUID,
|
||||
text_value: str,
|
||||
idempotency_key: str,
|
||||
attachment_ids: list[UUID] | None = None,
|
||||
) -> PublicMessage:
|
||||
settings = require_settings()
|
||||
files = list(attachment_ids or [])
|
||||
path = message_path(chat_id)
|
||||
request_hash = request_fingerprint(text_value, files)
|
||||
lock_a, lock_b = _lock_keys("POST:%s:%s:%s" % (sender_id, path, idempotency_key))
|
||||
ttl = timedelta(seconds=settings.idempotency_ttl_seconds)
|
||||
async with session_scope() as session:
|
||||
try:
|
||||
async with session.begin():
|
||||
await session.execute(
|
||||
text("SELECT pg_advisory_xact_lock(:a, :b)"),
|
||||
{"a": lock_a, "b": lock_b},
|
||||
)
|
||||
await _require_member(session, chat_id, sender_id)
|
||||
if files:
|
||||
found = (
|
||||
await session.scalars(select(Attachment).where(Attachment.id.in_(files)))
|
||||
).all()
|
||||
by_id = {row.id: row for row in found}
|
||||
if len(by_id) != len(files):
|
||||
raise AppError(404, "not_found", "Объект не найден")
|
||||
for item in files:
|
||||
row = by_id[item]
|
||||
if row.chat_id != chat_id or row.status != "ready":
|
||||
if row.status != "ready":
|
||||
raise AppError(409, "conflict", "Вложение ещё не готово")
|
||||
raise AppError(404, "not_found", "Объект не найден")
|
||||
existing = await session.scalar(
|
||||
select(IdempotencyRecord).where(
|
||||
IdempotencyRecord.user_id == sender_id,
|
||||
IdempotencyRecord.method == "POST",
|
||||
IdempotencyRecord.request_path == path,
|
||||
IdempotencyRecord.idempotency_key == idempotency_key,
|
||||
)
|
||||
)
|
||||
now = utcnow()
|
||||
if existing is not None and existing.created_at + ttl >= now:
|
||||
if existing.request_hash != request_hash:
|
||||
raise AppError(409, "conflict", "Повтор ключа с другим сообщением")
|
||||
row = await session.get(Message, existing.message_id)
|
||||
if row is None:
|
||||
raise AppError(500, "internal_error", "Внутренняя ошибка")
|
||||
mapping = await _attachment_map(session, [row.id])
|
||||
return _public(row, mapping.get(row.id, []))
|
||||
if existing is not None:
|
||||
await session.execute(
|
||||
delete(IdempotencyRecord).where(
|
||||
IdempotencyRecord.user_id == existing.user_id,
|
||||
IdempotencyRecord.method == existing.method,
|
||||
IdempotencyRecord.request_path == existing.request_path,
|
||||
IdempotencyRecord.idempotency_key == existing.idempotency_key,
|
||||
)
|
||||
)
|
||||
await session.flush()
|
||||
message_id = uuid4()
|
||||
created_at = now
|
||||
session.add(
|
||||
Message(
|
||||
id=message_id,
|
||||
chat_id=chat_id,
|
||||
sender_id=sender_id,
|
||||
text=text_value,
|
||||
created_at=created_at,
|
||||
)
|
||||
)
|
||||
await session.flush()
|
||||
for ordinal, attachment_id in enumerate(files):
|
||||
session.add(
|
||||
MessageAttachment(
|
||||
message_id=message_id,
|
||||
attachment_id=attachment_id,
|
||||
ordinal=ordinal,
|
||||
)
|
||||
)
|
||||
session.add(
|
||||
IdempotencyRecord(
|
||||
user_id=sender_id,
|
||||
method="POST",
|
||||
request_path=path,
|
||||
idempotency_key=idempotency_key,
|
||||
request_hash=request_hash,
|
||||
status_code=201,
|
||||
message_id=message_id,
|
||||
created_at=created_at,
|
||||
)
|
||||
)
|
||||
await session.flush()
|
||||
except IntegrityError as exc:
|
||||
raise map_integrity(exc, "Конфликт записи") from None
|
||||
return PublicMessage(
|
||||
id=message_id,
|
||||
chat_id=chat_id,
|
||||
sender_id=sender_id,
|
||||
text=text_value,
|
||||
created_at=created_at,
|
||||
attachment_ids=tuple(files),
|
||||
)
|
||||
|
||||
|
||||
async def messages_for_member(chat_id: UUID, user_id: UUID, limit: int, cursor: str | None) -> dict:
|
||||
async with session_scope() as session:
|
||||
async with session.begin():
|
||||
await _require_member(session, chat_id, user_id)
|
||||
position = decode_position(cursor, "m", chat_id) if cursor else None
|
||||
stmt = select(Message).where(Message.chat_id == chat_id)
|
||||
if position is not None:
|
||||
created_at, message_id = position
|
||||
stmt = stmt.where(tuple_(Message.created_at, Message.id) > tuple_(created_at, message_id))
|
||||
stmt = stmt.order_by(Message.created_at.asc(), Message.id.asc()).limit(limit + 1)
|
||||
rows = (await session.scalars(stmt)).all()
|
||||
mapping = await _attachment_map(session, [row.id for row in rows])
|
||||
public = [_public(row, mapping.get(row.id, [])) for row in rows]
|
||||
return slice_page(public, limit, "m", chat_id)
|
||||
@@ -0,0 +1,78 @@
|
||||
import re
|
||||
from uuid import UUID, uuid4
|
||||
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
|
||||
from app.db import map_integrity, session_scope
|
||||
from app.models import User
|
||||
from app.present import PublicUser
|
||||
from app.security import hash_password, verify_password
|
||||
from app.timeutil import utcnow
|
||||
|
||||
_USERNAME = re.compile(r"^[a-z0-9_]{3,32}$")
|
||||
|
||||
|
||||
async def get_user(user_id: UUID) -> PublicUser | None:
|
||||
async with session_scope() as session:
|
||||
async with session.begin():
|
||||
row = (
|
||||
await session.execute(
|
||||
select(User.id, User.username, User.display_name, User.created_at).where(User.id == user_id)
|
||||
)
|
||||
).one_or_none()
|
||||
if row is None:
|
||||
return None
|
||||
return PublicUser(id=row.id, username=row.username, display_name=row.display_name, created_at=row.created_at)
|
||||
|
||||
|
||||
async def create_user(username: str, display_name: str, password: str) -> PublicUser:
|
||||
# Argon2 считается до открытия транзакции, чтобы не держать соединение пула.
|
||||
password_hash = hash_password(password)
|
||||
user_id = uuid4()
|
||||
created_at = utcnow()
|
||||
async with session_scope() as session:
|
||||
try:
|
||||
async with session.begin():
|
||||
session.add(
|
||||
User(
|
||||
id=user_id,
|
||||
username=username,
|
||||
display_name=display_name,
|
||||
password_hash=password_hash,
|
||||
created_at=created_at,
|
||||
)
|
||||
)
|
||||
await session.flush()
|
||||
except IntegrityError as exc:
|
||||
raise map_integrity(exc, "Имя пользователя занято") from None
|
||||
return PublicUser(id=user_id, username=username, display_name=display_name, created_at=created_at)
|
||||
|
||||
|
||||
async def authenticate(username: str, password: str) -> PublicUser | None:
|
||||
if _USERNAME.fullmatch(username) is None or not 12 <= len(password) <= 128:
|
||||
verify_password("rejected-credential", None)
|
||||
return None
|
||||
async with session_scope() as session:
|
||||
async with session.begin():
|
||||
row = (
|
||||
await session.execute(
|
||||
select(User.id, User.username, User.display_name, User.created_at, User.password_hash).where(
|
||||
User.username == username
|
||||
)
|
||||
)
|
||||
).one_or_none()
|
||||
if row is None:
|
||||
stored = None
|
||||
snapshot = None
|
||||
else:
|
||||
stored = row.password_hash
|
||||
snapshot = PublicUser(
|
||||
id=row.id,
|
||||
username=row.username,
|
||||
display_name=row.display_name,
|
||||
created_at=row.created_at,
|
||||
)
|
||||
if not verify_password(password, stored):
|
||||
return None
|
||||
return snapshot
|
||||
@@ -0,0 +1,79 @@
|
||||
import logging
|
||||
from contextlib import asynccontextmanager
|
||||
|
||||
from redis.exceptions import RedisError
|
||||
from sqlalchemy.exc import DBAPIError, IntegrityError, InterfaceError, OperationalError
|
||||
from sqlalchemy.exc import TimeoutError as SATimeout
|
||||
from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, async_sessionmaker, create_async_engine
|
||||
|
||||
from app.config import Settings
|
||||
from app.errors import AppError
|
||||
|
||||
logger = logging.getLogger("app.db")
|
||||
|
||||
|
||||
def build_engine(settings: Settings) -> AsyncEngine:
|
||||
command_ms = str(int(settings.db_command_timeout_seconds * 1000))
|
||||
lock_ms = str(int(settings.db_pool_timeout_seconds * 1000))
|
||||
return create_async_engine(
|
||||
settings.database_url,
|
||||
pool_size=settings.db_pool_size,
|
||||
max_overflow=settings.db_max_overflow,
|
||||
pool_timeout=settings.db_pool_timeout_seconds,
|
||||
pool_pre_ping=True,
|
||||
pool_recycle=1800,
|
||||
echo=False,
|
||||
connect_args={
|
||||
"timeout": settings.db_connect_timeout_seconds,
|
||||
"command_timeout": settings.db_command_timeout_seconds,
|
||||
"server_settings": {
|
||||
"statement_timeout": command_ms,
|
||||
"lock_timeout": lock_ms,
|
||||
"idle_in_transaction_session_timeout": "10000",
|
||||
},
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
def build_session_factory(engine: AsyncEngine) -> async_sessionmaker[AsyncSession]:
|
||||
return async_sessionmaker(engine, expire_on_commit=False, autoflush=False)
|
||||
|
||||
|
||||
def is_dependency_error(exc: BaseException) -> bool:
|
||||
if isinstance(exc, (OperationalError, InterfaceError, SATimeout, RedisError, ConnectionError, TimeoutError)):
|
||||
return True
|
||||
return isinstance(exc, DBAPIError) and bool(getattr(exc, "connection_invalidated", False))
|
||||
|
||||
|
||||
def map_integrity(exc: IntegrityError, duplicate_message: str) -> AppError:
|
||||
orig = getattr(exc, "orig", None)
|
||||
code = getattr(orig, "sqlstate", None) or getattr(orig, "pgcode", None)
|
||||
if code == "23505":
|
||||
return AppError(409, "conflict", duplicate_message)
|
||||
if code in {"23503", "23514", "23502"}:
|
||||
return AppError(400, "invalid_request", "Некорректный запрос")
|
||||
return AppError(500, "internal_error", "Внутренняя ошибка")
|
||||
|
||||
|
||||
@asynccontextmanager
|
||||
async def session_scope():
|
||||
from app.runtime import require_factory
|
||||
|
||||
factory = require_factory()
|
||||
try:
|
||||
session = factory()
|
||||
except Exception as exc:
|
||||
if is_dependency_error(exc):
|
||||
logger.warning("database unavailable type=%s", type(exc).__name__)
|
||||
raise AppError(503, "unavailable", "Сервис временно недоступен") from None
|
||||
raise
|
||||
try:
|
||||
async with session:
|
||||
yield session
|
||||
except AppError:
|
||||
raise
|
||||
except Exception as exc:
|
||||
if is_dependency_error(exc):
|
||||
logger.warning("database unavailable type=%s", type(exc).__name__)
|
||||
raise AppError(503, "unavailable", "Сервис временно недоступен") from None
|
||||
raise
|
||||
@@ -0,0 +1,50 @@
|
||||
from fastapi import Depends, Header, Request
|
||||
from app.crud.users import get_user
|
||||
from app.errors import AppError
|
||||
from app.present import PublicUser
|
||||
from app.sessions import resolve_session
|
||||
|
||||
BEARER_CHALLENGE = 'Bearer realm="messenger"'
|
||||
BASIC_CHALLENGE = 'Basic realm="messenger", charset="UTF-8"'
|
||||
|
||||
|
||||
def unauthorized(challenge: str) -> AppError:
|
||||
return AppError(
|
||||
401,
|
||||
"unauthorized",
|
||||
"Требуется идентификация",
|
||||
headers={"WWW-Authenticate": challenge},
|
||||
)
|
||||
|
||||
|
||||
async def get_current_user(
|
||||
request: Request,
|
||||
authorization: str | None = Header(default=None),
|
||||
) -> PublicUser:
|
||||
# Нет заголовка — клиент анонимный. Redis для этого не нужен и не делает его доверенным.
|
||||
if authorization is None:
|
||||
raise unauthorized(BEARER_CHALLENGE)
|
||||
scheme, _, token = authorization.partition(" ")
|
||||
token = token.strip()
|
||||
if scheme.lower() != "bearer" or not token or len(token) > 512:
|
||||
raise unauthorized(BEARER_CHALLENGE)
|
||||
user_id = await resolve_session(token)
|
||||
if user_id is None:
|
||||
raise unauthorized(BEARER_CHALLENGE)
|
||||
user = await get_user(user_id)
|
||||
if user is None:
|
||||
raise unauthorized(BEARER_CHALLENGE)
|
||||
request.state.session_token = token
|
||||
return user
|
||||
|
||||
|
||||
def current_token(request: Request) -> str:
|
||||
token = getattr(request.state, "session_token", "")
|
||||
if not token:
|
||||
raise unauthorized(BEARER_CHALLENGE)
|
||||
return token
|
||||
|
||||
|
||||
def require_token(request: Request, user: PublicUser = Depends(get_current_user)) -> str:
|
||||
del user
|
||||
return current_token(request)
|
||||
@@ -0,0 +1,54 @@
|
||||
import logging
|
||||
|
||||
from fastapi import Request
|
||||
from fastapi.exceptions import RequestValidationError
|
||||
from fastapi.responses import JSONResponse
|
||||
from starlette.exceptions import HTTPException
|
||||
|
||||
|
||||
class AppError(Exception):
|
||||
def __init__(self, status: int, code: str, message: str, headers: dict | None = None) -> None:
|
||||
super().__init__(message)
|
||||
self.status = status
|
||||
self.code = code
|
||||
self.message = message
|
||||
self.headers = headers
|
||||
|
||||
|
||||
def request_id_of(request: Request) -> str:
|
||||
return getattr(request.state, "request_id", "") or "missing"
|
||||
|
||||
|
||||
def error_response(
|
||||
status: int,
|
||||
code: str,
|
||||
message: str,
|
||||
request_id: str,
|
||||
headers: dict | None = None,
|
||||
) -> JSONResponse:
|
||||
return JSONResponse(
|
||||
status_code=status,
|
||||
content={"error": {"code": code, "message": message, "request_id": request_id}},
|
||||
headers=headers,
|
||||
)
|
||||
|
||||
|
||||
async def handle_app_error(request: Request, exc: AppError) -> JSONResponse:
|
||||
return error_response(exc.status, exc.code, exc.message, request_id_of(request), exc.headers)
|
||||
|
||||
|
||||
async def handle_dependency(request: Request, exc: Exception) -> JSONResponse:
|
||||
# Текст исключения может содержать SQL или параметры. В ответ и лог его не кладём.
|
||||
logging.getLogger("app").warning("dependency unavailable type=%s", type(exc).__name__)
|
||||
return error_response(503, "unavailable", "Сервис временно недоступен", request_id_of(request))
|
||||
|
||||
|
||||
async def handle_validation_error(request: Request, _exc: RequestValidationError) -> JSONResponse:
|
||||
return error_response(400, "invalid_request", "Некорректный запрос", request_id_of(request))
|
||||
|
||||
|
||||
async def handle_http_error(request: Request, exc: HTTPException) -> JSONResponse:
|
||||
# Тело не в UTF-8 FastAPI превращает в HTTPException 400 с полем detail.
|
||||
if exc.status_code == 400:
|
||||
return error_response(400, "invalid_request", "Некорректный запрос", request_id_of(request))
|
||||
return JSONResponse(status_code=exc.status_code, content={"detail": exc.detail}, headers=exc.headers)
|
||||
@@ -0,0 +1,66 @@
|
||||
import asyncio
|
||||
import logging
|
||||
import os
|
||||
import sys
|
||||
from datetime import timedelta
|
||||
|
||||
from app.config import load_settings
|
||||
from app.crud.attachments import known_object_keys
|
||||
from app.db import build_engine, build_session_factory
|
||||
from app.migrate import wait_for_database, wait_for_schema
|
||||
from app.runtime import configure
|
||||
from app.s3 import build_store
|
||||
from app.timeutil import utcnow
|
||||
|
||||
logger = logging.getLogger("app.gc")
|
||||
|
||||
|
||||
async def sweep_once() -> int:
|
||||
settings = load_settings()
|
||||
store = build_store(settings)
|
||||
engine = build_engine(settings)
|
||||
try:
|
||||
await wait_for_database(engine)
|
||||
await wait_for_schema(engine, settings.migrations_dir)
|
||||
configure(build_session_factory(engine), None, settings, store)
|
||||
cutoff = utcnow() - timedelta(seconds=settings.attachment_gc_grace_seconds)
|
||||
known = await known_object_keys()
|
||||
deleted = 0
|
||||
for key, modified in await store.list_objects():
|
||||
if key in known or modified > cutoff:
|
||||
continue
|
||||
await store.delete(key)
|
||||
deleted += 1
|
||||
if deleted:
|
||||
logger.info("orphan objects deleted count=%s", deleted)
|
||||
return deleted
|
||||
finally:
|
||||
await engine.dispose()
|
||||
|
||||
|
||||
async def run_loop() -> None:
|
||||
settings = load_settings()
|
||||
interval = min(60, max(15, settings.attachment_gc_grace_seconds // 6))
|
||||
while True:
|
||||
try:
|
||||
await sweep_once()
|
||||
except Exception as exc:
|
||||
logger.warning("gc sweep failed type=%s", type(exc).__name__)
|
||||
await asyncio.sleep(interval)
|
||||
|
||||
|
||||
def main() -> None:
|
||||
logging.basicConfig(
|
||||
level=logging.INFO,
|
||||
format="%(asctime)s %(levelname)s %(name)s %(message)s",
|
||||
stream=sys.stdout,
|
||||
force=True,
|
||||
)
|
||||
if os.environ.get("GC_ONCE", "").strip() in {"1", "true", "yes"}:
|
||||
asyncio.run(sweep_once())
|
||||
return
|
||||
asyncio.run(run_loop())
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -0,0 +1,53 @@
|
||||
import io
|
||||
from dataclasses import dataclass
|
||||
|
||||
from PIL import Image, ImageFile, UnidentifiedImageError
|
||||
|
||||
from app.errors import AppError
|
||||
|
||||
ImageFile.LOAD_TRUNCATED_IMAGES = False
|
||||
|
||||
_PNG = b"\x89PNG\r\n\x1a\n"
|
||||
_JPEG = b"\xff\xd8\xff"
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ImageMeta:
|
||||
content_type: str
|
||||
|
||||
|
||||
def declared_content_type(header: str | None) -> str:
|
||||
value = (header or "").split(";", 1)[0].strip().lower()
|
||||
if value in {"image/png", "image/jpeg"}:
|
||||
return value
|
||||
raise AppError(415, "unsupported_media_type", "Неподдерживаемый тип изображения")
|
||||
|
||||
|
||||
def sniff_content_type(data: bytes) -> str | None:
|
||||
if data.startswith(_PNG):
|
||||
return "image/png"
|
||||
if data.startswith(_JPEG):
|
||||
return "image/jpeg"
|
||||
return None
|
||||
|
||||
|
||||
def inspect_image(data: bytes, declared: str, max_pixels: int) -> ImageMeta:
|
||||
sniffed = sniff_content_type(data)
|
||||
if sniffed is None or sniffed != declared:
|
||||
raise AppError(415, "unsupported_media_type", "Неподдерживаемый тип изображения")
|
||||
Image.MAX_IMAGE_PIXELS = max_pixels
|
||||
try:
|
||||
with Image.open(io.BytesIO(data)) as image:
|
||||
width, height = image.size
|
||||
if width < 1 or height < 1:
|
||||
raise AppError(415, "unsupported_media_type", "Неподдерживаемый тип изображения")
|
||||
if width * height > max_pixels:
|
||||
raise AppError(413, "payload_too_large", "Слишком большое изображение")
|
||||
image.verify()
|
||||
except AppError:
|
||||
raise
|
||||
except Image.DecompressionBombError:
|
||||
raise AppError(413, "payload_too_large", "Слишком большое изображение") from None
|
||||
except (UnidentifiedImageError, OSError, ValueError, SyntaxError):
|
||||
raise AppError(415, "unsupported_media_type", "Неподдерживаемый тип изображения") from None
|
||||
return ImageMeta(content_type=declared)
|
||||
+114
@@ -0,0 +1,114 @@
|
||||
import asyncio
|
||||
import logging
|
||||
from contextlib import asynccontextmanager
|
||||
|
||||
from fastapi import FastAPI
|
||||
from fastapi.exceptions import RequestValidationError
|
||||
from redis.exceptions import RedisError
|
||||
from sqlalchemy.exc import InterfaceError, OperationalError, ProgrammingError
|
||||
from sqlalchemy.exc import TimeoutError as SATimeout
|
||||
from starlette.exceptions import HTTPException
|
||||
|
||||
from app.api import api_router
|
||||
from app.api.health import router as health_router
|
||||
from app.config import load_settings
|
||||
from app.db import build_engine, build_session_factory, is_dependency_error
|
||||
from app.errors import AppError, handle_app_error, handle_dependency, handle_http_error, handle_validation_error
|
||||
from app.migrate import apply_migrations, wait_for_database, wait_for_schema
|
||||
from app.middleware import request_context
|
||||
from app.runtime import configure
|
||||
from app.s3 import build_store
|
||||
from app.security import init_security
|
||||
from app.sessions import build_redis
|
||||
|
||||
logger = logging.getLogger("app")
|
||||
|
||||
|
||||
async def open_stores(engine, redis, store, settings) -> None:
|
||||
await wait_for_database(engine)
|
||||
for attempt in range(40):
|
||||
try:
|
||||
await redis.ping()
|
||||
break
|
||||
except Exception as exc:
|
||||
if not is_dependency_error(exc):
|
||||
logger.error("redis probe failed type=%s", type(exc).__name__)
|
||||
raise SystemExit("redis probe failed") from None
|
||||
logger.warning("redis not ready type=%s attempt=%s", type(exc).__name__, attempt + 1)
|
||||
if attempt == 39:
|
||||
raise SystemExit("redis is not ready") from None
|
||||
await asyncio.sleep(0.5)
|
||||
for attempt in range(40):
|
||||
try:
|
||||
await store.ping()
|
||||
break
|
||||
except AppError:
|
||||
logger.warning("s3 not ready attempt=%s", attempt + 1)
|
||||
if attempt == 39:
|
||||
raise SystemExit("s3 is not ready") from None
|
||||
await asyncio.sleep(0.5)
|
||||
except Exception as exc:
|
||||
logger.warning("s3 probe failed type=%s attempt=%s", type(exc).__name__, attempt + 1)
|
||||
if attempt == 39:
|
||||
raise SystemExit("s3 is not ready") from None
|
||||
await asyncio.sleep(0.5)
|
||||
if settings.run_migrations:
|
||||
try:
|
||||
applied = await apply_migrations(engine, settings.migrations_dir)
|
||||
logger.info("migrations newly_applied=%s", applied)
|
||||
except ProgrammingError as exc:
|
||||
sqlstate = getattr(getattr(exc, "orig", None), "sqlstate", "")
|
||||
logger.error("migration rejected type=%s sqlstate=%s", type(exc).__name__, sqlstate)
|
||||
raise SystemExit("migration failed") from None
|
||||
else:
|
||||
await wait_for_schema(engine, settings.migrations_dir)
|
||||
|
||||
|
||||
@asynccontextmanager
|
||||
async def lifespan(app: FastAPI):
|
||||
settings = load_settings()
|
||||
init_security()
|
||||
engine = build_engine(settings)
|
||||
redis = build_redis(settings)
|
||||
store = build_store(settings)
|
||||
app.state.engine = engine
|
||||
app.state.redis = redis
|
||||
app.state.store = store
|
||||
app.state.settings = settings
|
||||
app.state.instance_id = settings.instance_id
|
||||
app.state.accepting = False
|
||||
try:
|
||||
await open_stores(engine, redis, store, settings)
|
||||
configure(build_session_factory(engine), redis, settings, store)
|
||||
app.state.accepting = True
|
||||
logger.info(
|
||||
"ready env=%s instance_id=%s session_ttl_seconds=%s db_pool=%s",
|
||||
settings.env,
|
||||
settings.instance_id,
|
||||
settings.session_ttl_seconds,
|
||||
settings.db_pool_size,
|
||||
)
|
||||
yield
|
||||
finally:
|
||||
app.state.accepting = False
|
||||
logger.info("shutdown: new requests are no longer accepted")
|
||||
await redis.aclose()
|
||||
await engine.dispose()
|
||||
|
||||
|
||||
def create_app() -> FastAPI:
|
||||
app = FastAPI(title="MTUSI Messenger", version="1.4.0", lifespan=lifespan)
|
||||
app.state.instance_id = "starting"
|
||||
app.state.accepting = False
|
||||
app.add_exception_handler(AppError, handle_app_error)
|
||||
app.add_exception_handler(RequestValidationError, handle_validation_error)
|
||||
app.add_exception_handler(HTTPException, handle_http_error)
|
||||
for cls in (OperationalError, InterfaceError, SATimeout, RedisError):
|
||||
app.add_exception_handler(cls, handle_dependency)
|
||||
app.middleware("http")(request_context)
|
||||
app.include_router(health_router)
|
||||
app.include_router(api_router)
|
||||
return app
|
||||
|
||||
|
||||
app = create_app()
|
||||
@@ -0,0 +1,52 @@
|
||||
import logging
|
||||
import time
|
||||
from uuid import uuid4
|
||||
|
||||
from fastapi import Request
|
||||
|
||||
from app.db import is_dependency_error
|
||||
from app.errors import error_response
|
||||
|
||||
logger = logging.getLogger("app.access")
|
||||
|
||||
|
||||
def _instance_id(request: Request) -> str:
|
||||
settings = getattr(request.app.state, "settings", None)
|
||||
if settings is not None:
|
||||
return settings.instance_id
|
||||
return getattr(request.app.state, "instance_id", "starting")
|
||||
|
||||
|
||||
async def request_context(request: Request, call_next):
|
||||
request_id = uuid4().hex
|
||||
request.state.request_id = request_id
|
||||
started = time.perf_counter()
|
||||
status = 500
|
||||
try:
|
||||
accepting = getattr(request.app.state, "accepting", True)
|
||||
if not accepting and request.url.path != "/health/live":
|
||||
response = error_response(503, "unavailable", "Сервер останавливается", request_id)
|
||||
else:
|
||||
try:
|
||||
response = await call_next(request)
|
||||
except Exception as exc:
|
||||
if is_dependency_error(exc):
|
||||
logger.warning("dependency unavailable type=%s", type(exc).__name__)
|
||||
response = error_response(503, "unavailable", "Сервис временно недоступен", request_id)
|
||||
else:
|
||||
logger.error("internal error request_id=%s type=%s", request_id, type(exc).__name__)
|
||||
response = error_response(500, "internal_error", "Внутренняя ошибка", request_id)
|
||||
response.headers["X-Request-Id"] = request_id
|
||||
response.headers["X-Instance-Id"] = _instance_id(request)
|
||||
status = response.status_code
|
||||
return response
|
||||
finally:
|
||||
elapsed_ms = int((time.perf_counter() - started) * 1000)
|
||||
logger.info(
|
||||
"request method=%s path=%s status=%s request_id=%s duration_ms=%s",
|
||||
request.method,
|
||||
request.url.path,
|
||||
status,
|
||||
request_id,
|
||||
elapsed_ms,
|
||||
)
|
||||
@@ -0,0 +1,141 @@
|
||||
import asyncio
|
||||
import logging
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
from sqlalchemy import text
|
||||
from sqlalchemy.exc import ProgrammingError
|
||||
from sqlalchemy.ext.asyncio import AsyncEngine
|
||||
|
||||
from app.config import load_settings
|
||||
from app.db import build_engine, is_dependency_error
|
||||
|
||||
logger = logging.getLogger("app.migrate")
|
||||
|
||||
# Один номер на все процессы, чтобы две миграции не применяли DDL одновременно.
|
||||
_ADVISORY_LOCK = 842021
|
||||
|
||||
|
||||
def sql_statements(script: str) -> list[str]:
|
||||
lines = []
|
||||
for line in script.splitlines():
|
||||
if line.strip().startswith("--"):
|
||||
continue
|
||||
lines.append(line)
|
||||
statements = []
|
||||
for part in "\n".join(lines).split(";"):
|
||||
statement = part.strip()
|
||||
if statement:
|
||||
statements.append(statement)
|
||||
return statements
|
||||
|
||||
|
||||
def expected_versions(directory: Path) -> list[str]:
|
||||
files = sorted(path for path in directory.glob("*.sql") if path.is_file())
|
||||
if not files:
|
||||
raise SystemExit("no SQL migrations found")
|
||||
return [path.name for path in files]
|
||||
|
||||
|
||||
async def apply_migrations(engine: AsyncEngine, directory: Path) -> int:
|
||||
files = sorted(path for path in directory.glob("*.sql") if path.is_file())
|
||||
if not files:
|
||||
raise SystemExit("no SQL migrations found")
|
||||
applied = 0
|
||||
async with engine.begin() as conn:
|
||||
await conn.execute(text("SELECT pg_advisory_xact_lock(:lock_id)"), {"lock_id": _ADVISORY_LOCK})
|
||||
await conn.execute(
|
||||
text(
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS schema_migrations (
|
||||
version TEXT PRIMARY KEY,
|
||||
applied_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
)
|
||||
"""
|
||||
)
|
||||
)
|
||||
for path in files:
|
||||
version = path.name
|
||||
exists = await conn.scalar(
|
||||
text("SELECT version FROM schema_migrations WHERE version = :version"),
|
||||
{"version": version},
|
||||
)
|
||||
if exists:
|
||||
continue
|
||||
for statement in sql_statements(path.read_text(encoding="utf-8")):
|
||||
await conn.execute(text(statement))
|
||||
await conn.execute(
|
||||
text("INSERT INTO schema_migrations (version) VALUES (:version)"),
|
||||
{"version": version},
|
||||
)
|
||||
applied += 1
|
||||
logger.info("migration applied version=%s", version)
|
||||
return applied
|
||||
|
||||
|
||||
async def wait_for_database(engine: AsyncEngine) -> None:
|
||||
for attempt in range(40):
|
||||
try:
|
||||
async with engine.connect() as conn:
|
||||
await conn.execute(text("SELECT 1"))
|
||||
return
|
||||
except Exception as exc:
|
||||
if not is_dependency_error(exc):
|
||||
logger.error("database probe failed type=%s", type(exc).__name__)
|
||||
raise SystemExit("database probe failed") from None
|
||||
logger.warning("database not ready type=%s attempt=%s", type(exc).__name__, attempt + 1)
|
||||
if attempt == 39:
|
||||
raise SystemExit("database is not ready") from None
|
||||
await asyncio.sleep(0.5)
|
||||
|
||||
|
||||
async def wait_for_schema(engine: AsyncEngine, directory: Path) -> None:
|
||||
needed = set(expected_versions(directory))
|
||||
for attempt in range(40):
|
||||
try:
|
||||
async with engine.connect() as conn:
|
||||
rows = (await conn.execute(text("SELECT version FROM schema_migrations"))).all()
|
||||
found = {row[0] for row in rows}
|
||||
if needed <= found:
|
||||
logger.info("schema ready versions=%s", ",".join(sorted(found)))
|
||||
return
|
||||
logger.warning("schema incomplete attempt=%s", attempt + 1)
|
||||
except ProgrammingError:
|
||||
logger.warning("schema_migrations missing attempt=%s", attempt + 1)
|
||||
except Exception as exc:
|
||||
if not is_dependency_error(exc):
|
||||
logger.error("schema probe failed type=%s", type(exc).__name__)
|
||||
raise SystemExit("schema probe failed") from None
|
||||
logger.warning("schema probe unavailable type=%s attempt=%s", type(exc).__name__, attempt + 1)
|
||||
if attempt == 39:
|
||||
raise SystemExit("schema is not ready")
|
||||
await asyncio.sleep(0.5)
|
||||
|
||||
|
||||
async def run_job() -> None:
|
||||
settings = load_settings()
|
||||
engine = build_engine(settings)
|
||||
try:
|
||||
await wait_for_database(engine)
|
||||
applied = await apply_migrations(engine, settings.migrations_dir)
|
||||
logger.info("migrations newly_applied=%s", applied)
|
||||
except ProgrammingError as exc:
|
||||
sqlstate = getattr(getattr(exc, "orig", None), "sqlstate", "")
|
||||
logger.error("migration rejected type=%s sqlstate=%s", type(exc).__name__, sqlstate)
|
||||
raise SystemExit("migration failed") from None
|
||||
finally:
|
||||
await engine.dispose()
|
||||
|
||||
|
||||
def main() -> None:
|
||||
logging.basicConfig(
|
||||
level=logging.INFO,
|
||||
format="%(asctime)s %(levelname)s %(name)s %(message)s",
|
||||
stream=sys.stdout,
|
||||
force=True,
|
||||
)
|
||||
asyncio.run(run_job())
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -0,0 +1,167 @@
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import (
|
||||
CheckConstraint,
|
||||
DateTime,
|
||||
ForeignKey,
|
||||
Index,
|
||||
Integer,
|
||||
SmallInteger,
|
||||
Text,
|
||||
UniqueConstraint,
|
||||
)
|
||||
from sqlalchemy.dialects.postgresql import UUID
|
||||
from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
|
||||
|
||||
|
||||
class Base(DeclarativeBase):
|
||||
pass
|
||||
|
||||
|
||||
class User(Base):
|
||||
__tablename__ = "users"
|
||||
__table_args__ = (
|
||||
UniqueConstraint("username", name="uq_users_username"),
|
||||
CheckConstraint("username ~ '^[a-z0-9_]{3,32}$'", name="ck_users_username_format"),
|
||||
CheckConstraint(
|
||||
"char_length(btrim(display_name)) >= 1 AND char_length(display_name) <= 100",
|
||||
name="ck_users_display_name_len",
|
||||
),
|
||||
CheckConstraint("char_length(password_hash) >= 20", name="ck_users_password_hash_len"),
|
||||
)
|
||||
|
||||
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True)
|
||||
username: Mapped[str] = mapped_column(Text, nullable=False)
|
||||
display_name: Mapped[str] = mapped_column(Text, nullable=False)
|
||||
password_hash: Mapped[str] = mapped_column(Text, nullable=False)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
|
||||
|
||||
|
||||
class Chat(Base):
|
||||
__tablename__ = "chats"
|
||||
__table_args__ = (
|
||||
CheckConstraint(
|
||||
"char_length(btrim(title)) >= 1 AND char_length(title) <= 100",
|
||||
name="ck_chats_title",
|
||||
),
|
||||
)
|
||||
|
||||
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True)
|
||||
title: Mapped[str] = mapped_column(Text, nullable=False)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
|
||||
|
||||
|
||||
class ChatMember(Base):
|
||||
__tablename__ = "chat_members"
|
||||
__table_args__ = (
|
||||
CheckConstraint("ordinal >= 0 AND ordinal < 100", name="ck_chat_members_ordinal"),
|
||||
Index("ix_chat_members_user", "user_id", "chat_id"),
|
||||
)
|
||||
|
||||
chat_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("chats.id"),
|
||||
primary_key=True,
|
||||
)
|
||||
user_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("users.id"),
|
||||
primary_key=True,
|
||||
)
|
||||
ordinal: Mapped[int] = mapped_column(SmallInteger, nullable=False)
|
||||
|
||||
|
||||
class Message(Base):
|
||||
__tablename__ = "messages"
|
||||
__table_args__ = (
|
||||
CheckConstraint(
|
||||
"char_length(body) <= 4000",
|
||||
name="ck_messages_text",
|
||||
),
|
||||
# Keyset: WHERE chat_id = $1 AND (created_at, id) > ($2, $3) ORDER BY created_at, id LIMIT $4
|
||||
Index("ix_messages_history", "chat_id", "created_at", "id"),
|
||||
)
|
||||
|
||||
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True)
|
||||
chat_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("chats.id"), nullable=False)
|
||||
sender_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=False)
|
||||
text: Mapped[str] = mapped_column("body", Text, nullable=False)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
|
||||
|
||||
|
||||
class IdempotencyRecord(Base):
|
||||
__tablename__ = "idempotency_records"
|
||||
__table_args__ = (
|
||||
CheckConstraint("method = 'POST'", name="ck_idem_method"),
|
||||
CheckConstraint("status_code = 201", name="ck_idem_status"),
|
||||
CheckConstraint("idempotency_key ~ '^[A-Za-z0-9._:-]{1,128}$'", name="ck_idem_key"),
|
||||
CheckConstraint("char_length(request_path) BETWEEN 1 AND 300", name="ck_idem_path"),
|
||||
CheckConstraint("char_length(request_hash) = 64", name="ck_idem_hash"),
|
||||
Index("ix_idempotency_message", "message_id"),
|
||||
Index("ix_idempotency_created", "created_at"),
|
||||
)
|
||||
|
||||
user_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("users.id"),
|
||||
primary_key=True,
|
||||
)
|
||||
method: Mapped[str] = mapped_column(Text, primary_key=True)
|
||||
request_path: Mapped[str] = mapped_column(Text, primary_key=True)
|
||||
idempotency_key: Mapped[str] = mapped_column(Text, primary_key=True)
|
||||
request_hash: Mapped[str] = mapped_column(Text, nullable=False)
|
||||
status_code: Mapped[int] = mapped_column(SmallInteger, nullable=False)
|
||||
message_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("messages.id"),
|
||||
nullable=False,
|
||||
)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
|
||||
|
||||
|
||||
class Attachment(Base):
|
||||
__tablename__ = "attachments"
|
||||
__table_args__ = (
|
||||
UniqueConstraint("object_key", name="uq_attachments_object_key"),
|
||||
CheckConstraint("char_length(filename) BETWEEN 1 AND 255", name="ck_attachments_filename"),
|
||||
CheckConstraint("content_type IN ('image/png', 'image/jpeg')", name="ck_attachments_content_type"),
|
||||
CheckConstraint("size_bytes >= 1 AND size_bytes <= 10485760", name="ck_attachments_size"),
|
||||
CheckConstraint("sha256 ~ '^[a-f0-9]{64}$'", name="ck_attachments_sha256"),
|
||||
CheckConstraint("status = 'ready'", name="ck_attachments_status"),
|
||||
CheckConstraint("error_code IS NULL", name="ck_attachments_error"),
|
||||
Index("ix_attachments_chat", "chat_id", "created_at", "id"),
|
||||
)
|
||||
|
||||
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True)
|
||||
chat_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("chats.id"), nullable=False)
|
||||
owner_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=False)
|
||||
filename: Mapped[str] = mapped_column(Text, nullable=False)
|
||||
content_type: Mapped[str] = mapped_column(Text, nullable=False)
|
||||
size_bytes: Mapped[int] = mapped_column(Integer, nullable=False)
|
||||
sha256: Mapped[str] = mapped_column(Text, nullable=False)
|
||||
object_key: Mapped[str] = mapped_column(Text, nullable=False)
|
||||
status: Mapped[str] = mapped_column(Text, nullable=False)
|
||||
error_code: Mapped[str | None] = mapped_column(Text, nullable=True)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
|
||||
updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
|
||||
|
||||
|
||||
class MessageAttachment(Base):
|
||||
__tablename__ = "message_attachments"
|
||||
__table_args__ = (
|
||||
CheckConstraint("ordinal >= 0 AND ordinal < 10", name="ck_message_attachments_ordinal"),
|
||||
Index("ix_message_attachments_attachment", "attachment_id"),
|
||||
)
|
||||
|
||||
message_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("messages.id"),
|
||||
primary_key=True,
|
||||
)
|
||||
attachment_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("attachments.id"),
|
||||
primary_key=True,
|
||||
)
|
||||
ordinal: Mapped[int] = mapped_column(SmallInteger, nullable=False)
|
||||
@@ -0,0 +1,50 @@
|
||||
import base64
|
||||
import json
|
||||
from datetime import datetime
|
||||
from uuid import UUID
|
||||
|
||||
from app.errors import AppError
|
||||
from app.timeutil import format_time, parse_time
|
||||
|
||||
|
||||
def encode_cursor(kind: str, resource_id: UUID, created_at: datetime, entity_id: UUID) -> str:
|
||||
payload = {
|
||||
"i": str(entity_id),
|
||||
"k": kind,
|
||||
"r": str(resource_id),
|
||||
"t": format_time(created_at),
|
||||
}
|
||||
raw = json.dumps(payload, separators=(",", ":"), sort_keys=True).encode("ascii")
|
||||
return base64.urlsafe_b64encode(raw).decode("ascii").rstrip("=")
|
||||
|
||||
|
||||
def decode_position(token: str, kind: str, resource_id: UUID) -> tuple[datetime, UUID]:
|
||||
if len(token) > 1024:
|
||||
raise AppError(400, "invalid_request", "Некорректный cursor")
|
||||
padding = "=" * (-len(token) % 4)
|
||||
try:
|
||||
data = json.loads(base64.urlsafe_b64decode(token + padding))
|
||||
if (
|
||||
not isinstance(data, dict)
|
||||
or data.get("k") != kind
|
||||
or data.get("r") != str(resource_id)
|
||||
or not isinstance(data.get("t"), str)
|
||||
or not isinstance(data.get("i"), str)
|
||||
):
|
||||
raise ValueError("cursor")
|
||||
created_at = parse_time(data["t"])
|
||||
entity_id = UUID(data["i"])
|
||||
except (KeyError, TypeError, ValueError, AttributeError, json.JSONDecodeError):
|
||||
raise AppError(400, "invalid_request", "Некорректный cursor") from None
|
||||
return created_at, entity_id
|
||||
|
||||
|
||||
def slice_page(rows: list, limit: int, kind: str, resource_id: UUID) -> dict:
|
||||
# SQL уже вернул не больше limit + 1 строк, отфильтрованных keyset-условием.
|
||||
has_more = len(rows) > limit
|
||||
page = rows[:limit]
|
||||
next_cursor = None
|
||||
if has_more and page:
|
||||
last = page[-1]
|
||||
next_cursor = encode_cursor(kind, resource_id, last.created_at, last.id)
|
||||
return {"items": [row.to_dict() for row in page], "next_cursor": next_cursor}
|
||||
@@ -0,0 +1,89 @@
|
||||
from dataclasses import dataclass
|
||||
from datetime import datetime
|
||||
from uuid import UUID
|
||||
|
||||
from app.timeutil import format_time
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class PublicUser:
|
||||
id: UUID
|
||||
username: str
|
||||
display_name: str
|
||||
created_at: datetime
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
return {
|
||||
"id": self.id,
|
||||
"username": self.username,
|
||||
"display_name": self.display_name,
|
||||
"created_at": format_time(self.created_at),
|
||||
}
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class PublicChat:
|
||||
id: UUID
|
||||
title: str
|
||||
member_ids: tuple[UUID, ...]
|
||||
created_at: datetime
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
return {
|
||||
"id": self.id,
|
||||
"title": self.title,
|
||||
"member_ids": list(self.member_ids),
|
||||
"created_at": format_time(self.created_at),
|
||||
}
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class PublicMessage:
|
||||
id: UUID
|
||||
chat_id: UUID
|
||||
sender_id: UUID
|
||||
text: str
|
||||
created_at: datetime
|
||||
attachment_ids: tuple[UUID, ...] = ()
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
return {
|
||||
"id": self.id,
|
||||
"chat_id": self.chat_id,
|
||||
"sender_id": self.sender_id,
|
||||
"text": self.text,
|
||||
"created_at": format_time(self.created_at),
|
||||
"attachment_ids": list(self.attachment_ids),
|
||||
}
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class PublicAttachment:
|
||||
id: UUID
|
||||
chat_id: UUID
|
||||
owner_id: UUID
|
||||
filename: str
|
||||
content_type: str
|
||||
size_bytes: int
|
||||
sha256: str
|
||||
status: str
|
||||
variants: tuple = ()
|
||||
error_code: str | None
|
||||
created_at: datetime
|
||||
updated_at: datetime
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
return {
|
||||
"id": self.id,
|
||||
"chat_id": self.chat_id,
|
||||
"owner_id": self.owner_id,
|
||||
"filename": self.filename,
|
||||
"content_type": self.content_type,
|
||||
"size_bytes": self.size_bytes,
|
||||
"sha256": self.sha256,
|
||||
"status": self.status,
|
||||
"variants": list(self.variants),
|
||||
"error_code": self.error_code,
|
||||
"created_at": format_time(self.created_at),
|
||||
"updated_at": format_time(self.updated_at),
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
from app.config import Settings
|
||||
|
||||
_factory = None
|
||||
_redis = None
|
||||
_store = None
|
||||
_settings: Settings | None = None
|
||||
|
||||
|
||||
def configure(factory, redis, settings: Settings, store=None) -> None:
|
||||
global _factory, _redis, _store, _settings
|
||||
_factory = factory
|
||||
_redis = redis
|
||||
_store = store
|
||||
_settings = settings
|
||||
|
||||
|
||||
def require_factory():
|
||||
if _factory is None:
|
||||
from app.errors import AppError
|
||||
|
||||
raise AppError(503, "unavailable", "Сервис временно недоступен")
|
||||
return _factory
|
||||
|
||||
|
||||
def require_redis():
|
||||
if _redis is None:
|
||||
from app.errors import AppError
|
||||
|
||||
raise AppError(503, "unavailable", "Сервис временно недоступен")
|
||||
return _redis
|
||||
|
||||
|
||||
def require_settings() -> Settings:
|
||||
if _settings is None:
|
||||
from app.errors import AppError
|
||||
|
||||
raise AppError(503, "unavailable", "Сервис временно недоступен")
|
||||
return _settings
|
||||
|
||||
|
||||
def require_store():
|
||||
if _store is None:
|
||||
from app.errors import AppError
|
||||
|
||||
raise AppError(503, "unavailable", "Сервис временно недоступен")
|
||||
return _store
|
||||
+101
@@ -0,0 +1,101 @@
|
||||
import asyncio
|
||||
import logging
|
||||
from datetime import datetime, timezone
|
||||
|
||||
import boto3
|
||||
from botocore.config import Config
|
||||
from botocore.exceptions import BotoCoreError, ClientError, EndpointConnectionError
|
||||
|
||||
from app.config import Settings
|
||||
from app.errors import AppError
|
||||
|
||||
logger = logging.getLogger("app.s3")
|
||||
|
||||
|
||||
class ObjectStore:
|
||||
def __init__(self, settings: Settings) -> None:
|
||||
self.bucket = settings.s3_bucket
|
||||
self._client = boto3.client(
|
||||
"s3",
|
||||
endpoint_url=settings.s3_endpoint,
|
||||
aws_access_key_id=settings.s3_access_key_id,
|
||||
aws_secret_access_key=settings.s3_secret_access_key,
|
||||
region_name=settings.s3_region,
|
||||
config=Config(
|
||||
s3={"addressing_style": "path"},
|
||||
connect_timeout=2,
|
||||
read_timeout=30,
|
||||
retries={"max_attempts": 2, "mode": "standard"},
|
||||
),
|
||||
)
|
||||
|
||||
def _call(self, fn, *args, **kwargs):
|
||||
try:
|
||||
return fn(*args, **kwargs)
|
||||
except EndpointConnectionError:
|
||||
logger.warning("s3 endpoint unavailable type=%s", "EndpointConnectionError")
|
||||
raise AppError(503, "unavailable", "Сервис временно недоступен") from None
|
||||
except ClientError as exc:
|
||||
code = str(exc.response.get("Error", {}).get("Code", ""))
|
||||
if code in {"NoSuchKey", "404"}:
|
||||
raise AppError(404, "not_found", "Объект не найден") from None
|
||||
logger.warning("s3 client error type=%s code=%s", type(exc).__name__, code or "unknown")
|
||||
raise AppError(503, "unavailable", "Сервис временно недоступен") from None
|
||||
except BotoCoreError:
|
||||
logger.warning("s3 unavailable type=%s", "BotoCoreError")
|
||||
raise AppError(503, "unavailable", "Сервис временно недоступен") from None
|
||||
|
||||
async def ping(self) -> None:
|
||||
await asyncio.to_thread(self._call, self._client.head_bucket, Bucket=self.bucket)
|
||||
|
||||
async def put(self, key: str, data: bytes, content_type: str) -> None:
|
||||
await asyncio.to_thread(
|
||||
self._call,
|
||||
self._client.put_object,
|
||||
Bucket=self.bucket,
|
||||
Key=key,
|
||||
Body=data,
|
||||
ContentType=content_type,
|
||||
ContentLength=len(data),
|
||||
)
|
||||
|
||||
async def get(self, key: str) -> bytes:
|
||||
def _read() -> bytes:
|
||||
body = self._call(self._client.get_object, Bucket=self.bucket, Key=key)["Body"]
|
||||
return body.read()
|
||||
|
||||
return await asyncio.to_thread(_read)
|
||||
|
||||
async def delete(self, key: str) -> None:
|
||||
try:
|
||||
await asyncio.to_thread(self._call, self._client.delete_object, Bucket=self.bucket, Key=key)
|
||||
except AppError:
|
||||
return
|
||||
|
||||
async def list_objects(self) -> list[tuple[str, datetime]]:
|
||||
def _list() -> list[tuple[str, datetime]]:
|
||||
items: list[tuple[str, datetime]] = []
|
||||
token = None
|
||||
while True:
|
||||
kwargs = {"Bucket": self.bucket, "Prefix": "att/"}
|
||||
if token:
|
||||
kwargs["ContinuationToken"] = token
|
||||
page = self._call(self._client.list_objects_v2, **kwargs)
|
||||
for obj in page.get("Contents") or []:
|
||||
key = str(obj["Key"])
|
||||
modified = obj["LastModified"]
|
||||
if modified.tzinfo is None:
|
||||
modified = modified.replace(tzinfo=timezone.utc)
|
||||
items.append((key, modified.astimezone(timezone.utc)))
|
||||
if not page.get("IsTruncated"):
|
||||
break
|
||||
token = page.get("NextContinuationToken")
|
||||
if not token:
|
||||
break
|
||||
return items
|
||||
|
||||
return await asyncio.to_thread(_list)
|
||||
|
||||
|
||||
def build_store(settings: Settings) -> ObjectStore:
|
||||
return ObjectStore(settings)
|
||||
@@ -0,0 +1,27 @@
|
||||
from uuid import UUID
|
||||
|
||||
from pydantic import BaseModel
|
||||
|
||||
|
||||
class VariantOut(BaseModel):
|
||||
name: str
|
||||
content_type: str
|
||||
size_bytes: int
|
||||
width: int
|
||||
height: int
|
||||
sha256: str
|
||||
|
||||
|
||||
class AttachmentOut(BaseModel):
|
||||
id: UUID
|
||||
chat_id: UUID
|
||||
owner_id: UUID
|
||||
filename: str
|
||||
content_type: str
|
||||
size_bytes: int
|
||||
sha256: str
|
||||
status: str
|
||||
variants: list[VariantOut]
|
||||
error_code: str | None
|
||||
created_at: str
|
||||
updated_at: str
|
||||
@@ -0,0 +1,35 @@
|
||||
from uuid import UUID
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field, field_validator
|
||||
|
||||
|
||||
class CreateChat(BaseModel):
|
||||
model_config = ConfigDict(extra="forbid")
|
||||
title: str
|
||||
member_ids: list[UUID] = Field(min_length=1, max_length=100)
|
||||
|
||||
@field_validator("title")
|
||||
@classmethod
|
||||
def check_title(cls, value: str) -> str:
|
||||
if value.strip() == "" or len(value) > 100:
|
||||
raise ValueError("title")
|
||||
return value
|
||||
|
||||
@field_validator("member_ids")
|
||||
@classmethod
|
||||
def unique_members(cls, value: list[UUID]) -> list[UUID]:
|
||||
if len(set(value)) != len(value):
|
||||
raise ValueError("duplicate members")
|
||||
return value
|
||||
|
||||
|
||||
class ChatOut(BaseModel):
|
||||
id: UUID
|
||||
title: str
|
||||
member_ids: list[UUID]
|
||||
created_at: str
|
||||
|
||||
|
||||
class ChatPage(BaseModel):
|
||||
items: list[ChatOut]
|
||||
next_cursor: str | None
|
||||
@@ -0,0 +1,43 @@
|
||||
from uuid import UUID
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, field_validator, model_validator
|
||||
|
||||
|
||||
class CreateMessage(BaseModel):
|
||||
model_config = ConfigDict(extra="forbid")
|
||||
text: str
|
||||
attachment_ids: list[UUID] = []
|
||||
|
||||
@field_validator("text")
|
||||
@classmethod
|
||||
def check_text(cls, value: str) -> str:
|
||||
if len(value) > 4000:
|
||||
raise ValueError("text")
|
||||
return value
|
||||
|
||||
@field_validator("attachment_ids")
|
||||
@classmethod
|
||||
def check_attachments(cls, value: list[UUID]) -> list[UUID]:
|
||||
if len(value) > 10 or len(set(value)) != len(value):
|
||||
raise ValueError("attachment_ids")
|
||||
return value
|
||||
|
||||
@model_validator(mode="after")
|
||||
def require_payload(self):
|
||||
if self.text.strip() == "" and not self.attachment_ids:
|
||||
raise ValueError("text")
|
||||
return self
|
||||
|
||||
|
||||
class MessageOut(BaseModel):
|
||||
id: UUID
|
||||
chat_id: UUID
|
||||
sender_id: UUID
|
||||
text: str
|
||||
created_at: str
|
||||
attachment_ids: list[UUID]
|
||||
|
||||
|
||||
class MessagePage(BaseModel):
|
||||
items: list[MessageOut]
|
||||
next_cursor: str | None
|
||||
@@ -0,0 +1,10 @@
|
||||
from pydantic import BaseModel
|
||||
|
||||
from app.schemas.user import UserOut
|
||||
|
||||
|
||||
class SessionOut(BaseModel):
|
||||
token: str
|
||||
token_type: str
|
||||
expires_at: str
|
||||
user: UserOut
|
||||
@@ -0,0 +1,41 @@
|
||||
import re
|
||||
|
||||
from uuid import UUID
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, field_validator
|
||||
|
||||
|
||||
class CreateUser(BaseModel):
|
||||
model_config = ConfigDict(extra="forbid")
|
||||
username: str
|
||||
display_name: str
|
||||
password: str
|
||||
|
||||
@field_validator("username")
|
||||
@classmethod
|
||||
def check_username(cls, value: str) -> str:
|
||||
if re.fullmatch(r"[a-z0-9_]{3,32}", value) is None:
|
||||
raise ValueError("username")
|
||||
return value
|
||||
|
||||
@field_validator("display_name")
|
||||
@classmethod
|
||||
def check_display_name(cls, value: str) -> str:
|
||||
if value.strip() == "" or len(value) > 100:
|
||||
raise ValueError("display_name")
|
||||
return value
|
||||
|
||||
@field_validator("password")
|
||||
@classmethod
|
||||
def check_password(cls, value: str) -> str:
|
||||
# Длина в code points. Пароль не обрезается и не нормализуется.
|
||||
if not 12 <= len(value) <= 128:
|
||||
raise ValueError("password")
|
||||
return value
|
||||
|
||||
|
||||
class UserOut(BaseModel):
|
||||
id: UUID
|
||||
username: str
|
||||
display_name: str
|
||||
created_at: str
|
||||
@@ -0,0 +1,65 @@
|
||||
import base64
|
||||
import binascii
|
||||
|
||||
from argon2 import PasswordHasher
|
||||
from argon2.exceptions import InvalidHashError, VerifyMismatchError
|
||||
from argon2.low_level import Type
|
||||
|
||||
# Учебные параметры Argon2id: устойчивее SHA-256, но подъём на ноутбуке
|
||||
_TIME_COST = 2
|
||||
_MEMORY_COST = 32768
|
||||
_PARALLELISM = 1
|
||||
|
||||
_hasher: PasswordHasher | None = None
|
||||
_dummy_hash: str | None = None
|
||||
|
||||
|
||||
def get_hasher() -> PasswordHasher:
|
||||
global _hasher
|
||||
if _hasher is None:
|
||||
_hasher = PasswordHasher(
|
||||
time_cost=_TIME_COST,
|
||||
memory_cost=_MEMORY_COST,
|
||||
parallelism=_PARALLELISM,
|
||||
hash_len=32,
|
||||
salt_len=16,
|
||||
type=Type.ID,
|
||||
)
|
||||
return _hasher
|
||||
|
||||
|
||||
def init_security() -> None:
|
||||
global _dummy_hash
|
||||
if _dummy_hash is None:
|
||||
_dummy_hash = get_hasher().hash("messenger-dummy-password-not-used-for-login")
|
||||
|
||||
|
||||
def hash_password(password: str) -> str:
|
||||
return get_hasher().hash(password)
|
||||
|
||||
|
||||
def verify_password(password: str, password_hash: str | None) -> bool:
|
||||
init_security()
|
||||
try:
|
||||
get_hasher().verify(password_hash or _dummy_hash, password)
|
||||
matched = True
|
||||
except (VerifyMismatchError, InvalidHashError):
|
||||
matched = False
|
||||
return password_hash is not None and matched
|
||||
|
||||
|
||||
def parse_basic(header: str) -> tuple[str, str] | None:
|
||||
if not header:
|
||||
return None
|
||||
scheme, _, rest = header.partition(" ")
|
||||
if scheme.lower() != "basic" or not rest.strip():
|
||||
return None
|
||||
try:
|
||||
decoded = base64.b64decode(rest.strip(), validate=True)
|
||||
text = decoded.decode("utf-8")
|
||||
except (ValueError, UnicodeError, binascii.Error):
|
||||
return None
|
||||
username, separator, password = text.partition(":")
|
||||
if separator != ":" or len(username) > 256 or len(password) > 1024:
|
||||
return None
|
||||
return username, password
|
||||
@@ -0,0 +1,90 @@
|
||||
import hashlib
|
||||
import json
|
||||
import logging
|
||||
import secrets
|
||||
from datetime import timedelta
|
||||
from uuid import UUID
|
||||
|
||||
from redis.asyncio import Redis
|
||||
from redis.exceptions import RedisError
|
||||
|
||||
from app.config import Settings
|
||||
from app.errors import AppError
|
||||
from app.runtime import require_redis, require_settings
|
||||
from app.timeutil import format_time, parse_time, utcnow
|
||||
|
||||
logger = logging.getLogger("app.sessions")
|
||||
|
||||
|
||||
def build_redis(settings: Settings) -> Redis:
|
||||
return Redis.from_url(
|
||||
settings.cache_url,
|
||||
decode_responses=True,
|
||||
socket_timeout=settings.redis_socket_timeout_seconds,
|
||||
socket_connect_timeout=settings.redis_socket_timeout_seconds,
|
||||
health_check_interval=30,
|
||||
max_connections=settings.redis_max_connections,
|
||||
)
|
||||
|
||||
|
||||
def session_key(token: str) -> str:
|
||||
digest = hashlib.sha256(token.encode("utf-8")).hexdigest()
|
||||
return "sess:" + digest
|
||||
|
||||
|
||||
async def _call(awaitable):
|
||||
try:
|
||||
return await awaitable
|
||||
except RedisError:
|
||||
logger.warning("redis unavailable type=%s", "RedisError")
|
||||
raise AppError(503, "unavailable", "Сервис временно недоступен") from None
|
||||
|
||||
|
||||
def _read_payload(raw: str) -> tuple[UUID, object] | None:
|
||||
try:
|
||||
data = json.loads(raw)
|
||||
if not isinstance(data, dict):
|
||||
raise ValueError("payload")
|
||||
return UUID(str(data["user_id"])), parse_time(data["expires_at"])
|
||||
except (ValueError, KeyError, TypeError):
|
||||
return None
|
||||
|
||||
|
||||
async def create_session(user_id: UUID) -> tuple[str, object]:
|
||||
settings = require_settings()
|
||||
token = secrets.token_urlsafe(32)
|
||||
expires_at = utcnow() + timedelta(seconds=settings.session_ttl_seconds)
|
||||
payload = json.dumps(
|
||||
{"user_id": str(user_id), "expires_at": format_time(expires_at)},
|
||||
separators=(",", ":"),
|
||||
)
|
||||
# PXAT — абсолютное время. Повтор AOF после рестарта не продлевает TTL.
|
||||
await _call(require_redis().set(session_key(token), payload, pxat=int(expires_at.timestamp() * 1000)))
|
||||
return token, expires_at
|
||||
|
||||
|
||||
async def resolve_session(token: str) -> UUID | None:
|
||||
key = session_key(token)
|
||||
raw = await _call(require_redis().get(key))
|
||||
if raw is None:
|
||||
return None
|
||||
parsed = _read_payload(raw)
|
||||
if parsed is None:
|
||||
await _call(require_redis().delete(key))
|
||||
return None
|
||||
user_id, expires_at = parsed
|
||||
if expires_at <= utcnow():
|
||||
await _call(require_redis().delete(key))
|
||||
return None
|
||||
return user_id
|
||||
|
||||
|
||||
async def revoke_session(token: str) -> bool:
|
||||
raw = await _call(require_redis().getdel(session_key(token)))
|
||||
if raw is None:
|
||||
return False
|
||||
parsed = _read_payload(raw)
|
||||
if parsed is None:
|
||||
return False
|
||||
_, expires_at = parsed
|
||||
return expires_at > utcnow()
|
||||
@@ -0,0 +1 @@
|
||||
"""Состояние лабораторной 2 хранится в PostgreSQL и Redis, не в памяти процесса."""
|
||||
@@ -0,0 +1,5 @@
|
||||
"""Память процесса больше не хранит пользователей, чаты и сообщения.
|
||||
|
||||
Источник истины для этих данных — PostgreSQL.
|
||||
Источник истины для сессий — Redis с AOF и абсолютным PXAT.
|
||||
"""
|
||||
@@ -0,0 +1,20 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
|
||||
def utcnow() -> datetime:
|
||||
return datetime.now(timezone.utc)
|
||||
|
||||
|
||||
def format_time(value: datetime) -> str:
|
||||
if value.tzinfo is None:
|
||||
value = value.replace(tzinfo=timezone.utc)
|
||||
return value.astimezone(timezone.utc).strftime("%Y-%m-%dT%H:%M:%S.%fZ")
|
||||
|
||||
|
||||
def parse_time(value: str) -> datetime:
|
||||
if not isinstance(value, str) or not value.endswith("Z"):
|
||||
raise ValueError("time")
|
||||
parsed = datetime.fromisoformat(value[:-1] + "+00:00")
|
||||
if parsed.tzinfo is None:
|
||||
raise ValueError("time")
|
||||
return parsed.astimezone(timezone.utc)
|
||||
@@ -0,0 +1,132 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Негативные проверки вложений для оценки 4: лимиты, MIME, ACL, чужой чат."""
|
||||
|
||||
import json
|
||||
import os
|
||||
import struct
|
||||
import sys
|
||||
import time
|
||||
import uuid
|
||||
import zlib
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
sys.path.insert(0, str(ROOT / "tests"))
|
||||
from client import Client, Failure, check, run
|
||||
|
||||
EVIDENCE = ROOT / "evidence"
|
||||
BASE = os.environ.get("BASE_URL", "http://127.0.0.1:8080").rstrip("/")
|
||||
SAMPLE = (ROOT / "tests" / "fixtures" / "sample.png").read_bytes()
|
||||
|
||||
|
||||
def png(width: int, height: int, extra: bytes = b"") -> bytes:
|
||||
def chunk(tag: bytes, data: bytes) -> bytes:
|
||||
crc = zlib.crc32(tag + data) & 0xFFFFFFFF
|
||||
return struct.pack(">I", len(data)) + tag + data + struct.pack(">I", crc)
|
||||
|
||||
ihdr = struct.pack(">IIBBBBB", width, height, 8, 2, 0, 0, 0)
|
||||
return b"\x89PNG\r\n\x1a\n" + chunk(b"IHDR", ihdr) + extra + chunk(b"IEND", b"")
|
||||
|
||||
|
||||
def upload(client, actor, chat, filename, body, content_type, expected):
|
||||
return client.call(
|
||||
"POST",
|
||||
"/api/v1/chats/%s/attachments?filename=%s" % (chat["id"], filename),
|
||||
expected,
|
||||
actor=actor,
|
||||
raw=body,
|
||||
headers={"Content-Type": content_type},
|
||||
schema="Attachment" if expected == 201 else None,
|
||||
)
|
||||
|
||||
|
||||
def main():
|
||||
client = Client(BASE, timeout=30)
|
||||
alice, bob, eve, chat = client.bootstrap()
|
||||
other = client.call(
|
||||
"POST",
|
||||
"/api/v1/chats",
|
||||
201,
|
||||
actor=eve,
|
||||
body={"title": "Чужой", "member_ids": [eve["id"]]},
|
||||
schema="Chat",
|
||||
)["json"]
|
||||
att, content = client.attachment(alice, chat)
|
||||
check(content == SAMPLE, "fixture changed")
|
||||
|
||||
too_big = upload(client, alice, chat, "big.png", SAMPLE + b"x" * (10 * 1024 * 1024), "image/png", 413)
|
||||
check(too_big["json"]["error"]["code"] == "payload_too_large", "oversize code")
|
||||
|
||||
spoof = upload(client, alice, chat, "spoof.png", SAMPLE, "image/jpeg", 415)
|
||||
check(spoof["json"]["error"]["code"] == "unsupported_media_type", "spoofed MIME code")
|
||||
|
||||
broken = upload(client, alice, chat, "broken.png", b"\x89PNG\r\n\x1a\nnot-an-image", "image/png", 415)
|
||||
check(broken["json"]["error"]["code"] == "unsupported_media_type", "corrupt image code")
|
||||
|
||||
huge = upload(client, alice, chat, "huge.png", png(10001, 4000), "image/png", 413)
|
||||
check(huge["json"]["error"]["code"] == "payload_too_large", "pixel limit code")
|
||||
|
||||
slash = upload(client, alice, chat, "a/b.png", SAMPLE, "image/png", 400)
|
||||
check(slash["json"]["error"]["code"] == "invalid_request", "slash filename code")
|
||||
|
||||
missing = client.call(
|
||||
"GET",
|
||||
"/api/v1/attachments/%s" % uuid.uuid4(),
|
||||
404,
|
||||
actor=alice,
|
||||
)
|
||||
check(missing["json"]["error"]["code"] == "not_found", "unknown attachment")
|
||||
|
||||
stolen = client.call("GET", "/api/v1/attachments/%s" % att["id"], 404, actor=eve)
|
||||
check(stolen["json"]["error"]["code"] == "not_found", "outsider metadata")
|
||||
stolen_bytes = client.call("GET", "/api/v1/attachments/%s/content" % att["id"], 404, actor=eve)
|
||||
check(stolen_bytes["json"]["error"]["code"] == "not_found", "outsider bytes")
|
||||
|
||||
foreign_file = upload(client, eve, other, "other.png", SAMPLE, "image/png", 201)["json"]
|
||||
linked = client.call(
|
||||
"POST",
|
||||
"/api/v1/chats/%s/messages" % chat["id"],
|
||||
404,
|
||||
actor=alice,
|
||||
body={"text": "", "attachment_ids": [foreign_file["id"]]},
|
||||
headers={"Idempotency-Key": uuid.uuid4().hex},
|
||||
)
|
||||
check(linked["json"]["error"]["code"] == "not_found", "cross-chat attachment")
|
||||
|
||||
unknown_link = client.call(
|
||||
"POST",
|
||||
"/api/v1/chats/%s/messages" % chat["id"],
|
||||
404,
|
||||
actor=alice,
|
||||
body={"text": "x", "attachment_ids": [str(uuid.uuid4())]},
|
||||
headers={"Idempotency-Key": uuid.uuid4().hex},
|
||||
)
|
||||
check(unknown_link["json"]["error"]["code"] == "not_found", "unknown attachment_id")
|
||||
|
||||
ok = client.message(alice, chat, "", attachments=[att["id"]])["json"]
|
||||
check(ok["attachment_ids"] == [att["id"]], "empty text with attachment")
|
||||
download = client.call("GET", "/api/v1/attachments/%s/content" % att["id"], actor=bob)
|
||||
check(download["bytes"] == SAMPLE, "member download mismatch")
|
||||
|
||||
EVIDENCE.mkdir(exist_ok=True)
|
||||
(EVIDENCE / "attachments.json").write_text(
|
||||
json.dumps(
|
||||
{
|
||||
"date": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()),
|
||||
"oversize": too_big["status"],
|
||||
"spoofed_mime": spoof["status"],
|
||||
"corrupt": broken["status"],
|
||||
"pixels": huge["status"],
|
||||
"foreign_chat": linked["status"],
|
||||
"outsider": stolen["status"],
|
||||
},
|
||||
indent=2,
|
||||
)
|
||||
+ "\n",
|
||||
encoding="utf-8",
|
||||
)
|
||||
print("PASS: attachment validation and ACL")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
run(main)
|
||||
@@ -0,0 +1,38 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Запуск публичного failover на Windows и POSIX с тем же scripts/stop-one.sh."""
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
|
||||
def script():
|
||||
if os.name == "nt":
|
||||
cmd = ROOT / "scripts" / "stop-one.cmd"
|
||||
if cmd.is_file():
|
||||
return str(cmd)
|
||||
sh = ROOT / "scripts" / "stop-one.sh"
|
||||
return str(sh)
|
||||
|
||||
|
||||
def main():
|
||||
env = os.environ.copy()
|
||||
command = [
|
||||
sys.executable,
|
||||
str(ROOT / "tests" / "resilience.py"),
|
||||
"--mode",
|
||||
"failover",
|
||||
"--action-script",
|
||||
script(),
|
||||
"--base-url",
|
||||
env.get("BASE_URL", "http://127.0.0.1:8080"),
|
||||
]
|
||||
completed = subprocess.run(command, cwd=str(ROOT), env=env)
|
||||
raise SystemExit(completed.returncode)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -0,0 +1,101 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Orphan object after S3 PUT without DB row is removed after the grace period."""
|
||||
|
||||
import json
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
import uuid
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
sys.path.insert(0, str(ROOT / "tests"))
|
||||
from client import Client, Failure, check, run
|
||||
|
||||
EVIDENCE = ROOT / "evidence"
|
||||
BASE = os.environ.get("BASE_URL", "http://127.0.0.1:8080").rstrip("/")
|
||||
BUCKET = os.environ.get("S3_BUCKET", "messenger-attachments")
|
||||
|
||||
|
||||
def compose(*args, timeout=120):
|
||||
proc = subprocess.run(
|
||||
["docker", "compose", "--env-file", ".env", *args],
|
||||
cwd=str(ROOT),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=timeout,
|
||||
encoding="utf-8",
|
||||
errors="replace",
|
||||
)
|
||||
if proc.returncode != 0:
|
||||
raise Failure("docker compose failed: " + (proc.stderr or proc.stdout)[-400:])
|
||||
return proc.stdout
|
||||
|
||||
|
||||
def main():
|
||||
client = Client(BASE, timeout=20)
|
||||
alice, _bob, _eve, chat = client.bootstrap()
|
||||
att, _content = client.attachment(alice, chat)
|
||||
orphan = "att/orphan-%s" % uuid.uuid4().hex
|
||||
script = """
|
||||
set -eu
|
||||
ROOT_USER=$(cat /run/secrets/minio_root_user)
|
||||
ROOT_PASS=$(cat /run/secrets/minio_root_password)
|
||||
mc alias set local http://minio:9000 "$ROOT_USER" "$ROOT_PASS" >/dev/null
|
||||
printf 'orphan' | mc pipe local/%s/%s
|
||||
mc ls local/%s/%s >/dev/null
|
||||
""" % (BUCKET, orphan, BUCKET, orphan)
|
||||
compose("run", "--rm", "--no-deps", "--entrypoint", "/bin/sh", "minio-init", "-c", script)
|
||||
time.sleep(2)
|
||||
compose(
|
||||
"run",
|
||||
"--rm",
|
||||
"--no-deps",
|
||||
"-e",
|
||||
"APP_ROLE=gc",
|
||||
"-e",
|
||||
"GC_ONCE=1",
|
||||
"-e",
|
||||
"ATTACHMENT_GC_GRACE_SECONDS=1",
|
||||
"gc",
|
||||
timeout=180,
|
||||
)
|
||||
missing = compose(
|
||||
"run",
|
||||
"--rm",
|
||||
"--no-deps",
|
||||
"--entrypoint",
|
||||
"/bin/sh",
|
||||
"minio-init",
|
||||
"-c",
|
||||
"""
|
||||
set -eu
|
||||
ROOT_USER=$(cat /run/secrets/minio_root_user)
|
||||
ROOT_PASS=$(cat /run/secrets/minio_root_password)
|
||||
mc alias set local http://minio:9000 "$ROOT_USER" "$ROOT_PASS" >/dev/null
|
||||
if mc ls local/%s/%s >/dev/null 2>&1; then exit 7; fi
|
||||
"""
|
||||
% (BUCKET, orphan),
|
||||
)
|
||||
del missing
|
||||
client.call("GET", "/api/v1/attachments/%s" % att["id"], actor=alice, schema="Attachment")
|
||||
EVIDENCE.mkdir(exist_ok=True)
|
||||
(EVIDENCE / "gc_orphans.json").write_text(
|
||||
json.dumps(
|
||||
{
|
||||
"date": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()),
|
||||
"orphan_removed": True,
|
||||
"live_attachment_kept": att["id"],
|
||||
"grace_seconds": 1,
|
||||
},
|
||||
indent=2,
|
||||
)
|
||||
+ "\n",
|
||||
encoding="utf-8",
|
||||
)
|
||||
print("PASS: orphan object removed, live attachment kept")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
run(main)
|
||||
@@ -0,0 +1,129 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Проверки lab3: разные реплики, идемпотентность через LB, гонка одного ключа."""
|
||||
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import threading
|
||||
import time
|
||||
import uuid
|
||||
from collections import Counter
|
||||
from pathlib import Path
|
||||
from urllib.parse import quote
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
sys.path.insert(0, str(ROOT / "tests"))
|
||||
from client import Client, Failure, check, run
|
||||
|
||||
EVIDENCE = ROOT / "evidence"
|
||||
BASE = os.environ.get("BASE_URL", "http://127.0.0.1:8080").rstrip("/")
|
||||
|
||||
|
||||
def history(client, actor, chat):
|
||||
path = "/api/v1/chats/" + chat["id"] + "/messages?limit=100"
|
||||
result = []
|
||||
seen = set()
|
||||
for _ in range(1000):
|
||||
page = client.call("GET", path, actor=actor, schema="MessagePage")["json"]
|
||||
result.extend(page["items"])
|
||||
cursor = page["next_cursor"]
|
||||
if cursor is None:
|
||||
return result
|
||||
check(cursor not in seen, "cursor cycle")
|
||||
seen.add(cursor)
|
||||
path = "/api/v1/chats/" + chat["id"] + "/messages?limit=100&cursor=" + quote(cursor, safe="")
|
||||
raise Failure("history pagination exceeded safety bound")
|
||||
|
||||
|
||||
def test_instances(client, actor):
|
||||
seen = []
|
||||
for _ in range(40):
|
||||
seen.append(client.call("GET", "/api/v1/users/me", actor=actor, schema="User")["headers"]["X-Instance-Id"])
|
||||
unique = sorted(set(seen))
|
||||
check(len(unique) >= 2, "less than two API instances observed: %s" % unique)
|
||||
return {"unique_instance_ids": unique, "samples": len(seen), "counts": dict(Counter(seen))}
|
||||
|
||||
|
||||
def test_idempotency(client, alice, bob, chat):
|
||||
key = uuid.uuid4().hex
|
||||
first = client.message(alice, chat, "Один ключ", key=key)
|
||||
replay = client.message(alice, chat, "Один ключ", key=key)
|
||||
check(first["json"] == replay["json"], "idempotent replay differs")
|
||||
check(first["json"]["id"] == replay["json"]["id"], "idempotent replay allocated a new id")
|
||||
conflict = client.call(
|
||||
"POST",
|
||||
"/api/v1/chats/" + chat["id"] + "/messages",
|
||||
409,
|
||||
actor=alice,
|
||||
body={"text": "другой body"},
|
||||
headers={"Idempotency-Key": key},
|
||||
)
|
||||
check(conflict["json"]["error"]["code"] == "conflict", "wrong body code")
|
||||
missing = client.call(
|
||||
"POST",
|
||||
"/api/v1/chats/" + chat["id"] + "/messages",
|
||||
400,
|
||||
actor=alice,
|
||||
body={"text": "без ключа"},
|
||||
)
|
||||
check(missing["json"]["error"]["code"] == "invalid_request", "missing key code")
|
||||
other_user = client.message(bob, chat, "Один ключ", key=key)
|
||||
check(other_user["json"]["id"] != first["json"]["id"], "key leaked across users")
|
||||
return first["json"]["id"]
|
||||
|
||||
|
||||
def test_concurrent_key(client, alice, chat):
|
||||
key = uuid.uuid4().hex
|
||||
text = "Гонка ключа " + key
|
||||
barrier = threading.Barrier(12)
|
||||
results = []
|
||||
errors = []
|
||||
lock = threading.Lock()
|
||||
|
||||
def worker():
|
||||
local = Client(BASE, timeout=20)
|
||||
try:
|
||||
barrier.wait(20)
|
||||
response = local.message(alice, chat, text, key=key)
|
||||
with lock:
|
||||
results.append((response["status"], response["json"]["id"], response["headers"]["X-Instance-Id"]))
|
||||
except Exception as exc:
|
||||
with lock:
|
||||
errors.append("%s: %s" % (type(exc).__name__, exc))
|
||||
|
||||
threads = [threading.Thread(target=worker) for _ in range(12)]
|
||||
for thread in threads:
|
||||
thread.start()
|
||||
for thread in threads:
|
||||
thread.join()
|
||||
check(not errors, "concurrent idempotent POST failed: " + "; ".join(errors[:5]))
|
||||
check(len(results) == 12, "expected 12 successes, got %s" % len(results))
|
||||
ids = {item[1] for item in results}
|
||||
instances = sorted({item[2] for item in results})
|
||||
check(len(ids) == 1, "concurrent key created %s messages" % len(ids))
|
||||
listed = history(client, alice, chat)
|
||||
matches = [item for item in listed if item["text"] == text]
|
||||
check(len(matches) == 1, "history contains %s copies of the concurrent key" % len(matches))
|
||||
return {"message_id": next(iter(ids)), "instances": instances, "successes": len(results)}
|
||||
|
||||
|
||||
def main():
|
||||
client = Client(BASE, timeout=10)
|
||||
alice, bob, _eve, chat = client.bootstrap()
|
||||
instances = test_instances(client, alice)
|
||||
message_id = test_idempotency(client, alice, bob, chat)
|
||||
race = test_concurrent_key(client, alice, chat)
|
||||
EVIDENCE.mkdir(exist_ok=True)
|
||||
report = {
|
||||
"date": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()),
|
||||
"base_url": BASE,
|
||||
"instances": instances,
|
||||
"idempotent_message_id_present": bool(message_id),
|
||||
"concurrent_key": race,
|
||||
}
|
||||
(EVIDENCE / "level3.json").write_text(json.dumps(report, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
|
||||
print("PASS: level 3 replica routing and shared idempotency")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
run(main)
|
||||
@@ -0,0 +1,642 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Проверки уровня 4: гонка, откат, EXPLAIN, TTL, logout и отказ Redis/PostgreSQL.
|
||||
|
||||
Стенд уже должен быть поднят: scripts/bootstrap и docker compose up.
|
||||
Скрипт останавливает redis и postgres и снова их запускает.
|
||||
Токены и пароли не печатаются и не пишутся в evidence.
|
||||
"""
|
||||
|
||||
import asyncio
|
||||
import base64
|
||||
import json
|
||||
import os
|
||||
import socket
|
||||
import subprocess
|
||||
import sys
|
||||
import threading
|
||||
import time
|
||||
import urllib.error
|
||||
import urllib.request
|
||||
import uuid
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
EVIDENCE = ROOT / "evidence"
|
||||
sys.path.insert(0, str(ROOT / "src"))
|
||||
|
||||
BASE = os.environ.get("BASE_URL", "http://127.0.0.1:8080").rstrip("/")
|
||||
|
||||
|
||||
class Failure(AssertionError):
|
||||
pass
|
||||
|
||||
|
||||
def check(condition, message):
|
||||
if not condition:
|
||||
raise Failure(message)
|
||||
|
||||
|
||||
def host_secret(name):
|
||||
path = ROOT / "secrets" / name
|
||||
if not path.is_file():
|
||||
raise Failure("missing secrets/%s; run scripts/bootstrap first" % name)
|
||||
value = path.read_text(encoding="utf-8").strip()
|
||||
if not value:
|
||||
raise Failure("empty secrets/%s" % name)
|
||||
return value
|
||||
|
||||
|
||||
def call(method, path, expected, body=None, token=None, authorization=None, user_id=None, timeout=15, headers=None):
|
||||
extra = headers or {}
|
||||
headers = {"Accept": "application/json"}
|
||||
headers.update(extra)
|
||||
data = None
|
||||
if body is not None:
|
||||
data = json.dumps(body, ensure_ascii=False).encode("utf-8")
|
||||
headers["Content-Type"] = "application/json"
|
||||
if authorization:
|
||||
headers["Authorization"] = authorization
|
||||
elif token:
|
||||
headers["Authorization"] = "Bearer " + token
|
||||
if user_id:
|
||||
headers["X-User-Id"] = user_id
|
||||
request = urllib.request.Request(BASE + path, data=data, headers=headers, method=method)
|
||||
try:
|
||||
response = urllib.request.urlopen(request, timeout=timeout)
|
||||
except urllib.error.HTTPError as error:
|
||||
response = error
|
||||
except (urllib.error.URLError, TimeoutError, OSError) as exc:
|
||||
raise Failure(method + " " + path.split("?")[0] + " failed: " + type(exc).__name__) from None
|
||||
with response:
|
||||
status = response.status
|
||||
payload = response.read()
|
||||
header_id = response.headers.get("X-Request-Id")
|
||||
challenge = response.headers.get("WWW-Authenticate", "")
|
||||
allowed = [expected] if isinstance(expected, int) else list(expected)
|
||||
check(status in allowed, "%s %s: expected %s, got %s" % (method, path.split("?")[0], allowed, status))
|
||||
check(header_id and header_id.strip(), "missing X-Request-Id")
|
||||
parsed = None
|
||||
if payload:
|
||||
try:
|
||||
parsed = json.loads(payload)
|
||||
except json.JSONDecodeError as exc:
|
||||
raise Failure("response is not JSON") from exc
|
||||
if status >= 400:
|
||||
check(isinstance(parsed, dict) and set(parsed) == {"error"}, "error envelope")
|
||||
error = parsed["error"]
|
||||
check(set(error) == {"code", "message", "request_id"}, "error fields")
|
||||
check(error["request_id"] == header_id, "request_id differs from header")
|
||||
lowered = error["message"].lower()
|
||||
for leaked in ("traceback", "select ", "password", "syntax", "asyncpg", "sqlalchemy"):
|
||||
check(leaked not in lowered, "error message leaked internals")
|
||||
if status == 204:
|
||||
check(not payload, "204 must not contain a body")
|
||||
return {"status": status, "json": parsed, "www": challenge}
|
||||
|
||||
|
||||
def basic(username, password):
|
||||
raw = base64.b64encode(("%s:%s" % (username, password)).encode("utf-8")).decode("ascii")
|
||||
return "Basic " + raw
|
||||
|
||||
|
||||
def register(label, password=None):
|
||||
username = ("u_%s_%s" % (label, uuid.uuid4().hex[:10])).lower()
|
||||
password = password or ("T3st-" + uuid.uuid4().hex)
|
||||
created = call(
|
||||
"POST",
|
||||
"/api/v1/users",
|
||||
201,
|
||||
body={"username": username, "display_name": "Студент " + label, "password": password},
|
||||
)["json"]
|
||||
check("password" not in created, "password leaked")
|
||||
session = call("POST", "/api/v1/auth/sessions", 201, authorization=basic(username, password))["json"]
|
||||
check(session["token_type"] == "Bearer" and session["user"]["id"] == created["id"], "session shape")
|
||||
check(len(session["token"]) >= 32, "token is too short")
|
||||
return {"id": created["id"], "username": username, "password": password, "token": session["token"]}
|
||||
|
||||
|
||||
def compose(*args, timeout=120):
|
||||
proc = subprocess.run(
|
||||
["docker", "compose", *args],
|
||||
cwd=str(ROOT),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=timeout,
|
||||
encoding="utf-8",
|
||||
errors="replace",
|
||||
)
|
||||
if proc.returncode != 0:
|
||||
raise Failure("docker compose %s failed with code %s" % (args[0], proc.returncode))
|
||||
return proc.stdout
|
||||
|
||||
|
||||
def psql(sql, timeout=60):
|
||||
proc = subprocess.run(
|
||||
[
|
||||
"docker",
|
||||
"compose",
|
||||
"exec",
|
||||
"-T",
|
||||
"postgres",
|
||||
"psql",
|
||||
"-U",
|
||||
"messenger",
|
||||
"-d",
|
||||
"messenger",
|
||||
"-v",
|
||||
"ON_ERROR_STOP=1",
|
||||
"-At",
|
||||
"-c",
|
||||
sql,
|
||||
],
|
||||
cwd=str(ROOT),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=timeout,
|
||||
encoding="utf-8",
|
||||
errors="replace",
|
||||
)
|
||||
if proc.returncode != 0:
|
||||
raise Failure("psql failed")
|
||||
return proc.stdout.strip()
|
||||
|
||||
|
||||
def redis_cli(*args):
|
||||
proc = subprocess.run(
|
||||
["docker", "compose", "exec", "-T", "redis", "redis-cli", *args],
|
||||
cwd=str(ROOT),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=20,
|
||||
encoding="utf-8",
|
||||
errors="replace",
|
||||
)
|
||||
if proc.returncode != 0:
|
||||
raise Failure("redis-cli failed")
|
||||
return proc.stdout.strip()
|
||||
|
||||
|
||||
def sql_quote(value):
|
||||
text = str(value)
|
||||
if "'" in text or ";" in text or "\n" in text:
|
||||
raise Failure("refusing unsafe SQL literal")
|
||||
return "'" + text + "'"
|
||||
|
||||
|
||||
def free_port():
|
||||
with socket.socket() as sock:
|
||||
sock.bind(("127.0.0.1", 0))
|
||||
return sock.getsockname()[1]
|
||||
|
||||
|
||||
def wait_ready(timeout=90):
|
||||
deadline = time.monotonic() + timeout
|
||||
last = ""
|
||||
while time.monotonic() < deadline:
|
||||
try:
|
||||
call("GET", "/health/ready", 200, timeout=5)
|
||||
return
|
||||
except Failure as exc:
|
||||
last = str(exc)
|
||||
time.sleep(0.5)
|
||||
raise Failure("API did not become ready: " + last)
|
||||
|
||||
|
||||
def test_credentials():
|
||||
user = register("cred")
|
||||
wrong = call(
|
||||
"POST",
|
||||
"/api/v1/auth/sessions",
|
||||
401,
|
||||
authorization=basic(user["username"], "wrong-password-value"),
|
||||
)
|
||||
missing = call(
|
||||
"POST",
|
||||
"/api/v1/auth/sessions",
|
||||
401,
|
||||
authorization=basic("no_such_user_zz", "wrong-password-value"),
|
||||
)
|
||||
check(wrong["json"]["error"]["code"] == "unauthorized", "wrong password code")
|
||||
check(wrong["json"]["error"]["message"] == missing["json"]["error"]["message"], "credential errors differ")
|
||||
check(wrong["www"].lower().startswith("basic "), "basic challenge")
|
||||
bare = call("GET", "/api/v1/users/me", 401)
|
||||
check(bare["www"].lower().startswith("bearer "), "bearer challenge")
|
||||
only_header = call("GET", "/api/v1/users/me", 401, user_id=user["id"])
|
||||
check(only_header["json"]["error"]["code"] == "unauthorized", "X-User-Id alone was accepted")
|
||||
other = register("other")
|
||||
me = call("GET", "/api/v1/users/me", 200, token=user["token"], user_id=other["id"])["json"]
|
||||
check(me["id"] == user["id"], "X-User-Id overrode bearer")
|
||||
basic_on_api = call("GET", "/api/v1/users/me", 401, authorization=basic(user["username"], user["password"]))
|
||||
check(basic_on_api["www"].lower().startswith("bearer "), "basic accepted on business API")
|
||||
print("PASS: credentials, same 401, X-User-Id ignored")
|
||||
|
||||
|
||||
def test_unicode_password():
|
||||
password = "Пароль:пример-12"
|
||||
check(12 <= len(password) <= 128 and ":" in password, "fixture password")
|
||||
user = register("uni", password=password)
|
||||
again = call("POST", "/api/v1/auth/sessions", 201, authorization=basic(user["username"], password))["json"]
|
||||
check(again["user"]["id"] == user["id"], "unicode password login failed")
|
||||
print("PASS: unicode password with colon")
|
||||
|
||||
|
||||
def test_logout():
|
||||
user = register("bye")
|
||||
call("DELETE", "/api/v1/auth/sessions/current", 204, token=user["token"])
|
||||
rejected = call("GET", "/api/v1/users/me", 401, token=user["token"])
|
||||
check(rejected["www"].lower().startswith("bearer "), "revoked token challenge")
|
||||
again = call("DELETE", "/api/v1/auth/sessions/current", 401, token=user["token"])
|
||||
check(again["json"]["error"]["code"] == "unauthorized", "second logout")
|
||||
print("PASS: logout revokes the session")
|
||||
|
||||
|
||||
def test_injection_and_rollback():
|
||||
user = register("sql")
|
||||
chat = call(
|
||||
"POST",
|
||||
"/api/v1/chats",
|
||||
201,
|
||||
token=user["token"],
|
||||
body={"title": "SQL", "member_ids": [user["id"]]},
|
||||
)["json"]
|
||||
payload = "'; DROP TABLE messages; --"
|
||||
sent = call(
|
||||
"POST",
|
||||
"/api/v1/chats/%s/messages" % chat["id"],
|
||||
201,
|
||||
token=user["token"],
|
||||
body={"text": payload},
|
||||
headers={"Idempotency-Key": uuid.uuid4().hex},
|
||||
)["json"]
|
||||
check(sent["text"] == payload, "text was rewritten")
|
||||
check(psql("SELECT to_regclass('public.messages')") == "messages", "messages table disappeared")
|
||||
listed = call("GET", "/api/v1/chats/%s/messages?limit=10" % chat["id"], 200, token=user["token"])["json"]
|
||||
check(listed["items"][0]["text"] == payload, "stored text differs")
|
||||
|
||||
before = int(psql("SELECT count(*) FROM chats"))
|
||||
title = "partial-" + uuid.uuid4().hex
|
||||
rejected = call(
|
||||
"POST",
|
||||
"/api/v1/chats",
|
||||
400,
|
||||
token=user["token"],
|
||||
body={"title": title, "member_ids": [user["id"], str(uuid.uuid4())]},
|
||||
)
|
||||
check(rejected["json"]["error"]["code"] == "invalid_request", "unknown member code")
|
||||
after = int(psql("SELECT count(*) FROM chats"))
|
||||
check(before == after, "unknown member committed a chat")
|
||||
check(psql("SELECT count(*) FROM chats WHERE title = %s" % sql_quote(title)) == "0", "partial chat row exists")
|
||||
print("PASS: parameterized text and unknown-member chat is not stored")
|
||||
return user, chat
|
||||
|
||||
|
||||
async def failpoint(owner_id, other_id, title):
|
||||
os.environ["DATABASE_URL"] = host_secret("host_database_url")
|
||||
os.environ["REDIS_URL"] = host_secret("host_cache_url")
|
||||
from app.config import load_settings
|
||||
from app.crud.chats import create_chat
|
||||
from app.db import build_engine, build_session_factory
|
||||
from app.runtime import configure
|
||||
from app.sessions import build_redis
|
||||
|
||||
settings = load_settings()
|
||||
engine = build_engine(settings)
|
||||
redis = build_redis(settings)
|
||||
configure(build_session_factory(engine), redis, settings)
|
||||
try:
|
||||
try:
|
||||
await create_chat(
|
||||
uuid.UUID(owner_id),
|
||||
title,
|
||||
(uuid.UUID(owner_id), uuid.UUID(other_id)),
|
||||
fail_after_insert=True,
|
||||
)
|
||||
except RuntimeError as exc:
|
||||
check(str(exc) == "rollback-check", "failpoint raised a different error")
|
||||
else:
|
||||
raise Failure("failpoint committed a chat")
|
||||
finally:
|
||||
await redis.aclose()
|
||||
await engine.dispose()
|
||||
|
||||
|
||||
def test_failpoint(owner_id, other_id):
|
||||
title = "rollback-" + uuid.uuid4().hex
|
||||
before = int(psql("SELECT count(*) FROM chats"))
|
||||
try:
|
||||
asyncio.run(failpoint(owner_id, other_id, title))
|
||||
except Failure:
|
||||
raise
|
||||
except Exception as exc:
|
||||
raise Failure("rollback check failed: " + type(exc).__name__) from None
|
||||
after = int(psql("SELECT count(*) FROM chats"))
|
||||
left = psql("SELECT count(*) FROM chats WHERE title = %s" % sql_quote(title))
|
||||
check(before == after and left == "0", "chat insert survived the rollback")
|
||||
print("PASS: composite chat insert rolls back before commit")
|
||||
return {"chats_before": before, "chats_after": after, "title_rows": int(left)}
|
||||
|
||||
|
||||
def test_race():
|
||||
username = "race_" + uuid.uuid4().hex[:8]
|
||||
password = "Race-password-" + uuid.uuid4().hex[:8]
|
||||
body = {"username": username, "display_name": "Гонка", "password": password}
|
||||
barrier = threading.Barrier(16)
|
||||
statuses = []
|
||||
lock = threading.Lock()
|
||||
|
||||
def worker():
|
||||
try:
|
||||
barrier.wait(20)
|
||||
result = call("POST", "/api/v1/users", [201, 409], body=body, timeout=30)
|
||||
with lock:
|
||||
statuses.append(result["status"])
|
||||
except Exception as exc:
|
||||
with lock:
|
||||
statuses.append(str(exc)[:120])
|
||||
|
||||
threads = [threading.Thread(target=worker) for _ in range(16)]
|
||||
for thread in threads:
|
||||
thread.start()
|
||||
for thread in threads:
|
||||
thread.join()
|
||||
created = statuses.count(201)
|
||||
conflict = statuses.count(409)
|
||||
check(created == 1 and conflict == 15 and len(statuses) == 16, "race statuses %s" % statuses)
|
||||
print("PASS: 16 parallel registrations, one 201 and fifteen 409")
|
||||
return {"created": created, "conflict": conflict}
|
||||
|
||||
|
||||
def assert_plan(name, plan):
|
||||
check("ix_messages_history" in plan, name + " plan ignores ix_messages_history")
|
||||
check("Seq Scan" not in plan, name + " plan seq-scans messages")
|
||||
check("Index Scan" in plan or "Index Only Scan" in plan, name + " plan is not an index scan")
|
||||
check("Buffers:" in plan, name + " plan has no buffer stats")
|
||||
|
||||
|
||||
def test_explain(user):
|
||||
chat = call(
|
||||
"POST",
|
||||
"/api/v1/chats",
|
||||
201,
|
||||
token=user["token"],
|
||||
body={"title": "План", "member_ids": [user["id"]]},
|
||||
)["json"]
|
||||
chat_sql = sql_quote(chat["id"])
|
||||
user_sql = sql_quote(user["id"])
|
||||
psql(
|
||||
"INSERT INTO messages (id, chat_id, sender_id, body, created_at) "
|
||||
"SELECT gen_random_uuid(), %s, %s, 'row-' || g, "
|
||||
"TIMESTAMPTZ '2026-01-01 00:00:00+00' + (g || ' microseconds')::interval "
|
||||
"FROM generate_series(1, 10000) AS g" % (chat_sql, user_sql),
|
||||
timeout=60,
|
||||
)
|
||||
count = int(psql("SELECT count(*) FROM messages WHERE chat_id = %s" % chat_sql))
|
||||
check(count >= 10000, "expected at least 10000 messages, got %s" % count)
|
||||
psql("ANALYZE messages")
|
||||
midpoint = psql(
|
||||
"SELECT to_char(created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS.US'), id::text "
|
||||
"FROM messages WHERE chat_id = %s ORDER BY created_at, id OFFSET 5000 LIMIT 1" % chat_sql
|
||||
)
|
||||
created_at, message_id = midpoint.split("|")
|
||||
late = psql(
|
||||
"EXPLAIN (ANALYZE, BUFFERS) SELECT id, body FROM messages "
|
||||
"WHERE chat_id = %s AND (created_at, id) > (%s::timestamptz, %s::uuid) "
|
||||
"ORDER BY created_at, id LIMIT 50"
|
||||
% (chat_sql, sql_quote(created_at + "+00"), sql_quote(message_id)),
|
||||
timeout=60,
|
||||
)
|
||||
first = psql(
|
||||
"EXPLAIN (ANALYZE, BUFFERS) SELECT id, body FROM messages "
|
||||
"WHERE chat_id = %s ORDER BY created_at, id LIMIT 50" % chat_sql,
|
||||
timeout=60,
|
||||
)
|
||||
EVIDENCE.mkdir(exist_ok=True)
|
||||
(EVIDENCE / "explain_messages.txt").write_text(
|
||||
"messages=%s\n\n-- first page\n%s\n\n-- page after row 5000\n%s\n" % (count, first, late),
|
||||
encoding="utf-8",
|
||||
)
|
||||
assert_plan("first", first)
|
||||
assert_plan("late", late)
|
||||
print("PASS: EXPLAIN uses ix_messages_history on %s messages" % count)
|
||||
return {"messages": count, "chat_id": chat["id"]}
|
||||
|
||||
|
||||
def test_expiry_and_migrations():
|
||||
from app.timeutil import parse_time
|
||||
|
||||
users_before = int(psql("SELECT count(*) FROM users"))
|
||||
port = free_port()
|
||||
env = os.environ.copy()
|
||||
env["PYTHONPATH"] = str(ROOT / "src")
|
||||
env["PYTHONUNBUFFERED"] = "1"
|
||||
env["APP_HOST"] = "127.0.0.1"
|
||||
env["APP_PORT"] = str(port)
|
||||
env["APP_ENV"] = "lab"
|
||||
env["DATABASE_URL"] = host_secret("host_database_url")
|
||||
env["REDIS_URL"] = host_secret("host_cache_url")
|
||||
env["S3_ENDPOINT"] = host_secret("host_s3_endpoint")
|
||||
env["S3_ACCESS_KEY_ID"] = host_secret("s3_access_key_id")
|
||||
env["S3_SECRET_ACCESS_KEY"] = host_secret("s3_secret_access_key")
|
||||
env["S3_BUCKET"] = "messenger-attachments"
|
||||
env["SESSION_TTL_SECONDS"] = "2"
|
||||
env.pop("DATABASE_URL_FILE", None)
|
||||
env.pop("CACHE_URL_FILE", None)
|
||||
proc = subprocess.Popen(
|
||||
[sys.executable, "-m", "app"],
|
||||
cwd=str(ROOT),
|
||||
env=env,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.STDOUT,
|
||||
text=True,
|
||||
encoding="utf-8",
|
||||
errors="replace",
|
||||
)
|
||||
logs = []
|
||||
|
||||
def read_logs():
|
||||
if proc.stdout is None:
|
||||
return
|
||||
for line in proc.stdout:
|
||||
if "://" not in line and "password" not in line.lower():
|
||||
logs.append(line)
|
||||
|
||||
reader = threading.Thread(target=read_logs, daemon=True)
|
||||
reader.start()
|
||||
base = "http://127.0.0.1:%s" % port
|
||||
try:
|
||||
deadline = time.monotonic() + 40
|
||||
ready = False
|
||||
while time.monotonic() < deadline:
|
||||
if proc.poll() is not None:
|
||||
raise Failure("short-ttl server exited: " + "".join(logs[-8:]))
|
||||
try:
|
||||
urllib.request.urlopen(base + "/health/ready", timeout=2).read()
|
||||
ready = True
|
||||
break
|
||||
except (urllib.error.URLError, TimeoutError, OSError):
|
||||
time.sleep(0.2)
|
||||
check(ready, "short-ttl server did not become ready: " + "".join(logs[-8:]))
|
||||
username = "ttl_" + uuid.uuid4().hex[:8]
|
||||
password = "Ttl-password-" + uuid.uuid4().hex[:8]
|
||||
body = json.dumps(
|
||||
{"username": username, "display_name": "TTL", "password": password},
|
||||
ensure_ascii=False,
|
||||
).encode("utf-8")
|
||||
request = urllib.request.Request(
|
||||
base + "/api/v1/users",
|
||||
data=body,
|
||||
headers={"Content-Type": "application/json", "Accept": "application/json"},
|
||||
method="POST",
|
||||
)
|
||||
with urllib.request.urlopen(request, timeout=20) as response:
|
||||
created = json.loads(response.read())
|
||||
login = urllib.request.Request(
|
||||
base + "/api/v1/auth/sessions",
|
||||
data=b"",
|
||||
headers={"Authorization": basic(username, password), "Accept": "application/json"},
|
||||
method="POST",
|
||||
)
|
||||
with urllib.request.urlopen(login, timeout=20) as response:
|
||||
session = json.loads(response.read())
|
||||
expires = parse_time(session["expires_at"])
|
||||
delta = (expires - datetime.now(timezone.utc)).total_seconds()
|
||||
check(0 < delta <= 3, "SESSION_TTL_SECONDS=2 was not applied")
|
||||
time.sleep(delta + 1.0)
|
||||
probe = urllib.request.Request(
|
||||
base + "/api/v1/users/me",
|
||||
headers={"Authorization": "Bearer " + session["token"], "Accept": "application/json"},
|
||||
)
|
||||
try:
|
||||
with urllib.request.urlopen(probe, timeout=10) as response:
|
||||
status = response.status
|
||||
except urllib.error.HTTPError as error:
|
||||
status = error.status
|
||||
check(status == 401, "expired session status %s" % status)
|
||||
finally:
|
||||
if proc.poll() is None:
|
||||
proc.terminate()
|
||||
try:
|
||||
proc.wait(timeout=8)
|
||||
except subprocess.TimeoutExpired:
|
||||
proc.kill()
|
||||
proc.wait(timeout=5)
|
||||
reader.join(timeout=2)
|
||||
users_after = int(psql("SELECT count(*) FROM users"))
|
||||
versions = psql("SELECT count(*) FROM schema_migrations")
|
||||
version_name = psql("SELECT version FROM schema_migrations ORDER BY version")
|
||||
check(users_after == users_before + 1, "migrations duplicated or dropped users")
|
||||
names = psql("SELECT version FROM schema_migrations ORDER BY version")
|
||||
check(versions == "3", "expected three applied migrations, got %s" % versions)
|
||||
check(
|
||||
"001_initial.sql" in names and "002_idempotency.sql" in names and "003_attachments.sql" in names,
|
||||
"migration set changed: %s" % names,
|
||||
)
|
||||
print("PASS: short TTL expires and migrations stay idempotent")
|
||||
return {"users_before": users_before, "users_after": users_after, "migration": version_name}
|
||||
|
||||
|
||||
def test_redis_persistence(user):
|
||||
from app.sessions import session_key
|
||||
|
||||
before = int(redis_cli("PTTL", session_key(user["token"])))
|
||||
check(before > 300000, "session ttl is unexpectedly short")
|
||||
compose("restart", "redis")
|
||||
wait_ready()
|
||||
after = int(redis_cli("PTTL", session_key(user["token"])))
|
||||
check(after > 0, "session disappeared after redis restart")
|
||||
check(after <= before + 1000, "redis restart extended the session ttl")
|
||||
me = call("GET", "/api/v1/users/me", 200, token=user["token"])["json"]
|
||||
check(me["id"] == user["id"], "token did not survive redis restart")
|
||||
print("PASS: Redis AOF kept the session and did not refresh TTL")
|
||||
return {"pttl_before_ms": before, "pttl_after_ms": after}
|
||||
|
||||
|
||||
def test_dependency_loss(user, chat_id):
|
||||
observed = {}
|
||||
compose("stop", "redis")
|
||||
try:
|
||||
live = call("GET", "/health/live", 200)
|
||||
ready = call("GET", "/health/ready", 503)
|
||||
anonymous = call("GET", "/api/v1/users/me", 401)
|
||||
trusted = call("GET", "/api/v1/users/me", 503, token=user["token"])
|
||||
check(live["json"]["status"] == "ok", "live failed while redis is down")
|
||||
check(ready["json"]["error"]["code"] == "unavailable", "ready code")
|
||||
check(anonymous["json"]["error"]["code"] == "unauthorized", "anonymous became trusted")
|
||||
check(trusted["json"]["error"]["code"] == "unavailable", "unverified token was accepted")
|
||||
observed["redis_down"] = {
|
||||
"live": live["status"],
|
||||
"ready": ready["status"],
|
||||
"anonymous": anonymous["status"],
|
||||
"bearer": trusted["status"],
|
||||
}
|
||||
finally:
|
||||
compose("start", "redis")
|
||||
wait_ready()
|
||||
me = call("GET", "/api/v1/users/me", 200, token=user["token"])["json"]
|
||||
check(me["id"] == user["id"], "token lost after redis came back")
|
||||
|
||||
compose("stop", "postgres")
|
||||
try:
|
||||
live = call("GET", "/health/live", 200)
|
||||
ready = call("GET", "/health/ready", 503, timeout=20)
|
||||
anonymous = call("GET", "/api/v1/users/me", 401, timeout=20)
|
||||
denied = call("GET", "/api/v1/chats/" + chat_id, 503, token=user["token"], timeout=20)
|
||||
check(live["json"]["status"] == "ok", "live depends on postgres")
|
||||
check(ready["json"]["error"]["code"] == "unavailable", "ready while postgres is down")
|
||||
check(anonymous["json"]["error"]["code"] == "unauthorized", "anonymous trusted without postgres")
|
||||
check(denied["json"]["error"]["code"] == "unavailable", "request served without postgres")
|
||||
observed["postgres_down"] = {
|
||||
"live": live["status"],
|
||||
"ready": ready["status"],
|
||||
"anonymous": anonymous["status"],
|
||||
"bearer": denied["status"],
|
||||
}
|
||||
finally:
|
||||
compose("start", "postgres")
|
||||
wait_ready(timeout=90)
|
||||
history = call("GET", "/api/v1/chats/%s/messages?limit=5" % chat_id, 200, token=user["token"])["json"]
|
||||
check(history["items"], "messages lost after postgres restart")
|
||||
print("PASS: redis and postgres outages return 503 and do not trust anonymous clients")
|
||||
return observed
|
||||
|
||||
|
||||
def main():
|
||||
os.environ["DATABASE_URL"] = host_secret("host_database_url")
|
||||
os.environ["REDIS_URL"] = host_secret("host_cache_url")
|
||||
wait_ready(timeout=60)
|
||||
test_credentials()
|
||||
test_unicode_password()
|
||||
test_logout()
|
||||
user, chat = test_injection_and_rollback()
|
||||
other = register("pair")
|
||||
rollback = test_failpoint(user["id"], other["id"])
|
||||
race = test_race()
|
||||
explain = test_explain(user)
|
||||
expiry = test_expiry_and_migrations()
|
||||
pttl = test_redis_persistence(user)
|
||||
faults = test_dependency_loss(user, chat["id"])
|
||||
remaining = int(psql("SELECT count(*) FROM messages WHERE chat_id = %s" % sql_quote(explain["chat_id"])))
|
||||
check(remaining == explain["messages"], "bulk history lost after postgres restart")
|
||||
EVIDENCE.mkdir(exist_ok=True)
|
||||
report = {
|
||||
"date": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()),
|
||||
"base_url": BASE,
|
||||
"race": race,
|
||||
"rollback": rollback,
|
||||
"explain": {"messages": explain["messages"]},
|
||||
"expiry_and_migrations": expiry,
|
||||
"redis_restart": pttl,
|
||||
"dependency_loss": faults,
|
||||
"messages_after_postgres_restart": remaining,
|
||||
}
|
||||
(EVIDENCE / "level4.json").write_text(json.dumps(report, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
|
||||
print("PASS: level 4 checks")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
try:
|
||||
main()
|
||||
except Failure as exc:
|
||||
print("FAIL:", exc)
|
||||
sys.exit(1)
|
||||
@@ -0,0 +1,69 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Тот же сценарий, что tests/resilience.py, но hook запускается так, как умеет ОС.
|
||||
|
||||
Linux выполняет scripts/restart.sh напрямую.
|
||||
Windows не умеет CreateProcess для shell-скрипта, поэтому здесь используется Git Bash.
|
||||
Скрипт тот же: перезапуск api, postgres и redis без удаления томов.
|
||||
"""
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
from pathlib import Path
|
||||
from urllib.parse import quote
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
sys.path.insert(0, str(ROOT / "tests"))
|
||||
|
||||
from client import Client, Failure, check, run
|
||||
|
||||
|
||||
def hook_command():
|
||||
script = ROOT / "scripts" / "restart.sh"
|
||||
if os.name != "nt":
|
||||
return [str(script)]
|
||||
bash = Path(os.environ.get("BASH", r"C:\Program Files\Git\bin\bash.exe"))
|
||||
check(bash.is_file(), "Git Bash is required to launch scripts/restart.sh on Windows")
|
||||
return [str(bash), "-c", "sh scripts/restart.sh"]
|
||||
|
||||
|
||||
def history(client, actor, chat):
|
||||
path = "/api/v1/chats/" + chat["id"] + "/messages?limit=100"
|
||||
result = []
|
||||
seen = set()
|
||||
for _ in range(1000):
|
||||
page = client.call("GET", path, actor=actor, schema="MessagePage")["json"]
|
||||
result.extend(page["items"])
|
||||
cursor = page["next_cursor"]
|
||||
if cursor is None:
|
||||
return result
|
||||
check(cursor not in seen, "cursor cycle")
|
||||
seen.add(cursor)
|
||||
path = "/api/v1/chats/" + chat["id"] + "/messages?limit=100&cursor=" + quote(cursor, safe="")
|
||||
raise Failure("history pagination exceeded safety bound")
|
||||
|
||||
|
||||
def main():
|
||||
client = Client("http://127.0.0.1:8080", timeout=5)
|
||||
alice, bob, _eve, chat = client.bootstrap()
|
||||
original = client.message(alice, chat, "Сохранить при отказе")["json"]
|
||||
print("Executing scripts/restart.sh")
|
||||
completed = subprocess.run(hook_command(), cwd=str(ROOT))
|
||||
check(completed.returncode == 0, "restart hook failed")
|
||||
deadline = time.monotonic() + 90
|
||||
while True:
|
||||
try:
|
||||
client.call("GET", "/health/ready", schema="Health")
|
||||
client.call("GET", "/api/v1/users/me", actor=alice, schema="User")
|
||||
break
|
||||
except Failure:
|
||||
check(time.monotonic() < deadline, "stack/session did not recover within 90 seconds")
|
||||
time.sleep(0.5)
|
||||
messages = history(client, bob, chat)
|
||||
check(any(item == original for item in messages), "confirmed message lost or altered")
|
||||
print("PASS: persistence preserved confirmed data and existing session")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
run(main)
|
||||
@@ -0,0 +1,37 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Публичный persistence-сценарий с restart.cmd на Windows и restart.sh на POSIX."""
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
|
||||
def script():
|
||||
if os.name == "nt":
|
||||
cmd = ROOT / "scripts" / "restart.cmd"
|
||||
if cmd.is_file():
|
||||
return str(cmd)
|
||||
return str(ROOT / "scripts" / "restart.sh")
|
||||
|
||||
|
||||
def main():
|
||||
env = os.environ.copy()
|
||||
command = [
|
||||
sys.executable,
|
||||
str(ROOT / "tests" / "resilience.py"),
|
||||
"--mode",
|
||||
"persistence",
|
||||
"--action-script",
|
||||
script(),
|
||||
"--base-url",
|
||||
env.get("BASE_URL", "http://127.0.0.1:8080"),
|
||||
]
|
||||
completed = subprocess.run(command, cwd=str(ROOT), env=env)
|
||||
raise SystemExit(completed.returncode)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -0,0 +1,148 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Поочерёдная замена API-реплик под нагрузкой POST сообщений."""
|
||||
|
||||
import json
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
import threading
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
sys.path.insert(0, str(ROOT / "tests"))
|
||||
from client import Client, Failure, check, run
|
||||
|
||||
EVIDENCE = ROOT / "evidence"
|
||||
BASE = os.environ.get("BASE_URL", "http://127.0.0.1:8080").rstrip("/")
|
||||
|
||||
|
||||
def compose(*args, timeout=180):
|
||||
proc = subprocess.run(
|
||||
["docker", "compose", "--env-file", ".env", *args],
|
||||
cwd=str(ROOT),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=timeout,
|
||||
encoding="utf-8",
|
||||
errors="replace",
|
||||
)
|
||||
if proc.returncode != 0:
|
||||
raise Failure("docker compose %s failed" % args[0])
|
||||
return proc.stdout
|
||||
|
||||
|
||||
def api_ids():
|
||||
return [line.strip() for line in compose("ps", "-q", "api").splitlines() if line.strip()]
|
||||
|
||||
|
||||
def inspect_health(container_id):
|
||||
proc = subprocess.run(
|
||||
["docker", "inspect", "-f", "{{if .State.Health}}{{.State.Health.Status}}{{else}}{{.State.Status}}{{end}}", container_id],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=20,
|
||||
encoding="utf-8",
|
||||
errors="replace",
|
||||
)
|
||||
return proc.stdout.strip()
|
||||
|
||||
|
||||
def wait_healthy(container_id, timeout=90):
|
||||
deadline = time.monotonic() + timeout
|
||||
last = ""
|
||||
while time.monotonic() < deadline:
|
||||
last = inspect_health(container_id)
|
||||
if last == "healthy":
|
||||
return
|
||||
time.sleep(0.5)
|
||||
raise Failure("replica %s did not become healthy: %s" % (container_id[:12], last))
|
||||
|
||||
|
||||
def wait_ready(timeout=90):
|
||||
client = Client(BASE, timeout=3)
|
||||
deadline = time.monotonic() + timeout
|
||||
last = ""
|
||||
while time.monotonic() < deadline:
|
||||
try:
|
||||
client.call("GET", "/health/ready", schema="Health")
|
||||
return
|
||||
except Failure as exc:
|
||||
last = str(exc)
|
||||
time.sleep(0.4)
|
||||
raise Failure("LB ready wait failed: " + last)
|
||||
|
||||
|
||||
def main():
|
||||
client = Client(BASE, timeout=8)
|
||||
alice, _bob, _eve, chat = client.bootstrap()
|
||||
halt = threading.Event()
|
||||
latencies = []
|
||||
errors = []
|
||||
lock = threading.Lock()
|
||||
|
||||
def worker(index):
|
||||
local = Client(BASE, timeout=5)
|
||||
n = 0
|
||||
while not halt.is_set():
|
||||
started = time.monotonic()
|
||||
try:
|
||||
local.message(alice, chat, "rolling-%s-%s" % (index, n))
|
||||
with lock:
|
||||
latencies.append(time.monotonic() - started)
|
||||
except Failure:
|
||||
with lock:
|
||||
errors.append(time.monotonic())
|
||||
n += 1
|
||||
|
||||
threads = [threading.Thread(target=worker, args=(i,), daemon=True) for i in range(4)]
|
||||
for thread in threads:
|
||||
thread.start()
|
||||
time.sleep(5)
|
||||
before = api_ids()
|
||||
check(len(before) >= 2, "rolling update needs >=2 replicas")
|
||||
compose("build", "api")
|
||||
replaced = []
|
||||
for old in list(before):
|
||||
current = api_ids()
|
||||
compose("up", "-d", "--no-deps", "--scale", "api=%d" % (len(current) + 1), "--no-recreate", "api")
|
||||
deadline = time.monotonic() + 60
|
||||
new_ids = api_ids()
|
||||
while len(new_ids) <= len(current) and time.monotonic() < deadline:
|
||||
time.sleep(0.5)
|
||||
new_ids = api_ids()
|
||||
added = [item for item in new_ids if item not in current]
|
||||
check(added, "new replica was not created")
|
||||
wait_healthy(added[-1])
|
||||
wait_ready()
|
||||
subprocess.run(["docker", "stop", "-t", "5", old], capture_output=True)
|
||||
subprocess.run(["docker", "rm", "-f", old], capture_output=True)
|
||||
remaining = api_ids()
|
||||
check(old not in remaining, "old replica %s still in service" % old[:12])
|
||||
compose("up", "-d", "--no-deps", "--scale", "api=%d" % len(before), "api")
|
||||
wait_ready()
|
||||
replaced.append(old[:12])
|
||||
time.sleep(5)
|
||||
halt.set()
|
||||
for thread in threads:
|
||||
thread.join(timeout=10)
|
||||
after = api_ids()
|
||||
check(len(after) >= 2, "lost replicas after rolling update")
|
||||
check(len(latencies) > 0, "no successful writes during rolling update")
|
||||
report = {
|
||||
"date": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()),
|
||||
"replaced": replaced,
|
||||
"replicas_before": [item[:12] for item in before],
|
||||
"replicas_after": [item[:12] for item in after],
|
||||
"successful_writes": len(latencies),
|
||||
"failed_writes": len(errors),
|
||||
"error_ratio": round(len(errors) / max(1, len(latencies) + len(errors)), 6),
|
||||
}
|
||||
EVIDENCE.mkdir(exist_ok=True)
|
||||
(EVIDENCE / "rolling.json").write_text(json.dumps(report, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
|
||||
print("PASS: rolling update under load")
|
||||
print(json.dumps(report, ensure_ascii=False))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
run(main)
|
||||
@@ -0,0 +1,509 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import base64
|
||||
import json
|
||||
import os
|
||||
import socket
|
||||
import subprocess
|
||||
import sys
|
||||
import threading
|
||||
import time
|
||||
import urllib.error
|
||||
import urllib.request
|
||||
import uuid
|
||||
from pathlib import Path
|
||||
from urllib.parse import quote
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
EVIDENCE = ROOT / "evidence"
|
||||
SECRET = "SECRET_MESSAGE_DO_NOT_LOG_7f3a"
|
||||
CLIENTS = 10
|
||||
PER_CLIENT = 10
|
||||
|
||||
|
||||
class Failure(AssertionError):
|
||||
pass
|
||||
|
||||
|
||||
def check(condition, message):
|
||||
if not condition:
|
||||
raise Failure(message)
|
||||
|
||||
|
||||
def free_port():
|
||||
with socket.socket() as sock:
|
||||
sock.bind(("127.0.0.1", 0))
|
||||
return sock.getsockname()[1]
|
||||
|
||||
|
||||
class Server:
|
||||
def __init__(self, port):
|
||||
self.base = "http://127.0.0.1:%d" % port
|
||||
env = os.environ.copy()
|
||||
env["PYTHONPATH"] = str(ROOT / "src")
|
||||
env["PYTHONUNBUFFERED"] = "1"
|
||||
env["APP_HOST"] = "127.0.0.1"
|
||||
env["APP_PORT"] = str(port)
|
||||
env["APP_ENV"] = "lab"
|
||||
env["DATABASE_URL"] = host_secret("host_database_url")
|
||||
env["REDIS_URL"] = host_secret("host_cache_url")
|
||||
env["S3_ENDPOINT"] = host_secret("host_s3_endpoint")
|
||||
env["S3_ACCESS_KEY_ID"] = host_secret("s3_access_key_id")
|
||||
env["S3_SECRET_ACCESS_KEY"] = host_secret("s3_secret_access_key")
|
||||
env["S3_BUCKET"] = "messenger-attachments"
|
||||
env["SESSION_TTL_SECONDS"] = "3600"
|
||||
env.pop("DATABASE_URL_FILE", None)
|
||||
env.pop("CACHE_URL_FILE", None)
|
||||
self.logs = []
|
||||
self.proc = subprocess.Popen(
|
||||
[sys.executable, "-m", "app"],
|
||||
cwd=str(ROOT),
|
||||
env=env,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.STDOUT,
|
||||
text=True,
|
||||
encoding="utf-8",
|
||||
errors="replace",
|
||||
)
|
||||
self._reader = threading.Thread(target=self._read, daemon=True)
|
||||
self._reader.start()
|
||||
|
||||
def _read(self):
|
||||
assert self.proc.stdout is not None
|
||||
for line in self.proc.stdout:
|
||||
self.logs.append(line)
|
||||
|
||||
def wait_ready(self):
|
||||
deadline = time.monotonic() + 40
|
||||
last = ""
|
||||
while time.monotonic() < deadline:
|
||||
if self.proc.poll() is not None:
|
||||
raise Failure("server exited early:\n" + "".join(self.logs[-40:]))
|
||||
try:
|
||||
call(self.base, "GET", "/health/ready", 200)
|
||||
return
|
||||
except Failure as exc:
|
||||
last = str(exc)
|
||||
except (urllib.error.URLError, TimeoutError, OSError) as exc:
|
||||
last = type(exc).__name__
|
||||
time.sleep(0.1)
|
||||
raise Failure("server did not become ready: " + last + "\n" + "".join(self.logs[-40:]))
|
||||
|
||||
def stop(self):
|
||||
if self.proc.poll() is None:
|
||||
self.proc.terminate()
|
||||
try:
|
||||
self.proc.wait(timeout=8)
|
||||
except subprocess.TimeoutExpired:
|
||||
self.proc.kill()
|
||||
self.proc.wait(timeout=5)
|
||||
self._reader.join(timeout=2)
|
||||
|
||||
def output(self):
|
||||
return "".join(self.logs)
|
||||
|
||||
|
||||
def host_secret(name):
|
||||
path = ROOT / "secrets" / name
|
||||
if not path.is_file():
|
||||
raise Failure("missing secrets/%s; run scripts/bootstrap.ps1 or scripts/bootstrap.sh" % name)
|
||||
value = path.read_text(encoding="utf-8").strip()
|
||||
if not value:
|
||||
raise Failure("empty secrets/%s" % name)
|
||||
return value
|
||||
|
||||
|
||||
def call(
|
||||
base,
|
||||
method,
|
||||
path,
|
||||
expected,
|
||||
body=None,
|
||||
token=None,
|
||||
user_id=None,
|
||||
authorization=None,
|
||||
raw=None,
|
||||
content_type="application/json",
|
||||
timeout=20,
|
||||
headers=None,
|
||||
):
|
||||
extra_headers = headers or {}
|
||||
headers = {"Accept": "application/json"}
|
||||
headers.update(extra_headers)
|
||||
data = None
|
||||
if raw is not None:
|
||||
data = raw
|
||||
headers["Content-Type"] = content_type
|
||||
elif body is not None:
|
||||
data = json.dumps(body, ensure_ascii=False).encode("utf-8")
|
||||
headers["Content-Type"] = content_type
|
||||
if authorization:
|
||||
headers["Authorization"] = authorization
|
||||
elif token:
|
||||
headers["Authorization"] = "Bearer " + token
|
||||
if user_id:
|
||||
headers["X-User-Id"] = user_id
|
||||
request = urllib.request.Request(base + path, data=data, headers=headers, method=method)
|
||||
try:
|
||||
response = urllib.request.urlopen(request, timeout=timeout)
|
||||
except urllib.error.HTTPError as error:
|
||||
response = error
|
||||
except (urllib.error.URLError, TimeoutError, OSError) as exc:
|
||||
raise Failure(method + " " + path.split("?")[0] + " failed: " + type(exc).__name__) from None
|
||||
with response:
|
||||
status = response.status
|
||||
payload = response.read()
|
||||
header_id = response.headers.get("X-Request-Id")
|
||||
instance_id = response.headers.get("X-Instance-Id")
|
||||
content_type_value = response.headers.get_content_type()
|
||||
allowed = [expected] if isinstance(expected, int) else list(expected)
|
||||
check(status in allowed, "%s %s: expected %s, got %s" % (method, path.split("?")[0], allowed, status))
|
||||
check(header_id and header_id.strip() and "," not in header_id, "missing or duplicated X-Request-Id")
|
||||
check(instance_id and instance_id.strip() and "," not in instance_id, "missing or duplicated X-Instance-Id")
|
||||
parsed = None
|
||||
if payload:
|
||||
check(content_type_value == "application/json", "expected application/json")
|
||||
try:
|
||||
parsed = json.loads(payload)
|
||||
except json.JSONDecodeError as exc:
|
||||
raise Failure("response is not JSON") from exc
|
||||
if status >= 400:
|
||||
check(isinstance(parsed, dict) and set(parsed) == {"error"}, "error envelope")
|
||||
error = parsed["error"]
|
||||
check(set(error) == {"code", "message", "request_id"}, "error fields")
|
||||
check(error["request_id"] == header_id, "request_id differs from header")
|
||||
check(error["message"] and "Traceback" not in error["message"], "error message leaked internals")
|
||||
return {"status": status, "json": parsed, "request_id": header_id, "instance_id": instance_id}
|
||||
|
||||
|
||||
def send_message(base, chat_id, token, text, expected=201, key=None):
|
||||
headers = {"Idempotency-Key": key or uuid.uuid4().hex}
|
||||
return call(
|
||||
base,
|
||||
"POST",
|
||||
"/api/v1/chats/%s/messages" % chat_id,
|
||||
expected,
|
||||
token=token,
|
||||
body={"text": text},
|
||||
headers=headers,
|
||||
)
|
||||
|
||||
|
||||
def create_user(base, label):
|
||||
username = ("u_%s_%s" % (label, uuid.uuid4().hex[:10])).lower()
|
||||
password = "T3st-" + uuid.uuid4().hex
|
||||
body = {"username": username, "display_name": "Студент " + label, "password": password}
|
||||
created = call(base, "POST", "/api/v1/users", 201, body=body)["json"]
|
||||
check(created["username"] == username, "username changed")
|
||||
check("password" not in created, "password leaked in user response")
|
||||
raw = base64.b64encode(("%s:%s" % (username, password)).encode("utf-8")).decode("ascii")
|
||||
session = call(base, "POST", "/api/v1/auth/sessions", 201, authorization="Basic " + raw)["json"]
|
||||
check(session["token_type"] == "Bearer", "token type")
|
||||
check(session["user"]["id"] == created["id"], "session user")
|
||||
check("password" not in session["user"], "password leaked in session")
|
||||
created["token"] = session["token"]
|
||||
created["instance_id"] = session.get("instance_id")
|
||||
return created
|
||||
|
||||
|
||||
def replace_cursor(token, fields):
|
||||
padding = "=" * (-len(token) % 4)
|
||||
data = json.loads(base64.urlsafe_b64decode(token + padding))
|
||||
data.update(fields)
|
||||
raw = json.dumps(data, separators=(",", ":"), sort_keys=True).encode("ascii")
|
||||
return base64.urlsafe_b64encode(raw).decode("ascii").rstrip("=")
|
||||
|
||||
|
||||
def test_invalid_json(base):
|
||||
broken = call(base, "POST", "/api/v1/users", 400, raw=b"{")
|
||||
check(broken["json"]["error"]["code"] == "invalid_request", "malformed JSON code")
|
||||
extra = call(
|
||||
base,
|
||||
"POST",
|
||||
"/api/v1/users",
|
||||
400,
|
||||
body={"username": "abc_user", "display_name": "Имя", "extra": True},
|
||||
)
|
||||
check(extra["json"]["error"]["code"] == "invalid_request", "extra field code")
|
||||
bad_utf = call(base, "POST", "/api/v1/users", 400, raw=b"\xff")
|
||||
check(bad_utf["json"]["error"]["code"] == "invalid_request", "invalid utf-8 code")
|
||||
alice = create_user(base, "utf")
|
||||
chat = call(
|
||||
base,
|
||||
"POST",
|
||||
"/api/v1/chats",
|
||||
201,
|
||||
token=alice["token"],
|
||||
body={"title": "UTF", "member_ids": [alice["id"]]},
|
||||
)["json"]
|
||||
bad_message = call(
|
||||
base,
|
||||
"POST",
|
||||
"/api/v1/chats/%s/messages" % chat["id"],
|
||||
400,
|
||||
token=alice["token"],
|
||||
raw=b"\xff",
|
||||
headers={"Idempotency-Key": uuid.uuid4().hex},
|
||||
)
|
||||
check(bad_message["json"]["error"]["code"] == "invalid_request", "invalid utf-8 message code")
|
||||
print("PASS: invalid JSON")
|
||||
|
||||
|
||||
def test_duplicate_username(base):
|
||||
first = create_user(base, "dup")
|
||||
again = call(
|
||||
base,
|
||||
"POST",
|
||||
"/api/v1/users",
|
||||
409,
|
||||
body={
|
||||
"username": first["username"],
|
||||
"display_name": "Другой",
|
||||
"password": "T3st-" + uuid.uuid4().hex,
|
||||
},
|
||||
)
|
||||
check(again["json"]["error"]["code"] == "conflict", "duplicate username code")
|
||||
me = call(base, "GET", "/api/v1/users/me", 200, token=first["token"])["json"]
|
||||
check(me["id"] == first["id"], "first user disappeared after duplicate")
|
||||
print("PASS: duplicate username")
|
||||
|
||||
|
||||
def test_empty_and_foreign(base):
|
||||
alice = create_user(base, "alice")
|
||||
bob = create_user(base, "bob")
|
||||
chat = call(
|
||||
base,
|
||||
"POST",
|
||||
"/api/v1/chats",
|
||||
201,
|
||||
token=alice["token"],
|
||||
body={"title": "Только Алиса", "member_ids": [alice["id"]]},
|
||||
)["json"]
|
||||
path = "/api/v1/chats/" + chat["id"]
|
||||
for text in ("", " ", "\n\t"):
|
||||
denied = call(
|
||||
base,
|
||||
"POST",
|
||||
path + "/messages",
|
||||
400,
|
||||
token=alice["token"],
|
||||
body={"text": text},
|
||||
headers={"Idempotency-Key": uuid.uuid4().hex},
|
||||
)
|
||||
check(denied["json"]["error"]["code"] == "invalid_request", "empty message code")
|
||||
for method, target, payload in (
|
||||
("GET", path, None),
|
||||
("GET", path + "/messages", None),
|
||||
("POST", path + "/messages", {"text": "чужое"}),
|
||||
):
|
||||
extra = {"Idempotency-Key": uuid.uuid4().hex} if method == "POST" else None
|
||||
hidden = call(base, method, target, 404, token=bob["token"], body=payload, headers=extra)
|
||||
check(hidden["json"]["error"]["code"] == "not_found", "foreign chat code")
|
||||
check(chat["title"] not in hidden["json"]["error"]["message"], "foreign chat leaked title")
|
||||
listed = call(base, "GET", "/api/v1/chats?limit=100", 200, token=bob["token"])["json"]
|
||||
check(all(item["id"] != chat["id"] for item in listed["items"]), "foreign chat listed")
|
||||
missing = call(base, "GET", "/api/v1/chats/" + str(uuid.uuid4()), 404, token=bob["token"])
|
||||
check(missing["json"]["error"]["code"] == "not_found", "missing chat code")
|
||||
bad_limit = call(base, "GET", path + "/messages?limit=0", 400, token=alice["token"])
|
||||
check(bad_limit["json"]["error"]["code"] == "invalid_request", "limit=0 code")
|
||||
print("PASS: empty message and foreign chat")
|
||||
|
||||
|
||||
def test_pagination(base):
|
||||
alice = create_user(base, "page")
|
||||
other = create_user(base, "other")
|
||||
chat = call(
|
||||
base,
|
||||
"POST",
|
||||
"/api/v1/chats",
|
||||
201,
|
||||
token=alice["token"],
|
||||
body={"title": "Страницы", "member_ids": [alice["id"]]},
|
||||
)["json"]
|
||||
other_chat = call(
|
||||
base,
|
||||
"POST",
|
||||
"/api/v1/chats",
|
||||
201,
|
||||
token=other["token"],
|
||||
body={"title": "Другой", "member_ids": [other["id"]]},
|
||||
)["json"]
|
||||
texts = ["p0", "Привет, мир 👋", "p2", "p3", "p4"]
|
||||
created = []
|
||||
for text in texts:
|
||||
created.append(send_message(base, chat["id"], alice["token"], text)["json"])
|
||||
send_message(base, other_chat["id"], other["token"], "x")
|
||||
send_message(base, other_chat["id"], other["token"], "y")
|
||||
collected = []
|
||||
cursor = None
|
||||
pages = 0
|
||||
while True:
|
||||
target = "/api/v1/chats/%s/messages?limit=2" % chat["id"]
|
||||
if cursor:
|
||||
target += "&cursor=" + quote(cursor, safe="")
|
||||
page = call(base, "GET", target, 200, token=alice["token"])["json"]
|
||||
pages += 1
|
||||
collected.extend(page["items"])
|
||||
cursor = page["next_cursor"]
|
||||
if cursor is None:
|
||||
break
|
||||
check(pages < 10, "pagination did not finish")
|
||||
check(pages == 3, "expected 3 pages, got %d" % pages)
|
||||
check(collected == created, "pagination lost, duplicated or reordered messages")
|
||||
stolen = call(
|
||||
base,
|
||||
"GET",
|
||||
"/api/v1/chats/%s/messages?limit=1" % other_chat["id"],
|
||||
200,
|
||||
token=other["token"],
|
||||
)["json"]
|
||||
check(stolen["next_cursor"], "foreign page should expose a cursor")
|
||||
rejected = call(
|
||||
base,
|
||||
"GET",
|
||||
"/api/v1/chats/%s/messages?limit=2&cursor=%s" % (chat["id"], quote(stolen["next_cursor"], safe="")),
|
||||
400,
|
||||
token=alice["token"],
|
||||
)
|
||||
check(rejected["json"]["error"]["code"] == "invalid_request", "foreign cursor code")
|
||||
first_page = call(
|
||||
base,
|
||||
"GET",
|
||||
"/api/v1/chats/%s/messages?limit=1" % chat["id"],
|
||||
200,
|
||||
token=alice["token"],
|
||||
)["json"]
|
||||
for fields in ({"t": None}, {"t": 123}, {"i": 123}):
|
||||
broken = call(
|
||||
base,
|
||||
"GET",
|
||||
"/api/v1/chats/%s/messages?limit=1&cursor=%s"
|
||||
% (chat["id"], quote(replace_cursor(first_page["next_cursor"], fields), safe="")),
|
||||
400,
|
||||
token=alice["token"],
|
||||
)
|
||||
check(broken["json"]["error"]["code"] == "invalid_request", "tampered cursor code")
|
||||
print("PASS: pagination")
|
||||
|
||||
|
||||
def test_concurrency(base):
|
||||
users = [create_user(base, "c%d" % index) for index in range(CLIENTS)]
|
||||
chat = call(
|
||||
base,
|
||||
"POST",
|
||||
"/api/v1/chats",
|
||||
201,
|
||||
token=users[0]["token"],
|
||||
body={"title": "Гонка", "member_ids": [user["id"] for user in users]},
|
||||
)["json"]
|
||||
barrier = threading.Barrier(CLIENTS)
|
||||
found = []
|
||||
errors = []
|
||||
lock = threading.Lock()
|
||||
|
||||
def worker(user):
|
||||
try:
|
||||
barrier.wait(10)
|
||||
local = []
|
||||
for index in range(PER_CLIENT):
|
||||
message = send_message(
|
||||
base,
|
||||
chat["id"],
|
||||
user["token"],
|
||||
"m-%s-%d" % (user["id"][:8], index),
|
||||
)["json"]
|
||||
local.append(message["id"])
|
||||
with lock:
|
||||
found.extend(local)
|
||||
except Exception as exc:
|
||||
with lock:
|
||||
errors.append("%s: %s" % (type(exc).__name__, exc))
|
||||
|
||||
threads = [threading.Thread(target=worker, args=(user,)) for user in users]
|
||||
for thread in threads:
|
||||
thread.start()
|
||||
for thread in threads:
|
||||
thread.join()
|
||||
check(not errors, "concurrent sends failed: " + "; ".join(errors[:5]))
|
||||
check(len(found) == CLIENTS * PER_CLIENT, "submitted count")
|
||||
check(len(set(found)) == CLIENTS * PER_CLIENT, "duplicate message ids")
|
||||
|
||||
listed = []
|
||||
cursor = None
|
||||
while True:
|
||||
target = "/api/v1/chats/%s/messages?limit=40" % chat["id"]
|
||||
if cursor:
|
||||
target += "&cursor=" + quote(cursor, safe="")
|
||||
page = call(base, "GET", target, 200, token=users[0]["token"])["json"]
|
||||
listed.extend(item["id"] for item in page["items"])
|
||||
cursor = page["next_cursor"]
|
||||
if cursor is None:
|
||||
break
|
||||
check(len(listed) == 100 and len(set(listed)) == 100, "history does not contain 100 unique messages")
|
||||
check(set(listed) == set(found), "history ids differ from accepted sends")
|
||||
EVIDENCE.mkdir(exist_ok=True)
|
||||
report = {
|
||||
"date": "2026-10-25",
|
||||
"command": "python student-tests/run.py",
|
||||
"clients": CLIENTS,
|
||||
"messages_per_client": PER_CLIENT,
|
||||
"submitted": len(found),
|
||||
"unique_ids": len(set(found)),
|
||||
"listed": len(listed),
|
||||
"failed_requests": len(errors),
|
||||
"pass": True,
|
||||
}
|
||||
(EVIDENCE / "concurrency.json").write_text(
|
||||
json.dumps(report, ensure_ascii=False, indent=2) + "\n",
|
||||
encoding="utf-8",
|
||||
)
|
||||
print("PASS: concurrency 100 unique messages from 10 clients")
|
||||
|
||||
|
||||
def test_logs(server):
|
||||
alice = create_user(server.base, "logs")
|
||||
chat = call(
|
||||
server.base,
|
||||
"POST",
|
||||
"/api/v1/chats",
|
||||
201,
|
||||
token=alice["token"],
|
||||
body={"title": "Логи", "member_ids": [alice["id"]]},
|
||||
)["json"]
|
||||
send_message(server.base, chat["id"], alice["token"], SECRET)
|
||||
time.sleep(0.2)
|
||||
output = server.output()
|
||||
check("duration_ms=" in output and "method=POST" in output, "request log line missing")
|
||||
check(SECRET not in output, "message text leaked into logs")
|
||||
check(alice["token"] not in output, "session token leaked into logs")
|
||||
check("lab-only-password" not in output and "postgresql+asyncpg://" not in output, "database url leaked into logs")
|
||||
print("PASS: logs omit message text")
|
||||
|
||||
|
||||
def main():
|
||||
port = free_port()
|
||||
server = Server(port)
|
||||
try:
|
||||
server.wait_ready()
|
||||
call(server.base, "GET", "/health/live", 200)
|
||||
call(server.base, "GET", "/api/v1/users/me", 401)
|
||||
header_only = create_user(server.base, "header")
|
||||
rejected = call(server.base, "GET", "/api/v1/users/me", 401, user_id=header_only["id"])
|
||||
check(rejected["json"]["error"]["code"] == "unauthorized", "X-User-Id was accepted")
|
||||
test_invalid_json(server.base)
|
||||
test_duplicate_username(server.base)
|
||||
test_empty_and_foreign(server.base)
|
||||
test_pagination(server.base)
|
||||
test_concurrency(server.base)
|
||||
test_logs(server)
|
||||
finally:
|
||||
server.stop()
|
||||
print("PASS: student tests")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
try:
|
||||
main()
|
||||
except Failure as exc:
|
||||
print("FAIL:", exc)
|
||||
sys.exit(1)
|
||||
@@ -0,0 +1,60 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Прямой анонимный доступ к bucket должен быть закрыт."""
|
||||
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import time
|
||||
import urllib.error
|
||||
import urllib.request
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
sys.path.insert(0, str(ROOT / "tests"))
|
||||
from client import Client, Failure, check, run
|
||||
|
||||
EVIDENCE = ROOT / "evidence"
|
||||
BASE = os.environ.get("BASE_URL", "http://127.0.0.1:8080").rstrip("/")
|
||||
S3 = os.environ.get("S3_PUBLIC_URL", "http://127.0.0.1:9000").rstrip("/")
|
||||
BUCKET = os.environ.get("S3_BUCKET", "messenger-attachments")
|
||||
|
||||
|
||||
def anonymous(path: str) -> int:
|
||||
request = urllib.request.Request(S3 + path, method="GET")
|
||||
try:
|
||||
with urllib.request.urlopen(request, timeout=10) as response:
|
||||
return response.status
|
||||
except urllib.error.HTTPError as exc:
|
||||
return exc.status
|
||||
except (urllib.error.URLError, TimeoutError, OSError) as exc:
|
||||
raise Failure("direct s3 probe failed: " + type(exc).__name__) from None
|
||||
|
||||
|
||||
def main():
|
||||
client = Client(BASE, timeout=20)
|
||||
alice, _bob, _eve, chat = client.bootstrap()
|
||||
att, content = client.attachment(alice, chat)
|
||||
listed = anonymous("/" + BUCKET)
|
||||
obj = anonymous("/" + BUCKET + "/att/" + att["id"])
|
||||
check(listed in {403, 404}, "anonymous list status %s" % listed)
|
||||
check(obj in {403, 404}, "anonymous object status %s" % obj)
|
||||
download = client.call("GET", "/api/v1/attachments/%s/content" % att["id"], actor=alice)
|
||||
check(download["bytes"] == content, "authorized download after anonymous probe")
|
||||
EVIDENCE.mkdir(exist_ok=True)
|
||||
(EVIDENCE / "s3_private.json").write_text(
|
||||
json.dumps(
|
||||
{
|
||||
"date": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()),
|
||||
"anonymous_list": listed,
|
||||
"anonymous_object": obj,
|
||||
},
|
||||
indent=2,
|
||||
)
|
||||
+ "\n",
|
||||
encoding="utf-8",
|
||||
)
|
||||
print("PASS: private bucket rejects anonymous GET")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
run(main)
|
||||
@@ -0,0 +1,199 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Трек 5.1: цена масштабирования API при фиксированном и растущем бюджете CPU/RAM."""
|
||||
|
||||
import json
|
||||
import math
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
import threading
|
||||
import time
|
||||
from concurrent.futures import ThreadPoolExecutor
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
sys.path.insert(0, str(ROOT / "tests"))
|
||||
from client import Client, Failure, check, run
|
||||
|
||||
EVIDENCE = ROOT / "evidence"
|
||||
BASE = os.environ.get("BASE_URL", "http://127.0.0.1:8080").rstrip("/")
|
||||
DURATION = float(os.environ.get("TRACK1_DURATION", "30"))
|
||||
CONCURRENCY = int(os.environ.get("TRACK1_CONCURRENCY", "8"))
|
||||
WARMUP = float(os.environ.get("TRACK1_WARMUP", "8"))
|
||||
|
||||
|
||||
def compose(*args, timeout=180):
|
||||
proc = subprocess.run(
|
||||
["docker", "compose", "--env-file", ".env", *args],
|
||||
cwd=str(ROOT),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=timeout,
|
||||
encoding="utf-8",
|
||||
errors="replace",
|
||||
)
|
||||
if proc.returncode != 0:
|
||||
raise Failure("docker compose %s failed: %s" % (args[0], proc.stderr[-400:]))
|
||||
return proc.stdout
|
||||
|
||||
|
||||
def api_ids():
|
||||
return [line.strip() for line in compose("ps", "-q", "api").splitlines() if line.strip()]
|
||||
|
||||
|
||||
def wait_ready(timeout=90):
|
||||
client = Client(BASE, timeout=3)
|
||||
deadline = time.monotonic() + timeout
|
||||
last = ""
|
||||
while time.monotonic() < deadline:
|
||||
try:
|
||||
client.call("GET", "/health/ready", schema="Health")
|
||||
return
|
||||
except Failure as exc:
|
||||
last = str(exc)
|
||||
time.sleep(0.4)
|
||||
raise Failure("ready wait failed: " + last)
|
||||
|
||||
|
||||
def scale_api(n):
|
||||
compose("up", "-d", "--no-deps", "--scale", "api=%d" % n, "api")
|
||||
deadline = time.monotonic() + 90
|
||||
while time.monotonic() < deadline:
|
||||
if len(api_ids()) >= n:
|
||||
wait_ready()
|
||||
return
|
||||
time.sleep(0.5)
|
||||
raise Failure("failed to scale api to %s" % n)
|
||||
|
||||
|
||||
def apply_limits(cpus_each, memory_mb_each):
|
||||
for container_id in api_ids():
|
||||
args = ["docker", "update", "--cpus", "%.3f" % cpus_each, "--memory", "%dm" % memory_mb_each, container_id]
|
||||
proc = subprocess.run(args, capture_output=True, text=True, timeout=30)
|
||||
if proc.returncode != 0:
|
||||
raise Failure("docker update failed")
|
||||
|
||||
|
||||
def docker_stats():
|
||||
proc = subprocess.run(
|
||||
["docker", "stats", "--no-stream", "--format", "{{.Name}}\t{{.CPUPerc}}\t{{.MemUsage}}"],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=30,
|
||||
encoding="utf-8",
|
||||
errors="replace",
|
||||
)
|
||||
rows = []
|
||||
for line in proc.stdout.splitlines():
|
||||
parts = line.split("\t")
|
||||
if len(parts) == 3:
|
||||
rows.append({"name": parts[0], "cpu": parts[1], "mem": parts[2]})
|
||||
return rows
|
||||
|
||||
|
||||
def run_load(duration, concurrency, warmup):
|
||||
client = Client(BASE, timeout=8)
|
||||
alice, _bob, _eve, chat = client.bootstrap()
|
||||
if warmup > 0:
|
||||
deadline = time.monotonic() + warmup
|
||||
index = 0
|
||||
while time.monotonic() < deadline:
|
||||
client.message(alice, chat, "warmup-%s" % index)
|
||||
index += 1
|
||||
barrier = threading.Barrier(concurrency)
|
||||
|
||||
def worker(worker_id):
|
||||
local = Client(BASE, timeout=5)
|
||||
barrier.wait()
|
||||
end = time.monotonic() + duration
|
||||
latencies, errors = [], 0
|
||||
index = 0
|
||||
while time.monotonic() < end:
|
||||
started = time.monotonic()
|
||||
try:
|
||||
local.message(alice, chat, "track1-%s-%s" % (worker_id, index))
|
||||
latencies.append(time.monotonic() - started)
|
||||
except Failure:
|
||||
errors += 1
|
||||
index += 1
|
||||
return latencies, errors
|
||||
|
||||
started = time.monotonic()
|
||||
with ThreadPoolExecutor(max_workers=concurrency) as pool:
|
||||
results = list(pool.map(worker, range(concurrency)))
|
||||
elapsed = time.monotonic() - started
|
||||
latencies = sorted(item for values, _ in results for item in values)
|
||||
errors = sum(n for _, n in results)
|
||||
total = len(latencies) + errors
|
||||
|
||||
def percentile(p):
|
||||
if not latencies:
|
||||
return None
|
||||
return round(1000 * latencies[max(0, math.ceil(p * len(latencies)) - 1)], 3)
|
||||
|
||||
return {
|
||||
"elapsed_seconds": round(elapsed, 3),
|
||||
"concurrency": concurrency,
|
||||
"successful_requests": len(latencies),
|
||||
"failed_requests": errors,
|
||||
"error_ratio": round(errors / total, 6) if total else None,
|
||||
"successful_rps": round(len(latencies) / elapsed, 3) if elapsed else None,
|
||||
"successful_latency_ms": {"p50": percentile(0.50), "p95": percentile(0.95), "p99": percentile(0.99)},
|
||||
"docker_stats": docker_stats(),
|
||||
}
|
||||
|
||||
|
||||
def measure(label, replicas, cpus_each, memory_mb_each):
|
||||
scale_api(replicas)
|
||||
apply_limits(cpus_each, memory_mb_each)
|
||||
wait_ready()
|
||||
time.sleep(2)
|
||||
result = run_load(DURATION, CONCURRENCY, WARMUP)
|
||||
result.update(
|
||||
{
|
||||
"label": label,
|
||||
"replicas": replicas,
|
||||
"cpus_each": cpus_each,
|
||||
"memory_mb_each": memory_mb_each,
|
||||
"total_cpu": round(replicas * cpus_each, 3),
|
||||
"total_memory_mb": replicas * memory_mb_each,
|
||||
}
|
||||
)
|
||||
print(json.dumps({k: result[k] for k in ("label", "replicas", "total_cpu", "successful_rps", "error_ratio")}, ensure_ascii=False))
|
||||
return result
|
||||
|
||||
|
||||
def main():
|
||||
wait_ready()
|
||||
fixed_budget = [
|
||||
measure("fixed-1", 1, 1.00, 512),
|
||||
measure("fixed-2", 2, 0.50, 256),
|
||||
measure("fixed-4", 4, 0.25, 128),
|
||||
]
|
||||
growing = [
|
||||
measure("grow-2x0.25", 2, 0.25, 128),
|
||||
measure("grow-2x0.50", 2, 0.50, 256),
|
||||
measure("grow-2x1.00", 2, 1.00, 512),
|
||||
]
|
||||
scale_api(2)
|
||||
apply_limits(0.50, 256)
|
||||
report = {
|
||||
"date": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()),
|
||||
"hypothesis": "При фиксированном суммарном CPU/RAM добавление реплик перестаёт помогать, когда узким местом становится PostgreSQL/HAProxy, а не CPU процесса API.",
|
||||
"profile": {
|
||||
"duration_seconds": DURATION,
|
||||
"concurrency": CONCURRENCY,
|
||||
"warmup_seconds": WARMUP,
|
||||
"workload": "closed-loop POST /messages through HAProxy",
|
||||
},
|
||||
"fixed_total_budget": fixed_budget,
|
||||
"growing_resources": growing,
|
||||
}
|
||||
EVIDENCE.mkdir(exist_ok=True)
|
||||
(EVIDENCE / "track1.json").write_text(json.dumps(report, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
|
||||
check(all(item["successful_requests"] > 0 for item in fixed_budget + growing), "a track1 series had no successes")
|
||||
print("PASS: track1 series written to evidence/track1.json")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
run(main)
|
||||
@@ -0,0 +1,108 @@
|
||||
#!/usr/bin/env python3
|
||||
"""10 параллельных загрузок и пик RSS API-реплик по docker stats."""
|
||||
|
||||
import json
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
import threading
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
sys.path.insert(0, str(ROOT / "tests"))
|
||||
from client import Client, Failure, check, run
|
||||
|
||||
EVIDENCE = ROOT / "evidence"
|
||||
BASE = os.environ.get("BASE_URL", "http://127.0.0.1:8080").rstrip("/")
|
||||
WORKERS = 10
|
||||
SAMPLE = (ROOT / "tests" / "fixtures" / "sample.png").read_bytes()
|
||||
|
||||
|
||||
def api_mem_mib() -> float:
|
||||
proc = subprocess.run(
|
||||
["docker", "compose", "--env-file", ".env", "ps", "-q", "api"],
|
||||
cwd=str(ROOT),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=20,
|
||||
)
|
||||
ids = [line.strip() for line in proc.stdout.splitlines() if line.strip()]
|
||||
if not ids:
|
||||
raise Failure("no api containers")
|
||||
stats = subprocess.run(
|
||||
["docker", "stats", "--no-stream", "--format", "{{.MemUsage}}", *ids],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=20,
|
||||
)
|
||||
if stats.returncode != 0:
|
||||
raise Failure("docker stats failed")
|
||||
peak = 0.0
|
||||
for line in stats.stdout.splitlines():
|
||||
used = line.split("/", 1)[0].strip()
|
||||
if used.endswith("GiB"):
|
||||
peak = max(peak, float(used[:-3].strip()) * 1024)
|
||||
elif used.endswith("MiB"):
|
||||
peak = max(peak, float(used[:-3].strip()))
|
||||
elif used.endswith("KiB"):
|
||||
peak = max(peak, float(used[:-3].strip()) / 1024)
|
||||
return peak
|
||||
|
||||
|
||||
def main():
|
||||
client = Client(BASE, timeout=30)
|
||||
alice, _bob, _eve, chat = client.bootstrap()
|
||||
before = api_mem_mib()
|
||||
barrier = threading.Barrier(WORKERS)
|
||||
errors = []
|
||||
lock = threading.Lock()
|
||||
|
||||
def worker(index: int) -> None:
|
||||
local = Client(BASE, timeout=30)
|
||||
try:
|
||||
barrier.wait(20)
|
||||
local.call(
|
||||
"POST",
|
||||
"/api/v1/chats/%s/attachments?filename=p%d.png" % (chat["id"], index),
|
||||
201,
|
||||
actor=alice,
|
||||
raw=SAMPLE,
|
||||
headers={"Content-Type": "image/png"},
|
||||
schema="Attachment",
|
||||
)
|
||||
except Exception as exc:
|
||||
with lock:
|
||||
errors.append("%s: %s" % (type(exc).__name__, exc))
|
||||
|
||||
threads = [threading.Thread(target=worker, args=(i,)) for i in range(WORKERS)]
|
||||
for thread in threads:
|
||||
thread.start()
|
||||
peak = before
|
||||
deadline = time.monotonic() + 30
|
||||
while any(thread.is_alive() for thread in threads) and time.monotonic() < deadline:
|
||||
peak = max(peak, api_mem_mib())
|
||||
time.sleep(0.4)
|
||||
for thread in threads:
|
||||
thread.join()
|
||||
peak = max(peak, api_mem_mib())
|
||||
check(not errors, "concurrent uploads failed: " + "; ".join(errors[:3]))
|
||||
EVIDENCE.mkdir(exist_ok=True)
|
||||
(EVIDENCE / "upload_mem.json").write_text(
|
||||
json.dumps(
|
||||
{
|
||||
"date": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()),
|
||||
"workers": WORKERS,
|
||||
"rss_before_mib": round(before, 2),
|
||||
"rss_peak_mib": round(peak, 2),
|
||||
},
|
||||
indent=2,
|
||||
)
|
||||
+ "\n",
|
||||
encoding="utf-8",
|
||||
)
|
||||
print("PASS: %s concurrent uploads, peak RSS %.1f MiB" % (WORKERS, peak))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
run(main)
|
||||
Reference in New Issue
Block a user