diff --git a/.dockerignore b/.dockerignore index bc16e556..a5414d96 100644 --- a/.dockerignore +++ b/.dockerignore @@ -17,4 +17,6 @@ backups __pycache__ node_modules evidence +backend/target +target .DS_Store diff --git a/.env.example b/.env.example index d32b9be0..b33c5c74 100644 --- a/.env.example +++ b/.env.example @@ -11,3 +11,11 @@ SESSION_STORE=postgres CACHE_URL_FILE=/run/secrets/cache_url API_REPLICAS=2 IDEMPOTENCY_TTL_SECONDS=86400 +POSTGRES_USER=messenger +POSTGRES_PASSWORD=messenger +POSTGRES_DB=messenger +SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/messenger +SPRING_DATASOURCE_USERNAME=messenger +SPRING_DATASOURCE_PASSWORD=messenger +SPRING_DATA_REDIS_HOST=redis +SPRING_DATA_REDIS_PORT=6379 diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..b000e8ac --- /dev/null +++ b/Dockerfile @@ -0,0 +1,20 @@ +FROM maven:3.9.11-eclipse-temurin-21 AS build +WORKDIR /src +COPY backend/pom.xml backend/pom.xml +COPY contracts contracts +COPY backend/src backend/src +RUN mvn -f backend/pom.xml -DskipTests package + +FROM eclipse-temurin:21.0.8_9-jre-jammy +RUN apt-get update \ + && apt-get install -y --no-install-recommends curl \ + && rm -rf /var/lib/apt/lists/* \ + && useradd --uid 10001 --create-home --shell /usr/sbin/nologin app +WORKDIR /app +COPY --from=build /src/backend/target/messenger.jar /app/messenger.jar +USER app +EXPOSE 8080 +ENV LIQUIBASE_ANALYTICS_ENABLED=false +HEALTHCHECK --interval=5s --timeout=3s --start-period=60s --retries=3 \ + CMD curl -fsS http://127.0.0.1:8080/health/ready || exit 1 +ENTRYPOINT ["java", "-jar", "/app/messenger.jar"] diff --git a/REPORT.md b/REPORT.md index c2679005..dbd73b75 100644 --- a/REPORT.md +++ b/REPORT.md @@ -1,37 +1,100 @@ # Отчёт — лабораторная 3 -- Автор, группа: TODO -- Целевая оценка; выбранный трек 5, если нужен: TODO +- Автор, группа: ivanstorozhev, БВТ2304 +- Целевая оценка: 4 +- Трек 5: не выбран - Commit/PR: TODO после публикации -- Использованные источники, библиотеки и помощь ИИ: TODO +- Использованные источники, библиотеки и помощь ИИ: контракт `contracts/openapi.json` и `contracts/README.md`; реализация lab2 (Spring Boot 4.1.1, Spring Data JPA, `spring-security-crypto` Argon2id, Spring Data Redis, Liquibase, Actuator, MapStruct 1.6.3, OpenAPI Generator 7.17.0, Bouncy Castle 1.86). Образы: PostgreSQL 16.10, Redis 7.4.6, HAProxy 3.2.6, сборка `maven:3.9.11-eclipse-temurin-21`, runtime `eclipse-temurin:21.0.8_9-jre-jammy`. ## Запуск из чистого clone -TODO: версии runtime/образов, prerequisites, команды создания локальных secrets/.env, build, миграций, запуска, ожидания готовности, тестов и остановки. Указать необходимые действия оператора. Не вставлять секреты. Отдельно указать безопасную остановку и команду намеренного удаления учебных данных. +Нужны Docker Desktop (проверено 28.5.1), Docker Compose, Python 3.9+. JDK 21 и Maven 3.9 нужны только для `mvn test` вне образа. + +```sh +cp .env.example .env +# Перед общим стендом замените учебный пароль PostgreSQL в .env. +docker compose --env-file .env config --quiet +docker compose --env-file .env up -d --build +curl -fsS http://127.0.0.1:8080/health/ready +make test +make test-persistence ACTION_SCRIPT=scripts/restart.sh +make test-failover ACTION_SCRIPT=scripts/stop-one.sh +# Поднять остановленную реплику и повторить отказ для второй: +docker compose --env-file .env start api +``` + +Миграции выполняет одноразовый сервис `migrate`: тот же JAR с профилем `migrate`. Liquibase отрабатывает при старте, затем процесс завершается с кодом 0. Реплики `api` стартуют после этого и с `SPRING_LIQUIBASE_ENABLED=false`. Повторный запуск `migrate` на уже заполненной схеме пишет `Run: 0`, `Previously run: 5` и не создаёт таблицы заново. Отдельного seed нет. + +Остановка без удаления данных: `docker compose --env-file .env stop`. Снятие контейнеров с сохранением volumes: `docker compose --env-file .env down`. Намеренное удаление учебных данных: `docker compose --env-file .env down -v`. Файл `.env` в Git не входит. + +Свои проверки API: `mvn -q test` в каталоге `backend/` (нужен Docker: Testcontainers поднимает PostgreSQL и Redis). ## Архитектура и решения -TODO: схема процессов/хранилищ, источник истины, транзакционные границы, ограничения. Что перенесено из lab2, что изменено в этой работе. Соответствие переменных из .env.example реальной конфигурации. +Клиент ходит только в HAProxy на `127.0.0.1:8080`. Две реплики сервиса `api` портов наружу не публикуют. HAProxy резолвит имя `api` через DNS Docker (`127.0.0.11`), `balance roundrobin`, sticky session нет. Проверка `GET /health/ready` каждые 1 с, backend снимается после 2 неудач (`fall 2`), возвращается после 1 успеха (`rise 1`). Таймаут проверки 1 с, `timeout connect` 1 с, `timeout server` 5 с, повторов запроса на балансировщике нет (`retries 0`). Худшая оценка обнаружения мёртвого backend — около 3 с (два интервала плюс таймаут проверки). На стенде первая успешная запись после начала `stop-one.sh` была через 1.108 с и 1.389 с. + +PostgreSQL хранит пользователей, чаты, участников, сообщения, сессии и записи идемпотентности. Redis — только кэш разбора Bearer, как в lab2. История в Redis не кладётся. Источник истины сессии — строка в `sessions`. `X-Instance-Id` равен hostname контейнера (короткий id) и не меняется, пока процесс жив. `scripts/stop-one.sh` находит контейнер сервиса `api` по этому значению и делает `docker stop -t 6`. Политика `restart: unless-stopped`, поэтому остановленная реплика сама не поднимается. Код выхода 143 — это SIGTERM, не SIGKILL. + +`POST /api/v1/chats/{chat_id}/messages` требует `Idempotency-Key` (`[A-Za-z0-9._:-]{1,128}`), иначе 400. Область — пользователь, метод POST, путь чата и ключ. В одной транзакции берётся `pg_advisory_xact_lock`, затем либо возвращается уже записанное сообщение, либо вместе с ним вставляется строка `idempotency_records`. Откат не оставляет ключ. Тот же текст в пределах `IDEMPOTENCY_TTL_SECONDS` (по умолчанию 86400) даёт тот же 201 и то же сообщение; другой текст — 409. В контракте lab3 у тела есть только `text`, поэтому канонический хеш — SHA-256 этого текста. Сессия и членство в чате проверяются и на повторе. + +При SIGTERM Spring Boot перестаёт принимать трафик (`server.shutdown=graceful`, `timeout-per-shutdown-phase=4s`). `/health/ready` включает `readinessState` и `db` и в этот момент становится 503, HAProxy снимает реплику. Redis в readiness не входит: кэш не обязателен, сессия читается из PostgreSQL. Пул Hikari на реплику: `maximum-pool-size=10`, `connection-timeout=3000`. + +Лимиты: API 1 CPU и 1024 MiB на реплику (`-XX:MaxRAMPercentage=75`), PostgreSQL 1 CPU и 512 MiB, Redis 0.25 CPU и 128 MiB, HAProxy 0.25 CPU и 128 MiB, `migrate` 0.5 CPU и 1024 MiB. `container_name` нет, число реплик задаёт `API_REPLICAS` (по умолчанию 2). + +Соответствие `.env.example`: + +| Переменная примера | Куда попадает | +| --- | --- | +| `APP_HOST`, `APP_PORT` | `server.address`, `server.port` внутри реплики; снаружи слушает только HAProxy | +| `SESSION_TTL_SECONDS` | `app.session-ttl` | +| `IDEMPOTENCY_TTL_SECONDS` | `app.idempotency-ttl` | +| `API_REPLICAS` | `deploy.replicas` сервиса `api` | +| `POSTGRES_*` | контейнер Postgres и `SPRING_DATASOURCE_*` | +| `SPRING_DATASOURCE_URL` | в Compose URL всё равно указывает на сервис `postgres` | +| `SPRING_DATA_REDIS_HOST`, `SPRING_DATA_REDIS_PORT` | Spring Data Redis; в Compose хост `redis` | +| `DATABASE_URL_FILE`, `CACHE_URL_FILE` | не используются: доступ задаётся переменными Spring | +| `SESSION_STORE` | сессии в PostgreSQL, Redis только кэш | +| `HOSTNAME` | `app.instance-id`, заголовок `X-Instance-Id` | ## Доказательства критериев +Стенд: Mac16,8, arm64, 12 CPU, 24 GiB RAM, Docker 28.5.1. Прогон 29 октября 2026. + | Критерий README | Команда/сценарий | Наблюдаемый результат | Файл доказательства | | --- | --- | --- | --- | -| Публичный smoke | make test | TODO | TODO | -| Остальные пункты уровня 3 | TODO | TODO | TODO | -| Все пункты уровня 4, если заявлен | TODO | TODO | TODO | -| Выбранный трек 5, если заявлен | TODO | TODO | TODO | - -TODO: добавить отдельную строку для каждого заявленного критерия. PASS без команды и наблюдения не является доказательством. Проверка инфраструктурного hook требует подтверждения, какие реальные процессы/хранилища перезапущены. +| Публичный smoke | `make test` | `PASS: lab3 public API scenario` | этот отчёт | +| Две реплики за одной точкой входа | 30 запросов `GET /health/live` через `127.0.0.1:8080` | два `X-Instance-Id`: `60a47156672c` и `6cf753eaeaaf`, они же hostname контейнеров `api-1` и `api-2`. Порт наружу есть только у `lb` | `evidence/limits.txt` | +| Данные и сессия переживают рестарт | `make test-persistence ACTION_SCRIPT=scripts/restart.sh` | `PASS: persistence preserved confirmed data and existing session` | этот отчёт | +| Рестарт затронул API, PostgreSQL, Redis и LB, volumes на месте | `docker inspect` до и после | `StartedAt` сменился: api-1 `15:48:00Z` → `15:48:37Z`, api-2 `15:48:00Z` → `15:48:37Z`, postgres `15:45:39Z` → `15:48:37Z`, redis `15:45:39Z` → `15:48:37Z`, lb `15:48:11Z` → `15:48:37Z`. Volumes `messenger-lab3_postgres-data` и `messenger-lab3_redis-data` те же | `evidence/restart-before.txt`, `evidence/restart-after.txt` | +| Отказ первой реплики | `make test-failover ACTION_SCRIPT=scripts/stop-one.sh` | до отказа 2 instance id; остановлен `api-1` `60a47156672c` (`Exited (143)`), `api-2` остался healthy. Успешных записей 119, ошибок 1, первая успешная запись через 1.108 с. `PASS` | `evidence/failover-1.txt`, `evidence/failover-1-ps.txt` | +| Повтор после восстановления первой | снова `make test-failover` | снова 2 instance id до отказа; снова остановлен `api-1` (проба попала на него). 115 успехов, 1 ошибка, восстановление 1.389 с. `PASS` | `evidence/failover-2.txt`, `evidence/failover-2-ps.txt` | +| Отказ второй реплики | `TARGET_INSTANCE_ID=6cf753eaeaaf ./scripts/stop-one.sh` во время `tests/load.py` | `api-2` `Exited (143)`, `api-1` healthy. За 25 с: 11911 успехов, 23 ошибки (0.193%), 476.173 RPS, p50/p95/p99 3.952/50.775/69.867 мс | `evidence/failover-api2-ps.txt`, `evidence/load-stop-api2.json` | +| Идемпотентность, в том числе 8 параллельных запросов с одним ключом | `mvn -q test`, класс `IdempotencyIntegrationTest` | повтор того же текста — тот же message; другой текст — 409; нет ключа и кривой ключ — 400; неуспешный 400 не занимает ключ; один ключ в другом чате и у другого пользователя создаёт разные сообщения; 8 потоков — ровно одно сообщение | `backend/src/test/java/ru/mtuci/messenger/IdempotencyIntegrationTest.java` | +| Лимиты, нет обхода LB, нет `container_name` | `docker inspect` | API: 1 CPU, 1024 MiB, `ports={}`; postgres 1 CPU / 512 MiB; redis 0.25 CPU / 128 MiB; lb 0.25 CPU / 128 MiB и только `127.0.0.1:8080` | `evidence/limits.txt` | +| Миграции один раз | лог второго `migrate` и `databasechangelog` | второй прогон: `Run: 0`, `Previously run: 5`. В таблице 5 changesets, `005-idempotency` один раз в `15:45:56` | `evidence/changelog.txt` | +| Поочерёдная замена под нагрузкой | `scripts/rolling-update.sh` во время `tests/load.py --duration 90 --concurrency 4` | каждая реплика остановлена и снова стала healthy, пока вторая отвечала на `/health/ready`. `6cf753eaeaaf`: stop 15:51:51Z, healthy 15:52:01Z. `60a47156672c`: stop 15:52:01Z, healthy 15:52:12Z. Нагрузка: 66264 успеха, 797 ошибок (1.189%), 736.209 RPS, p50/p95/p99 3.389/11.779/49.555 мс | `evidence/rolling-update.txt`, `evidence/rolling-load.json` | +| Свои тесты целиком | `mvn -q test` в `backend/` | 13 тестов, 0 ошибок | `backend/target/surefire-reports/` | +| Базовая нагрузка без отказа | `tests/load.py --duration 20 --concurrency 4` | 12968 успехов, 0 ошибок, 648.130 RPS, p50/p95/p99 3.643/19.829/64.050 мс | `evidence/load.json` | +| Трек 5 | не запускался | — | — | ## Эксперименты и отказы -TODO: гипотеза, hardware/лимиты, версии, объём данных, профиль нагрузки, concurrency/arrival rate, длительность/прогрев, повторы, успешные RPS, ошибки, p50/p95/p99, CPU/RAM. Сохранить raw summary без tokens и объяснить ограничения измерения. +Нагрузка — закрытый цикл `tests/load.py`, 4 клиента, без автоматических повторов. Это throughput HTTP-подтверждений, не число COMMIT и не предел стенда. Прогрева отдельным профилем не было: первый запрос входит в окно. Сравнение «спокойный прогон» и «прогон с остановкой реплики» не выровнено по длительности (20 с и 25 с). | Воздействие | Что ожидаем | Что наблюдали | Время восстановления / потеря данных | | --- | --- | --- | --- | -| TODO | TODO | TODO | TODO | +| `scripts/restart.sh` перезапускает lb, api, postgres, redis | тот же Bearer читает подтверждённое сообщение, volumes на месте | persistence-тест прошёл; `StartedAt` всех этих контейнеров обновился | готовность вернулась внутри теста; подтверждённое сообщение на месте | +| `stop-one.sh` останавливает реплику, ответившую на пробу | не позднее 10 с идут новые записи, остановленный id пропадает из ответов, дублей нет | два прогона: восстановление 1.108 с и 1.389 с, по одной ошибке на переход, `PASS` | данные, подтверждённые до и во время отказа, на месте | +| Тот же скрипт останавливает вторую реплику во время записи | оставшаяся реплика принимает POST | `api-2` exited 143, `api-1` healthy; 23 ошибки на 11934 попытки | запись продолжалась, отдельной потери подтверждённых сообщений тест не показал | +| Поочерёдный stop/start каждой реплики под нагрузкой | `/health/ready` жив за счёт второй реплики, обе возвращаются | ready не пропадал между stop и start; healthy через 10 с на каждую; 1.189% ошибок на 90 с | обе реплики снова healthy, дубли из-за замены не измерялись отдельным подсчётом id | +| SIGTERM | процесс завершается по сигналу, LB перестаёт слать на него | `docker stop -t 6` дал exit 143 | уложилось в таймаут 6 с, SIGKILL (137) не понадобился | ## Ограничения и следующие шаги -TODO: какие отказы выдерживаются и какие нет; что не реализовано; где учебное упрощение; какое улучшение подтверждено, а какое пока гипотеза. +Один Docker-host не переживает потерю этой машины. Единственные PostgreSQL, Redis и HAProxy — точки отказа: их остановка останавливает запись или вход, даже если вторая реплика API жива. Несколько API-процессов не делают базу и балансировщик высокодоступными. + +Миграция запускается один раз до старта реплик и повторно ничего не меняет. Совместимость новой схемы со старым бинарём API под нагрузкой не проверялась: на стенде одна версия. Ломающее изменение схемы потребовало бы остановить API до миграции. + +Пока HAProxy не снял backend (до 2 неудачных проверок), часть запросов попадает в останавливаемую реплику и завершается ошибкой соединения. Балансировщик такой POST не повторяет. Клиент может повторить тот же `Idempotency-Key`: подтверждённая запись не удваивается, неподтверждённая выполняется заново. + +`attachment_ids` в обязательной схеме lab3 ещё нет, поэтому равенство «нет поля» и `[]` появится вместе с вложениями. Redis по-прежнему только кэш сессии; если `DEL` при logout не прошёл, ключ может жить до своего TTL, а отзыв виден через PostgreSQL при промахе кэша. diff --git a/backend/pom.xml b/backend/pom.xml new file mode 100644 index 00000000..ed4c27a1 --- /dev/null +++ b/backend/pom.xml @@ -0,0 +1,184 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 4.1.1 + + + ru.mtuci + messenger + 1.0.0-SNAPSHOT + messenger + MTUSI messenger lab 3 + + 21 + 1.6.3 + 7.17.0 + 2.2.36 + + + + org.springframework.boot + spring-boot-starter-webmvc + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-liquibase + + + org.springframework.boot + spring-boot-starter-data-redis + + + org.springframework.security + spring-security-crypto + + + org.bouncycastle + bcprov-jdk18on + 1.86 + + + org.springframework.boot + spring-boot-starter-actuator + + + io.micrometer + micrometer-registry-prometheus + + + org.postgresql + postgresql + runtime + + + org.mapstruct + mapstruct + ${mapstruct.version} + + + io.swagger.core.v3 + swagger-annotations-jakarta + ${swagger-annotations.version} + + + org.springframework.boot + spring-boot-starter-webmvc-test + test + + + org.springframework.boot + spring-boot-starter-data-jpa-test + test + + + org.springframework.boot + spring-boot-testcontainers + test + + + org.testcontainers + testcontainers + test + + + org.testcontainers + testcontainers-postgresql + test + + + + messenger + + + org.openapitools + openapi-generator-maven-plugin + ${openapi-generator.version} + + + + generate + + + ${project.basedir}/../contracts/openapi.json + spring + ${project.build.directory}/generated-sources/openapi + ru.mtuci.messenger.api.model + ru.mtuci.messenger.api.generated + false + true + false + + set=List + + + set=ArrayList + + + true + true + true + java8 + false + jackson + true + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + jackson3-model-annotations + generate-sources + + run + + + + + + + + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + + + + + diff --git a/backend/src/main/java/ru/mtuci/messenger/MessengerApplication.java b/backend/src/main/java/ru/mtuci/messenger/MessengerApplication.java new file mode 100644 index 00000000..639754ee --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/MessengerApplication.java @@ -0,0 +1,20 @@ +package ru.mtuci.messenger; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.security.crypto.argon2.Argon2PasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; + +@SpringBootApplication +public class MessengerApplication { + + public static void main(String[] args) { + SpringApplication.run(MessengerApplication.class, args); + } + + @Bean + PasswordEncoder passwordEncoder() { + return Argon2PasswordEncoder.defaultsForSpringSecurity_v5_8(); + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/api/chat/ChatController.java b/backend/src/main/java/ru/mtuci/messenger/api/chat/ChatController.java new file mode 100644 index 00000000..1a936db2 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/api/chat/ChatController.java @@ -0,0 +1,51 @@ +package ru.mtuci.messenger.api.chat; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import ru.mtuci.messenger.api.model.Chat; +import ru.mtuci.messenger.api.model.ChatPage; +import ru.mtuci.messenger.api.model.CreateChat; +import ru.mtuci.messenger.service.ChatService; +import ru.mtuci.messenger.web.BearerAuthFilter; + +import java.util.UUID; + +@Validated +@RestController +public class ChatController { + + private final ChatService chats; + + public ChatController(ChatService chats) { + this.chats = chats; + } + + @PostMapping("/api/v1/chats") + public ResponseEntity create(HttpServletRequest request, @Valid @RequestBody CreateChat body) { + return ResponseEntity.status(HttpStatus.CREATED).body(chats.create(BearerAuthFilter.userId(request), body)); + } + + @GetMapping("/api/v1/chats") + public ChatPage list(HttpServletRequest request, + @RequestParam(required = false) @Min(1) @Max(100) Integer limit, + @RequestParam(required = false) @Size(min = 1) String cursor) { + return chats.list(BearerAuthFilter.userId(request), limit, cursor); + } + + @GetMapping("/api/v1/chats/{chatId}") + public Chat get(HttpServletRequest request, @PathVariable UUID chatId) { + return chats.get(BearerAuthFilter.userId(request), chatId); + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/api/health/HealthController.java b/backend/src/main/java/ru/mtuci/messenger/api/health/HealthController.java new file mode 100644 index 00000000..d21757c3 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/api/health/HealthController.java @@ -0,0 +1,44 @@ +package ru.mtuci.messenger.api.health; + +import org.springframework.boot.health.actuate.endpoint.HealthDescriptor; +import org.springframework.boot.health.actuate.endpoint.HealthEndpoint; +import org.springframework.boot.health.contributor.Status; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import ru.mtuci.messenger.api.model.Health; +import ru.mtuci.messenger.exception.UnavailableException; + +@RestController +public class HealthController { + + private final HealthEndpoint healthEndpoint; + + public HealthController(HealthEndpoint healthEndpoint) { + this.healthEndpoint = healthEndpoint; + } + + @GetMapping("/health/live") + public Health live() { + if (!up("liveness")) { + throw new IllegalStateException("liveness"); + } + return ok(); + } + + @GetMapping("/health/ready") + public Health ready() { + if (!up("readiness")) { + throw new UnavailableException("Сервис не готов"); + } + return ok(); + } + + private boolean up(String path) { + HealthDescriptor descriptor = healthEndpoint.healthForPath(path); + return descriptor != null && Status.UP.equals(descriptor.getStatus()); + } + + private Health ok() { + return new Health(Health.StatusEnum.OK); + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/api/message/MessageController.java b/backend/src/main/java/ru/mtuci/messenger/api/message/MessageController.java new file mode 100644 index 00000000..015ad13b --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/api/message/MessageController.java @@ -0,0 +1,50 @@ +package ru.mtuci.messenger.api.message; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import ru.mtuci.messenger.api.model.CreateMessage; +import ru.mtuci.messenger.api.model.Message; +import ru.mtuci.messenger.api.model.MessagePage; +import jakarta.servlet.http.HttpServletRequest; +import ru.mtuci.messenger.service.MessageService; +import ru.mtuci.messenger.web.BearerAuthFilter; + +import java.util.UUID; + +@Validated +@RestController +public class MessageController { + + private final MessageService messageService; + + public MessageController(MessageService messageService) { + this.messageService = messageService; + } + + @PostMapping("/api/v1/chats/{chatId}/messages") + public ResponseEntity create(HttpServletRequest request, @PathVariable UUID chatId, + @RequestHeader(value = "Idempotency-Key", required = false) String idempotencyKey, + @Valid @RequestBody CreateMessage body) { + return ResponseEntity.status(HttpStatus.CREATED) + .body(messageService.create(BearerAuthFilter.userId(request), chatId, idempotencyKey, body)); + } + + @GetMapping("/api/v1/chats/{chatId}/messages") + public MessagePage list(HttpServletRequest request, @PathVariable UUID chatId, + @RequestParam(required = false) @Min(1) @Max(100) Integer limit, + @RequestParam(required = false) @Size(min = 1) String cursor) { + return messageService.list(BearerAuthFilter.userId(request), chatId, limit, cursor); + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/api/user/UserController.java b/backend/src/main/java/ru/mtuci/messenger/api/user/UserController.java new file mode 100644 index 00000000..5d180b59 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/api/user/UserController.java @@ -0,0 +1,47 @@ +package ru.mtuci.messenger.api.user; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import ru.mtuci.messenger.api.model.CreateUser; +import ru.mtuci.messenger.api.model.Session; +import ru.mtuci.messenger.api.model.User; +import ru.mtuci.messenger.service.UserService; +import ru.mtuci.messenger.web.BearerAuthFilter; + +@RestController +public class UserController { + + private final UserService users; + + public UserController(UserService users) { + this.users = users; + } + + @PostMapping("/api/v1/users") + public ResponseEntity register(@Valid @RequestBody CreateUser request) { + return ResponseEntity.status(HttpStatus.CREATED).body(users.register(request)); + } + + @GetMapping("/api/v1/users/me") + public User me(HttpServletRequest request) { + return users.current(BearerAuthFilter.userId(request)); + } + + @PostMapping("/api/v1/auth/sessions") + public ResponseEntity login(HttpServletRequest request) { + return ResponseEntity.status(HttpStatus.CREATED).body(users.login(request.getHeader("Authorization"))); + } + + @DeleteMapping("/api/v1/auth/sessions/current") + public ResponseEntity logout(HttpServletRequest request) { + users.revoke((String) request.getAttribute(BearerAuthFilter.TOKEN)); + return ResponseEntity.noContent().build(); + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/cache/SessionCache.java b/backend/src/main/java/ru/mtuci/messenger/cache/SessionCache.java new file mode 100644 index 00000000..836fe1ac --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/cache/SessionCache.java @@ -0,0 +1,61 @@ +package ru.mtuci.messenger.cache; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.dao.DataAccessException; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Component; + +import java.time.Duration; +import java.time.Instant; +import java.util.Optional; +import java.util.UUID; + +/** + * Кэш Bearer-сессий: session:{sha256(token)} -> userId, TTL = остаток жизни сессии. + * Источник истины — таблица sessions; при ошибке Redis вызывающий идёт в PostgreSQL. + */ +@Component +public class SessionCache { + + private static final Logger log = LoggerFactory.getLogger(SessionCache.class); + + private final StringRedisTemplate redis; + + public SessionCache(StringRedisTemplate redis) { + this.redis = redis; + } + + public Optional find(String tokenHash) { + try { + return Optional.ofNullable(redis.opsForValue().get(key(tokenHash))).map(UUID::fromString); + } catch (DataAccessException exception) { + log.warn("session cache bypass: {}", exception.getClass().getSimpleName()); + return Optional.empty(); + } + } + + public void put(String tokenHash, UUID userId, Instant expiresAt) { + Duration ttl = Duration.between(Instant.now(), expiresAt); + if (ttl.isNegative() || ttl.isZero()) { + return; + } + try { + redis.opsForValue().set(key(tokenHash), userId.toString(), ttl); + } catch (DataAccessException exception) { + log.warn("session cache write skipped: {}", exception.getClass().getSimpleName()); + } + } + + public void evict(String tokenHash) { + try { + redis.delete(key(tokenHash)); + } catch (DataAccessException exception) { + log.warn("session cache evict skipped: {}", exception.getClass().getSimpleName()); + } + } + + private static String key(String tokenHash) { + return "session:" + tokenHash; + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/domain/ChatEntity.java b/backend/src/main/java/ru/mtuci/messenger/domain/ChatEntity.java new file mode 100644 index 00000000..ff6169d0 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/domain/ChatEntity.java @@ -0,0 +1,45 @@ +package ru.mtuci.messenger.domain; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.UUID; + +@Entity +@Table(name = "chats") +public class ChatEntity { + + @Id + private UUID id; + + @Column(nullable = false, length = 100) + private String title; + + @Column(name = "created_at", nullable = false) + private Instant createdAt; + + protected ChatEntity() { + } + + public ChatEntity(String title) { + this.id = UUID.randomUUID(); + this.title = title; + this.createdAt = Instant.now().truncatedTo(ChronoUnit.MICROS); + } + + public UUID getId() { + return id; + } + + public String getTitle() { + return title; + } + + public Instant getCreatedAt() { + return createdAt; + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/domain/ChatMemberEntity.java b/backend/src/main/java/ru/mtuci/messenger/domain/ChatMemberEntity.java new file mode 100644 index 00000000..1a929a5b --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/domain/ChatMemberEntity.java @@ -0,0 +1,47 @@ +package ru.mtuci.messenger.domain; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; + +import java.util.UUID; + +@Entity +@Table(name = "chat_members") +@IdClass(ChatMemberId.class) +public class ChatMemberEntity { + + @Id + @Column(name = "chat_id", nullable = false) + private UUID chatId; + + @Id + @Column(name = "user_id", nullable = false) + private UUID userId; + + @Column(name = "ordinal", nullable = false) + private int ordinal; + + protected ChatMemberEntity() { + } + + public ChatMemberEntity(UUID chatId, UUID userId, int ordinal) { + this.chatId = chatId; + this.userId = userId; + this.ordinal = ordinal; + } + + public UUID getChatId() { + return chatId; + } + + public UUID getUserId() { + return userId; + } + + public int getOrdinal() { + return ordinal; + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/domain/ChatMemberId.java b/backend/src/main/java/ru/mtuci/messenger/domain/ChatMemberId.java new file mode 100644 index 00000000..5caf3970 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/domain/ChatMemberId.java @@ -0,0 +1,34 @@ +package ru.mtuci.messenger.domain; + +import java.io.Serializable; +import java.util.UUID; + +public class ChatMemberId implements Serializable { + + private UUID chatId; + private UUID userId; + + public ChatMemberId() { + } + + public ChatMemberId(UUID chatId, UUID userId) { + this.chatId = chatId; + this.userId = userId; + } + + @Override + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof ChatMemberId that)) { + return false; + } + return chatId.equals(that.chatId) && userId.equals(that.userId); + } + + @Override + public int hashCode() { + return chatId.hashCode() * 31 + userId.hashCode(); + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/domain/IdempotencyRecord.java b/backend/src/main/java/ru/mtuci/messenger/domain/IdempotencyRecord.java new file mode 100644 index 00000000..76ddfdc5 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/domain/IdempotencyRecord.java @@ -0,0 +1,69 @@ +package ru.mtuci.messenger.domain; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +import java.time.Instant; +import java.util.UUID; + +@Entity +@Table(name = "idempotency_records") +public class IdempotencyRecord { + + @Id + private UUID id; + + @Column(name = "user_id", nullable = false) + private UUID userId; + + @Column(name = "http_method", nullable = false, length = 8) + private String httpMethod; + + @Column(nullable = false, length = 256) + private String path; + + @Column(name = "idempotency_key", nullable = false, length = 128) + private String idempotencyKey; + + @Column(name = "request_hash", nullable = false, length = 64) + private String requestHash; + + @Column(name = "message_id", nullable = false) + private UUID messageId; + + @Column(name = "created_at", nullable = false) + private Instant createdAt; + + @Column(name = "expires_at", nullable = false) + private Instant expiresAt; + + protected IdempotencyRecord() { + } + + public IdempotencyRecord(UUID userId, String httpMethod, String path, String idempotencyKey, String requestHash, + UUID messageId, Instant createdAt, Instant expiresAt) { + this.id = UUID.randomUUID(); + this.userId = userId; + this.httpMethod = httpMethod; + this.path = path; + this.idempotencyKey = idempotencyKey; + this.requestHash = requestHash; + this.messageId = messageId; + this.createdAt = createdAt; + this.expiresAt = expiresAt; + } + + public UUID getMessageId() { + return messageId; + } + + public String getRequestHash() { + return requestHash; + } + + public Instant getExpiresAt() { + return expiresAt; + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/domain/MessageEntity.java b/backend/src/main/java/ru/mtuci/messenger/domain/MessageEntity.java new file mode 100644 index 00000000..1abd098c --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/domain/MessageEntity.java @@ -0,0 +1,61 @@ +package ru.mtuci.messenger.domain; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.UUID; + +@Entity +@Table(name = "messages") +public class MessageEntity { + + @Id + private UUID id; + + @Column(name = "chat_id", nullable = false) + private UUID chatId; + + @Column(name = "sender_id", nullable = false) + private UUID senderId; + + @Column(nullable = false, length = 4000) + private String text; + + @Column(name = "created_at", nullable = false) + private Instant createdAt; + + protected MessageEntity() { + } + + public MessageEntity(UUID chatId, UUID senderId, String text) { + this.id = UUID.randomUUID(); + this.chatId = chatId; + this.senderId = senderId; + this.text = text; + this.createdAt = Instant.now().truncatedTo(ChronoUnit.MICROS); + } + + public UUID getId() { + return id; + } + + public UUID getChatId() { + return chatId; + } + + public UUID getSenderId() { + return senderId; + } + + public String getText() { + return text; + } + + public Instant getCreatedAt() { + return createdAt; + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/domain/SessionEntity.java b/backend/src/main/java/ru/mtuci/messenger/domain/SessionEntity.java new file mode 100644 index 00000000..409cda91 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/domain/SessionEntity.java @@ -0,0 +1,53 @@ +package ru.mtuci.messenger.domain; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +import java.time.Duration; +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.UUID; + +@Entity +@Table(name = "sessions") +public class SessionEntity { + + @Id + private UUID id; + + @Column(name = "token_hash", nullable = false, unique = true, length = 64) + private String tokenHash; + + @Column(name = "user_id", nullable = false) + private UUID userId; + + @Column(name = "expires_at", nullable = false) + private Instant expiresAt; + + @Column(name = "revoked_at") + private Instant revokedAt; + + @Column(name = "created_at", nullable = false) + private Instant createdAt; + + protected SessionEntity() { + } + + public SessionEntity(String tokenHash, UUID userId, Duration ttl) { + this.id = UUID.randomUUID(); + this.tokenHash = tokenHash; + this.userId = userId; + this.createdAt = Instant.now().truncatedTo(ChronoUnit.MICROS); + this.expiresAt = createdAt.plus(ttl); + } + + public UUID getUserId() { + return userId; + } + + public Instant getExpiresAt() { + return expiresAt; + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/domain/UserAccount.java b/backend/src/main/java/ru/mtuci/messenger/domain/UserAccount.java new file mode 100644 index 00000000..d5fac265 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/domain/UserAccount.java @@ -0,0 +1,61 @@ +package ru.mtuci.messenger.domain; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.UUID; + +@Entity +@Table(name = "users") +public class UserAccount { + + @Id + private UUID id; + + @Column(nullable = false, unique = true, length = 32) + private String username; + + @Column(name = "display_name", nullable = false, length = 100) + private String displayName; + + @Column(name = "password_hash", nullable = false, length = 255) + private String passwordHash; + + @Column(name = "created_at", nullable = false) + private Instant createdAt; + + protected UserAccount() { + } + + public UserAccount(String username, String displayName, String passwordHash) { + this.id = UUID.randomUUID(); + this.username = username; + this.displayName = displayName; + this.passwordHash = passwordHash; + this.createdAt = Instant.now().truncatedTo(ChronoUnit.MICROS); + } + + public UUID getId() { + return id; + } + + public String getUsername() { + return username; + } + + public String getDisplayName() { + return displayName; + } + + public String getPasswordHash() { + return passwordHash; + } + + public Instant getCreatedAt() { + return createdAt; + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/exception/ApiException.java b/backend/src/main/java/ru/mtuci/messenger/exception/ApiException.java new file mode 100644 index 00000000..810796a4 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/exception/ApiException.java @@ -0,0 +1,24 @@ +package ru.mtuci.messenger.exception; + +import org.springframework.http.HttpStatus; +import ru.mtuci.messenger.api.model.ErrorError; + +public class ApiException extends RuntimeException { + + private final HttpStatus status; + private final ErrorError.CodeEnum code; + + public ApiException(HttpStatus status, ErrorError.CodeEnum code, String message) { + super(message); + this.status = status; + this.code = code; + } + + public HttpStatus status() { + return status; + } + + public ErrorError.CodeEnum code() { + return code; + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/exception/ConflictException.java b/backend/src/main/java/ru/mtuci/messenger/exception/ConflictException.java new file mode 100644 index 00000000..e3388b6e --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/exception/ConflictException.java @@ -0,0 +1,11 @@ +package ru.mtuci.messenger.exception; + +import org.springframework.http.HttpStatus; +import ru.mtuci.messenger.api.model.ErrorError; + +public class ConflictException extends ApiException { + + public ConflictException(String message) { + super(HttpStatus.CONFLICT, ErrorError.CodeEnum.CONFLICT, message); + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/exception/InvalidRequestException.java b/backend/src/main/java/ru/mtuci/messenger/exception/InvalidRequestException.java new file mode 100644 index 00000000..6e203a1e --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/exception/InvalidRequestException.java @@ -0,0 +1,11 @@ +package ru.mtuci.messenger.exception; + +import org.springframework.http.HttpStatus; +import ru.mtuci.messenger.api.model.ErrorError; + +public class InvalidRequestException extends ApiException { + + public InvalidRequestException(String message) { + super(HttpStatus.BAD_REQUEST, ErrorError.CodeEnum.INVALID_REQUEST, message); + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/exception/NotFoundException.java b/backend/src/main/java/ru/mtuci/messenger/exception/NotFoundException.java new file mode 100644 index 00000000..96a728b5 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/exception/NotFoundException.java @@ -0,0 +1,11 @@ +package ru.mtuci.messenger.exception; + +import org.springframework.http.HttpStatus; +import ru.mtuci.messenger.api.model.ErrorError; + +public class NotFoundException extends ApiException { + + public NotFoundException() { + super(HttpStatus.NOT_FOUND, ErrorError.CodeEnum.NOT_FOUND, "Объект не найден"); + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/exception/UnauthorizedException.java b/backend/src/main/java/ru/mtuci/messenger/exception/UnauthorizedException.java new file mode 100644 index 00000000..0950ac38 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/exception/UnauthorizedException.java @@ -0,0 +1,26 @@ +package ru.mtuci.messenger.exception; + +import org.springframework.http.HttpStatus; +import ru.mtuci.messenger.api.model.ErrorError; + +public class UnauthorizedException extends ApiException { + + private final String challenge; + + private UnauthorizedException(String challenge) { + super(HttpStatus.UNAUTHORIZED, ErrorError.CodeEnum.UNAUTHORIZED, "Требуется аутентификация"); + this.challenge = challenge; + } + + public static UnauthorizedException basic() { + return new UnauthorizedException("Basic realm=\"messenger\", charset=\"UTF-8\""); + } + + public static UnauthorizedException bearer() { + return new UnauthorizedException("Bearer realm=\"messenger\""); + } + + public String challenge() { + return challenge; + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/exception/UnavailableException.java b/backend/src/main/java/ru/mtuci/messenger/exception/UnavailableException.java new file mode 100644 index 00000000..e3b72d84 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/exception/UnavailableException.java @@ -0,0 +1,11 @@ +package ru.mtuci.messenger.exception; + +import org.springframework.http.HttpStatus; +import ru.mtuci.messenger.api.model.ErrorError; + +public class UnavailableException extends ApiException { + + public UnavailableException(String message) { + super(HttpStatus.SERVICE_UNAVAILABLE, ErrorError.CodeEnum.UNAVAILABLE, message); + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/mapper/ChatMapper.java b/backend/src/main/java/ru/mtuci/messenger/mapper/ChatMapper.java new file mode 100644 index 00000000..ca8d7a7a --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/mapper/ChatMapper.java @@ -0,0 +1,20 @@ +package ru.mtuci.messenger.mapper; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.ReportingPolicy; +import ru.mtuci.messenger.api.model.Chat; +import ru.mtuci.messenger.domain.ChatEntity; + +import java.util.List; +import java.util.UUID; + +@Mapper(componentModel = "spring", uses = TimeMapper.class, unmappedTargetPolicy = ReportingPolicy.ERROR) +public interface ChatMapper { + + @Mapping(target = "id", source = "chat.id") + @Mapping(target = "title", source = "chat.title") + @Mapping(target = "createdAt", source = "chat.createdAt") + @Mapping(target = "memberIds", source = "memberIds") + Chat toModel(ChatEntity chat, List memberIds); +} diff --git a/backend/src/main/java/ru/mtuci/messenger/mapper/MessageMapper.java b/backend/src/main/java/ru/mtuci/messenger/mapper/MessageMapper.java new file mode 100644 index 00000000..8ff896e0 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/mapper/MessageMapper.java @@ -0,0 +1,12 @@ +package ru.mtuci.messenger.mapper; + +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; +import ru.mtuci.messenger.api.model.Message; +import ru.mtuci.messenger.domain.MessageEntity; + +@Mapper(componentModel = "spring", uses = TimeMapper.class, unmappedTargetPolicy = ReportingPolicy.ERROR) +public interface MessageMapper { + + Message toModel(MessageEntity message); +} diff --git a/backend/src/main/java/ru/mtuci/messenger/mapper/TimeMapper.java b/backend/src/main/java/ru/mtuci/messenger/mapper/TimeMapper.java new file mode 100644 index 00000000..33f52233 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/mapper/TimeMapper.java @@ -0,0 +1,15 @@ +package ru.mtuci.messenger.mapper; + +import org.mapstruct.Mapper; + +import java.time.Instant; +import java.time.OffsetDateTime; +import java.time.ZoneOffset; + +@Mapper(componentModel = "spring") +public interface TimeMapper { + + default OffsetDateTime map(Instant instant) { + return instant == null ? null : instant.atOffset(ZoneOffset.UTC); + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/mapper/UserMapper.java b/backend/src/main/java/ru/mtuci/messenger/mapper/UserMapper.java new file mode 100644 index 00000000..f775cc2e --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/mapper/UserMapper.java @@ -0,0 +1,19 @@ +package ru.mtuci.messenger.mapper; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.ReportingPolicy; +import ru.mtuci.messenger.api.model.Session; +import ru.mtuci.messenger.api.model.User; +import ru.mtuci.messenger.domain.UserAccount; + +import java.time.Instant; + +@Mapper(componentModel = "spring", uses = TimeMapper.class, unmappedTargetPolicy = ReportingPolicy.ERROR) +public interface UserMapper { + + User toModel(UserAccount user); + + @Mapping(target = "tokenType", expression = "java(ru.mtuci.messenger.api.model.Session.TokenTypeEnum.BEARER)") + Session toSession(String token, Instant expiresAt, UserAccount user); +} diff --git a/backend/src/main/java/ru/mtuci/messenger/migrate/MigrateExit.java b/backend/src/main/java/ru/mtuci/messenger/migrate/MigrateExit.java new file mode 100644 index 00000000..0508a583 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/migrate/MigrateExit.java @@ -0,0 +1,34 @@ +package ru.mtuci.messenger.migrate; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Component; + +@Component +@Profile("migrate") +public class MigrateExit implements ApplicationRunner { + + private final ConfigurableApplicationContext context; + + public MigrateExit(ConfigurableApplicationContext context) { + this.context = context; + } + + @Override + public void run(ApplicationArguments args) { + Thread exit = new Thread(() -> { + try { + Thread.sleep(500); + } catch (InterruptedException interrupted) { + Thread.currentThread().interrupt(); + } + int code = SpringApplication.exit(context, () -> 0); + System.exit(code); + }, "migrate-exit"); + exit.setDaemon(false); + exit.start(); + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/repository/ChatMemberRepository.java b/backend/src/main/java/ru/mtuci/messenger/repository/ChatMemberRepository.java new file mode 100644 index 00000000..4af44b28 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/repository/ChatMemberRepository.java @@ -0,0 +1,18 @@ +package ru.mtuci.messenger.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import ru.mtuci.messenger.domain.ChatMemberEntity; +import ru.mtuci.messenger.domain.ChatMemberId; + +import java.util.Collection; +import java.util.List; +import java.util.UUID; + +public interface ChatMemberRepository extends JpaRepository { + + boolean existsByChatIdAndUserId(UUID chatId, UUID userId); + + List findByChatIdOrderByOrdinalAsc(UUID chatId); + + List findByChatIdInOrderByOrdinalAsc(Collection chatIds); +} diff --git a/backend/src/main/java/ru/mtuci/messenger/repository/ChatRepository.java b/backend/src/main/java/ru/mtuci/messenger/repository/ChatRepository.java new file mode 100644 index 00000000..a9b6f30e --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/repository/ChatRepository.java @@ -0,0 +1,30 @@ +package ru.mtuci.messenger.repository; + +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import ru.mtuci.messenger.domain.ChatEntity; + +import java.time.Instant; +import java.util.List; +import java.util.UUID; + +public interface ChatRepository extends JpaRepository { + + @Query(""" + select c from ChatEntity c + where c.id in (select m.chatId from ChatMemberEntity m where m.userId = :userId) + order by c.createdAt asc, c.id asc + """) + List findFirst(UUID userId, Pageable pageable); + + @Query(value = """ + select c.* from chats c + where c.id in (select m.chat_id from chat_members m where m.user_id = :userId) + and (c.created_at, c.id) > (:createdAt, :id) + order by c.created_at asc, c.id asc + """, nativeQuery = true) + List findAfter(UUID userId, Instant createdAt, UUID id, Pageable pageable); + + long countByTitle(String title); +} diff --git a/backend/src/main/java/ru/mtuci/messenger/repository/IdempotencyRepository.java b/backend/src/main/java/ru/mtuci/messenger/repository/IdempotencyRepository.java new file mode 100644 index 00000000..fe043f08 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/repository/IdempotencyRepository.java @@ -0,0 +1,13 @@ +package ru.mtuci.messenger.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import ru.mtuci.messenger.domain.IdempotencyRecord; + +import java.util.Optional; +import java.util.UUID; + +public interface IdempotencyRepository extends JpaRepository { + + Optional findByUserIdAndHttpMethodAndPathAndIdempotencyKey( + UUID userId, String httpMethod, String path, String idempotencyKey); +} diff --git a/backend/src/main/java/ru/mtuci/messenger/repository/MessageRepository.java b/backend/src/main/java/ru/mtuci/messenger/repository/MessageRepository.java new file mode 100644 index 00000000..5f2378fd --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/repository/MessageRepository.java @@ -0,0 +1,31 @@ +package ru.mtuci.messenger.repository; + +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import ru.mtuci.messenger.domain.MessageEntity; + +import java.time.Instant; +import java.util.List; +import java.util.UUID; + +public interface MessageRepository extends JpaRepository { + + long countByChatId(UUID chatId); + + + @Query(""" + select m from MessageEntity m + where m.chatId = :chatId + order by m.createdAt asc, m.id asc + """) + List findFirst(UUID chatId, Pageable pageable); + + @Query(value = """ + select * from messages + where chat_id = :chatId + and (created_at, id) > (:createdAt, :id) + order by created_at asc, id asc + """, nativeQuery = true) + List findAfter(UUID chatId, Instant createdAt, UUID id, Pageable pageable); +} diff --git a/backend/src/main/java/ru/mtuci/messenger/repository/SessionRepository.java b/backend/src/main/java/ru/mtuci/messenger/repository/SessionRepository.java new file mode 100644 index 00000000..8481867b --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/repository/SessionRepository.java @@ -0,0 +1,28 @@ +package ru.mtuci.messenger.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.transaction.annotation.Transactional; +import ru.mtuci.messenger.domain.SessionEntity; + +import java.time.Instant; +import java.util.Optional; +import java.util.UUID; + +public interface SessionRepository extends JpaRepository { + + @Query(""" + select s from SessionEntity s + where s.tokenHash = :tokenHash and s.revokedAt is null and s.expiresAt > :now + """) + Optional findActive(String tokenHash, Instant now); + + @Transactional + @Modifying + @Query(""" + update SessionEntity s set s.revokedAt = :now + where s.tokenHash = :tokenHash and s.revokedAt is null and s.expiresAt > :now + """) + int revoke(String tokenHash, Instant now); +} diff --git a/backend/src/main/java/ru/mtuci/messenger/repository/UserRepository.java b/backend/src/main/java/ru/mtuci/messenger/repository/UserRepository.java new file mode 100644 index 00000000..34e4dd05 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/repository/UserRepository.java @@ -0,0 +1,15 @@ +package ru.mtuci.messenger.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import ru.mtuci.messenger.domain.UserAccount; + +import java.util.Collection; +import java.util.Optional; +import java.util.UUID; + +public interface UserRepository extends JpaRepository { + + Optional findByUsername(String username); + + long countByIdIn(Collection ids); +} diff --git a/backend/src/main/java/ru/mtuci/messenger/service/ChatService.java b/backend/src/main/java/ru/mtuci/messenger/service/ChatService.java new file mode 100644 index 00000000..2d5f3ea0 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/service/ChatService.java @@ -0,0 +1,99 @@ +package ru.mtuci.messenger.service; + +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import ru.mtuci.messenger.api.model.Chat; +import ru.mtuci.messenger.api.model.ChatPage; +import ru.mtuci.messenger.api.model.CreateChat; +import ru.mtuci.messenger.domain.ChatEntity; +import ru.mtuci.messenger.domain.ChatMemberEntity; +import ru.mtuci.messenger.exception.InvalidRequestException; +import ru.mtuci.messenger.exception.NotFoundException; +import ru.mtuci.messenger.mapper.ChatMapper; +import ru.mtuci.messenger.repository.ChatMemberRepository; +import ru.mtuci.messenger.repository.ChatRepository; +import ru.mtuci.messenger.repository.UserRepository; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +@Service +public class ChatService { + + private final ChatRepository chats; + private final ChatMemberRepository members; + private final UserRepository users; + private final ChatMapper mapper; + + public ChatService(ChatRepository chats, ChatMemberRepository members, UserRepository users, ChatMapper mapper) { + this.chats = chats; + this.members = members; + this.users = users; + this.mapper = mapper; + } + + @Transactional + public Chat create(UUID actorId, CreateChat request) { + TextRules.title(request.getTitle()); + List memberIds = request.getMemberIds(); + if (memberIds == null || new HashSet<>(memberIds).size() != memberIds.size() || !memberIds.contains(actorId)) { + throw new InvalidRequestException("Некорректный запрос"); + } + ChatEntity chat = chats.save(new ChatEntity(request.getTitle())); + if (users.countByIdIn(memberIds) != memberIds.size()) { + throw new InvalidRequestException("Некорректный запрос"); + } + for (int index = 0; index < memberIds.size(); index++) { + members.save(new ChatMemberEntity(chat.getId(), memberIds.get(index), index)); + } + return mapper.toModel(chat, memberIds); + } + + @Transactional(readOnly = true) + public ChatPage list(UUID actorId, Integer limit, String cursor) { + int pageSize = limit == null ? 50 : limit; + CursorCodec.Position position = cursor == null ? null : CursorCodec.decode(cursor, null); + List rows = position == null + ? chats.findFirst(actorId, PageRequest.of(0, pageSize + 1)) + : chats.findAfter(actorId, position.createdAt(), position.id(), PageRequest.of(0, pageSize + 1)); + boolean more = rows.size() > pageSize; + List visible = more ? rows.subList(0, pageSize) : rows; + Map> byChat = memberIds(visible); + List items = visible.stream() + .map(chat -> mapper.toModel(chat, byChat.getOrDefault(chat.getId(), List.of()))) + .toList(); + String next = null; + if (more) { + ChatEntity last = visible.get(visible.size() - 1); + next = CursorCodec.encode(null, last.getCreatedAt(), last.getId()); + } + return new ChatPage(items, next); + } + + @Transactional(readOnly = true) + public Chat get(UUID actorId, UUID chatId) { + if (!members.existsByChatIdAndUserId(chatId, actorId)) { + throw new NotFoundException(); + } + ChatEntity chat = chats.findById(chatId).orElseThrow(NotFoundException::new); + List memberIds = members.findByChatIdOrderByOrdinalAsc(chatId).stream().map(ChatMemberEntity::getUserId).toList(); + return mapper.toModel(chat, memberIds); + } + + private Map> memberIds(List chats) { + Map> result = new LinkedHashMap<>(); + if (chats.isEmpty()) { + return result; + } + List ids = chats.stream().map(ChatEntity::getId).toList(); + for (ChatMemberEntity member : members.findByChatIdInOrderByOrdinalAsc(ids)) { + result.computeIfAbsent(member.getChatId(), ignored -> new ArrayList<>()).add(member.getUserId()); + } + return result; + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/service/CursorCodec.java b/backend/src/main/java/ru/mtuci/messenger/service/CursorCodec.java new file mode 100644 index 00000000..0033fa7a --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/service/CursorCodec.java @@ -0,0 +1,48 @@ +package ru.mtuci.messenger.service; + +import ru.mtuci.messenger.exception.InvalidRequestException; + +import java.nio.charset.StandardCharsets; +import java.time.Instant; +import java.util.Base64; +import java.util.UUID; + +/** + * Непрозрачная позиция keyset-страницы: клиент получает её как next_cursor + * и возвращает в ?cursor=, чтобы следующая страница началась после (created_at, id). + * Для истории в курсор входит chatId: курсор другого чата отклоняется. + */ +public final class CursorCodec { + + private CursorCodec() { + } + + public static String encode(UUID scope, Instant createdAt, UUID id) { + String raw = scope == null ? createdAt + "|" + id : scope + "|" + createdAt + "|" + id; + return Base64.getUrlEncoder().withoutPadding().encodeToString(raw.getBytes(StandardCharsets.UTF_8)); + } + + public static Position decode(String cursor, UUID scope) { + String raw; + try { + raw = new String(Base64.getUrlDecoder().decode(cursor), StandardCharsets.UTF_8); + } catch (IllegalArgumentException exception) { + throw new InvalidRequestException("Некорректный курсор"); + } + String[] parts = raw.split("\\|", -1); + try { + if (scope == null && parts.length == 2) { + return new Position(Instant.parse(parts[0]), UUID.fromString(parts[1])); + } + if (scope != null && parts.length == 3 && scope.equals(UUID.fromString(parts[0]))) { + return new Position(Instant.parse(parts[1]), UUID.fromString(parts[2])); + } + } catch (RuntimeException exception) { + throw new InvalidRequestException("Некорректный курсор"); + } + throw new InvalidRequestException("Некорректный курсор"); + } + + public record Position(Instant createdAt, UUID id) { + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/service/MessageService.java b/backend/src/main/java/ru/mtuci/messenger/service/MessageService.java new file mode 100644 index 00000000..a9ae12b5 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/service/MessageService.java @@ -0,0 +1,143 @@ +package ru.mtuci.messenger.service; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import ru.mtuci.messenger.api.model.CreateMessage; +import ru.mtuci.messenger.api.model.Message; +import ru.mtuci.messenger.api.model.MessagePage; +import ru.mtuci.messenger.domain.IdempotencyRecord; +import ru.mtuci.messenger.domain.MessageEntity; +import ru.mtuci.messenger.exception.ConflictException; +import ru.mtuci.messenger.exception.InvalidRequestException; +import ru.mtuci.messenger.exception.NotFoundException; +import ru.mtuci.messenger.mapper.MessageMapper; +import ru.mtuci.messenger.repository.ChatMemberRepository; +import ru.mtuci.messenger.repository.IdempotencyRepository; +import ru.mtuci.messenger.repository.MessageRepository; +import org.springframework.data.domain.PageRequest; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.sql.Connection; +import java.time.Duration; +import java.time.Instant; +import java.util.HexFormat; +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import java.util.regex.Pattern; + +@Service +public class MessageService { + + private static final Pattern IDEMPOTENCY_KEY = Pattern.compile("^[A-Za-z0-9._:-]{1,128}$"); + private static final String METHOD = "POST"; + + private final MessageRepository messages; + private final IdempotencyRepository idempotency; + private final ChatMemberRepository members; + private final MessageMapper mapper; + private final JdbcTemplate jdbc; + private final Duration idempotencyTtl; + + public MessageService(MessageRepository messages, IdempotencyRepository idempotency, ChatMemberRepository members, + MessageMapper mapper, JdbcTemplate jdbc, + @Value("${app.idempotency-ttl:PT24H}") Duration idempotencyTtl) { + this.messages = messages; + this.idempotency = idempotency; + this.members = members; + this.mapper = mapper; + this.jdbc = jdbc; + this.idempotencyTtl = idempotencyTtl; + } + + @Transactional + public Message create(UUID actorId, UUID chatId, String idempotencyKey, CreateMessage request) { + requireMember(chatId, actorId); + String key = requireKey(idempotencyKey); + TextRules.message(request.getText()); + String path = "/api/v1/chats/" + chatId + "/messages"; + lock(actorId + "\n" + METHOD + "\n" + path + "\n" + key); + String hash = sha256(request.getText()); + Optional existing = idempotency.findByUserIdAndHttpMethodAndPathAndIdempotencyKey( + actorId, METHOD, path, key); + if (existing.isPresent()) { + IdempotencyRecord record = existing.get(); + if (record.getExpiresAt().isAfter(Instant.now())) { + if (!record.getRequestHash().equals(hash)) { + throw new ConflictException("Ключ идемпотентности уже использован с другим телом"); + } + return mapper.toModel(messages.findById(record.getMessageId()).orElseThrow(NotFoundException::new)); + } + idempotency.delete(record); + idempotency.flush(); + } + Instant now = Instant.now(); + MessageEntity saved = messages.saveAndFlush(new MessageEntity(chatId, actorId, request.getText())); + idempotency.saveAndFlush(new IdempotencyRecord( + actorId, METHOD, path, key, hash, saved.getId(), now, now.plus(idempotencyTtl))); + return mapper.toModel(messages.findById(saved.getId()).orElseThrow(NotFoundException::new)); + } + + @Transactional(readOnly = true) + public MessagePage list(UUID actorId, UUID chatId, Integer limit, String cursor) { + requireMember(chatId, actorId); + int pageSize = limit == null ? 50 : limit; + CursorCodec.Position position = cursor == null ? null : CursorCodec.decode(cursor, chatId); + List rows = position == null + ? messages.findFirst(chatId, PageRequest.of(0, pageSize + 1)) + : messages.findAfter(chatId, position.createdAt(), position.id(), PageRequest.of(0, pageSize + 1)); + boolean more = rows.size() > pageSize; + List visible = more ? rows.subList(0, pageSize) : rows; + String next = null; + if (more) { + MessageEntity last = visible.get(visible.size() - 1); + next = CursorCodec.encode(chatId, last.getCreatedAt(), last.getId()); + } + return new MessagePage(visible.stream().map(mapper::toModel).toList(), next); + } + + private void lock(String scope) { + byte[] digest = digest(scope); + long key = 0; + for (int i = 0; i < 8; i++) { + key = (key << 8) | (digest[i] & 0xffL); + } + long lockKey = key; + jdbc.execute((Connection connection) -> { + try (var statement = connection.prepareStatement("select pg_advisory_xact_lock(?)")) { + statement.setLong(1, lockKey); + statement.execute(); + } + return null; + }); + } + + private static String requireKey(String key) { + if (key == null || !IDEMPOTENCY_KEY.matcher(key).matches()) { + throw new InvalidRequestException("Некорректный запрос"); + } + return key; + } + + private static String sha256(String value) { + return HexFormat.of().formatHex(digest(value)); + } + + private static byte[] digest(String value) { + try { + return MessageDigest.getInstance("SHA-256").digest(value.getBytes(StandardCharsets.UTF_8)); + } catch (NoSuchAlgorithmException exception) { + throw new IllegalStateException(exception); + } + } + + private void requireMember(UUID chatId, UUID actorId) { + if (!members.existsByChatIdAndUserId(chatId, actorId)) { + throw new NotFoundException(); + } + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/service/TextRules.java b/backend/src/main/java/ru/mtuci/messenger/service/TextRules.java new file mode 100644 index 00000000..d32c4b80 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/service/TextRules.java @@ -0,0 +1,35 @@ +package ru.mtuci.messenger.service; + +import ru.mtuci.messenger.exception.InvalidRequestException; + +public final class TextRules { + + private TextRules() { + } + + public static void displayName(String value) { + text(value, 1, 100); + } + + public static void title(String value) { + text(value, 1, 100); + } + + public static void message(String value) { + text(value, 1, 4000); + } + + public static void password(String value) { + text(value, 12, 128); + } + + private static void text(String value, int minCodePoints, int maxCodePoints) { + if (value == null || value.isBlank()) { + throw new InvalidRequestException("Некорректный запрос"); + } + int codePoints = value.codePointCount(0, value.length()); + if (codePoints < minCodePoints || codePoints > maxCodePoints) { + throw new InvalidRequestException("Некорректный запрос"); + } + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/service/UserService.java b/backend/src/main/java/ru/mtuci/messenger/service/UserService.java new file mode 100644 index 00000000..d853eb83 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/service/UserService.java @@ -0,0 +1,147 @@ +package ru.mtuci.messenger.service; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.support.TransactionTemplate; +import ru.mtuci.messenger.api.model.CreateUser; +import ru.mtuci.messenger.api.model.Session; +import ru.mtuci.messenger.api.model.User; +import ru.mtuci.messenger.cache.SessionCache; +import ru.mtuci.messenger.domain.SessionEntity; +import ru.mtuci.messenger.domain.UserAccount; +import ru.mtuci.messenger.exception.ConflictException; +import ru.mtuci.messenger.exception.NotFoundException; +import ru.mtuci.messenger.exception.UnauthorizedException; +import ru.mtuci.messenger.mapper.UserMapper; +import ru.mtuci.messenger.repository.SessionRepository; +import ru.mtuci.messenger.repository.UserRepository; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.time.Duration; +import java.time.Instant; +import java.util.Base64; +import java.util.HexFormat; +import java.util.Optional; +import java.util.UUID; + +@Service +public class UserService { + + private final UserRepository users; + private final SessionRepository sessions; + private final SessionCache cache; + private final UserMapper mapper; + private final PasswordEncoder passwords; + private final TransactionTemplate transactions; + private final Duration sessionTtl; + private final SecureRandom random = new SecureRandom(); + private volatile String dummyHash; + + public UserService(UserRepository users, SessionRepository sessions, SessionCache cache, UserMapper mapper, + PasswordEncoder passwords, TransactionTemplate transactions, + @Value("${app.session-ttl}") Duration sessionTtl) { + this.users = users; + this.sessions = sessions; + this.cache = cache; + this.mapper = mapper; + this.passwords = passwords; + this.transactions = transactions; + this.sessionTtl = sessionTtl; + } + + public User register(CreateUser request) { + TextRules.displayName(request.getDisplayName()); + TextRules.password(request.getPassword()); + try { + return transactions.execute(status -> mapper.toModel(users.saveAndFlush(new UserAccount( + request.getUsername(), + request.getDisplayName(), + passwords.encode(request.getPassword()) + )))); + } catch (DataIntegrityViolationException exception) { + throw new ConflictException("Имя пользователя занято"); + } + } + + public User current(UUID userId) { + return users.findById(userId).map(mapper::toModel).orElseThrow(NotFoundException::new); + } + + public Session login(String authorization) { + String[] credentials = basic(authorization); + UserAccount user = users.findByUsername(credentials[0]).orElse(null); + String hash = user == null ? dummyHash() : user.getPasswordHash(); + if (user == null || !passwords.matches(credentials[1], hash)) { + throw UnauthorizedException.basic(); + } + String token = newToken(); + SessionEntity session = sessions.saveAndFlush(new SessionEntity(tokenHash(token), user.getId(), sessionTtl)); + cache.put(tokenHash(token), user.getId(), session.getExpiresAt()); + return mapper.toSession(token, session.getExpiresAt(), user); + } + + public Optional authenticate(String token) { + String hash = tokenHash(token); + Optional cached = cache.find(hash); + if (cached.isPresent()) { + return cached; + } + return sessions.findActive(hash, Instant.now()).map(session -> { + cache.put(hash, session.getUserId(), session.getExpiresAt()); + return session.getUserId(); + }); + } + + public void revoke(String token) { + String hash = tokenHash(token); + if (sessions.revoke(hash, Instant.now()) == 0) { + throw UnauthorizedException.bearer(); + } + cache.evict(hash); + } + + public static String tokenHash(String token) { + try { + return HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256").digest(token.getBytes(StandardCharsets.UTF_8))); + } catch (NoSuchAlgorithmException exception) { + throw new IllegalStateException(exception); + } + } + + private String newToken() { + byte[] bytes = new byte[32]; + random.nextBytes(bytes); + return Base64.getUrlEncoder().withoutPadding().encodeToString(bytes); + } + + private String dummyHash() { + String current = dummyHash; + if (current == null) { + current = passwords.encode("not-a-real-password"); + dummyHash = current; + } + return current; + } + + private static String[] basic(String header) { + if (header == null || !header.regionMatches(true, 0, "Basic ", 0, 6)) { + throw UnauthorizedException.basic(); + } + String decoded; + try { + decoded = new String(Base64.getDecoder().decode(header.substring(6).trim()), StandardCharsets.UTF_8); + } catch (IllegalArgumentException exception) { + throw UnauthorizedException.basic(); + } + int colon = decoded.indexOf(':'); + if (colon <= 0) { + throw UnauthorizedException.basic(); + } + return new String[]{decoded.substring(0, colon), decoded.substring(colon + 1)}; + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/web/ApiAdvice.java b/backend/src/main/java/ru/mtuci/messenger/web/ApiAdvice.java new file mode 100644 index 00000000..f251dd7f --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/web/ApiAdvice.java @@ -0,0 +1,97 @@ +package ru.mtuci.messenger.web; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.ConstraintViolationException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.dao.DataAccessException; +import org.springframework.transaction.CannotCreateTransactionException; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.http.converter.HttpMessageNotReadableException; +import org.springframework.web.HttpMediaTypeNotSupportedException; +import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.MissingServletRequestParameterException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.method.annotation.HandlerMethodValidationException; +import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; +import org.springframework.web.servlet.NoHandlerFoundException; +import org.springframework.web.servlet.resource.NoResourceFoundException; +import ru.mtuci.messenger.api.model.Error; +import ru.mtuci.messenger.api.model.ErrorError; +import ru.mtuci.messenger.exception.ApiException; +import ru.mtuci.messenger.exception.UnauthorizedException; + +@RestControllerAdvice +public class ApiAdvice { + + private static final Logger log = LoggerFactory.getLogger(ApiAdvice.class); + + private final InstanceIdentity instanceId; + + public ApiAdvice(InstanceIdentity instanceId) { + this.instanceId = instanceId; + } + + @ExceptionHandler(ApiException.class) + public ResponseEntity handleApi(HttpServletRequest request, HttpServletResponse response, ApiException exception) { + log.info("api error code={}", exception.code().getValue()); + String challenge = exception instanceof UnauthorizedException unauthorized ? unauthorized.challenge() : null; + return response(request, response, exception.status(), exception.code(), exception.getMessage(), challenge); + } + + @ExceptionHandler({ + HttpMessageNotReadableException.class, + MethodArgumentNotValidException.class, + ConstraintViolationException.class, + HandlerMethodValidationException.class, + MethodArgumentTypeMismatchException.class, + MissingServletRequestParameterException.class, + HttpRequestMethodNotSupportedException.class + }) + public ResponseEntity handleInvalid(HttpServletRequest request, HttpServletResponse response, Exception exception) { + log.info("invalid request type={}", exception.getClass().getSimpleName()); + return response(request, response, HttpStatus.BAD_REQUEST, ErrorError.CodeEnum.INVALID_REQUEST, "Некорректный запрос", null); + } + + @ExceptionHandler(HttpMediaTypeNotSupportedException.class) + public ResponseEntity handleMedia(HttpServletRequest request, HttpServletResponse response) { + return response(request, response, HttpStatus.UNSUPPORTED_MEDIA_TYPE, ErrorError.CodeEnum.UNSUPPORTED_MEDIA_TYPE, + "Неподдерживаемый тип содержимого", null); + } + + @ExceptionHandler({NoResourceFoundException.class, NoHandlerFoundException.class}) + public ResponseEntity handleMissing(HttpServletRequest request, HttpServletResponse response) { + return response(request, response, HttpStatus.NOT_FOUND, ErrorError.CodeEnum.NOT_FOUND, "Объект не найден", null); + } + + @ExceptionHandler({DataAccessException.class, CannotCreateTransactionException.class}) + public ResponseEntity handleDataAccess(HttpServletRequest request, HttpServletResponse response, Exception exception) { + log.warn("data access failure type={}", exception.getClass().getSimpleName()); + return response(request, response, HttpStatus.SERVICE_UNAVAILABLE, ErrorError.CodeEnum.UNAVAILABLE, + "Сервис временно недоступен", null); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity handleUnexpected(HttpServletRequest request, HttpServletResponse response, Exception exception) { + log.error("unexpected failure type={}", exception.getClass().getName(), exception); + return response(request, response, HttpStatus.INTERNAL_SERVER_ERROR, ErrorError.CodeEnum.INTERNAL_ERROR, + "Внутренняя ошибка", null); + } + + private ResponseEntity response(HttpServletRequest request, HttpServletResponse response, HttpStatus status, + ErrorError.CodeEnum code, String message, String challenge) { + String requestId = RequestIdFilter.id(request); + response.setHeader(RequestIdFilter.HEADER, requestId); + response.setHeader(InstanceIdFilter.HEADER, instanceId.value()); + HttpHeaders headers = new HttpHeaders(); + if (challenge != null) { + headers.set(HttpHeaders.WWW_AUTHENTICATE, challenge); + } + return new ResponseEntity<>(new Error(new ErrorError(code, message, requestId)), headers, status); + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/web/BearerAuthFilter.java b/backend/src/main/java/ru/mtuci/messenger/web/BearerAuthFilter.java new file mode 100644 index 00000000..397b60c6 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/web/BearerAuthFilter.java @@ -0,0 +1,70 @@ +package ru.mtuci.messenger.web; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.http.HttpMethod; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; +import org.springframework.web.servlet.HandlerExceptionResolver; +import ru.mtuci.messenger.exception.UnauthorizedException; +import ru.mtuci.messenger.service.UserService; + +import java.io.IOException; +import java.util.UUID; + +@Component +@Order(Ordered.HIGHEST_PRECEDENCE + 10) +public class BearerAuthFilter extends OncePerRequestFilter { + + public static final String TOKEN = "token"; + + private final UserService users; + private final HandlerExceptionResolver errors; + + public BearerAuthFilter(UserService users, @Qualifier("handlerExceptionResolver") HandlerExceptionResolver errors) { + this.users = users; + this.errors = errors; + } + + public static UUID userId(HttpServletRequest request) { + return (UUID) request.getAttribute("userId"); + } + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) + throws ServletException, IOException { + if (isPublic(request)) { + chain.doFilter(request, response); + return; + } + try { + String header = request.getHeader("Authorization"); + if (header == null || !header.regionMatches(true, 0, "Bearer ", 0, 7)) { + throw UnauthorizedException.bearer(); + } + String token = header.substring(7).trim(); + UUID userId = users.authenticate(token).orElseThrow(UnauthorizedException::bearer); + request.setAttribute("userId", userId); + request.setAttribute(TOKEN, token); + } catch (RuntimeException exception) { + errors.resolveException(request, response, null, exception); + return; + } + chain.doFilter(request, response); + } + + private static boolean isPublic(HttpServletRequest request) { + String path = request.getRequestURI(); + if (HttpMethod.GET.matches(request.getMethod()) && (path.equals("/health/live") || path.equals("/health/ready") + || path.startsWith("/actuator/"))) { + return true; + } + return HttpMethod.POST.matches(request.getMethod()) + && (path.equals("/api/v1/users") || path.equals("/api/v1/auth/sessions")); + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/web/InstanceIdFilter.java b/backend/src/main/java/ru/mtuci/messenger/web/InstanceIdFilter.java new file mode 100644 index 00000000..fc232121 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/web/InstanceIdFilter.java @@ -0,0 +1,32 @@ +package ru.mtuci.messenger.web; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +@Component +@Order(Ordered.HIGHEST_PRECEDENCE) +public class InstanceIdFilter extends OncePerRequestFilter { + + static final String HEADER = "X-Instance-Id"; + + private final InstanceIdentity instanceId; + + public InstanceIdFilter(InstanceIdentity instanceId) { + this.instanceId = instanceId; + } + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) + throws ServletException, IOException { + response.setHeader(HEADER, instanceId.value()); + filterChain.doFilter(request, response); + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/web/InstanceIdentity.java b/backend/src/main/java/ru/mtuci/messenger/web/InstanceIdentity.java new file mode 100644 index 00000000..6d60dffd --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/web/InstanceIdentity.java @@ -0,0 +1,19 @@ +package ru.mtuci.messenger.web; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +@Component +public class InstanceIdentity { + + private final String value; + + public InstanceIdentity(@Value("${app.instance-id:local}") String configured) { + String trimmed = configured == null ? "" : configured.trim(); + this.value = trimmed.isEmpty() ? "local" : trimmed; + } + + public String value() { + return value; + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/web/RequestIdFilter.java b/backend/src/main/java/ru/mtuci/messenger/web/RequestIdFilter.java new file mode 100644 index 00000000..e0dff872 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/web/RequestIdFilter.java @@ -0,0 +1,45 @@ +package ru.mtuci.messenger.web; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.slf4j.MDC; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; +import java.util.UUID; + +@Component +@Order(Ordered.HIGHEST_PRECEDENCE) +public class RequestIdFilter extends OncePerRequestFilter { + + static final String HEADER = "X-Request-Id"; + + static String id(HttpServletRequest request) { + Object existing = request.getAttribute(HEADER); + if (existing != null) { + return existing.toString(); + } + String header = request.getHeader(HEADER); + String id = header == null || header.isBlank() ? UUID.randomUUID().toString() : header; + request.setAttribute(HEADER, id); + return id; + } + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) + throws ServletException, IOException { + String requestId = id(request); + response.setHeader(HEADER, requestId); + MDC.put("requestId", requestId); + try { + filterChain.doFilter(request, response); + } finally { + MDC.remove("requestId"); + } + } +} diff --git a/backend/src/main/java/ru/mtuci/messenger/web/TimeFormatConfig.java b/backend/src/main/java/ru/mtuci/messenger/web/TimeFormatConfig.java new file mode 100644 index 00000000..266ab7b4 --- /dev/null +++ b/backend/src/main/java/ru/mtuci/messenger/web/TimeFormatConfig.java @@ -0,0 +1,25 @@ +package ru.mtuci.messenger.web; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.boot.jackson.autoconfigure.JsonMapperBuilderCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; + +import java.time.OffsetDateTime; + +@Configuration +public class TimeFormatConfig { + + /** + * Python 3.9 {@code fromisoformat} принимает только 0, 3 или 6 знаков дробной секунды. + * Jackson по умолчанию отбрасывает хвостовые нули, и время вроде {@code .38078Z} ломает публичные тесты. + */ + @Bean + @Order(Ordered.LOWEST_PRECEDENCE) + JsonMapperBuilderCustomizer utcMicroseconds() { + JsonFormat.Value format = JsonFormat.Value.forPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSSXXX"); + return builder -> builder.withConfigOverride(OffsetDateTime.class, override -> override.setFormat(format)); + } +} diff --git a/backend/src/main/resources/application.yaml b/backend/src/main/resources/application.yaml new file mode 100644 index 00000000..fe8968c2 --- /dev/null +++ b/backend/src/main/resources/application.yaml @@ -0,0 +1,109 @@ +server: + address: ${APP_HOST:0.0.0.0} + port: ${APP_PORT:8080} + shutdown: graceful + tomcat: + connection-timeout: 3s + error: + include-message: never + include-stacktrace: never + include-binding-errors: never + whitelabel: + enabled: false + +spring: + application: + name: messenger + lifecycle: + timeout-per-shutdown-phase: 4s + threads: + virtual: + enabled: false + mvc: + problemdetails: + enabled: false + throw-exception-if-no-handler-found: true + web: + resources: + add-mappings: false + jackson: + use-jackson2-defaults: false + property-naming-strategy: SNAKE_CASE + time-zone: UTC + default-property-inclusion: always + deserialization: + fail-on-unknown-properties: true + datatype: + datetime: + write-dates-as-timestamps: false + write-utc-as-offset: false + datasource: + url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/messenger} + username: ${SPRING_DATASOURCE_USERNAME:messenger} + password: ${SPRING_DATASOURCE_PASSWORD:messenger} + hikari: + maximum-pool-size: 10 + minimum-idle: 1 + connection-timeout: 3000 + validation-timeout: 1000 + jpa: + open-in-view: false + hibernate: + ddl-auto: validate + properties: + hibernate.jdbc.time_zone: UTC + liquibase: + change-log: classpath:db/changelog/db.changelog-master.yaml + data: + redis: + host: ${SPRING_DATA_REDIS_HOST:localhost} + port: ${SPRING_DATA_REDIS_PORT:6379} + timeout: 1s + connect-timeout: 1s + repositories: + enabled: false + +management: + endpoints: + access: + default: READ_ONLY + web: + exposure: + include: + - health + - info + - prometheus + endpoint: + health: + probes: + enabled: true + show-details: always + show-components: always + cache: + time-to-live: 0s + group: + readiness: + include: + - readinessState + - db + health: + redis: + enabled: false + prometheus: + metrics: + export: + enabled: true + +info: + app: + name: messenger + lab: 3 + +app: + session-ttl: ${SESSION_TTL_SECONDS:3600}s + idempotency-ttl: ${IDEMPOTENCY_TTL_SECONDS:86400}s + instance-id: ${HOSTNAME:local} + +logging: + pattern: + console: "%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX} %-5level [%X{requestId}] %msg%n" diff --git a/backend/src/main/resources/db/changelog/001-users.yaml b/backend/src/main/resources/db/changelog/001-users.yaml new file mode 100644 index 00000000..44636139 --- /dev/null +++ b/backend/src/main/resources/db/changelog/001-users.yaml @@ -0,0 +1,41 @@ +databaseChangeLog: + - changeSet: + id: 001-users + author: lab2 + changes: + - createTable: + tableName: users + columns: + - column: + name: id + type: uuid + constraints: + primaryKey: true + nullable: false + primaryKeyName: users_pkey + - column: + name: username + type: varchar(32) + constraints: + nullable: false + unique: true + uniqueConstraintName: users_username_key + - column: + name: display_name + type: varchar(100) + constraints: + nullable: false + - column: + name: password_hash + type: varchar(255) + constraints: + nullable: false + - column: + name: created_at + type: timestamp with time zone + constraints: + nullable: false + - sql: + sql: alter table users add constraint users_username_pattern check (username ~ '^[a-z0-9_]{3,32}$') + - sql: + sql: alter table users add constraint users_display_name_text check (char_length(btrim(display_name)) > 0) diff --git a/backend/src/main/resources/db/changelog/002-sessions.yaml b/backend/src/main/resources/db/changelog/002-sessions.yaml new file mode 100644 index 00000000..44e8dc5c --- /dev/null +++ b/backend/src/main/resources/db/changelog/002-sessions.yaml @@ -0,0 +1,47 @@ +databaseChangeLog: + - changeSet: + id: 002-sessions + author: lab2 + changes: + - createTable: + tableName: sessions + columns: + - column: + name: id + type: uuid + constraints: + primaryKey: true + nullable: false + primaryKeyName: sessions_pkey + - column: + name: token_hash + type: varchar(64) + constraints: + nullable: false + unique: true + uniqueConstraintName: sessions_token_hash_key + - column: + name: user_id + type: uuid + constraints: + nullable: false + - column: + name: expires_at + type: timestamp with time zone + constraints: + nullable: false + - column: + name: revoked_at + type: timestamp with time zone + - column: + name: created_at + type: timestamp with time zone + constraints: + nullable: false + - addForeignKeyConstraint: + baseTableName: sessions + baseColumnNames: user_id + referencedTableName: users + referencedColumnNames: id + constraintName: sessions_user_fk + onDelete: RESTRICT diff --git a/backend/src/main/resources/db/changelog/003-chats.yaml b/backend/src/main/resources/db/changelog/003-chats.yaml new file mode 100644 index 00000000..5683a523 --- /dev/null +++ b/backend/src/main/resources/db/changelog/003-chats.yaml @@ -0,0 +1,77 @@ +databaseChangeLog: + - changeSet: + id: 003-chats + author: lab2 + changes: + - createTable: + tableName: chats + columns: + - column: + name: id + type: uuid + constraints: + primaryKey: true + nullable: false + primaryKeyName: chats_pkey + - column: + name: title + type: varchar(100) + constraints: + nullable: false + - column: + name: created_at + type: timestamp with time zone + constraints: + nullable: false + - sql: + sql: alter table chats add constraint chats_title_text check (char_length(btrim(title)) > 0) + - createTable: + tableName: chat_members + columns: + - column: + name: chat_id + type: uuid + constraints: + nullable: false + - column: + name: user_id + type: uuid + constraints: + nullable: false + - column: + name: ordinal + type: int + constraints: + nullable: false + - addPrimaryKey: + tableName: chat_members + columnNames: chat_id, user_id + constraintName: chat_members_pkey + - addForeignKeyConstraint: + baseTableName: chat_members + baseColumnNames: chat_id + referencedTableName: chats + referencedColumnNames: id + constraintName: chat_members_chat_fk + onDelete: RESTRICT + - addForeignKeyConstraint: + baseTableName: chat_members + baseColumnNames: user_id + referencedTableName: users + referencedColumnNames: id + constraintName: chat_members_user_fk + onDelete: RESTRICT + - createIndex: + indexName: chat_members_user_idx + tableName: chat_members + columns: + - column: + name: user_id + - createIndex: + indexName: chats_history_idx + tableName: chats + columns: + - column: + name: created_at + - column: + name: id diff --git a/backend/src/main/resources/db/changelog/004-messages.yaml b/backend/src/main/resources/db/changelog/004-messages.yaml new file mode 100644 index 00000000..29d26b70 --- /dev/null +++ b/backend/src/main/resources/db/changelog/004-messages.yaml @@ -0,0 +1,61 @@ +databaseChangeLog: + - changeSet: + id: 004-messages + author: lab2 + changes: + - createTable: + tableName: messages + columns: + - column: + name: id + type: uuid + constraints: + primaryKey: true + nullable: false + primaryKeyName: messages_pkey + - column: + name: chat_id + type: uuid + constraints: + nullable: false + - column: + name: sender_id + type: uuid + constraints: + nullable: false + - column: + name: text + type: varchar(4000) + constraints: + nullable: false + - column: + name: created_at + type: timestamp with time zone + constraints: + nullable: false + - addForeignKeyConstraint: + baseTableName: messages + baseColumnNames: chat_id + referencedTableName: chats + referencedColumnNames: id + constraintName: messages_chat_fk + onDelete: RESTRICT + - addForeignKeyConstraint: + baseTableName: messages + baseColumnNames: sender_id + referencedTableName: users + referencedColumnNames: id + constraintName: messages_sender_fk + onDelete: RESTRICT + - sql: + sql: alter table messages add constraint messages_text_not_blank check (char_length(btrim(text)) > 0 and char_length(text) <= 4000) + - createIndex: + indexName: messages_history_idx + tableName: messages + columns: + - column: + name: chat_id + - column: + name: created_at + - column: + name: id diff --git a/backend/src/main/resources/db/changelog/005-idempotency.yaml b/backend/src/main/resources/db/changelog/005-idempotency.yaml new file mode 100644 index 00000000..c11d9691 --- /dev/null +++ b/backend/src/main/resources/db/changelog/005-idempotency.yaml @@ -0,0 +1,73 @@ +databaseChangeLog: + - changeSet: + id: 005-idempotency + author: lab3 + changes: + - createTable: + tableName: idempotency_records + columns: + - column: + name: id + type: uuid + constraints: + primaryKey: true + nullable: false + primaryKeyName: idempotency_records_pkey + - column: + name: user_id + type: uuid + constraints: + nullable: false + - column: + name: http_method + type: varchar(8) + constraints: + nullable: false + - column: + name: path + type: varchar(256) + constraints: + nullable: false + - column: + name: idempotency_key + type: varchar(128) + constraints: + nullable: false + - column: + name: request_hash + type: varchar(64) + constraints: + nullable: false + - column: + name: message_id + type: uuid + constraints: + nullable: false + - column: + name: created_at + type: timestamp with time zone + constraints: + nullable: false + - column: + name: expires_at + type: timestamp with time zone + constraints: + nullable: false + - addUniqueConstraint: + tableName: idempotency_records + columnNames: user_id, http_method, path, idempotency_key + constraintName: idempotency_scope_uq + - addForeignKeyConstraint: + baseTableName: idempotency_records + baseColumnNames: user_id + referencedTableName: users + referencedColumnNames: id + constraintName: idempotency_user_fk + onDelete: RESTRICT + - addForeignKeyConstraint: + baseTableName: idempotency_records + baseColumnNames: message_id + referencedTableName: messages + referencedColumnNames: id + constraintName: idempotency_message_fk + onDelete: RESTRICT diff --git a/backend/src/main/resources/db/changelog/db.changelog-master.yaml b/backend/src/main/resources/db/changelog/db.changelog-master.yaml new file mode 100644 index 00000000..5ff0cb50 --- /dev/null +++ b/backend/src/main/resources/db/changelog/db.changelog-master.yaml @@ -0,0 +1,16 @@ +databaseChangeLog: + - include: + file: 001-users.yaml + relativeToChangelogFile: true + - include: + file: 002-sessions.yaml + relativeToChangelogFile: true + - include: + file: 003-chats.yaml + relativeToChangelogFile: true + - include: + file: 004-messages.yaml + relativeToChangelogFile: true + - include: + file: 005-idempotency.yaml + relativeToChangelogFile: true diff --git a/backend/src/test/java/ru/mtuci/messenger/ApiIntegrationTest.java b/backend/src/test/java/ru/mtuci/messenger/ApiIntegrationTest.java new file mode 100644 index 00000000..d2d57b24 --- /dev/null +++ b/backend/src/test/java/ru/mtuci/messenger/ApiIntegrationTest.java @@ -0,0 +1,281 @@ +package ru.mtuci.messenger; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.test.context.DynamicPropertyRegistry; +import org.springframework.test.context.DynamicPropertySource; +import ru.mtuci.messenger.repository.ChatRepository; +import ru.mtuci.messenger.service.UserService; +import ru.mtuci.messenger.support.ApiClient; +import ru.mtuci.messenger.support.LabContainers; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.json.JsonMapper; + +import java.util.Base64; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +class ApiIntegrationTest { + + @LocalServerPort + int port; + + @Autowired + JsonMapper jsonMapper; + + @Autowired + ChatRepository chatRepository; + + @Autowired + StringRedisTemplate redis; + + private ApiClient api; + + @DynamicPropertySource + static void containers(DynamicPropertyRegistry registry) { + LabContainers.register(registry); + } + + @BeforeEach + void client() { + api = new ApiClient(port, jsonMapper); + } + + @Test + void healthAndActuatorReportProcessAndDatabase() { + ApiClient.Result live = api.get("/health/live", null); + assertEquals(200, live.status()); + assertEquals("ok", live.body().get("status").asString()); + assertFalse(live.requestId().isBlank()); + ApiClient.Result ready = api.get("/health/ready", null); + assertEquals(200, ready.status()); + assertEquals("ok", ready.body().get("status").asString()); + ApiClient.Result actuator = api.get("/actuator/health/readiness", null); + assertEquals(200, actuator.status()); + assertEquals("UP", actuator.body().get("status").asString()); + } + + @Test + void registrationConflictValidationAndRace() throws Exception { + String username = name("reg"); + ApiClient.Result created = api.post("/api/v1/users", api.user(username, "Алиса", "Example-only-not-a-real-secret-123")); + assertEquals(201, created.status()); + assertEquals(username, created.body().get("username").asString()); + assertTrue(created.body().get("created_at").asString().endsWith("Z")); + assertFalse(created.raw().contains("password")); + assertEquals(created.requestId(), created.requestId()); + + ApiClient.Result conflict = api.post("/api/v1/users", api.user(username, "Алиса", "Example-only-not-a-real-secret-123")); + assertEquals(409, conflict.status()); + assertEquals("conflict", conflict.body().get("error").get("code").asString()); + assertEquals(conflict.requestId(), conflict.body().get("error").get("request_id").asString()); + + ApiClient.Result blank = api.post("/api/v1/users", api.user(name("blank"), " ", "Example-only-not-a-real-secret-123")); + assertEquals(400, blank.status()); + ApiClient.Result extra = api.post("/api/v1/users", Map.of("username", name("extra"), "display_name", "Имя", "password", "Example-only-not-a-real-secret-123", "role", "admin")); + assertEquals(400, extra.status()); + + String raced = name("race"); + CountDownLatch latch = new CountDownLatch(1); + try (ExecutorService pool = Executors.newFixedThreadPool(2)) { + List> results = List.of( + pool.submit(() -> once(latch, raced)), + pool.submit(() -> once(latch, raced)) + ); + latch.countDown(); + int createdCount = 0; + int conflictCount = 0; + for (Future result : results) { + int status = result.get(); + if (status == 201) { + createdCount++; + } else if (status == 409) { + conflictCount++; + } + } + assertEquals(1, createdCount); + assertEquals(1, conflictCount); + } + } + + @Test + void sessionLoginLogoutAndIgnoredUserHeader() { + String username = name("sess"); + String password = "Example-only-not-a-real-secret-123"; + JsonNode user = api.post("/api/v1/users", api.user(username, "Алиса", password)).body(); + JsonNode other = api.post("/api/v1/users", api.user(name("oth"), "Боб", password)).body(); + String basic = Base64.getEncoder().encodeToString((username + ":" + password).getBytes()); + ApiClient.Result bad = api.postBasic("/api/v1/auth/sessions", Base64.getEncoder().encodeToString((username + ":wrong-password-xx").getBytes())); + assertEquals(401, bad.status()); + assertTrue(bad.authenticate().toLowerCase().startsWith("basic")); + + ApiClient.Result session = api.postBasic("/api/v1/auth/sessions", basic); + assertEquals(201, session.status()); + assertEquals("Bearer", session.body().get("token_type").asString()); + assertTrue(session.body().get("token").asString().length() >= 32); + assertNotEquals(user.get("id").asString(), session.body().get("token").asString()); + assertEquals(user.get("id").asString(), session.body().get("user").get("id").asString()); + String token = session.body().get("token").asString(); + + ApiClient.Result basicOnApi = api.postBasic("/api/v1/users/me", basic); + assertEquals(401, basicOnApi.status()); + assertTrue(basicOnApi.authenticate().toLowerCase().startsWith("bearer")); + ApiClient.Result headerOnly = api.get("/api/v1/users/me", null, Map.of("X-User-Id", user.get("id").asString())); + assertEquals(401, headerOnly.status()); + ApiClient.Result me = api.get("/api/v1/users/me", token, Map.of("X-User-Id", other.get("id").asString())); + assertEquals(200, me.status()); + assertEquals(user.get("id").asString(), me.body().get("id").asString()); + + assertTrue(Boolean.TRUE.equals(redis.hasKey("session:" + UserService.tokenHash(token)))); + ApiClient.Result logout = api.delete("/api/v1/auth/sessions/current", token); + assertEquals(204, logout.status()); + assertTrue(logout.raw().isBlank()); + assertFalse(Boolean.TRUE.equals(redis.hasKey("session:" + UserService.tokenHash(token)))); + assertEquals(401, api.get("/api/v1/users/me", token).status()); + assertEquals(401, api.delete("/api/v1/auth/sessions/current", token).status()); + } + + @Test + void chatsAreAtomicAndHiddenFromOutsiders() { + String password = "Example-only-not-a-real-secret-123"; + JsonNode alice = register(name("alice"), "Алиса", password); + JsonNode bob = register(name("bob"), "Боб", password); + String aliceToken = login(alice.get("username").asString(), password); + String bobToken = login(bob.get("username").asString(), password); + String eveToken = login(register(name("eve"), "Ева", password).get("username").asString(), password); + + String title = "rollback-" + UUID.randomUUID(); + ApiClient.Result unknown = api.post("/api/v1/chats", aliceToken, Map.of( + "title", title, + "member_ids", List.of(alice.get("id").asString(), UUID.randomUUID().toString()) + )); + assertEquals(400, unknown.status()); + assertEquals(0, chatRepository.countByTitle(title)); + + ApiClient.Result duplicates = api.post("/api/v1/chats", aliceToken, Map.of( + "title", "dup-" + UUID.randomUUID(), + "member_ids", List.of(alice.get("id").asString(), alice.get("id").asString()) + )); + assertEquals(400, duplicates.status()); + ApiClient.Result withoutSelf = api.post("/api/v1/chats", aliceToken, Map.of( + "title", "self-" + UUID.randomUUID(), + "member_ids", List.of(bob.get("id").asString()) + )); + assertEquals(400, withoutSelf.status()); + + ApiClient.Result created = api.post("/api/v1/chats", aliceToken, Map.of( + "title", "Контрактный тест", + "member_ids", List.of(alice.get("id").asString(), bob.get("id").asString()) + )); + assertEquals(201, created.status()); + String chatId = created.body().get("id").asString(); + assertEquals(404, api.get("/api/v1/chats/" + chatId, eveToken).status()); + JsonNode bobList = api.get("/api/v1/chats?limit=100", bobToken).body(); + assertTrue(containsId(bobList.get("items"), chatId)); + JsonNode eveList = api.get("/api/v1/chats?limit=100", eveToken).body(); + assertFalse(containsId(eveList.get("items"), chatId)); + + ApiClient.Result second = api.post("/api/v1/chats", aliceToken, Map.of( + "title", "Второй", + "member_ids", List.of(alice.get("id").asString()) + )); + assertEquals(201, second.status()); + JsonNode page = api.get("/api/v1/chats?limit=1", aliceToken).body(); + assertEquals(1, page.get("items").size()); + assertFalse(page.get("next_cursor").isNull()); + JsonNode next = api.get("/api/v1/chats?limit=1&cursor=" + page.get("next_cursor").asString(), aliceToken).body(); + assertEquals(1, next.get("items").size()); + assertNotEquals(page.get("items").get(0).get("id").asString(), next.get("items").get(0).get("id").asString()); + } + + @Test + void messageHistoryUsesKeysetCursor() { + String password = "Example-only-not-a-real-secret-123"; + JsonNode alice = register(name("ma"), "Алиса", password); + JsonNode bob = register(name("mb"), "Боб", password); + String aliceToken = login(alice.get("username").asString(), password); + String bobToken = login(bob.get("username").asString(), password); + String eveToken = login(register(name("me"), "Ева", password).get("username").asString(), password); + String chatId = api.post("/api/v1/chats", aliceToken, Map.of( + "title", "История", + "member_ids", List.of(alice.get("id").asString(), bob.get("id").asString()) + )).body().get("id").asString(); + String otherChat = api.post("/api/v1/chats", aliceToken, Map.of( + "title", "Другой", + "member_ids", List.of(alice.get("id").asString()) + )).body().get("id").asString(); + + ApiClient.Result first = sendMessage(aliceToken, chatId, "Привет, мир"); + ApiClient.Result second = sendMessage(bobToken, chatId, "Сообщение Боба"); + assertEquals(201, first.status()); + assertTrue(first.body().get("created_at").asString().matches("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{6}Z")); + assertFalse(first.instanceId().isBlank()); + assertEquals(first.instanceId(), api.get("/api/v1/users/me", aliceToken).instanceId()); + assertEquals(alice.get("id").asString(), first.body().get("sender_id").asString()); + assertEquals(201, second.status()); + assertEquals(400, sendMessage(aliceToken, chatId, "").status()); + assertEquals(400, sendMessage(aliceToken, chatId, " ").status()); + assertEquals(404, sendMessage(eveToken, chatId, "чужое").status()); + assertEquals(400, api.get("/api/v1/chats/" + chatId + "/messages?limit=0", aliceToken).status()); + + JsonNode page = api.get("/api/v1/chats/" + chatId + "/messages?limit=1", bobToken).body(); + assertEquals(1, page.get("items").size()); + assertEquals(first.body().get("id").asString(), page.get("items").get(0).get("id").asString()); + String cursor = page.get("next_cursor").asString(); + JsonNode rest = api.get("/api/v1/chats/" + chatId + "/messages?limit=1&cursor=" + cursor, aliceToken).body(); + assertEquals(second.body().get("id").asString(), rest.get("items").get(0).get("id").asString()); + assertTrue(rest.get("next_cursor").isNull()); + assertEquals(400, api.get("/api/v1/chats/" + otherChat + "/messages?cursor=" + cursor, aliceToken).status()); + } + + private int once(CountDownLatch latch, String username) throws Exception { + latch.await(); + return api.post("/api/v1/users", api.user(username, "Гонка", "Example-only-not-a-real-secret-123")).status(); + } + + private JsonNode register(String username, String displayName, String password) { + ApiClient.Result result = api.post("/api/v1/users", api.user(username, displayName, password)); + assertEquals(201, result.status()); + return result.body(); + } + + private String login(String username, String password) { + String basic = Base64.getEncoder().encodeToString((username + ":" + password).getBytes()); + ApiClient.Result session = api.postBasic("/api/v1/auth/sessions", basic); + assertEquals(201, session.status()); + return session.body().get("token").asString(); + } + + private static boolean containsId(JsonNode items, String id) { + for (JsonNode item : items) { + if (id.equals(item.get("id").asString())) { + return true; + } + } + return false; + } + + private ApiClient.Result sendMessage(String token, String chatId, String text) { + return api.post("/api/v1/chats/" + chatId + "/messages", token, Map.of("text", text), + Map.of("Idempotency-Key", UUID.randomUUID().toString())); + } + + private static String name(String prefix) { + return (prefix + UUID.randomUUID().toString().replace("-", "")).substring(0, 20); + } +} diff --git a/backend/src/test/java/ru/mtuci/messenger/DatabaseOutageIntegrationTest.java b/backend/src/test/java/ru/mtuci/messenger/DatabaseOutageIntegrationTest.java new file mode 100644 index 00000000..aa357d02 --- /dev/null +++ b/backend/src/test/java/ru/mtuci/messenger/DatabaseOutageIntegrationTest.java @@ -0,0 +1,73 @@ +package ru.mtuci.messenger; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.DynamicPropertyRegistry; +import org.springframework.test.context.DynamicPropertySource; +import org.testcontainers.postgresql.PostgreSQLContainer; +import ru.mtuci.messenger.support.ApiClient; +import tools.jackson.databind.json.JsonMapper; + +import java.util.UUID; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { + "spring.data.redis.host=127.0.0.1", + "spring.data.redis.port=1", + "spring.data.redis.timeout=200ms", + "spring.data.redis.connect-timeout=200ms", + "spring.datasource.hikari.connection-timeout=1000", + "spring.datasource.hikari.validation-timeout=500", + "spring.datasource.hikari.maximum-pool-size=2" +}) +@DirtiesContext +class DatabaseOutageIntegrationTest { + + private static final PostgreSQLContainer POSTGRES = new PostgreSQLContainer("postgres:16.10"); + + static { + POSTGRES.start(); + } + + @LocalServerPort + int port; + + @Autowired + JsonMapper jsonMapper; + + private ApiClient api; + + @DynamicPropertySource + static void database(DynamicPropertyRegistry registry) { + registry.add("spring.datasource.url", POSTGRES::getJdbcUrl); + registry.add("spring.datasource.username", POSTGRES::getUsername); + registry.add("spring.datasource.password", POSTGRES::getPassword); + } + + @BeforeEach + void client() { + api = new ApiClient(port, jsonMapper); + } + + @Test + @Timeout(40) + void readinessAndWritesFailWhenDatabaseStops() { + assertEquals(200, api.get("/health/ready", null).status()); + POSTGRES.stop(); + ApiClient.Result ready = api.get("/health/ready", null); + assertEquals(503, ready.status()); + assertEquals("unavailable", ready.body().get("error").get("code").asString()); + ApiClient.Result register = api.post("/api/v1/users", api.user( + ("db" + UUID.randomUUID().toString().replace("-", "")).substring(0, 16), + "База", + "Example-only-not-a-real-secret-123" + )); + assertEquals(503, register.status()); + } +} diff --git a/backend/src/test/java/ru/mtuci/messenger/HistoryIndexIntegrationTest.java b/backend/src/test/java/ru/mtuci/messenger/HistoryIndexIntegrationTest.java new file mode 100644 index 00000000..d4f3227c --- /dev/null +++ b/backend/src/test/java/ru/mtuci/messenger/HistoryIndexIntegrationTest.java @@ -0,0 +1,65 @@ +package ru.mtuci.messenger; + +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.test.context.DynamicPropertyRegistry; +import org.springframework.test.context.DynamicPropertySource; +import ru.mtuci.messenger.support.LabContainers; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.sql.Timestamp; +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@SpringBootTest +class HistoryIndexIntegrationTest { + + @Autowired + JdbcTemplate jdbc; + + @DynamicPropertySource + static void containers(DynamicPropertyRegistry registry) { + LabContainers.register(registry); + } + + @Test + void historyPageUsesCompositeIndex() throws Exception { + UUID userId = UUID.randomUUID(); + UUID chatId = UUID.randomUUID(); + Instant created = Instant.parse("2026-01-01T00:00:00Z"); + jdbc.update("insert into users (id, username, display_name, password_hash, created_at) values (?, ?, ?, ?, ?)", + userId, ("idx" + userId.toString().replace("-", "")).substring(0, 16), "Индекс", "hash", Timestamp.from(created)); + jdbc.update("insert into chats (id, title, created_at) values (?, ?, ?)", chatId, "Индекс", Timestamp.from(created)); + jdbc.update("insert into chat_members (chat_id, user_id, ordinal) values (?, ?, 0)", chatId, userId); + + List batch = new ArrayList<>(); + for (int index = 0; index < 10_000; index++) { + batch.add(new Object[]{UUID.randomUUID(), chatId, userId, "m" + index, Timestamp.from(created.plusMillis(index))}); + } + jdbc.batchUpdate("insert into messages (id, chat_id, sender_id, text, created_at) values (?, ?, ?, ?, ?)", batch); + jdbc.execute("analyze messages"); + String plan = String.join("\n", jdbc.query(""" + explain (analyze, buffers) + select id from messages + where chat_id = ? + and (created_at, id) > (?, ?) + order by created_at asc, id asc + limit 50 + """, (rs, row) -> rs.getString(1), chatId, Timestamp.from(created.plusMillis(5000)), UUID.randomUUID())); + Path evidence = Files.isDirectory(Path.of("evidence")) ? Path.of("evidence") : Path.of("..", "evidence"); + Files.createDirectories(evidence); + Files.writeString(evidence.resolve("explain-messages.txt"), plan + "\n"); + assertTrue(plan.contains("messages_history_idx"), plan); + assertTrue(plan.contains("Index Cond"), plan); + assertFalse(plan.contains("Seq Scan on messages"), plan); + assertFalse(plan.contains("Rows Removed by Filter"), plan); + } +} diff --git a/backend/src/test/java/ru/mtuci/messenger/IdempotencyIntegrationTest.java b/backend/src/test/java/ru/mtuci/messenger/IdempotencyIntegrationTest.java new file mode 100644 index 00000000..acec8248 --- /dev/null +++ b/backend/src/test/java/ru/mtuci/messenger/IdempotencyIntegrationTest.java @@ -0,0 +1,164 @@ +package ru.mtuci.messenger; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.test.context.DynamicPropertyRegistry; +import org.springframework.test.context.DynamicPropertySource; +import ru.mtuci.messenger.repository.MessageRepository; +import ru.mtuci.messenger.support.ApiClient; +import ru.mtuci.messenger.support.LabContainers; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.json.JsonMapper; + +import java.util.ArrayList; +import java.util.Base64; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +class IdempotencyIntegrationTest { + + @LocalServerPort + int port; + + @Autowired + JsonMapper jsonMapper; + + @Autowired + MessageRepository messages; + + private ApiClient api; + + @DynamicPropertySource + static void containers(DynamicPropertyRegistry registry) { + LabContainers.register(registry); + } + + @BeforeEach + void client() { + api = new ApiClient(port, jsonMapper); + } + + @Test + void replayConflictAndRejectedKey() { + String password = "Example-only-not-a-real-secret-123"; + JsonNode alice = register(name("ia"), password); + String token = login(alice.get("username").asString(), password); + String chatId = chat(token, List.of(alice.get("id").asString())); + String key = "same-" + UUID.randomUUID(); + + ApiClient.Result rejected = send(token, chatId, "ещё не записано", key.replace("same", "bad key")); + assertEquals(400, rejected.status()); + assertFalse(rejected.instanceId().isBlank()); + assertEquals(400, api.post("/api/v1/chats/" + chatId + "/messages", token, Map.of("text", "без ключа")).status()); + + String recover = "recover-" + UUID.randomUUID(); + assertEquals(400, send(token, chatId, "", recover).status()); + ApiClient.Result first = send(token, chatId, "Привет, мир", recover); + assertEquals(201, first.status()); + ApiClient.Result replay = send(token, chatId, "Привет, мир", recover); + assertEquals(201, replay.status()); + assertEquals(first.body(), replay.body()); + assertEquals(409, send(token, chatId, "другой body", recover).status()); + assertEquals(1, messages.countByChatId(UUID.fromString(chatId))); + + ApiClient.Result fresh = send(token, chatId, "Привет, мир", key); + assertEquals(201, fresh.status()); + assertNotEquals(first.body().get("id").asString(), fresh.body().get("id").asString()); + } + + @Test + void sameKeyIsIndependentAcrossUsersAndChats() { + String password = "Example-only-not-a-real-secret-123"; + JsonNode alice = register(name("ib"), password); + JsonNode bob = register(name("ic"), password); + String aliceToken = login(alice.get("username").asString(), password); + String bobToken = login(bob.get("username").asString(), password); + String shared = chat(aliceToken, List.of(alice.get("id").asString(), bob.get("id").asString())); + String other = chat(aliceToken, List.of(alice.get("id").asString())); + String key = "shared-" + UUID.randomUUID(); + + ApiClient.Result aliceMessage = send(aliceToken, shared, "общий ключ", key); + ApiClient.Result bobMessage = send(bobToken, shared, "общий ключ", key); + ApiClient.Result otherChat = send(aliceToken, other, "общий ключ", key); + assertEquals(201, aliceMessage.status()); + assertEquals(201, bobMessage.status()); + assertEquals(201, otherChat.status()); + assertNotEquals(aliceMessage.body().get("id").asString(), bobMessage.body().get("id").asString()); + assertNotEquals(aliceMessage.body().get("id").asString(), otherChat.body().get("id").asString()); + } + + @Test + void parallelSameKeyCreatesOneMessage() throws Exception { + String password = "Example-only-not-a-real-secret-123"; + JsonNode alice = register(name("ip"), password); + String token = login(alice.get("username").asString(), password); + String chatId = chat(token, List.of(alice.get("id").asString())); + String key = "parallel-" + UUID.randomUUID(); + int threads = 8; + ExecutorService pool = Executors.newFixedThreadPool(threads); + CountDownLatch start = new CountDownLatch(1); + try { + List> futures = new ArrayList<>(); + for (int i = 0; i < threads; i++) { + futures.add(pool.submit(() -> { + start.await(); + return send(token, chatId, "одно сообщение", key); + })); + } + start.countDown(); + JsonNode body = null; + for (Future future : futures) { + ApiClient.Result result = future.get(); + assertEquals(201, result.status()); + if (body == null) { + body = result.body(); + } else { + assertEquals(body, result.body()); + } + } + } finally { + pool.shutdownNow(); + } + assertEquals(1, messages.countByChatId(UUID.fromString(chatId))); + } + + private ApiClient.Result send(String token, String chatId, String text, String key) { + return api.post("/api/v1/chats/" + chatId + "/messages", token, Map.of("text", text), + Map.of("Idempotency-Key", key)); + } + + private String chat(String token, List members) { + return api.post("/api/v1/chats", token, Map.of("title", "Идемпотентность", "member_ids", members)) + .body().get("id").asString(); + } + + private JsonNode register(String username, String password) { + ApiClient.Result result = api.post("/api/v1/users", api.user(username, "Алиса", password)); + assertEquals(201, result.status()); + return result.body(); + } + + private String login(String username, String password) { + String basic = Base64.getEncoder().encodeToString((username + ":" + password).getBytes()); + ApiClient.Result session = api.postBasic("/api/v1/auth/sessions", basic); + assertEquals(201, session.status()); + return session.body().get("token").asString(); + } + + private static String name(String prefix) { + return (prefix + UUID.randomUUID().toString().replace("-", "")).substring(0, 20); + } +} diff --git a/backend/src/test/java/ru/mtuci/messenger/RedisOutageIntegrationTest.java b/backend/src/test/java/ru/mtuci/messenger/RedisOutageIntegrationTest.java new file mode 100644 index 00000000..7559cf97 --- /dev/null +++ b/backend/src/test/java/ru/mtuci/messenger/RedisOutageIntegrationTest.java @@ -0,0 +1,61 @@ +package ru.mtuci.messenger; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.test.context.DynamicPropertyRegistry; +import org.springframework.test.context.DynamicPropertySource; +import ru.mtuci.messenger.support.ApiClient; +import ru.mtuci.messenger.support.LabContainers; +import tools.jackson.databind.json.JsonMapper; + +import java.util.Base64; +import java.util.UUID; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { + "spring.data.redis.host=127.0.0.1", + "spring.data.redis.port=1", + "spring.data.redis.timeout=200ms", + "spring.data.redis.connect-timeout=200ms" +}) +class RedisOutageIntegrationTest { + + @LocalServerPort + int port; + + @Autowired + JsonMapper jsonMapper; + + private ApiClient api; + + @DynamicPropertySource + static void database(DynamicPropertyRegistry registry) { + registry.add("spring.datasource.url", LabContainers.POSTGRES::getJdbcUrl); + registry.add("spring.datasource.username", LabContainers.POSTGRES::getUsername); + registry.add("spring.datasource.password", LabContainers.POSTGRES::getPassword); + } + + @BeforeEach + void client() { + api = new ApiClient(port, jsonMapper); + } + + @Test + void databaseSessionWorksWhenRedisIsDown() { + assertEquals(200, api.get("/health/ready", null).status()); + String username = ("red" + UUID.randomUUID().toString().replace("-", "")).substring(0, 16); + String password = "Example-only-not-a-real-secret-123"; + assertEquals(201, api.post("/api/v1/users", api.user(username, "Кэш", password)).status()); + String basic = Base64.getEncoder().encodeToString((username + ":" + password).getBytes()); + ApiClient.Result session = api.postBasic("/api/v1/auth/sessions", basic); + assertEquals(201, session.status()); + ApiClient.Result me = api.get("/api/v1/users/me", session.body().get("token").asString()); + assertEquals(200, me.status()); + assertEquals(username, me.body().get("username").asString()); + assertEquals(200, api.get("/actuator/health", null).status()); + } +} diff --git a/backend/src/test/java/ru/mtuci/messenger/SessionExpiryIntegrationTest.java b/backend/src/test/java/ru/mtuci/messenger/SessionExpiryIntegrationTest.java new file mode 100644 index 00000000..4cff296b --- /dev/null +++ b/backend/src/test/java/ru/mtuci/messenger/SessionExpiryIntegrationTest.java @@ -0,0 +1,53 @@ +package ru.mtuci.messenger; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.test.context.DynamicPropertyRegistry; +import org.springframework.test.context.DynamicPropertySource; +import ru.mtuci.messenger.support.ApiClient; +import ru.mtuci.messenger.support.LabContainers; +import tools.jackson.databind.json.JsonMapper; + +import java.util.Base64; +import java.util.UUID; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = "app.session-ttl=2s") +class SessionExpiryIntegrationTest { + + @LocalServerPort + int port; + + @Autowired + JsonMapper jsonMapper; + + private ApiClient api; + + @DynamicPropertySource + static void containers(DynamicPropertyRegistry registry) { + LabContainers.register(registry); + } + + @BeforeEach + void client() { + api = new ApiClient(port, jsonMapper); + } + + @Test + void expiredTokenIsRejected() throws Exception { + String username = ("exp" + UUID.randomUUID().toString().replace("-", "")).substring(0, 16); + String password = "Example-only-not-a-real-secret-123"; + assertEquals(201, api.post("/api/v1/users", api.user(username, "Срок", password)).status()); + String basic = Base64.getEncoder().encodeToString((username + ":" + password).getBytes()); + String token = api.postBasic("/api/v1/auth/sessions", basic).body().get("token").asString(); + assertEquals(200, api.get("/api/v1/users/me", token).status()); + Thread.sleep(2500); + ApiClient.Result expired = api.get("/api/v1/users/me", token); + assertEquals(401, expired.status()); + assertEquals("unauthorized", expired.body().get("error").get("code").asString()); + } +} diff --git a/backend/src/test/java/ru/mtuci/messenger/service/TextRulesTest.java b/backend/src/test/java/ru/mtuci/messenger/service/TextRulesTest.java new file mode 100644 index 00000000..04f703d5 --- /dev/null +++ b/backend/src/test/java/ru/mtuci/messenger/service/TextRulesTest.java @@ -0,0 +1,16 @@ +package ru.mtuci.messenger.service; + +import org.junit.jupiter.api.Test; +import ru.mtuci.messenger.exception.InvalidRequestException; + +import static org.junit.jupiter.api.Assertions.assertThrows; + +class TextRulesTest { + + @Test + void rejectsBlankAndTooShortPassword() { + assertThrows(InvalidRequestException.class, () -> TextRules.displayName(" ")); + assertThrows(InvalidRequestException.class, () -> TextRules.message(" \n ")); + assertThrows(InvalidRequestException.class, () -> TextRules.password("short")); + } +} diff --git a/backend/src/test/java/ru/mtuci/messenger/support/ApiClient.java b/backend/src/test/java/ru/mtuci/messenger/support/ApiClient.java new file mode 100644 index 00000000..4c9a7342 --- /dev/null +++ b/backend/src/test/java/ru/mtuci/messenger/support/ApiClient.java @@ -0,0 +1,93 @@ +package ru.mtuci.messenger.support; + +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.json.JsonMapper; + +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.LinkedHashMap; +import java.util.Map; + +public final class ApiClient { + + private final HttpClient http = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(5)).build(); + private final String base; + private final JsonMapper json; + + public ApiClient(int port, JsonMapper json) { + this.base = "http://127.0.0.1:" + port; + this.json = json; + } + + public Result get(String path, String token) { + return send("GET", path, token, null, null, null); + } + + public Result get(String path, String token, Map headers) { + return send("GET", path, token, null, null, headers); + } + + public Result post(String path, Object body) { + return send("POST", path, null, null, body, null); + } + + public Result post(String path, String token, Object body) { + return send("POST", path, token, null, body, null); + } + + public Result post(String path, String token, Object body, Map headers) { + return send("POST", path, token, null, body, headers); + } + + public Result postBasic(String path, String basic) { + return send("POST", path, null, basic, null, null); + } + + public Result delete(String path, String token) { + return send("DELETE", path, token, null, null, null); + } + + private Result send(String method, String path, String token, String basic, Object body, Map extra) { + HttpRequest.Builder builder = HttpRequest.newBuilder(URI.create(base + path)).timeout(Duration.ofSeconds(20)); + if (body == null) { + builder.method(method, HttpRequest.BodyPublishers.noBody()); + } else { + builder.method(method, HttpRequest.BodyPublishers.ofString(json.writeValueAsString(body), StandardCharsets.UTF_8)); + builder.header("Content-Type", "application/json"); + } + if (token != null) { + builder.header("Authorization", "Bearer " + token); + } + if (basic != null) { + builder.header("Authorization", "Basic " + basic); + } + if (extra != null) { + extra.forEach(builder::header); + } + try { + HttpResponse response = http.send(builder.build(), HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8)); + String raw = response.body() == null ? "" : response.body(); + JsonNode tree = raw.isBlank() ? null : json.readTree(raw); + return new Result(response.statusCode(), response.headers().firstValue("X-Request-Id").orElse(""), + response.headers().firstValue("X-Instance-Id").orElse(""), + response.headers().firstValue("WWW-Authenticate").orElse(""), tree, raw); + } catch (Exception exception) { + throw new IllegalStateException(method + " " + path, exception); + } + } + + public Map user(String username, String displayName, String password) { + Map body = new LinkedHashMap<>(); + body.put("username", username); + body.put("display_name", displayName); + body.put("password", password); + return body; + } + + public record Result(int status, String requestId, String instanceId, String authenticate, JsonNode body, String raw) { + } +} diff --git a/backend/src/test/java/ru/mtuci/messenger/support/LabContainers.java b/backend/src/test/java/ru/mtuci/messenger/support/LabContainers.java new file mode 100644 index 00000000..b2938fcf --- /dev/null +++ b/backend/src/test/java/ru/mtuci/messenger/support/LabContainers.java @@ -0,0 +1,27 @@ +package ru.mtuci.messenger.support; + +import org.springframework.test.context.DynamicPropertyRegistry; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.postgresql.PostgreSQLContainer; + +public final class LabContainers { + + public static final PostgreSQLContainer POSTGRES = new PostgreSQLContainer("postgres:16.10"); + public static final GenericContainer REDIS = new GenericContainer<>("redis:7.4.6").withExposedPorts(6379); + + static { + POSTGRES.start(); + REDIS.start(); + } + + private LabContainers() { + } + + public static void register(DynamicPropertyRegistry registry) { + registry.add("spring.datasource.url", POSTGRES::getJdbcUrl); + registry.add("spring.datasource.username", POSTGRES::getUsername); + registry.add("spring.datasource.password", POSTGRES::getPassword); + registry.add("spring.data.redis.host", REDIS::getHost); + registry.add("spring.data.redis.port", () -> REDIS.getMappedPort(6379)); + } +} diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 00000000..986d75c9 --- /dev/null +++ b/compose.yaml @@ -0,0 +1,124 @@ +name: messenger-lab3 + +x-app-image: &app-image + image: messenger-lab3:1.0.0 + +x-datasource: &datasource + SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/${POSTGRES_DB:-messenger} + SPRING_DATASOURCE_USERNAME: ${POSTGRES_USER:-messenger} + SPRING_DATASOURCE_PASSWORD: ${POSTGRES_PASSWORD:-messenger} + SPRING_DATA_REDIS_HOST: redis + SPRING_DATA_REDIS_PORT: "6379" + LIQUIBASE_ANALYTICS_ENABLED: "false" + JAVA_TOOL_OPTIONS: -XX:MaxRAMPercentage=75.0 + +services: + postgres: + image: postgres:16.10 + environment: + POSTGRES_USER: ${POSTGRES_USER:-messenger} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-messenger} + POSTGRES_DB: ${POSTGRES_DB:-messenger} + volumes: + - postgres-data:/var/lib/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-messenger} -d ${POSTGRES_DB:-messenger}"] + interval: 5s + timeout: 3s + retries: 20 + shm_size: 128mb + restart: unless-stopped + deploy: + resources: + limits: + cpus: "1.0" + memory: 512M + + redis: + image: redis:7.4.6 + command: ["redis-server", "--appendonly", "yes"] + volumes: + - redis-data:/data + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 5s + timeout: 3s + retries: 20 + restart: unless-stopped + deploy: + resources: + limits: + cpus: "0.25" + memory: 128M + + migrate: + <<: *app-image + build: + context: . + dockerfile: Dockerfile + command: ["--spring.profiles.active=migrate"] + environment: + <<: *datasource + SPRING_LIQUIBASE_ENABLED: "true" + SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-3600} + IDEMPOTENCY_TTL_SECONDS: ${IDEMPOTENCY_TTL_SECONDS:-86400} + depends_on: + postgres: + condition: service_healthy + redis: + condition: service_healthy + healthcheck: + disable: true + restart: "no" + deploy: + resources: + limits: + cpus: "0.50" + memory: 1024M + + api: + <<: *app-image + environment: + <<: *datasource + APP_HOST: 0.0.0.0 + APP_PORT: "8080" + APP_ENV: ${APP_ENV:-lab} + SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-3600} + IDEMPOTENCY_TTL_SECONDS: ${IDEMPOTENCY_TTL_SECONDS:-86400} + SPRING_LIQUIBASE_ENABLED: "false" + depends_on: + migrate: + condition: service_completed_successfully + postgres: + condition: service_healthy + redis: + condition: service_healthy + stop_grace_period: 12s + init: true + restart: unless-stopped + deploy: + replicas: ${API_REPLICAS:-2} + resources: + limits: + cpus: "1.0" + memory: 1024M + + lb: + image: haproxy:3.2.6 + volumes: + - ./infra/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro + ports: + - "127.0.0.1:8080:8080" + depends_on: + api: + condition: service_healthy + restart: unless-stopped + deploy: + resources: + limits: + cpus: "0.25" + memory: 128M + +volumes: + postgres-data: + redis-data: diff --git a/evidence/changelog.txt b/evidence/changelog.txt new file mode 100644 index 00000000..21242733 --- /dev/null +++ b/evidence/changelog.txt @@ -0,0 +1,9 @@ + id | author | dateexecuted +-----------------+--------+---------------------------- + 001-users | lab2 | 2026-10-29 15:45:56.018437 + 002-sessions | lab2 | 2026-10-29 15:45:56.031359 + 003-chats | lab2 | 2026-10-29 15:45:56.132238 + 004-messages | lab2 | 2026-10-29 15:45:56.217346 + 005-idempotency | lab3 | 2026-10-29 15:45:56.228835 +(5 rows) + diff --git a/evidence/explain-messages.txt b/evidence/explain-messages.txt new file mode 100644 index 00000000..7a80eb5c --- /dev/null +++ b/evidence/explain-messages.txt @@ -0,0 +1,10 @@ +Limit (cost=0.29..5.11 rows=50 width=24) (actual time=0.009..0.020 rows=50 loops=1) + Buffers: shared hit=5 + -> Index Only Scan using messages_history_idx on messages (cost=0.29..482.66 rows=5003 width=24) (actual time=0.009..0.017 rows=50 loops=1) + Index Cond: ((chat_id = 'a3e4d9b4-2c6b-47af-913e-663e57f5cff3'::uuid) AND (ROW(created_at, id) > ROW('2026-01-01 03:00:05+03'::timestamp with time zone, '677ea6b1-d3fb-471f-828b-16ca887b7a0d'::uuid))) + Heap Fetches: 50 + Buffers: shared hit=5 +Planning: + Buffers: shared hit=33 +Planning Time: 0.116 ms +Execution Time: 0.035 ms diff --git a/evidence/failover-1-ps.txt b/evidence/failover-1-ps.txt new file mode 100644 index 00000000..6e6c3952 --- /dev/null +++ b/evidence/failover-1-ps.txt @@ -0,0 +1,2 @@ +messenger-lab3-api-2 Up 33 seconds (healthy) 6cf753eaeaaf +messenger-lab3-api-1 Exited (143) 14 seconds ago 60a47156672c diff --git a/evidence/failover-1.txt b/evidence/failover-1.txt new file mode 100644 index 00000000..7877f02f --- /dev/null +++ b/evidence/failover-1.txt @@ -0,0 +1,4 @@ +python3 tests/resilience.py --mode failover --action-script "scripts/stop-one.sh" --base-url "http://localhost:8080" +Executing explicit failover hook; hook output suppressed to avoid leaking secrets. +{"observed_instances_before": 2, "successful_writes": 119, "failed_attempts": 1, "first_recovery_seconds": 1.108} +PASS: failover preserved confirmed data and existing session. Hook scope needs operator evidence. diff --git a/evidence/failover-2-ps.txt b/evidence/failover-2-ps.txt new file mode 100644 index 00000000..f6444c00 --- /dev/null +++ b/evidence/failover-2-ps.txt @@ -0,0 +1,2 @@ +messenger-lab3-api-2 Up About a minute (healthy) 6cf753eaeaaf +messenger-lab3-api-1 Exited (143) 14 seconds ago 60a47156672c diff --git a/evidence/failover-2.txt b/evidence/failover-2.txt new file mode 100644 index 00000000..86900f3a --- /dev/null +++ b/evidence/failover-2.txt @@ -0,0 +1,4 @@ +python3 tests/resilience.py --mode failover --action-script "scripts/stop-one.sh" --base-url "http://localhost:8080" +Executing explicit failover hook; hook output suppressed to avoid leaking secrets. +{"observed_instances_before": 2, "successful_writes": 115, "failed_attempts": 1, "first_recovery_seconds": 1.389} +PASS: failover preserved confirmed data and existing session. Hook scope needs operator evidence. diff --git a/evidence/failover-api2-ps.txt b/evidence/failover-api2-ps.txt new file mode 100644 index 00000000..26876a4a --- /dev/null +++ b/evidence/failover-api2-ps.txt @@ -0,0 +1,2 @@ +messenger-lab3-api-2 Exited (143) Less than a second ago 6cf753eaeaaf +messenger-lab3-api-1 Up 15 seconds (healthy) 60a47156672c diff --git a/evidence/limits.txt b/evidence/limits.txt new file mode 100644 index 00000000..c8fad6f4 --- /dev/null +++ b/evidence/limits.txt @@ -0,0 +1,5 @@ +/messenger-lab3-api-1 cpus=1000000000 memory=1073741824 ports={} +/messenger-lab3-api-2 cpus=1000000000 memory=1073741824 ports={} +/messenger-lab3-postgres-1 cpus=1000000000 memory=536870912 ports={} +/messenger-lab3-redis-1 cpus=250000000 memory=134217728 ports={} +/messenger-lab3-lb-1 cpus=250000000 memory=134217728 ports={"8080/tcp":[{"HostIp":"127.0.0.1","HostPort":"8080"}]} diff --git a/evidence/load-stop-api2.json b/evidence/load-stop-api2.json new file mode 100644 index 00000000..217202ab --- /dev/null +++ b/evidence/load-stop-api2.json @@ -0,0 +1,17 @@ +{ + "lab": 3, + "workload": "closed-loop POST messages; no automatic retries", + "requested_duration_seconds": 25.0, + "elapsed_seconds": 25.014, + "concurrency": 4, + "successful_requests": 11911, + "failed_requests": 23, + "error_ratio": 0.001927, + "successful_rps": 476.173, + "successful_latency_ms": { + "p50": 3.952, + "p95": 50.775, + "p99": 69.867 + }, + "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." +} diff --git a/evidence/load.json b/evidence/load.json new file mode 100644 index 00000000..2998e70d --- /dev/null +++ b/evidence/load.json @@ -0,0 +1,17 @@ +{ + "lab": 3, + "workload": "closed-loop POST messages; no automatic retries", + "requested_duration_seconds": 20.0, + "elapsed_seconds": 20.008, + "concurrency": 4, + "successful_requests": 12968, + "failed_requests": 0, + "error_ratio": 0.0, + "successful_rps": 648.13, + "successful_latency_ms": { + "p50": 3.643, + "p95": 19.829, + "p99": 64.05 + }, + "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." +} diff --git a/evidence/restart-after.txt b/evidence/restart-after.txt new file mode 100644 index 00000000..a31ba1f6 --- /dev/null +++ b/evidence/restart-after.txt @@ -0,0 +1,5 @@ +/messenger-lab3-api-1 2026-10-29T15:48:37.42114101Z running +/messenger-lab3-api-2 2026-10-29T15:48:37.439325885Z running +/messenger-lab3-postgres-1 2026-10-29T15:48:37.372990802Z running +/messenger-lab3-redis-1 2026-10-29T15:48:37.347089969Z running +/messenger-lab3-lb-1 2026-10-29T15:48:37.320627844Z running diff --git a/evidence/restart-before.txt b/evidence/restart-before.txt new file mode 100644 index 00000000..d68284de --- /dev/null +++ b/evidence/restart-before.txt @@ -0,0 +1,5 @@ +/messenger-lab3-api-1 2026-10-29T15:48:00.980211841Z running +/messenger-lab3-api-2 2026-10-29T15:48:00.893822341Z running +/messenger-lab3-postgres-1 2026-10-29T15:45:39.74062047Z running +/messenger-lab3-redis-1 2026-10-29T15:45:39.740035512Z running +/messenger-lab3-lb-1 2026-10-29T15:48:11.571522721Z running diff --git a/evidence/rolling-load.json b/evidence/rolling-load.json new file mode 100644 index 00000000..9a4fed7f --- /dev/null +++ b/evidence/rolling-load.json @@ -0,0 +1,17 @@ +{ + "lab": 3, + "workload": "closed-loop POST messages; no automatic retries", + "requested_duration_seconds": 90.0, + "elapsed_seconds": 90.007, + "concurrency": 4, + "successful_requests": 66264, + "failed_requests": 797, + "error_ratio": 0.011885, + "successful_rps": 736.209, + "successful_latency_ms": { + "p50": 3.389, + "p95": 11.779, + "p99": 49.555 + }, + "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." +} diff --git a/evidence/rolling-update.txt b/evidence/rolling-update.txt new file mode 100644 index 00000000..a7abb5eb --- /dev/null +++ b/evidence/rolling-update.txt @@ -0,0 +1,7 @@ +rolling 6cf753eaeaaf stop 2026-10-29T15:51:51Z +rolling 6cf753eaeaaf start 2026-10-29T15:51:51Z +rolling 6cf753eaeaaf healthy 2026-10-29T15:52:01Z +rolling 60a47156672c stop 2026-10-29T15:52:01Z +rolling 60a47156672c start 2026-10-29T15:52:02Z +rolling 60a47156672c healthy 2026-10-29T15:52:12Z +rolling update finished 2026-10-29T15:52:12Z diff --git a/evidence/stats.txt b/evidence/stats.txt new file mode 100644 index 00000000..c94e2ff7 --- /dev/null +++ b/evidence/stats.txt @@ -0,0 +1,8 @@ +messenger-lab3-api-2 cpu=2.18% mem=384MiB / 1GiB +messenger-lab3-api-1 cpu=0.54% mem=389.5MiB / 1GiB +messenger-lab3-lb-1 cpu=0.24% mem=17.15MiB / 128MiB +messenger-lab3-postgres-1 cpu=0.11% mem=64MiB / 512MiB +messenger-lab3-redis-1 cpu=0.62% mem=9.906MiB / 128MiB +qualify-redis cpu=0.90% mem=21.06MiB / 7.653GiB +qualify-postgres-dev cpu=0.00% mem=58.75MiB / 7.653GiB +database-video_db-1 cpu=0.00% mem=45.18MiB / 7.653GiB diff --git a/evidence/volumes-after.txt b/evidence/volumes-after.txt new file mode 100644 index 00000000..e1b0e2dd --- /dev/null +++ b/evidence/volumes-after.txt @@ -0,0 +1,3 @@ +DRIVER VOLUME NAME +local messenger-lab3_postgres-data +local messenger-lab3_redis-data diff --git a/evidence/volumes-before.txt b/evidence/volumes-before.txt new file mode 100644 index 00000000..e1b0e2dd --- /dev/null +++ b/evidence/volumes-before.txt @@ -0,0 +1,3 @@ +DRIVER VOLUME NAME +local messenger-lab3_postgres-data +local messenger-lab3_redis-data diff --git a/infra/haproxy.cfg b/infra/haproxy.cfg new file mode 100644 index 00000000..a583d82e --- /dev/null +++ b/infra/haproxy.cfg @@ -0,0 +1,39 @@ +global + maxconn 200 + log stdout format raw local0 + +defaults + mode http + log global + option httplog + timeout connect 1s + timeout client 10s + timeout server 5s + timeout http-request 10s + timeout check 1s + retries 0 + +resolvers docker + nameserver dns 127.0.0.11:53 + resolve_retries 3 + timeout resolve 1s + timeout retry 1s + hold valid 1s + hold other 1s + hold refused 1s + hold nx 1s + hold timeout 1s + hold obsolete 1s + accepted_payload_size 8192 + +frontend http + 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 1 on-marked-down shutdown-sessions + server-template api 8 api:8080 check resolvers docker init-addr none resolve-prefer ipv4 diff --git a/scripts/restart.sh b/scripts/restart.sh new file mode 100755 index 00000000..ffed3012 --- /dev/null +++ b/scripts/restart.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -eu +cd "$(dirname "$0")/.." +if [ -f .env ]; then + docker compose --env-file .env restart lb api postgres redis +else + docker compose restart lb api postgres redis +fi diff --git a/scripts/rolling-update.sh b/scripts/rolling-update.sh new file mode 100755 index 00000000..19eef2ca --- /dev/null +++ b/scripts/rolling-update.sh @@ -0,0 +1,50 @@ +#!/bin/sh +set -eu +cd "$(dirname "$0")/.." + +ids=$(docker ps -q --filter "label=com.docker.compose.project=messenger-lab3" --filter "label=com.docker.compose.service=api") +count=$(printf '%s\n' "$ids" | grep -c . || true) +if [ "$count" -lt 2 ]; then + echo "need at least 2 running api replicas" >&2 + exit 1 +fi + +for id in $ids; do + short=$(printf '%s' "$id" | cut -c1-12) + echo "rolling $short stop $(date -u +%Y-%m-%dT%H:%M:%SZ)" + docker stop -t 6 "$id" >/dev/null + ready=0 + i=0 + while [ "$i" -lt 40 ]; do + if curl -fsS http://127.0.0.1:8080/health/ready >/dev/null; then + ready=1 + break + fi + i=$((i + 1)) + sleep 0.5 + done + if [ "$ready" -ne 1 ]; then + echo "ready did not survive stopping $short" >&2 + docker start "$id" >/dev/null || true + exit 1 + fi + echo "rolling $short start $(date -u +%Y-%m-%dT%H:%M:%SZ)" + docker start "$id" >/dev/null + i=0 + healthy=0 + while [ "$i" -lt 90 ]; do + status=$(docker inspect -f '{{if .State.Health}}{{.State.Health.Status}}{{else}}none{{end}}' "$id") + if [ "$status" = "healthy" ]; then + healthy=1 + break + fi + i=$((i + 1)) + sleep 1 + done + if [ "$healthy" -ne 1 ]; then + echo "replica $short did not become healthy" >&2 + exit 1 + fi + echo "rolling $short healthy $(date -u +%Y-%m-%dT%H:%M:%SZ)" +done +echo "rolling update finished $(date -u +%Y-%m-%dT%H:%M:%SZ)" diff --git a/scripts/stop-one.sh b/scripts/stop-one.sh new file mode 100755 index 00000000..50cc4045 --- /dev/null +++ b/scripts/stop-one.sh @@ -0,0 +1,24 @@ +#!/bin/sh +set -eu +cd "$(dirname "$0")/.." +: "${TARGET_INSTANCE_ID:?test provides target API instance alias}" + +cid="" +for id in $(docker ps -q --filter "label=com.docker.compose.project=messenger-lab3" --filter "label=com.docker.compose.service=api"); do + full=$(docker inspect -f '{{.Id}}' "$id") + host=$(docker inspect -f '{{.Config.Hostname}}' "$id") + name=$(docker inspect -f '{{.Name}}' "$id") + name=${name#/} + short=$(printf '%s' "$full" | cut -c1-12) + if [ "$host" = "$TARGET_INSTANCE_ID" ] || [ "$short" = "$TARGET_INSTANCE_ID" ] || [ "$name" = "$TARGET_INSTANCE_ID" ] || [ "$full" = "$TARGET_INSTANCE_ID" ]; then + cid=$id + break + fi +done + +if [ -z "$cid" ]; then + echo "no running api replica matches TARGET_INSTANCE_ID" >&2 + exit 1 +fi + +docker stop -t 6 "$cid" >/dev/null