Author SHA1 Message Date
ivanstorozhev 0fd4f49861 ## Лабораторная 2
Автор / группа: ivanstorozhev, БВТ2304
Целевая оценка (3/4/5): 4
Трек 5, если заявлен: не заявлен
Что реализовано и что перенесено: Spring Boot API мессенджера. Код lab1 не копировался, взята только модель пользователя, чата и сообщения. PostgreSQL хранит пользователей, чаты, участников, сообщения и сессии. Redis кэширует разбор Bearer-токена и обходится при отказе. Пароли — Argon2id. Миграции Liquibase, модели из OpenAPI, MapStruct.
Команды запуска из чистого clone:
cp .env.example .env
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
Результаты проверок и ссылка на REPORT.md: подробности в REPORT.md.
make check — PASS: offline skeleton structure, local refs and Python syntax.
make test — PASS: lab2 public API scenario.
make test-persistence ACTION_SCRIPT=scripts/restart.sh — PASS: persistence preserved confirmed data and existing session.
mvn -q test в backend/ — пройден, включая гонку username, откат чата, expiry, logout, недоступность Redis и PostgreSQL, EXPLAIN индекса (evidence/explain-messages.txt).
Ограничения / известные ошибки: трек 5 не делался. Если Redis жив, а удаление ключа при logout не прошло, кэш может жить до своего TTL; при недоступном Redis сессия читается из PostgreSQL. История сообщений не кэшируется. Bean Validation сгенерированных моделей считает Java char, сервис проверяет code points.
Источники и использование ИИ: контракт contracts/openapi.json и contracts/README.md; Spring Boot 4.1.1, Spring Data JPA, spring-security-crypto, Spring Data Redis, Liquibase, Actuator, MapStruct 1.6.3, OpenAPI Generator 7.17.0, Bouncy Castle, PostgreSQL 16.10, Redis 7.4.6, Testcontainers. Реализация собрана в Cursor.
- [x] Весь обязательный минимум текущей и предыдущих работ сохранён с объявленными переходами.
- [x] Контракт и публичные тесты не ослаблены.
- [x] make check и make test выполнены; приложен реальный вывод.
- [x] Сценарии отказов/безопасности своего уровня воспроизведены.
- [x] Все секреты и приватные ключи находятся вне Git; отчёт не содержит tokens.
- [x] README задания сохранён, REPORT.md содержит инструкцию именно моего решения.
2026-10-23 10:40:29 +03:00
57 changed files with 2802 additions and 14 deletions
+2
View File
@@ -17,4 +17,6 @@ backups
__pycache__
node_modules
evidence
backend/target
target
.DS_Store
+11
View File
@@ -9,3 +9,14 @@ DATABASE_URL_FILE=/run/secrets/database_url
# Optional on 3, required use on 4 in lab2; Redis OR Valkey:
SESSION_STORE=postgres
CACHE_URL_FILE=/run/secrets/cache_url
# This implementation maps the logical settings above to Spring Boot variables.
# Copy this file to .env and replace the synthetic local password before a shared demo.
POSTGRES_USER=messenger
POSTGRES_PASSWORD=messenger
POSTGRES_DB=messenger
SPRING_DATASOURCE_URL=jdbc:postgresql://localhost:5432/messenger
SPRING_DATASOURCE_USERNAME=messenger
SPRING_DATASOURCE_PASSWORD=messenger
SPRING_DATA_REDIS_HOST=localhost
SPRING_DATA_REDIS_PORT=6379
+20
View File
@@ -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=10s --timeout=3s --start-period=60s --retries=12 \
CMD curl -fsS http://127.0.0.1:8080/health/live || exit 1
ENTRYPOINT ["java", "-jar", "/app/messenger.jar"]
+66 -14
View File
@@ -1,37 +1,89 @@
# Отчёт — лабораторная 2
- Автор, группа: TODO
- Целевая оценка; выбранный трек 5, если нужен: TODO
- Commit/PR: TODO после публикации
- Использованные источники, библиотеки и помощь ИИ: TODO
- Автор, группа: ivanstorozhev, БВТ2304
- Целевая оценка; 4
- Использованные источники, библиотеки и помощь ИИ: контракт `contracts/openapi.json` и `contracts/README.md`; Spring Boot 4.1.1, Spring Data JPA, `spring-security-crypto` (`Argon2PasswordEncoder`), Spring Data Redis, Liquibase, Actuator, Micrometer Prometheus, MapStruct 1.6.3, OpenAPI Generator 7.17.0, Bouncy Castle 1.86, PostgreSQL 16.10, Redis 7.4.6, Testcontainers. Код lab1 не копировался: из него взята только предметная модель пользователя, чата и сообщения.
## Запуск из чистого clone
TODO: версии runtime/образов, prerequisites, команды создания локальных secrets/.env, build, миграций, запуска, ожидания готовности, тестов и остановки. Указать необходимые действия оператора. Не вставлять секреты. Отдельно указать безопасную остановку и команду намеренного удаления учебных данных.
Нужны Docker, Docker Compose, JDK 21 и Maven 3.9, если тесты запускаются вне образа, и Python 3.9+. Образы закреплены: `postgres:16.10`, `redis:7.4.6`, сборка `maven:3.9.11-eclipse-temurin-21`, runtime `eclipse-temurin:21.0.8_9-jre-jammy`.
```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
```
Миграции применяет Liquibase при старте API (`classpath:db/changelog/db.changelog-master.yaml`). Повторный старт читает `databasechangelog` и не создаёт таблицы заново. Отдельной команды 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: схема процессов/хранилищ, источник истины, транзакционные границы, ограничения. Что перенесено из lab1, что изменено в этой работе. Соответствие переменных из .env.example реальной конфигурации.
Клиент ходит в API на `127.0.0.1:8080`. PostgreSQL хранит пользователей, чаты, участников, сообщения и сессии. Redis хранит только кэш разбора Bearer: ключ `session:{sha256(token)}`, значение `userId`, TTL равен остатку жизни сессии. История сообщений в Redis не кладётся.
Источник истины сессии — строка в `sessions` (`token_hash`, `expires_at`, `revoked_at`). Сырой токен — 32 байта `SecureRandom`, в ответе на вход один раз; в БД лежит SHA-256. Срок задаёт `SESSION_TTL_SECONDS` и при рестарте API или Redis не продлевается. Пока ключ есть в Redis, запрос ему доверяет: срок ключа совпадает с `expires_at` и рестарт его не продлевает. Промах и ошибка Redis читают PostgreSQL. Регистрация, вход и отзыв живут в `UserService`. Logout сначала пишет `revoked_at`, затем best-effort удаляет ключ Redis. Если Redis в этот момент недоступен, следующий запрос обойдёт кэш и увидит отзыв в БД. Если Redis жив, а `DEL` не прошёл, кэш может оставаться до своего TTL: это учебное упрощение, не отдельное хранилище сессий.
Пароль — Argon2id (`Argon2PasswordEncoder.defaultsForSpringSecurity_v5_8()`), Bouncy Castle нужен этой реализации. Неизвестный пользователь сравнивается с заранее посчитанным фиктивным хешем, ответ тот же `401`. `X-User-Id` не читается. Basic принимается только на `POST /api/v1/auth/sessions`.
Создание чата — одна транзакция: запись чата, проверка, что все `member_ids` существуют, затем участники. Неизвестный участник или отсутствие вызывающего даёт `400`, транзакция откатывается. Чужой чат — `404`. Гонка одинакового `username` ловится уникальным индексом и возвращает `409`.
История — keyset `(created_at, id)` и индекс `messages_history_idx (chat_id, created_at, id)`. Страница после курсора сравнивает кортеж `(created_at, id)`, чтобы условие попало в `Index Cond`. Курсор непрозрачный и привязан к чату. `Instant` перед записью обрезается до микросекунд, как в PostgreSQL.
Пул Hikari: `maximum-pool-size=10`, `connection-timeout=3000`, `validation-timeout=1000`. Запросы идут через Spring Data. Ошибки БД и невозможность открыть транзакцию снаружи — `503` без SQL. `/health/live` и `/health/ready` читают пробы Actuator. Readiness включает `readinessState` и `db`. Автоиндикатор Redis выключен: недоступный кэш не делает приложение неготовым, сессия читается из PostgreSQL.
Модели ответа генерируются из OpenAPI в `ru.mtuci.messenger.api.model`. MapStruct переводит JPA-сущности в эти модели. Свои DTO контракта нет.
Соответствие `.env.example`:
| Переменная примера | Куда попадает |
| --- | --- |
| `APP_HOST`, `APP_PORT` | `server.address`, `server.port` |
| `SESSION_TTL_SECONDS` | `app.session-ttl` |
| `POSTGRES_USER`, `POSTGRES_PASSWORD`, `POSTGRES_DB` | контейнер Postgres и `SPRING_DATASOURCE_*` в Compose |
| `SPRING_DATASOURCE_URL`, `SPRING_DATASOURCE_USERNAME`, `SPRING_DATASOURCE_PASSWORD` | Hikari; в 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 только кэш |
## Доказательства критериев
| Критерий README | Команда/сценарий | Наблюдаемый результат | Файл доказательства |
| --- | --- | --- | --- |
| Публичный smoke | make test | TODO | TODO |
| Остальные пункты уровня 3 | TODO | TODO | TODO |
| Все пункты уровня 4, если заявлен | TODO | TODO | TODO |
| Выбранный трек 5, если заявлен | TODO | TODO | TODO |
| Публичный smoke | `make test` при поднятом Compose | `PASS: lab2 public API scenario` | этот отчёт |
| Данные и сессия переживают рестарт | `make test-persistence ACTION_SCRIPT=scripts/restart.sh` | `PASS: persistence preserved confirmed data and existing session`. Тот же токен прочитал то же сообщение | этот отчёт |
| Рестарт затронул API, PostgreSQL и Redis, volumes сохранены | `docker inspect` до и после hook | `StartedAt` сменился у всех трёх контейнеров: api `2026-10-23T04:37:52Z` → `2026-10-23T04:38:21Z`, postgres `04:37:46Z` → `04:38:21Z`, redis `04:37:46Z` → `04:38:21Z`. Имена контейнеров те же, `scripts/restart.sh` вызывает `docker compose restart` и не удаляет volumes. После рестарта `GET /health/ready` вернул `{"status":"ok"}` | этот отчёт |
| Уникальный username и гонка | `ApiIntegrationTest.registrationConflictValidationAndRace` | повтор и два параллельных `POST /api/v1/users` дают ровно один `201` и `409` | `backend/src/test/java/ru/mtuci/messenger/ApiIntegrationTest.java` |
| Basic, Bearer, logout, игнор `X-User-Id`, неверный пароль | smoke и `ApiIntegrationTest.sessionLoginLogoutAndIgnoredUserHeader` | неверный пароль — `401` и `WWW-Authenticate: Basic`; Basic и один `X-User-Id` на `/users/me` — `401` Bearer; заголовок не подменяет Bearer; logout — `204` с пустым телом, повтор — `401` | `tests/smoke.py`, `ApiIntegrationTest` |
| Expiry | `SessionExpiryIntegrationTest`, `app.session-ttl=2s` | после ожидания 2.5 с тот же токен получает `401` | `SessionExpiryIntegrationTest.java` |
| Атомарное создание чата | `ApiIntegrationTest.chatsAreAtomicAndHiddenFromOutsiders` | неизвестный участник не оставляет чат (`countByTitle` = 0); чужой чат — `404` | `ApiIntegrationTest.java` |
| Keyset-история | `ApiIntegrationTest.messageHistoryUsesKeysetCursor` и smoke `limit=1` | две страницы без дыр и дублей; курсор другого чата — `400`; пустой текст — `400` | `ApiIntegrationTest.java` |
| Индекс истории на ≥10 000 сообщений | `HistoryIndexIntegrationTest` | `EXPLAIN (ANALYZE, BUFFERS)`: `Index Only Scan using messages_history_idx`, `Index Cond` по `chat_id` и `ROW(created_at, id)`, 50 строк, `shared hit=5`, `Execution Time: 0.061 ms`. Нет `Seq Scan` и `Rows Removed by Filter` | `evidence/explain-messages.txt` |
| Redis недоступен | `RedisOutageIntegrationTest`, Redis на порту 1 | `/health/ready` = 200, регистрация, вход и `/users/me` проходят через PostgreSQL при недоступном Redis | `RedisOutageIntegrationTest.java` |
| БД недоступна | `DatabaseOutageIntegrationTest` останавливает свой Postgres | `/health/ready` и регистрация отвечают `503`, код `unavailable` | `DatabaseOutageIntegrationTest.java` |
| Свои тесты целиком | `mvn -q test` в `backend/` | 14 тестов, 0 ошибок | `backend/target/surefire-reports/` |
| Трек 5 | не запускался | — | — |
TODO: добавить отдельную строку для каждого заявленного критерия. PASS без команды и наблюдения не является доказательством. Проверка инфраструктурного hook требует подтверждения, какие реальные процессы/хранилища перезапущены.
`mvn -q test` прогнан после перевода keyset на сравнение кортежа. Публичные `make test` и `make test-persistence` прогнаны на Compose-стенде 23 октября 2026.
## Эксперименты и отказы
TODO: гипотеза, hardware/лимиты, версии, объём данных, профиль нагрузки, concurrency/arrival rate, длительность/прогрев, повторы, успешные RPS, ошибки, p50/p95/p99, CPU/RAM. Сохранить raw summary без tokens и объяснить ограничения измерения.
Нагрузочный прогон и трек 5 не выполнялись. Ниже — проверки отказов уровня 4, не профиль RPS.
| Воздействие | Что ожидаем | Что наблюдали | Время восстановления / потеря данных |
| --- | --- | --- | --- |
| TODO | TODO | TODO | TODO |
| `docker compose restart` API, Postgres и Redis | тот же Bearer читает подтверждённое сообщение, volumes на месте | persistence-тест прошёл; `StartedAt` всех трёх контейнеров обновился | готовность вернулась внутри теста (весь hook и проверка заняли около 6 с); подтверждённое сообщение на месте |
| Redis не отвечает | готовность жива, сессия читается из PostgreSQL | `RedisOutageIntegrationTest`: ready 200, вход и `/users/me` успешны, кэш `bypass` | обход сразу; данные не терялись |
| PostgreSQL остановлен | `503` на ready и на запись | `DatabaseOutageIntegrationTest`: ready и регистрация `503 unavailable` | процесс жив; запись не принимается, пока БД не поднята |
| `SESSION_TTL_SECONDS=2` | истёкший токен отвергается и не продлевается | через 2.5 с `401` | сессия не восстановлена, это ожидаемый отказ |
| Неверный пароль и logout | `401` / отзыв | smoke и `ApiIntegrationTest`: неверный пароль `401`, logout `204`, следующий запрос `401` | отозванная сессия не принимается |
## Ограничения и следующие шаги
TODO: какие отказы выдерживаются и какие нет; что не реализовано; где учебное упрощение; какое улучшение подтверждено, а какое пока гипотеза.
Redis не является единственным хранилищем сессий, поэтому его рестарт не обязан сохранять ключи: AOF включён, но истина — PostgreSQL. Неудачный `DEL` при живом Redis может оставить кэш до TTL. История не кэшируется. Bean Validation сгенерированных моделей считает Java `char`, а контракт говорит о code points; проверки сервиса считают code points, но `@Size` может отклонить часть строк с дополнительными символами раньше. Длина smoke-текстов в BMP. Трек на 100 000 сообщений и cache stampede не делался. Чувствительные actuator endpoint (`env`, `heapdump`) не открыты.
+184
View File
@@ -0,0 +1,184 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>4.1.1</version>
<relativePath/>
</parent>
<groupId>ru.mtuci</groupId>
<artifactId>messenger</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>messenger</name>
<description>MTUSI messenger lab 2</description>
<properties>
<java.version>21</java.version>
<mapstruct.version>1.6.3</mapstruct.version>
<openapi-generator.version>7.17.0</openapi-generator.version>
<swagger-annotations.version>2.2.36</swagger-annotations.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webmvc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-liquibase</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>1.86</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>${mapstruct.version}</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations-jakarta</artifactId>
<version>${swagger-annotations.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webmvc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-testcontainers</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-postgresql</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>messenger</finalName>
<plugins>
<plugin>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<version>${openapi-generator.version}</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<inputSpec>${project.basedir}/../contracts/openapi.json</inputSpec>
<generatorName>spring</generatorName>
<output>${project.build.directory}/generated-sources/openapi</output>
<modelPackage>ru.mtuci.messenger.api.model</modelPackage>
<apiPackage>ru.mtuci.messenger.api.generated</apiPackage>
<generateApis>false</generateApis>
<generateModels>true</generateModels>
<generateSupportingFiles>false</generateSupportingFiles>
<typeMappings>
<typeMapping>set=List</typeMapping>
</typeMappings>
<instantiationTypes>
<instantiationType>set=ArrayList</instantiationType>
</instantiationTypes>
<configOptions>
<useSpringBoot3>true</useSpringBoot3>
<useJakartaEe>true</useJakartaEe>
<interfaceOnly>true</interfaceOnly>
<dateLibrary>java8</dateLibrary>
<openApiNullable>false</openApiNullable>
<serializationLibrary>jackson</serializationLibrary>
<hideGenerationTimestamp>true</hideGenerationTimestamp>
<additionalModelTypeAnnotations>@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS)</additionalModelTypeAnnotations>
</configOptions>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>jackson3-model-annotations</id>
<phase>generate-sources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<replace dir="${project.build.directory}/generated-sources/openapi" token="import com.fasterxml.jackson.databind.annotation.JsonDeserialize;" value="">
<include name="**/*.java"/>
</replace>
<replace dir="${project.build.directory}/generated-sources/openapi" token="@JsonDeserialize(as = LinkedHashSet.class)" value="">
<include name="**/*.java"/>
</replace>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>
</project>
@@ -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();
}
}
@@ -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<Chat> 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);
}
}
@@ -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);
}
}
@@ -0,0 +1,48 @@
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.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<Message> create(HttpServletRequest request, @PathVariable UUID chatId,
@Valid @RequestBody CreateMessage body) {
return ResponseEntity.status(HttpStatus.CREATED)
.body(messageService.create(BearerAuthFilter.userId(request), chatId, 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);
}
}
@@ -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<User> 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<Session> login(HttpServletRequest request) {
return ResponseEntity.status(HttpStatus.CREATED).body(users.login(request.getHeader("Authorization")));
}
@DeleteMapping("/api/v1/auth/sessions/current")
public ResponseEntity<Void> logout(HttpServletRequest request) {
users.revoke((String) request.getAttribute(BearerAuthFilter.TOKEN));
return ResponseEntity.noContent().build();
}
}
@@ -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<UUID> 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;
}
}
@@ -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;
}
}
@@ -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;
}
}
@@ -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();
}
}
@@ -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;
}
}
@@ -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;
}
}
@@ -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;
}
}
@@ -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;
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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, "Объект не найден");
}
}
@@ -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;
}
}
@@ -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);
}
}
@@ -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<UUID> memberIds);
}
@@ -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);
}
@@ -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);
}
}
@@ -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);
}
@@ -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<ChatMemberEntity, ChatMemberId> {
boolean existsByChatIdAndUserId(UUID chatId, UUID userId);
List<ChatMemberEntity> findByChatIdOrderByOrdinalAsc(UUID chatId);
List<ChatMemberEntity> findByChatIdInOrderByOrdinalAsc(Collection<UUID> chatIds);
}
@@ -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<ChatEntity, UUID> {
@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<ChatEntity> 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<ChatEntity> findAfter(UUID userId, Instant createdAt, UUID id, Pageable pageable);
long countByTitle(String title);
}
@@ -0,0 +1,28 @@
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<MessageEntity, UUID> {
@Query("""
select m from MessageEntity m
where m.chatId = :chatId
order by m.createdAt asc, m.id asc
""")
List<MessageEntity> 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<MessageEntity> findAfter(UUID chatId, Instant createdAt, UUID id, Pageable pageable);
}
@@ -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<SessionEntity, UUID> {
@Query("""
select s from SessionEntity s
where s.tokenHash = :tokenHash and s.revokedAt is null and s.expiresAt > :now
""")
Optional<SessionEntity> 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);
}
@@ -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<UserAccount, UUID> {
Optional<UserAccount> findByUsername(String username);
long countByIdIn(Collection<UUID> ids);
}
@@ -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<UUID> 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<ChatEntity> 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<ChatEntity> visible = more ? rows.subList(0, pageSize) : rows;
Map<UUID, List<UUID>> byChat = memberIds(visible);
List<Chat> 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<UUID> memberIds = members.findByChatIdOrderByOrdinalAsc(chatId).stream().map(ChatMemberEntity::getUserId).toList();
return mapper.toModel(chat, memberIds);
}
private Map<UUID, List<UUID>> memberIds(List<ChatEntity> chats) {
Map<UUID, List<UUID>> result = new LinkedHashMap<>();
if (chats.isEmpty()) {
return result;
}
List<UUID> 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;
}
}
@@ -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) {
}
}
@@ -0,0 +1,61 @@
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.CreateMessage;
import ru.mtuci.messenger.api.model.Message;
import ru.mtuci.messenger.api.model.MessagePage;
import ru.mtuci.messenger.domain.MessageEntity;
import ru.mtuci.messenger.exception.NotFoundException;
import ru.mtuci.messenger.mapper.MessageMapper;
import ru.mtuci.messenger.repository.ChatMemberRepository;
import ru.mtuci.messenger.repository.MessageRepository;
import java.util.List;
import java.util.UUID;
@Service
public class MessageService {
private final MessageRepository messages;
private final ChatMemberRepository members;
private final MessageMapper mapper;
public MessageService(MessageRepository messages, ChatMemberRepository members, MessageMapper mapper) {
this.messages = messages;
this.members = members;
this.mapper = mapper;
}
@Transactional
public Message create(UUID actorId, UUID chatId, CreateMessage request) {
requireMember(chatId, actorId);
TextRules.message(request.getText());
return mapper.toModel(messages.saveAndFlush(new MessageEntity(chatId, actorId, request.getText())));
}
@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<MessageEntity> 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<MessageEntity> 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 requireMember(UUID chatId, UUID actorId) {
if (!members.existsByChatIdAndUserId(chatId, actorId)) {
throw new NotFoundException();
}
}
}
@@ -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("Некорректный запрос");
}
}
}
@@ -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<UUID> authenticate(String token) {
String hash = tokenHash(token);
Optional<UUID> 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)};
}
}
@@ -0,0 +1,90 @@
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);
@ExceptionHandler(ApiException.class)
public ResponseEntity<Error> 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<Error> 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<Error> 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<Error> handleMissing(HttpServletRequest request, HttpServletResponse response) {
return response(request, response, HttpStatus.NOT_FOUND, ErrorError.CodeEnum.NOT_FOUND, "Объект не найден", null);
}
@ExceptionHandler({DataAccessException.class, CannotCreateTransactionException.class})
public ResponseEntity<Error> 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<Error> 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<Error> response(HttpServletRequest request, HttpServletResponse response, HttpStatus status,
ErrorError.CodeEnum code, String message, String challenge) {
String requestId = RequestIdFilter.id(request);
response.setHeader(RequestIdFilter.HEADER, requestId);
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);
}
}
@@ -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"));
}
}
@@ -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");
}
}
}
+105
View File
@@ -0,0 +1,105 @@
server:
address: ${APP_HOST:0.0.0.0}
port: ${APP_PORT:8080}
shutdown: graceful
error:
include-message: never
include-stacktrace: never
include-binding-errors: never
whitelabel:
enabled: false
spring:
application:
name: messenger
lifecycle:
timeout-per-shutdown-phase: 8s
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: 2
app:
session-ttl: ${SESSION_TTL_SECONDS:3600}s
logging:
pattern:
console: "%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX} %-5level [%X{requestId}] %msg%n"
@@ -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)
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,13 @@
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
@@ -0,0 +1,273 @@
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<Future<Integer>> results = List.of(
pool.submit(() -> once(latch, raced)),
pool.submit(() -> once(latch, raced))
);
latch.countDown();
int createdCount = 0;
int conflictCount = 0;
for (Future<Integer> 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 = api.post("/api/v1/chats/" + chatId + "/messages", aliceToken, Map.of("text", "Привет, мир"));
ApiClient.Result second = api.post("/api/v1/chats/" + chatId + "/messages", bobToken, Map.of("text", "Сообщение Боба"));
assertEquals(201, first.status());
assertEquals(alice.get("id").asString(), first.body().get("sender_id").asString());
assertEquals(201, second.status());
assertEquals(400, api.post("/api/v1/chats/" + chatId + "/messages", aliceToken, Map.of("text", "")).status());
assertEquals(400, api.post("/api/v1/chats/" + chatId + "/messages", aliceToken, Map.of("text", " ")).status());
assertEquals(404, api.post("/api/v1/chats/" + chatId + "/messages", eveToken, Map.of("text", "чужое")).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 static String name(String prefix) {
return (prefix + UUID.randomUUID().toString().replace("-", "")).substring(0, 20);
}
}
@@ -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());
}
}
@@ -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<Object[]> 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);
}
}
@@ -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());
}
}
@@ -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());
}
}
@@ -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"));
}
}
@@ -0,0 +1,88 @@
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<String, String> 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 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<String, String> 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<String> 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("WWW-Authenticate").orElse(""), tree, raw);
} catch (Exception exception) {
throw new IllegalStateException(method + " " + path, exception);
}
}
public Map<String, Object> user(String username, String displayName, String password) {
Map<String, Object> 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 authenticate, JsonNode body, String raw) {
}
}
@@ -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));
}
}
+55
View File
@@ -0,0 +1,55 @@
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
restart: unless-stopped
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
api:
build:
context: .
dockerfile: Dockerfile
environment:
APP_HOST: 0.0.0.0
APP_PORT: 8080
APP_ENV: ${APP_ENV:-lab}
SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-3600}
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"
ports:
- "127.0.0.1:8080:8080"
depends_on:
postgres:
condition: service_healthy
redis:
condition: service_healthy
restart: unless-stopped
volumes:
postgres-data:
redis-data:
+10
View File
@@ -0,0 +1,10 @@
Limit (cost=0.29..5.10 rows=50 width=24) (actual time=0.006..0.014 rows=50 loops=1)
Buffers: shared hit=5
-> Index Only Scan using messages_history_idx on messages (cost=0.29..481.54 rows=5000 width=24) (actual time=0.006..0.011 rows=50 loops=1)
Index Cond: ((chat_id = '6451ea94-2976-441e-810a-aaacc217325d'::uuid) AND (ROW(created_at, id) > ROW('2026-01-01 03:00:05+03'::timestamp with time zone, '5d3f8e7b-1854-48aa-960f-1cbad60a7432'::uuid)))
Heap Fetches: 50
Buffers: shared hit=5
Planning:
Buffers: shared hit=33
Planning Time: 0.070 ms
Execution Time: 0.025 ms
+8
View File
@@ -0,0 +1,8 @@
#!/bin/sh
set -eu
cd "$(dirname "$0")/.."
if [ -f .env ]; then
docker compose --env-file .env restart api postgres redis
else
docker compose restart api postgres redis
fi