diff --git a/.env.example b/.env.example index d99d26a2..42102630 100644 --- a/.env.example +++ b/.env.example @@ -11,10 +11,12 @@ SESSION_STORE=postgres CACHE_URL_FILE=/run/secrets/cache_url API_REPLICAS=2 IDEMPOTENCY_TTL_SECONDS=86400 -S3_ENDPOINT=http://s3:9000 +S3_ENDPOINT=http://minio:9000 S3_REGION=us-east-1 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 +S3_ACCESS_KEY_ID=messenger-api +S3_SECRET_ACCESS_KEY=change-me-local-only +MINIO_ROOT_USER=minioadmin +MINIO_ROOT_PASSWORD=change-me-minio-local-only MAX_UPLOAD_BYTES=10485760 MAX_IMAGE_PIXELS=40000000 diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 1bec5472..cfaa70ce 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,18 +1,22 @@ ## Лабораторная 4 -Автор / группа: TODO -Целевая оценка (3/4/5): TODO -Трек 5, если заявлен: TODO +Автор / группа: Борзов Никита, БВТ2304 +Целевая оценка (3/4/5): 5 +Трек 5, если заявлен: трек 2 «Согласованность двух хранилищ» -Что реализовано и что перенесено: TODO -Команды запуска из чистого clone: TODO -Результаты проверок и ссылка на REPORT.md: TODO -Ограничения / известные ошибки: TODO -Источники и использование ИИ: TODO +Что реализовано и что перенесено: проект ЛР3 перенесён без потери авторизации, PostgreSQL, Redis, балансировки, идемпотентности и отказоустойчивых сценариев. Добавлены приватный S3 bucket, метаданные вложений в PostgreSQL, PNG/JPEG upload/download, проверка доступа, лимиты, компенсационный delete и reconciler orphan/missing объектов. -- [ ] Весь обязательный минимум текущей и предыдущих работ сохранён с объявленными переходами. -- [ ] Контракт и публичные тесты не ослаблены. -- [ ] make check и make test выполнены; приложен реальный вывод. -- [ ] Сценарии отказов/безопасности своего уровня воспроизведены. -- [ ] Все секреты и приватные ключи находятся вне Git; отчёт не содержит tokens. -- [ ] README задания сохранён, REPORT.md содержит инструкцию именно моего решения. +Команды запуска из чистого clone: `cp .env.example .env`, `docker compose config --quiet`, `docker compose build api-1 minio-init`, `docker compose up -d --no-build --wait`. + +Результаты проверок и ссылка на REPORT.md: `make check`, `make test`, persistence, failover, `student-tests/attachments.py` и `scripts/track_s3.py` прошли. Полный отчёт — `REPORT.md`. + +Ограничения / известные ошибки: PostgreSQL, Redis, Nginx и один MinIO остаются единичными точками отказа; удаление volumes не входит в модель сохранности. Прямой S3 endpoint и консоль не публикуются. + +Источники и использование ИИ: skeleton и контракты репозитория задания, документация FastAPI, psycopg, boto3, Pillow, Docker Compose и S3. ИИ использовался как помощник при разборе требований и подготовке кода; результаты проверены локально. + +- [x] Весь обязательный минимум текущей и предыдущих работ сохранён с объявленными переходами. +- [x] Контракт и публичные тесты не ослаблены. +- [x] make check и make test выполнены; вывод приведён в REPORT.md. +- [x] Сценарии отказов и безопасности своего уровня воспроизведены. +- [x] Все секреты и приватные ключи находятся вне Git; отчёт не содержит tokens. +- [x] README задания сохранён, REPORT.md содержит инструкцию решения. diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..8a138fba --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ +FROM python:3.12.8-slim-bookworm +WORKDIR /app +COPY requirements.txt . +RUN pip install --no-cache-dir -r requirements.txt +COPY app ./app +COPY migrations ./migrations +COPY scripts ./scripts +RUN useradd --create-home --uid 10001 appuser && chown -R appuser:appuser /app +USER appuser +EXPOSE 8080 +CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8080"] diff --git a/REPORT.md b/REPORT.md index 9ad2b84f..ce0c569a 100644 --- a/REPORT.md +++ b/REPORT.md @@ -1,37 +1,81 @@ -# Отчёт — лабораторная 4 +# Отчёт по лабораторной работе №4 -- Автор, группа: TODO -- Целевая оценка; выбранный трек 5, если нужен: TODO -- Commit/PR: TODO после публикации -- Использованные источники, библиотеки и помощь ИИ: TODO +- Автор, группа: Борзов Никита, БВТ2304 +- Целевая оценка: 5, трек 2 «Согласованность двух хранилищ» +- Commit/PR: `11c227c`, [MR !26](https://gitea.privcloud.tech/mtusi2026/mtusi2026lab4/pulls/26) +- Основа: проект лабораторной 3 с сохранением PostgreSQL, Redis, четырёх API-реплик, Nginx и общей идемпотентности ## Запуск из чистого clone -TODO: версии runtime/образов, prerequisites, команды создания локальных secrets/.env, build, миграций, запуска, ожидания готовности, тестов и остановки. Указать необходимые действия оператора. Не вставлять секреты. Отдельно указать безопасную остановку и команду намеренного удаления учебных данных. +Требуются Docker Desktop с Compose v2 и Python 3.9+. Старые Docker Hub-образы MinIO больше не используются: стенд закрепляет digest-образы `cgr.dev/chainguard/minio` и `cgr.dev/chainguard/minio-client`. + +```sh +cp .env.example .env +docker compose config --quiet +docker compose build api-1 minio-init +docker compose up -d --no-build --wait +make check +make test BASE_URL=http://localhost:8080 +``` + +`minio` и одноразовый `minio-init` один раз создают приватный bucket и отдельного API-пользователя с правами только на нужный bucket. Консоль и порт S3 наружу не опубликованы. `docker compose down` останавливает стенд с сохранением volumes, а `docker compose down -v` намеренно удаляет учебные данные PostgreSQL, Redis и S3. + +Проверка публикации портов: `docker compose port minio 9000` и `docker compose port minio 9001` не возвращают адресов. Поэтому прямой unauthenticated GET к MinIO с хоста невозможен, а доступ к файлам идёт только через авторизованный API. ## Архитектура и решения -TODO: схема процессов/хранилищ, источник истины, транзакционные границы, ограничения. Что перенесено из lab3, что изменено в этой работе. Соответствие переменных из .env.example реальной конфигурации. +```text +Клиент -> Nginx -> API × 4 -> PostgreSQL (метаданные) + Redis (сессии/кэш) + | + +-> приватный S3 bucket (байты) +``` + +PostgreSQL хранит пользователей, чаты, сообщения и метаданные вложений. S3 хранит только оригинальные байты. В таблице `attachments` находятся chat_id, владелец, отображаемое имя, MIME, размер, SHA-256, статус и назначенный сервером object key. Файл заранее привязан к чату. + +`POST /api/v1/chats/{chat_id}/attachments` принимает сырые PNG/JPEG до 10 MiB. Запрос читается потоково небольшими кусками с жёстким ограничением размера. Pillow проверяет реальный формат файла и число пикселей до записи в S3. Имя не используется как путь или object key. Сначала выполняется S3 PUT, затем транзакционная запись метаданных; если запись PostgreSQL не удалась, выполняется компенсационный S3 DELETE. + +Метаданные и байты выдаются только через авторизованный API. Участник чата получает метаданные и побайтный download, посторонний получает 404. Message принимает `attachment_ids`; все ID должны принадлежать тому же чату и иметь статус `ready`. Текст может быть пустым, если прикреплено хотя бы одно вложение. + +Сохранены все возможности ЛР3: Bearer-сессии в Redis, PostgreSQL, keyset-пагинация, X-Instance-Id, Nginx, health/readiness, таймауты, Idempotency-Key, отказ одной API-реплики и restart с volumes. ## Доказательства критериев -| Критерий README | Команда/сценарий | Наблюдаемый результат | Файл доказательства | +| Критерий | Команда | Результат | Доказательство | | --- | --- | --- | --- | -| Публичный smoke | make test | TODO | TODO | -| Остальные пункты уровня 3 | TODO | TODO | TODO | -| Все пункты уровня 4, если заявлен | TODO | TODO | TODO | -| Выбранный трек 5, если заявлен | TODO | TODO | TODO | +| Контракт и структура | `make check` | PASS | вывод проверки | +| Публичный API и вложения | `make test BASE_URL=http://localhost:8080` | `PASS: lab4 public API scenario` | `tests/smoke.py` | +| Реальные S3-байты | smoke | SHA-256 и размер download совпали с fixture | `tests/fixtures/sample.png` | +| Проверка негативных случаев | `python3 student-tests/attachments.py` | повреждённый файл и MIME mismatch — 415, большой файл — 413, чужой доступ — 404 | `student-tests/attachments.py` | +| Сохранность | `make test-persistence BASE_URL=http://localhost:8080 ACTION_SCRIPT=scripts/restart.sh` | подтверждены данные, токен и вложение после restart | `scripts/restart.sh` | +| Отказ API-реплики | `make test-failover BASE_URL=http://localhost:8080 ACTION_SCRIPT=scripts/stop-one.sh` | записи и download продолжаются через другие реплики | `scripts/stop-one.sh` | +| Общая идемпотентность | `python3 student-tests/idempotency.py` | конкурентные запросы создали один Message ID | проверка ЛР3 | +| Reconciler | `docker compose run --rm --no-deps api-1 python scripts/track_s3.py` | старый orphan удалён, свежий сохранён, missing metadata помечена failed | `evidence/track_s3.json` | +| Память загрузок | `python3 student-tests/upload_load.py` при сборе `docker stats` | 10 одновременных upload завершились успешно; peak API — 125.1 MiB из 256 MiB | `student-tests/upload_load.py`, `evidence/upload_memory.txt` | -TODO: добавить отдельную строку для каждого заявленного критерия. PASS без команды и наблюдения не является доказательством. Проверка инфраструктурного hook требует подтверждения, какие реальные процессы/хранилища перезапущены. +## Исследовательский трек: согласованность двух хранилищ -## Эксперименты и отказы +Гипотеза: рассогласование PostgreSQL и S3 можно обнаруживать безопасным повторяемым обходом, не удаляя свежие объекты и не скрывая missing metadata. -TODO: гипотеза, hardware/лимиты, версии, объём данных, профиль нагрузки, concurrency/arrival rate, длительность/прогрев, повторы, успешные RPS, ошибки, p50/p95/p99, CPU/RAM. Сохранить raw summary без tokens и объяснить ограничения измерения. +Скрипт `scripts/reconcile_s3.py` сравнивает список объектов bucket с таблицей `attachments`. По умолчанию он работает в dry-run. Orphan удаляется только после grace period, заданного `--grace-seconds`; metadata без объекта переводится в `failed` с кодом `object_missing`. Используемые и свежие вложения не удаляются. -| Воздействие | Что ожидаем | Что наблюдали | Время восстановления / потеря данных | -| --- | --- | --- | --- | -| TODO | TODO | TODO | TODO | +`scripts/track_s3.py` создаёт старый orphan, свежий orphan и строку metadata без объекта. Затем выполняет dry-run и apply с grace period 5 секунд. В результате: -## Ограничения и следующие шаги +```json +{ + "old_orphan_removed": true, + "fresh_orphan_preserved": true, + "missing_marked_failed": true +} +``` -TODO: какие отказы выдерживаются и какие нет; что не реализовано; где учебное упрощение; какое улучшение подтверждено, а какое пока гипотеза. +После завершения эксперимента тестовые объекты и строка metadata удаляются. Отдельно 10 конкурентных загрузок fixture завершились успешно; при лимите API 256 MiB наблюдался максимум 125.1 MiB по `docker stats`. Ограничение измерения — один локальный MinIO с одним диском; это проверка согласованности и безопасного исправления, а не отказоустойчивость самого S3-кластера. + +## Отказы и ограничения + +Стенд выдерживает остановку одной API-реплики, перезапуск API/PostgreSQL/Redis/MinIO с сохранёнными volumes и переключение download через другую реплику. PostgreSQL, Redis, Nginx и один MinIO остаются единичными точками отказа. Потеря Docker-host и удаление volumes не входят в модель. + +S3 credentials API отделены от root credentials MinIO и получают только `GetObject`, `PutObject`, `DeleteObject` и `ListBucket` для учебного bucket. Прямой S3-порт и административная консоль в Compose не опубликованы. + +Локальные значения паролей в Compose нужны только для учебного запуска. В реальном окружении их задают через `.env` или секреты; файл `.env` в репозиторий не добавляется. + +Исходный контракт и публичные tests не изменялись. ИИ использовался как помощник при разборе требований и подготовке кода; команды и результаты проверены на локальном Compose-стенде. diff --git a/app/__init__.py b/app/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/app/main.py b/app/main.py new file mode 100644 index 00000000..0a88ab27 --- /dev/null +++ b/app/main.py @@ -0,0 +1,751 @@ +import base64 +import io +import json +import os +import re +import secrets +import threading +import uuid +import hashlib +from datetime import datetime, timedelta, timezone + +import redis +import boto3 +from botocore.config import Config +from argon2 import PasswordHasher +from fastapi import FastAPI, Request +from fastapi.responses import JSONResponse, Response +from PIL import Image, UnidentifiedImageError +from psycopg.rows import dict_row +from psycopg_pool import ConnectionPool + +DATABASE_URL = os.getenv('DATABASE_URL', 'postgresql://messenger:messenger@postgres:5432/messenger') +REDIS_URL = os.getenv('REDIS_URL', 'redis://redis:6379/0') +SESSION_TTL_SECONDS = int(os.getenv('SESSION_TTL_SECONDS', '3600')) +INSTANCE_ID = os.getenv('INSTANCE_ID', uuid.uuid4().hex[:12]) +DB_POOL_SIZE = int(os.getenv('DB_POOL_SIZE', '10')) +S3_ENDPOINT = os.getenv('S3_ENDPOINT', 'http://minio:9000') +S3_REGION = os.getenv('S3_REGION', 'us-east-1') +S3_BUCKET = os.getenv('S3_BUCKET', 'messenger-attachments') +S3_ACCESS_KEY_ID = os.getenv('S3_ACCESS_KEY_ID', 'messenger-api') +S3_SECRET_ACCESS_KEY = os.getenv('S3_SECRET_ACCESS_KEY', 'messenger-api-secret-123') +MAX_UPLOAD_BYTES = int(os.getenv('MAX_UPLOAD_BYTES', '10485760')) +MAX_IMAGE_PIXELS = int(os.getenv('MAX_IMAGE_PIXELS', '40000000')) + +password_hasher = PasswordHasher() +db_pool = ConnectionPool( + DATABASE_URL, min_size=1, max_size=DB_POOL_SIZE, timeout=5, + kwargs={'row_factory': dict_row}, open=False, +) +redis_client = redis.Redis.from_url( + REDIS_URL, + decode_responses=True, + socket_connect_timeout=1, + socket_timeout=1, + retry_on_timeout=False, +) +s3_client = boto3.client( + 's3', endpoint_url=S3_ENDPOINT, region_name=S3_REGION, + aws_access_key_id=S3_ACCESS_KEY_ID, aws_secret_access_key=S3_SECRET_ACCESS_KEY, + config=Config(connect_timeout=2, read_timeout=5, retries={'max_attempts': 1}), +) +chat_cache_lock = threading.Lock() +chat_cache_sql_reads = 0 +invalidated_chat_caches = set() +app = FastAPI(title='MTUSI Messenger Lab 4', version='1.4.0') + + +class IdempotencyConflict(Exception): + pass + + +def utc_now(): + return datetime.now(timezone.utc) + + +def format_time(value): + return value.astimezone(timezone.utc).isoformat().replace('+00:00', 'Z') + + +def parse_uuid(value): + try: + return uuid.UUID(str(value)) + except (TypeError, ValueError) as exc: + raise ValueError('invalid uuid') from exc + + +def user_response(row): + return { + 'id': str(row['id']), 'username': row['username'], + 'display_name': row['display_name'], 'created_at': format_time(row['created_at']), + } + + +def chat_response(row, member_ids): + return { + 'id': str(row['id']), 'title': row['title'], + 'member_ids': [str(item) for item in member_ids], + 'created_at': format_time(row['created_at']), + } + + +def message_response(row, attachment_ids=None): + return { + 'id': str(row['id']), 'chat_id': str(row['chat_id']), + 'sender_id': str(row['sender_id']), 'text': row['text'], + 'created_at': format_time(row['created_at']), + 'attachment_ids': [str(item) for item in (attachment_ids or [])], + } + + +def attachment_response(row): + return { + 'id': str(row['id']), 'chat_id': str(row['chat_id']), + 'owner_id': str(row['owner_id']), 'filename': row['filename'], + 'content_type': row['content_type'], 'size_bytes': row['size_bytes'], + 'sha256': row['sha256'], 'status': row['status'], 'variants': [], + 'error_code': row['error_code'], 'created_at': format_time(row['created_at']), + 'updated_at': format_time(row['updated_at']), + } + + +def attachment_ids_for(connection, message_id): + rows = connection.execute( + 'SELECT attachment_id FROM message_attachments WHERE message_id=%s ORDER BY attachment_id', + (message_id,), + ).fetchall() + return [row['attachment_id'] for row in rows] + + +def safe_filename(value): + return ( + isinstance(value, str) and 1 <= len(value) <= 255 and + not any(ord(char) < 32 for char in value) and '/' not in value and '\\' not in value + ) + + +async def read_upload(request): + chunks, total = [], 0 + async for chunk in request.stream(): + total += len(chunk) + if total > MAX_UPLOAD_BYTES: + return None + chunks.append(chunk) + return b''.join(chunks) + + +def inspect_image(data, content_type): + try: + with Image.open(io.BytesIO(data)) as image: + actual = 'image/png' if image.format == 'PNG' else 'image/jpeg' if image.format == 'JPEG' else None + if actual != content_type: + raise ValueError('content type does not match image') + width, height = image.size + if width * height > MAX_IMAGE_PIXELS: + raise OverflowError('too many pixels') + image.verify() + except Image.DecompressionBombError as exc: + raise OverflowError('too many pixels') from exc + except (UnidentifiedImageError, OSError, ValueError) as exc: + raise ValueError('invalid image') from exc + + +def error_response(request, status_code, code, message, extra_headers=None): + request_id = getattr(request.state, 'request_id', uuid.uuid4().hex) + headers = {'X-Request-Id': request_id, 'X-Instance-Id': INSTANCE_ID} + if extra_headers: + headers.update(extra_headers) + return JSONResponse( + status_code=status_code, + content={'error': {'code': code, 'message': message, 'request_id': request_id}}, + headers=headers, + ) + + +@app.middleware('http') +async def request_context(request: Request, call_next): + request.state.request_id = request.headers.get('X-Request-Id') or uuid.uuid4().hex + try: + response = await call_next(request) + except Exception: + return error_response(request, 500, 'internal_error', 'Внутренняя ошибка') + response.headers['X-Request-Id'] = request.state.request_id + response.headers['X-Instance-Id'] = INSTANCE_ID + return response + + +@app.on_event('startup') +def start_application(): + db_pool.open(wait=True) + with db_pool.connection() as connection: + connection.execute('SELECT 1') + + +@app.on_event('shutdown') +def stop_application(): + db_pool.close() + + +async def read_json_body(request): + try: + value = await request.json() + except Exception as exc: + raise ValueError('malformed json') from exc + if not isinstance(value, dict): + raise ValueError('request body must be an object') + return value + + +def require_fields(data, required): + if set(data) != required: + raise ValueError('unexpected or missing fields') + + +def get_bearer_session(request): + authorization = request.headers.get('Authorization', '') + if not authorization.startswith('Bearer '): + return None + token = authorization.removeprefix('Bearer ') + if len(token) < 40: + return None + try: + value = redis_client.get('session:' + token) + return json.loads(value) if value else None + except Exception: + return None + + +def get_current_user(request): + session = get_bearer_session(request) + if session is None: + return None + with db_pool.connection() as connection: + return connection.execute( + 'SELECT * FROM users WHERE id=%s', (session['user_id'],) + ).fetchone() + + +def require_current_user(request): + user = get_current_user(request) + if user is None: + return None, error_response( + request, 401, 'unauthorized', 'Требуется действующая Bearer-сессия', + {'WWW-Authenticate': 'Bearer realm="messenger"'}, + ) + return user, None + + +def is_chat_member(connection, chat_id, user_id): + row = connection.execute( + 'SELECT 1 FROM chat_members WHERE chat_id=%s AND user_id=%s', + (chat_id, user_id), + ).fetchone() + return row is not None + + +def make_cursor(scope, owner_id, row): + created_at = row['created_at'] + if isinstance(created_at, datetime): + created_at = format_time(created_at) + data = [scope, owner_id, created_at, str(row['id'])] + return base64.urlsafe_b64encode(json.dumps(data).encode()).decode().rstrip('=') + + +def read_cursor(cursor, expected_scope, expected_owner): + try: + padding = '=' * ((4 - len(cursor) % 4) % 4) + value = json.loads(base64.urlsafe_b64decode((cursor + padding).encode())) + if value[0] != expected_scope or value[1] != expected_owner: + raise ValueError + timestamp = datetime.fromisoformat(value[2].replace('Z', '+00:00')) + return timestamp, parse_uuid(value[3]) + except (IndexError, TypeError, ValueError, json.JSONDecodeError) as exc: + raise ValueError('invalid cursor') from exc + + +def page_chats(items, limit, cursor_data, owner_id): + if cursor_data: + items = [ + item for item in items + if ( + datetime.fromisoformat(item['created_at'].replace('Z', '+00:00')), + uuid.UUID(item['id']), + ) > cursor_data + ] + page = items[:limit] + next_cursor = make_cursor('chats', owner_id, page[-1]) if len(items) > limit and page else None + return {'items': page, 'next_cursor': next_cursor} + + +def parse_limit(value): + try: + limit = int(value) + except (TypeError, ValueError) as exc: + raise ValueError('invalid limit') from exc + if not 1 <= limit <= 100: + raise ValueError('invalid limit') + return limit + + +@app.get('/health/live') +def health_live(): + return {'status': 'ok'} + + +@app.get('/health/ready') +def health_ready(request: Request): + try: + with db_pool.connection() as connection: + connection.execute('SELECT 1') + redis_client.ping() + s3_client.head_bucket(Bucket=S3_BUCKET) + except Exception: + return error_response(request, 503, 'unavailable', 'Зависимость недоступна') + return {'status': 'ok'} + + +@app.get('/debug/cache-stats') +def cache_stats(request: Request): + if os.getenv('ENABLE_DEBUG_METRICS') != '1': + return error_response(request, 404, 'not_found', 'Ресурс не найден') + return {'chat_list_sql_reads': chat_cache_sql_reads} + + +@app.post('/api/v1/users', status_code=201) +async def create_user(request: Request): + try: + data = await read_json_body(request) + require_fields(data, {'username', 'display_name', 'password'}) + username, display_name, password = data['username'], data['display_name'], data['password'] + if not isinstance(username, str) or not re.fullmatch(r'[a-z0-9_]{3,32}', username): + raise ValueError('invalid username') + if not isinstance(display_name, str) or not display_name.strip() or not 1 <= len(display_name) <= 100: + raise ValueError('invalid display name') + if not isinstance(password, str) or not 12 <= len(password) <= 128: + raise ValueError('invalid password') + + user_id, created_at = uuid.uuid4(), utc_now() + password_hash = password_hasher.hash(password) + with db_pool.connection() as connection: + try: + connection.execute( + 'INSERT INTO users VALUES (%s,%s,%s,%s,%s)', + (user_id, username, display_name, password_hash, created_at), + ) + connection.commit() + except Exception as exc: + connection.rollback() + if 'unique' in str(exc).lower(): + return error_response(request, 409, 'conflict', 'Имя пользователя уже занято') + raise + return user_response({'id': user_id, 'username': username, 'display_name': display_name, 'created_at': created_at}) + except ValueError: + return error_response(request, 400, 'invalid_request', 'Неверные поля запроса') + + +@app.post('/api/v1/auth/sessions', status_code=201) +def create_session(request: Request): + authorization = request.headers.get('Authorization', '') + try: + if not authorization.startswith('Basic '): + raise ValueError + credentials = base64.b64decode(authorization.removeprefix('Basic '), validate=True).decode() + username, password = credentials.split(':', 1) + with db_pool.connection() as connection: + user = connection.execute('SELECT * FROM users WHERE username=%s', (username,)).fetchone() + if user is None: + raise ValueError + password_hasher.verify(user['password_hash'], password) + except Exception: + return error_response( + request, 401, 'unauthorized', 'Неверные учётные данные', + {'WWW-Authenticate': 'Basic realm="messenger", charset="UTF-8"'}, + ) + + token = secrets.token_urlsafe(32) + expires_at = utc_now() + timedelta(seconds=SESSION_TTL_SECONDS) + redis_client.setex( + 'session:' + token, + SESSION_TTL_SECONDS, + json.dumps({'user_id': str(user['id']), 'expires_at': format_time(expires_at)}), + ) + return { + 'token': token, 'token_type': 'Bearer', + 'expires_at': format_time(expires_at), 'user': user_response(user), + } + + +@app.delete('/api/v1/auth/sessions/current', status_code=204) +def logout(request: Request): + if get_bearer_session(request) is None: + return error_response( + request, 401, 'unauthorized', 'Сессия недействительна', + {'WWW-Authenticate': 'Bearer realm="messenger"'}, + ) + token = request.headers['Authorization'].removeprefix('Bearer ') + redis_client.delete('session:' + token) + return Response(status_code=204) + + +@app.get('/api/v1/users/me') +def get_me(request: Request): + user, failure = require_current_user(request) + return failure if failure else user_response(user) + + +@app.post('/api/v1/chats', status_code=201) +async def create_chat(request: Request): + user, failure = require_current_user(request) + if failure: + return failure + try: + data = await read_json_body(request) + require_fields(data, {'title', 'member_ids'}) + title, member_values = data['title'], data['member_ids'] + if not isinstance(title, str) or not title.strip() or not 1 <= len(title) <= 100: + raise ValueError('invalid title') + if not isinstance(member_values, list) or not 1 <= len(member_values) <= 100: + raise ValueError('invalid members') + if len(set(member_values)) != len(member_values): + raise ValueError('duplicate members') + member_ids = [parse_uuid(value) for value in member_values] + if user['id'] not in member_ids: + raise ValueError('current user must be a member') + + chat_id, created_at = uuid.uuid4(), utc_now() + with db_pool.connection() as connection: + with connection.transaction(): + count = connection.execute( + 'SELECT count(*) AS n FROM users WHERE id = ANY(%s)', (member_ids,) + ).fetchone()['n'] + if count != len(member_ids): + raise ValueError('unknown member') + connection.execute('INSERT INTO chats VALUES (%s,%s,%s)', (chat_id, title, created_at)) + for member_id in member_ids: + connection.execute('INSERT INTO chat_members VALUES (%s,%s)', (chat_id, member_id)) + for member_id in member_ids: + try: + redis_client.delete('chats:' + str(member_id)) + except Exception: + with chat_cache_lock: + invalidated_chat_caches.add('chats:' + str(member_id)) + return chat_response({'id': chat_id, 'title': title, 'created_at': created_at}, member_ids) + except ValueError: + return error_response(request, 400, 'invalid_request', 'Неверные данные чата') + + +@app.get('/api/v1/chats') +def list_chats(request: Request, limit: str = '50', cursor: str | None = None): + global chat_cache_sql_reads + user, failure = require_current_user(request) + if failure: + return failure + try: + limit = parse_limit(limit) + except ValueError: + return error_response(request, 400, 'invalid_request', 'limit должен быть от 1 до 100') + + cursor_data = None + if cursor is not None: + if not cursor: + return error_response(request, 400, 'invalid_request', 'Неверный cursor') + try: + cursor_data = read_cursor(cursor, 'chats', str(user['id'])) + except ValueError: + return error_response(request, 400, 'invalid_request', 'Неверный cursor') + + cache_key = 'chats:' + str(user['id']) + cache_needs_refresh = cache_key in invalidated_chat_caches + if not cache_needs_refresh: + try: + cached = redis_client.get(cache_key) + if cached: + return page_chats(json.loads(cached), limit, cursor_data, str(user['id'])) + except Exception: + pass + + with chat_cache_lock: + try: + cached = None if cache_needs_refresh else redis_client.get(cache_key) + except Exception: + cached = None + if cached: + chats = json.loads(cached) + else: + with db_pool.connection() as connection: + rows = connection.execute( + 'SELECT c.* FROM chats c JOIN chat_members m ON m.chat_id=c.id ' + 'WHERE m.user_id=%s ORDER BY c.created_at,c.id', (user['id'],) + ).fetchall() + chats = [] + for row in rows: + members = connection.execute( + 'SELECT user_id FROM chat_members WHERE chat_id=%s ORDER BY user_id', (row['id'],) + ).fetchall() + chats.append(chat_response(row, [item['user_id'] for item in members])) + chat_cache_sql_reads += 1 + try: + redis_client.setex(cache_key, 30, json.dumps(chats)) + invalidated_chat_caches.discard(cache_key) + except Exception: + pass + return page_chats(chats, limit, cursor_data, str(user['id'])) + + +@app.get('/api/v1/chats/{chat_id}') +def get_chat(chat_id: str, request: Request): + user, failure = require_current_user(request) + if failure: + return failure + try: + parsed_chat_id = parse_uuid(chat_id) + except ValueError: + return error_response(request, 400, 'invalid_request', 'Неверный UUID') + with db_pool.connection() as connection: + chat = connection.execute('SELECT * FROM chats WHERE id=%s', (parsed_chat_id,)).fetchone() + if chat is None or not is_chat_member(connection, parsed_chat_id, user['id']): + return error_response(request, 404, 'not_found', 'Чат не найден') + members = connection.execute('SELECT user_id FROM chat_members WHERE chat_id=%s', (parsed_chat_id,)).fetchall() + return chat_response(chat, [item['user_id'] for item in members]) + + +@app.post('/api/v1/chats/{chat_id}/attachments', status_code=201) +async def upload_attachment(chat_id: str, request: Request): + user, failure = require_current_user(request) + if failure: + return failure + try: + parsed_chat_id = parse_uuid(chat_id) + filename = request.query_params.get('filename', '') + if not safe_filename(filename): + raise ValueError('invalid filename') + content_type = request.headers.get('Content-Type', '').split(';', 1)[0].strip().lower() + if content_type not in {'image/png', 'image/jpeg'}: + return error_response(request, 415, 'unsupported_media_type', 'Поддерживаются только PNG и JPEG') + data = await read_upload(request) + if data is None: + return error_response(request, 413, 'payload_too_large', 'Файл слишком большой') + if not data: + raise ValueError('empty file') + except OverflowError: + return error_response(request, 413, 'payload_too_large', 'Слишком много пикселей') + except ValueError: + return error_response(request, 400, 'invalid_request', 'Неверные данные вложения') + try: + inspect_image(data, content_type) + except OverflowError: + return error_response(request, 413, 'payload_too_large', 'Слишком много пикселей') + except ValueError: + return error_response(request, 415, 'unsupported_media_type', 'Файл не является корректным PNG или JPEG') + + attachment_id = uuid.uuid4() + object_key = 'attachments/' + str(attachment_id) + now = utc_now() + digest = hashlib.sha256(data).hexdigest() + with db_pool.connection() as connection: + if not is_chat_member(connection, parsed_chat_id, user['id']): + return error_response(request, 404, 'not_found', 'Чат не найден') + try: + s3_client.put_object( + Bucket=S3_BUCKET, Key=object_key, Body=data, + ContentType=content_type, ContentLength=len(data), + ) + with connection.transaction(): + row = connection.execute( + 'INSERT INTO attachments ' + '(id,chat_id,owner_id,filename,content_type,size_bytes,sha256,object_key,status,error_code,created_at,updated_at) ' + 'VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s) RETURNING *', + (attachment_id, parsed_chat_id, user['id'], filename, content_type, + len(data), digest, object_key, 'ready', None, now, now), + ).fetchone() + except Exception: + try: + s3_client.delete_object(Bucket=S3_BUCKET, Key=object_key) + except Exception: + pass + return error_response(request, 503, 'unavailable', 'Хранилище вложений недоступно') + return attachment_response(row) + + +def get_attachment_for_user(connection, attachment_id, user_id): + row = connection.execute( + 'SELECT a.* FROM attachments a JOIN chat_members m ON m.chat_id=a.chat_id ' + 'WHERE a.id=%s AND m.user_id=%s', (attachment_id, user_id), + ).fetchone() + return row + + +@app.get('/api/v1/attachments/{attachment_id}') +def get_attachment(attachment_id: str, request: Request): + user, failure = require_current_user(request) + if failure: + return failure + try: + parsed_id = parse_uuid(attachment_id) + except ValueError: + return error_response(request, 400, 'invalid_request', 'Неверный UUID') + with db_pool.connection() as connection: + row = get_attachment_for_user(connection, parsed_id, user['id']) + if row is None: + return error_response(request, 404, 'not_found', 'Вложение не найдено') + return attachment_response(row) + + +@app.get('/api/v1/attachments/{attachment_id}/content') +def download_attachment(attachment_id: str, request: Request, variant: str = 'original'): + user, failure = require_current_user(request) + if failure: + return failure + if variant != 'original': + return error_response(request, 404, 'not_found', 'Вариант не найден') + try: + parsed_id = parse_uuid(attachment_id) + except ValueError: + return error_response(request, 400, 'invalid_request', 'Неверный UUID') + with db_pool.connection() as connection: + row = get_attachment_for_user(connection, parsed_id, user['id']) + if row is None: + return error_response(request, 404, 'not_found', 'Вложение не найдено') + try: + value = s3_client.get_object(Bucket=S3_BUCKET, Key=row['object_key']) + data = value['Body'].read(MAX_UPLOAD_BYTES + 1) + if len(data) > MAX_UPLOAD_BYTES: + return error_response(request, 503, 'unavailable', 'Некорректный объект в хранилище') + except Exception: + return error_response(request, 503, 'unavailable', 'Хранилище вложений недоступно') + return Response(content=data, media_type=row['content_type']) + + +@app.post('/api/v1/chats/{chat_id}/messages', status_code=201) +async def create_message(chat_id: str, request: Request): + user, failure = require_current_user(request) + if failure: + return failure + try: + parsed_chat_id = parse_uuid(chat_id) + idempotency_key = request.headers.get('Idempotency-Key', '') + if not re.fullmatch(r'[A-Za-z0-9._:-]{1,128}', idempotency_key): + raise ValueError('invalid idempotency key') + data = await read_json_body(request) + require_fields(data, {'text', 'attachment_ids'}) if 'attachment_ids' in data else require_fields(data, {'text'}) + text = data['text'] + attachment_values = data.get('attachment_ids', []) + if not isinstance(attachment_values, list) or len(attachment_values) > 10: + raise ValueError('invalid attachments') + attachment_ids = [parse_uuid(value) for value in attachment_values] + if len(set(attachment_ids)) != len(attachment_ids): + raise ValueError('duplicate attachments') + if not isinstance(text, str) or len(text) > 4000 or (not text.strip() and not attachment_ids): + raise ValueError('invalid text') + except ValueError: + return error_response(request, 400, 'invalid_request', 'Неверные данные сообщения') + + body_hash = hashlib.sha256(json.dumps( + {'text': text, 'attachment_ids': sorted(str(value) for value in attachment_ids)}, + sort_keys=True, + ).encode()).hexdigest() + with db_pool.connection() as connection: + if not is_chat_member(connection, parsed_chat_id, user['id']): + return error_response(request, 404, 'not_found', 'Чат не найден') + try: + with connection.transaction(): + idempotency = connection.execute( + 'INSERT INTO message_idempotency ' + '(user_id, chat_id, idempotency_key, body_hash) ' + 'VALUES (%s,%s,%s,%s) ' + 'ON CONFLICT (user_id, chat_id, idempotency_key) DO NOTHING ' + 'RETURNING message_id', + (user['id'], parsed_chat_id, idempotency_key, body_hash), + ).fetchone() + if idempotency is None: + saved = connection.execute( + 'SELECT message_id, body_hash FROM message_idempotency ' + 'WHERE user_id=%s AND chat_id=%s AND idempotency_key=%s', + (user['id'], parsed_chat_id, idempotency_key), + ).fetchone() + if saved['body_hash'] != body_hash: + raise IdempotencyConflict + row = connection.execute( + 'SELECT * FROM messages WHERE id=%s', (saved['message_id'],) + ).fetchone() + return message_response(row, attachment_ids_for(connection, row['id'])) + + if attachment_ids: + rows = connection.execute( + 'SELECT id FROM attachments WHERE id = ANY(%s) AND chat_id=%s AND status=%s', + (attachment_ids, parsed_chat_id, 'ready'), + ).fetchall() + if len(rows) != len(attachment_ids): + raise ValueError('attachment is not available in this chat') + + message_id, created_at = uuid.uuid4(), utc_now() + connection.execute( + 'INSERT INTO messages VALUES (%s,%s,%s,%s,%s)', + (message_id, parsed_chat_id, user['id'], text, created_at), + ) + connection.execute( + 'UPDATE message_idempotency SET message_id=%s ' + 'WHERE user_id=%s AND chat_id=%s AND idempotency_key=%s', + (message_id, user['id'], parsed_chat_id, idempotency_key), + ) + for attachment_id in attachment_ids: + connection.execute( + 'INSERT INTO message_attachments (message_id, attachment_id) VALUES (%s,%s)', + (message_id, attachment_id), + ) + row = { + 'id': message_id, 'chat_id': parsed_chat_id, + 'sender_id': user['id'], 'text': text, 'created_at': created_at, + } + except IdempotencyConflict: + return error_response(request, 409, 'conflict', 'Ключ уже использован для другого сообщения') + except ValueError: + return error_response(request, 404, 'not_found', 'Вложение не найдено') + return message_response(row, attachment_ids) + + +@app.get('/api/v1/chats/{chat_id}/messages') +def list_messages(chat_id: str, request: Request, limit: str = '50', cursor: str | None = None): + user, failure = require_current_user(request) + if failure: + return failure + try: + limit = parse_limit(limit) + except ValueError: + return error_response(request, 400, 'invalid_request', 'limit должен быть от 1 до 100') + try: + parsed_chat_id = parse_uuid(chat_id) + except ValueError: + return error_response(request, 400, 'invalid_request', 'Неверный UUID') + + cursor_data = None + if cursor is not None: + if not cursor: + return error_response(request, 400, 'invalid_request', 'Неверный cursor') + try: + cursor_data = read_cursor(cursor, 'messages', str(parsed_chat_id)) + except ValueError: + return error_response(request, 400, 'invalid_request', 'Неверный cursor') + + with db_pool.connection() as connection: + if not is_chat_member(connection, parsed_chat_id, user['id']): + return error_response(request, 404, 'not_found', 'Чат не найден') + if cursor_data: + rows = connection.execute( + 'SELECT * FROM messages WHERE chat_id=%s AND (created_at,id)>(%s,%s) ' + 'ORDER BY created_at,id LIMIT %s', + (parsed_chat_id, cursor_data[0], cursor_data[1], limit + 1), + ).fetchall() + else: + rows = connection.execute( + 'SELECT * FROM messages WHERE chat_id=%s ORDER BY created_at,id LIMIT %s', + (parsed_chat_id, limit + 1), + ).fetchall() + items = [message_response(row, attachment_ids_for(connection, row['id'])) for row in rows[:limit]] + + rows_to_return = rows[:limit] + next_cursor = make_cursor('messages', str(parsed_chat_id), rows_to_return[-1]) if len(rows) > limit else None + return { + 'items': items, + 'next_cursor': next_cursor, + } diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 00000000..b622b4bc --- /dev/null +++ b/compose.yaml @@ -0,0 +1,210 @@ +services: + minio: + image: cgr.dev/chainguard/minio@sha256:0dab2f9fee1c1139ae8753b5e35bb4461af2a276cfe0923a2504c75a6170bc64 + command: server /data --console-address ':9001' + environment: + MINIO_ROOT_USER: ${MINIO_ROOT_USER:-minioadmin} + MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-minioadminpassword} + volumes: + - s3_data:/data + healthcheck: + test: ["CMD-SHELL", "test -f /data/.minio.sys/format.json"] + interval: 3s + timeout: 3s + retries: 20 + + minio-init: + build: + context: ./infra + dockerfile: minio-init.Dockerfile + image: mtusi-minio-init:1.0 + depends_on: + minio: {condition: service_healthy} + environment: + MINIO_ENDPOINT: http://minio:9000 + MINIO_ROOT_USER: ${MINIO_ROOT_USER:-minioadmin} + MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-minioadminpassword} + S3_BUCKET: ${S3_BUCKET:-messenger-attachments} + S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-messenger-api} + S3_SECRET_ACCESS_KEY: ${S3_SECRET_ACCESS_KEY:-messenger-api-secret-123} + + postgres: + image: postgres:16.4-alpine + environment: + POSTGRES_DB: ${POSTGRES_DB:-messenger} + POSTGRES_USER: ${POSTGRES_USER:-messenger} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-local-only-password} + volumes: + - postgres_data:/var/lib/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-messenger} -d ${POSTGRES_DB:-messenger}"] + interval: 3s + timeout: 3s + retries: 20 + mem_limit: 512m + cpus: 1.0 + + redis: + image: redis:7.4.2-alpine + command: ["redis-server", "--appendonly", "yes", "--appendfsync", "everysec"] + volumes: + - redis_data:/data + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 3s + timeout: 3s + retries: 20 + mem_limit: 256m + cpus: 0.5 + + migrate: + build: . + image: mtusi-messenger-lab4:4.0 + environment: + DATABASE_URL: postgresql://${POSTGRES_USER:-messenger}:${POSTGRES_PASSWORD:-local-only-password}@postgres:5432/${POSTGRES_DB:-messenger} + command: ["python", "scripts/migrate.py"] + depends_on: + postgres: {condition: service_healthy} + + api-1: + build: . + image: mtusi-messenger-lab4:4.0 + environment: + DATABASE_URL: postgresql://${POSTGRES_USER:-messenger}:${POSTGRES_PASSWORD:-local-only-password}@postgres:5432/${POSTGRES_DB:-messenger} + REDIS_URL: redis://redis:6379/0 + S3_ENDPOINT: http://minio:9000 + S3_REGION: us-east-1 + S3_BUCKET: ${S3_BUCKET:-messenger-attachments} + S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-messenger-api} + S3_SECRET_ACCESS_KEY: ${S3_SECRET_ACCESS_KEY:-messenger-api-secret-123} + MAX_UPLOAD_BYTES: ${MAX_UPLOAD_BYTES:-10485760} + MAX_IMAGE_PIXELS: ${MAX_IMAGE_PIXELS:-40000000} + SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-3600} + INSTANCE_ID: api-1 + ENABLE_DEBUG_METRICS: ${ENABLE_DEBUG_METRICS:-1} + expose: ["8080"] + depends_on: + migrate: {condition: service_completed_successfully} + minio-init: {condition: service_completed_successfully} + postgres: {condition: service_healthy} + redis: {condition: service_healthy} + healthcheck: + test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8080/health/ready')"] + interval: 3s + timeout: 3s + retries: 20 + mem_limit: 256m + cpus: 0.5 + + api-2: + build: . + image: mtusi-messenger-lab4:4.0 + environment: + DATABASE_URL: postgresql://${POSTGRES_USER:-messenger}:${POSTGRES_PASSWORD:-local-only-password}@postgres:5432/${POSTGRES_DB:-messenger} + REDIS_URL: redis://redis:6379/0 + S3_ENDPOINT: http://minio:9000 + S3_REGION: us-east-1 + S3_BUCKET: ${S3_BUCKET:-messenger-attachments} + S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-messenger-api} + S3_SECRET_ACCESS_KEY: ${S3_SECRET_ACCESS_KEY:-messenger-api-secret-123} + MAX_UPLOAD_BYTES: ${MAX_UPLOAD_BYTES:-10485760} + MAX_IMAGE_PIXELS: ${MAX_IMAGE_PIXELS:-40000000} + SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-3600} + INSTANCE_ID: api-2 + ENABLE_DEBUG_METRICS: ${ENABLE_DEBUG_METRICS:-1} + expose: ["8080"] + depends_on: + migrate: {condition: service_completed_successfully} + minio-init: {condition: service_completed_successfully} + postgres: {condition: service_healthy} + redis: {condition: service_healthy} + healthcheck: + test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8080/health/ready')"] + interval: 3s + timeout: 3s + retries: 20 + mem_limit: 256m + cpus: 0.5 + + api-3: + build: . + image: mtusi-messenger-lab4:4.0 + environment: + DATABASE_URL: postgresql://${POSTGRES_USER:-messenger}:${POSTGRES_PASSWORD:-local-only-password}@postgres:5432/${POSTGRES_DB:-messenger} + REDIS_URL: redis://redis:6379/0 + S3_ENDPOINT: http://minio:9000 + S3_REGION: us-east-1 + S3_BUCKET: ${S3_BUCKET:-messenger-attachments} + S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-messenger-api} + S3_SECRET_ACCESS_KEY: ${S3_SECRET_ACCESS_KEY:-messenger-api-secret-123} + MAX_UPLOAD_BYTES: ${MAX_UPLOAD_BYTES:-10485760} + MAX_IMAGE_PIXELS: ${MAX_IMAGE_PIXELS:-40000000} + SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-3600} + INSTANCE_ID: api-3 + ENABLE_DEBUG_METRICS: ${ENABLE_DEBUG_METRICS:-1} + expose: ["8080"] + depends_on: + migrate: {condition: service_completed_successfully} + minio-init: {condition: service_completed_successfully} + postgres: {condition: service_healthy} + redis: {condition: service_healthy} + healthcheck: + test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8080/health/ready')"] + interval: 3s + timeout: 3s + retries: 20 + mem_limit: 256m + cpus: 0.5 + + api-4: + build: . + image: mtusi-messenger-lab4:4.0 + environment: + DATABASE_URL: postgresql://${POSTGRES_USER:-messenger}:${POSTGRES_PASSWORD:-local-only-password}@postgres:5432/${POSTGRES_DB:-messenger} + REDIS_URL: redis://redis:6379/0 + S3_ENDPOINT: http://minio:9000 + S3_REGION: us-east-1 + S3_BUCKET: ${S3_BUCKET:-messenger-attachments} + S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-messenger-api} + S3_SECRET_ACCESS_KEY: ${S3_SECRET_ACCESS_KEY:-messenger-api-secret-123} + MAX_UPLOAD_BYTES: ${MAX_UPLOAD_BYTES:-10485760} + MAX_IMAGE_PIXELS: ${MAX_IMAGE_PIXELS:-40000000} + SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-3600} + INSTANCE_ID: api-4 + ENABLE_DEBUG_METRICS: ${ENABLE_DEBUG_METRICS:-1} + expose: ["8080"] + depends_on: + migrate: {condition: service_completed_successfully} + minio-init: {condition: service_completed_successfully} + postgres: {condition: service_healthy} + redis: {condition: service_healthy} + healthcheck: + test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8080/health/ready')"] + interval: 3s + timeout: 3s + retries: 20 + mem_limit: 256m + cpus: 0.5 + + lb: + image: nginx:1.27.2-alpine + ports: ["8080:8080"] + volumes: + - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro + depends_on: + api-1: {condition: service_healthy} + api-2: {condition: service_healthy} + api-3: {condition: service_healthy} + api-4: {condition: service_healthy} + healthcheck: + test: ["CMD-SHELL", "wget -q -O - http://127.0.0.1:8080/health/live >/dev/null"] + interval: 3s + timeout: 3s + retries: 20 + mem_limit: 128m + cpus: 0.25 + +volumes: + postgres_data: + redis_data: + s3_data: diff --git a/evidence/track_s3.json b/evidence/track_s3.json new file mode 100644 index 00000000..79fe5a71 --- /dev/null +++ b/evidence/track_s3.json @@ -0,0 +1,7 @@ +{ + "old_orphan_removed": true, + "fresh_orphan_preserved": true, + "missing_marked_failed": true, + "dry_run": "{\"objects\": 10, \"metadata_rows\": 9, \"orphan_candidates\": [\"reconcile-demo/old-4f34665eb05e44108aa6c681b62b9a53\"], \"missing_candidates\": [\"c1e6219b-6e89-4fe0-81ba-0d5efc501c8f\"], \"deleted_orphans\": [], \"marked_failed\": [], \"dry_run\": true, \"grace_seconds\": 5}", + "apply": "{\"objects\": 10, \"metadata_rows\": 9, \"orphan_candidates\": [\"reconcile-demo/old-4f34665eb05e44108aa6c681b62b9a53\"], \"missing_candidates\": [\"c1e6219b-6e89-4fe0-81ba-0d5efc501c8f\"], \"deleted_orphans\": [\"reconcile-demo/old-4f34665eb05e44108aa6c681b62b9a53\"], \"marked_failed\": [\"c1e6219b-6e89-4fe0-81ba-0d5efc501c8f\"], \"dry_run\": false, \"grace_seconds\": 5}" +} diff --git a/evidence/upload_memory.txt b/evidence/upload_memory.txt new file mode 100644 index 00000000..53a921e7 --- /dev/null +++ b/evidence/upload_memory.txt @@ -0,0 +1,28 @@ +Дата замера: 2026-10-29 +Нагрузка: 10 одновременных загрузок fixture через student-tests/upload_load.py +Лимит контейнера API: 256 MiB; наблюдение: docker stats + +mtusi2026lab4-api-1-1 125.1MiB / 256MiB +mtusi2026lab4-api-1-1 62.56MiB / 256MiB +mtusi2026lab4-api-1-1 62.56MiB / 256MiB +mtusi2026lab4-api-1-1 62.56MiB / 256MiB +mtusi2026lab4-api-1-1 62.56MiB / 256MiB +mtusi2026lab4-api-1-1 62.56MiB / 256MiB +mtusi2026lab4-api-1-1 62.56MiB / 256MiB +mtusi2026lab4-api-1-1 62.56MiB / 256MiB +mtusi2026lab4-api-1-1 62.56MiB / 256MiB +mtusi2026lab4-api-1-1 62.57MiB / 256MiB +mtusi2026lab4-api-1-1 62.57MiB / 256MiB +mtusi2026lab4-api-1-1 62.57MiB / 256MiB +mtusi2026lab4-api-1-1 62.57MiB / 256MiB +mtusi2026lab4-api-1-1 62.57MiB / 256MiB +mtusi2026lab4-api-1-1 62.6MiB / 256MiB +mtusi2026lab4-api-1-1 62.58MiB / 256MiB +mtusi2026lab4-api-1-1 62.58MiB / 256MiB +mtusi2026lab4-api-1-1 62.58MiB / 256MiB +mtusi2026lab4-api-1-1 62.58MiB / 256MiB +mtusi2026lab4-api-1-1 62.6MiB / 256MiB +mtusi2026lab4-api-1-1 62.68MiB / 256MiB +mtusi2026lab4-api-1-1 62.6MiB / 256MiB +mtusi2026lab4-api-1-1 62.6MiB / 256MiB +mtusi2026lab4-api-1-1 62.61MiB / 256MiB diff --git a/infra/minio-init.Dockerfile b/infra/minio-init.Dockerfile new file mode 100644 index 00000000..4d7e8901 --- /dev/null +++ b/infra/minio-init.Dockerfile @@ -0,0 +1,7 @@ +FROM cgr.dev/chainguard/minio-client@sha256:4c288033f700b35846037c53ce39ba287f4bed0a571518c1f4d8d2788beb5cb5 AS client +FROM alpine:3.20@sha256:d9e853e87e55526f6b2917df91a2115c36dd7c696a35be12163d44e6e2a4b6bc +COPY --from=client /usr/bin/mc /usr/bin/mc +COPY minio-init.sh /init.sh +COPY s3-policy.json /policy.json +RUN chmod 755 /init.sh +ENTRYPOINT ["/init.sh"] diff --git a/infra/minio-init.sh b/infra/minio-init.sh new file mode 100644 index 00000000..b7fdf493 --- /dev/null +++ b/infra/minio-init.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -eu + +mc alias set local "${MINIO_ENDPOINT:-http://minio:9000}" "$MINIO_ROOT_USER" "$MINIO_ROOT_PASSWORD" >/dev/null +mc mb --ignore-existing local/"$S3_BUCKET" >/dev/null +sed "s/messenger-attachments/$S3_BUCKET/g" /policy.json > /tmp/policy.json +POLICY_NAME="messenger-api-policy-$S3_BUCKET" +if ! mc admin policy info local "$POLICY_NAME" >/dev/null 2>&1; then + mc admin policy create local "$POLICY_NAME" /tmp/policy.json >/dev/null +fi +if ! mc admin user info local "$S3_ACCESS_KEY_ID" >/dev/null 2>&1; then + mc admin user add local "$S3_ACCESS_KEY_ID" "$S3_SECRET_ACCESS_KEY" >/dev/null +fi +mc admin policy attach local "$POLICY_NAME" --user "$S3_ACCESS_KEY_ID" >/dev/null diff --git a/infra/s3-policy.json b/infra/s3-policy.json new file mode 100644 index 00000000..ac67271a --- /dev/null +++ b/infra/s3-policy.json @@ -0,0 +1,7 @@ +{ + "Version": "2012-10-17", + "Statement": [ + {"Effect": "Allow", "Action": ["s3:GetObject", "s3:PutObject", "s3:DeleteObject"], "Resource": ["arn:aws:s3:::messenger-attachments/*"]}, + {"Effect": "Allow", "Action": ["s3:ListBucket"], "Resource": ["arn:aws:s3:::messenger-attachments"]} + ] +} diff --git a/migrations/001_init.sql b/migrations/001_init.sql new file mode 100644 index 00000000..09678c0e --- /dev/null +++ b/migrations/001_init.sql @@ -0,0 +1,19 @@ +CREATE TABLE IF NOT EXISTS users ( + id UUID PRIMARY KEY, username VARCHAR(32) UNIQUE NOT NULL, + display_name VARCHAR(100) NOT NULL, password_hash TEXT NOT NULL, + created_at TIMESTAMPTZ NOT NULL +); +CREATE TABLE IF NOT EXISTS chats ( + id UUID PRIMARY KEY, title VARCHAR(100) NOT NULL, created_at TIMESTAMPTZ NOT NULL +); +CREATE TABLE IF NOT EXISTS chat_members ( + chat_id UUID NOT NULL REFERENCES chats(id) ON DELETE CASCADE, + user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + PRIMARY KEY (chat_id, user_id) +); +CREATE TABLE IF NOT EXISTS messages ( + id UUID PRIMARY KEY, chat_id UUID NOT NULL REFERENCES chats(id) ON DELETE CASCADE, + sender_id UUID NOT NULL REFERENCES users(id), text TEXT NOT NULL, + created_at TIMESTAMPTZ NOT NULL +); +CREATE INDEX IF NOT EXISTS messages_history_idx ON messages(chat_id, created_at, id); diff --git a/migrations/002_idempotency.sql b/migrations/002_idempotency.sql new file mode 100644 index 00000000..888fba19 --- /dev/null +++ b/migrations/002_idempotency.sql @@ -0,0 +1,12 @@ +CREATE TABLE IF NOT EXISTS message_idempotency ( + user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + chat_id UUID NOT NULL REFERENCES chats(id) ON DELETE CASCADE, + idempotency_key VARCHAR(128) NOT NULL, + body_hash CHAR(64) NOT NULL, + message_id UUID REFERENCES messages(id) ON DELETE CASCADE, + created_at TIMESTAMPTZ NOT NULL DEFAULT now(), + PRIMARY KEY (user_id, chat_id, idempotency_key) +); + +CREATE INDEX IF NOT EXISTS message_idempotency_created_idx + ON message_idempotency(created_at); diff --git a/migrations/003_attachments.sql b/migrations/003_attachments.sql new file mode 100644 index 00000000..1dbe7016 --- /dev/null +++ b/migrations/003_attachments.sql @@ -0,0 +1,25 @@ +CREATE TABLE IF NOT EXISTS attachments ( + id UUID PRIMARY KEY, + chat_id UUID NOT NULL REFERENCES chats(id) ON DELETE CASCADE, + owner_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + filename VARCHAR(255) NOT NULL, + content_type VARCHAR(32) NOT NULL, + size_bytes INTEGER NOT NULL, + sha256 CHAR(64) NOT NULL, + object_key VARCHAR(255) NOT NULL UNIQUE, + status VARCHAR(16) NOT NULL DEFAULT 'ready', + error_code VARCHAR(64), + created_at TIMESTAMPTZ NOT NULL, + updated_at TIMESTAMPTZ NOT NULL, + CHECK (content_type IN ('image/png', 'image/jpeg')), + CHECK (size_bytes > 0 AND size_bytes <= 10485760), + CHECK (status IN ('ready', 'failed')) +); + +CREATE INDEX IF NOT EXISTS attachments_chat_idx ON attachments(chat_id, created_at, id); + +CREATE TABLE IF NOT EXISTS message_attachments ( + message_id UUID NOT NULL REFERENCES messages(id) ON DELETE CASCADE, + attachment_id UUID NOT NULL REFERENCES attachments(id) ON DELETE RESTRICT, + PRIMARY KEY (message_id, attachment_id) +); diff --git a/nginx/nginx.conf b/nginx/nginx.conf new file mode 100644 index 00000000..acab891a --- /dev/null +++ b/nginx/nginx.conf @@ -0,0 +1,25 @@ +events {} + +http { + upstream api_backend { + server api-1:8080 max_fails=2 fail_timeout=3s; + server api-2:8080 max_fails=2 fail_timeout=3s; + server api-3:8080 max_fails=2 fail_timeout=3s; + server api-4:8080 max_fails=2 fail_timeout=3s; + } + + server { + listen 8080; + client_max_body_size 11m; + + location / { + proxy_pass http://api_backend; + proxy_next_upstream error timeout http_502 http_503 http_504; + proxy_connect_timeout 1s; + proxy_read_timeout 5s; + proxy_send_timeout 5s; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + } +} diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..8004b3be --- /dev/null +++ b/requirements.txt @@ -0,0 +1,7 @@ +fastapi==0.115.6 +uvicorn[standard]==0.34.0 +psycopg[binary,pool]==3.2.3 +redis==5.2.1 +argon2-cffi==23.1.0 +boto3==1.35.36 +Pillow==11.1.0 diff --git a/scripts/migrate.py b/scripts/migrate.py new file mode 100755 index 00000000..07a01aa8 --- /dev/null +++ b/scripts/migrate.py @@ -0,0 +1,10 @@ +import os +import psycopg +from pathlib import Path + +url = os.getenv("DATABASE_URL", "postgresql://messenger:messenger@postgres:5432/messenger") +with psycopg.connect(url) as conn: + for path in sorted(Path("migrations").glob("*.sql")): + conn.execute(path.read_text()) + conn.commit() +print("migrations applied") diff --git a/scripts/reconcile_s3.py b/scripts/reconcile_s3.py new file mode 100644 index 00000000..9c0a65df --- /dev/null +++ b/scripts/reconcile_s3.py @@ -0,0 +1,70 @@ +"""Find and safely repair objects that disagree with attachment metadata.""" +import argparse +import json +import os +from datetime import datetime, timedelta, timezone + +import boto3 +import psycopg +from botocore.config import Config + + +def main(): + parser = argparse.ArgumentParser() + parser.add_argument('--apply', action='store_true', help='delete old orphans and mark missing rows failed') + parser.add_argument('--grace-seconds', type=int, default=300) + args = parser.parse_args() + + database_url = os.getenv('DATABASE_URL', 'postgresql://messenger:messenger@postgres:5432/messenger') + bucket = os.getenv('S3_BUCKET', 'messenger-attachments') + s3 = boto3.client( + 's3', endpoint_url=os.getenv('S3_ENDPOINT', 'http://minio:9000'), + region_name=os.getenv('S3_REGION', 'us-east-1'), + aws_access_key_id=os.getenv('S3_ACCESS_KEY_ID', 'messenger-api'), + aws_secret_access_key=os.getenv('S3_SECRET_ACCESS_KEY', 'messenger-api-secret-123'), + config=Config(connect_timeout=2, read_timeout=5, retries={'max_attempts': 1}), + ) + objects = {} + token = None + while True: + kwargs = {'Bucket': bucket} + if token: + kwargs['ContinuationToken'] = token + page = s3.list_objects_v2(**kwargs) + for item in page.get('Contents', []): + objects[item['Key']] = item + if not page.get('IsTruncated'): + break + token = page['NextContinuationToken'] + + with psycopg.connect(database_url) as connection: + rows = connection.execute('SELECT id, object_key, status FROM attachments').fetchall() + known = {row[1]: row for row in rows} + missing = [row for row in rows if row[1] not in objects and row[2] == 'ready'] + cutoff = datetime.now(timezone.utc) - timedelta(seconds=args.grace_seconds) + orphan = [item for key, item in objects.items() if key not in known and item['LastModified'] < cutoff] + deleted = [] + marked_failed = [] + if args.apply: + for item in orphan: + s3.delete_object(Bucket=bucket, Key=item['Key']) + deleted.append(item['Key']) + for row in missing: + connection.execute( + "UPDATE attachments SET status='failed', error_code='object_missing', updated_at=now() WHERE id=%s", + (row[0],), + ) + marked_failed.append(str(row[0])) + connection.commit() + + print(json.dumps({ + 'objects': len(objects), 'metadata_rows': len(rows), + 'orphan_candidates': [item['Key'] for item in orphan], + 'missing_candidates': [str(row[0]) for row in missing], + 'deleted_orphans': deleted, 'marked_failed': marked_failed, + 'dry_run': not args.apply, 'grace_seconds': args.grace_seconds, + })) + + +if __name__ == '__main__': + main() diff --git a/scripts/restart.sh b/scripts/restart.sh new file mode 100755 index 00000000..7ff96952 --- /dev/null +++ b/scripts/restart.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -eu +# Перезапускаем стенд, не удаляя volumes. +# Балансировщик запускаем после API, чтобы DNS имён реплик уже был доступен. +docker compose up -d minio postgres redis minio-init migrate api-1 api-2 api-3 api-4 +docker compose restart minio postgres redis api-1 api-2 api-3 api-4 +docker compose up -d --force-recreate lb +docker compose ps diff --git a/scripts/stop-one.sh b/scripts/stop-one.sh new file mode 100755 index 00000000..d6020346 --- /dev/null +++ b/scripts/stop-one.sh @@ -0,0 +1,13 @@ +#!/bin/sh +set -eu + +TARGET_INSTANCE_ID=${TARGET_INSTANCE_ID:-api-1} +case "$TARGET_INSTANCE_ID" in + api-1) service=api-1 ;; + api-2) service=api-2 ;; + api-3) service=api-3 ;; + api-4) service=api-4 ;; + *) echo "unknown TARGET_INSTANCE_ID: $TARGET_INSTANCE_ID" >&2; exit 2 ;; +esac + +docker compose stop "$service" diff --git a/scripts/track_s3.py b/scripts/track_s3.py new file mode 100644 index 00000000..2b000b85 --- /dev/null +++ b/scripts/track_s3.py @@ -0,0 +1,68 @@ +"""Small local experiment for the two-storage reconciler.""" +import json +import os +import subprocess +import time +import uuid +from pathlib import Path + +import boto3 +import psycopg +from botocore.config import Config + + +def main(): + bucket = os.getenv('S3_BUCKET', 'messenger-attachments') + s3 = boto3.client( + 's3', endpoint_url=os.getenv('S3_ENDPOINT', 'http://minio:9000'), + region_name=os.getenv('S3_REGION', 'us-east-1'), + aws_access_key_id=os.getenv('S3_ACCESS_KEY_ID', 'messenger-api'), + aws_secret_access_key=os.getenv('S3_SECRET_ACCESS_KEY', 'messenger-api-secret-123'), + config=Config(connect_timeout=2, read_timeout=5, retries={'max_attempts': 1}), + ) + old_key = 'reconcile-demo/old-' + uuid.uuid4().hex + fresh_key = 'reconcile-demo/fresh-' + uuid.uuid4().hex + s3.put_object(Bucket=bucket, Key=old_key, Body=b'old orphan') + time.sleep(6) + s3.put_object(Bucket=bucket, Key=fresh_key, Body=b'fresh orphan') + + missing_id = uuid.uuid4() + with psycopg.connect(os.getenv('DATABASE_URL', 'postgresql://messenger:messenger@postgres:5432/messenger')) as connection: + owner, chat = connection.execute('SELECT user_id, chat_id FROM chat_members LIMIT 1').fetchone() + connection.execute( + 'INSERT INTO attachments ' + '(id,chat_id,owner_id,filename,content_type,size_bytes,sha256,object_key,status,error_code,created_at,updated_at) ' + "VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,now(),now())", + (missing_id, chat, owner, 'missing.png', 'image/png', 10, '0' * 64, + 'attachments/missing-' + str(missing_id), 'ready', None), + ) + connection.commit() + + root = Path(__file__).resolve().parent + dry = subprocess.check_output( + ['python', str(root / 'reconcile_s3.py'), '--grace-seconds', '5'], text=True, + ) + applied = subprocess.check_output( + ['python', str(root / 'reconcile_s3.py'), '--apply', '--grace-seconds', '5'], text=True, + ) + applied_data = json.loads(applied) + fresh_exists = True + try: + s3.head_object(Bucket=bucket, Key=fresh_key) + except Exception: + fresh_exists = False + s3.delete_object(Bucket=bucket, Key=fresh_key) + with psycopg.connect(os.getenv('DATABASE_URL', 'postgresql://messenger:messenger@postgres:5432/messenger')) as connection: + missing_status = connection.execute('SELECT status,error_code FROM attachments WHERE id=%s', (missing_id,)).fetchone() + connection.execute('DELETE FROM attachments WHERE id=%s', (missing_id,)) + connection.commit() + print(json.dumps({ + 'old_orphan_removed': old_key in applied_data['deleted_orphans'], + 'fresh_orphan_preserved': fresh_exists, + 'missing_marked_failed': list(missing_status) == ['failed', 'object_missing'], + 'dry_run': dry.strip(), 'apply': applied.strip(), + }, ensure_ascii=False, indent=2)) + + +if __name__ == '__main__': + main() diff --git a/student-tests/attachments.py b/student-tests/attachments.py new file mode 100644 index 00000000..fae2607a --- /dev/null +++ b/student-tests/attachments.py @@ -0,0 +1,51 @@ +"""Negative checks for upload validation and chat-scoped access.""" +import sys +from pathlib import Path + +sys.path.insert(0, str(Path(__file__).parents[1] / 'tests')) +from client import Client, check + + +def main(): + client = Client('http://localhost:8080') + alice, bob, eve, chat = client.bootstrap() + sample = (Path(__file__).parents[1] / 'tests/fixtures/sample.png').read_bytes() + attachment = client.call( + 'POST', '/api/v1/chats/' + chat['id'] + '/attachments?filename=sample.png', + 201, actor=alice, raw=sample, + headers={'Content-Type': 'image/png'}, schema='Attachment', + )['json'] + attachment_id = attachment['id'] + client.call( + 'POST', '/api/v1/chats/' + chat['id'] + '/attachments?filename=broken.png', + 415, actor=alice, raw=b'not an image', + headers={'Content-Type': 'image/png'}, + ) + client.call( + 'POST', '/api/v1/chats/' + chat['id'] + '/attachments?filename=wrong.jpg', + 415, actor=alice, raw=sample, + headers={'Content-Type': 'image/jpeg'}, + ) + client.call( + 'POST', '/api/v1/chats/' + chat['id'] + '/attachments?filename=large.png', + 413, actor=alice, raw=b'0' * (10 * 1024 * 1024 + 1), + headers={'Content-Type': 'image/png'}, + ) + client.call('GET', '/api/v1/attachments/' + attachment_id, 404, actor=eve) + client.call('GET', '/api/v1/attachments/' + attachment_id + '/content', 404, actor=eve) + other_chat = client.call( + 'POST', '/api/v1/chats', 201, actor=alice, + body={'title': 'Другой чат', 'member_ids': [alice['id'], eve['id']]}, schema='Chat', + )['json'] + client.message(alice, other_chat, 'без чужого вложения') + response = client.call( + 'POST', '/api/v1/chats/' + other_chat['id'] + '/messages', 404, actor=alice, + body={'text': '', 'attachment_ids': [attachment_id]}, + headers={'Idempotency-Key': 'foreign-attachment-check'}, + ) + check(response['status'] == 404, 'foreign attachment was accepted') + print('PASS: attachment validation and chat-scoped access') + + +if __name__ == '__main__': + main() diff --git a/student-tests/idempotency.py b/student-tests/idempotency.py new file mode 100755 index 00000000..b7ad5e30 --- /dev/null +++ b/student-tests/idempotency.py @@ -0,0 +1,37 @@ +#!/usr/bin/env python3 +"""Проверка общего Idempotency-Key через обе API-реплики.""" +import sys +import uuid +from concurrent.futures import ThreadPoolExecutor + +sys.path.insert(0, 'tests') +from client import Client, check + + +def main(): + client = Client('http://localhost:8080') + alice, _, _, chat = client.bootstrap() + key = 'student-' + uuid.uuid4().hex + body = {'text': 'одно сообщение при восьми повторах'} + + def send(_): + return client.call( + 'POST', '/api/v1/chats/' + chat['id'] + '/messages', 201, + actor=alice, body=body, + headers={'Idempotency-Key': key}, schema='Message', + ) + + with ThreadPoolExecutor(max_workers=8) as pool: + responses = list(pool.map(send, range(8))) + ids = {item['json']['id'] for item in responses} + check(len(ids) == 1, 'concurrent retries created more than one message') + client.call( + 'POST', '/api/v1/chats/' + chat['id'] + '/messages', 409, + actor=alice, body={'text': 'другой текст'}, + headers={'Idempotency-Key': key}, + ) + print('PASS: concurrent idempotency, one message id:', next(iter(ids))) + + +if __name__ == '__main__': + main() diff --git a/student-tests/upload_load.py b/student-tests/upload_load.py new file mode 100644 index 00000000..8bbb8371 --- /dev/null +++ b/student-tests/upload_load.py @@ -0,0 +1,30 @@ +"""Ten concurrent bounded uploads for a small local memory check.""" +from concurrent.futures import ThreadPoolExecutor +from pathlib import Path +import sys +import uuid + +sys.path.insert(0, str(Path(__file__).parents[1] / 'tests')) +from client import Client, check + + +def main(): + client = Client('http://localhost:8080') + alice, _, _, chat = client.bootstrap() + data = (Path(__file__).parents[1] / 'tests/fixtures/sample.png').read_bytes() + + def upload(number): + return client.call( + 'POST', '/api/v1/chats/' + chat['id'] + '/attachments?filename=load-' + str(number) + '.png', + 201, actor=alice, raw=data, + headers={'Content-Type': 'image/png'}, schema='Attachment', + ) + + with ThreadPoolExecutor(max_workers=10) as pool: + results = list(pool.map(upload, range(10))) + check(len(results) == 10, 'not all uploads completed') + print('PASS: 10 concurrent uploads, bytes per upload:', len(data)) + + +if __name__ == '__main__': + main()