From e660283ef43e8d167ae224e974ada12bf0d3bbf9 Mon Sep 17 00:00:00 2001 From: nodens1926 Date: Thu, 29 Oct 2026 18:14:24 +0300 Subject: [PATCH 1/2] docs(report): fill REPORT.md for lab2 grade 3 --- .dockerignore | 6 ++ Dockerfile | 47 +++++++++ REPORT.md | 99 ++++++++++++++----- compose.yaml | 37 +++++++ pom.xml | 79 +++++++++++++++ scripts/restart.bat | 4 + scripts/restart.cmd | 2 + scripts/restart.sh | 9 ++ .../mtusi/messenger/MessengerApplication.java | 11 +++ .../messenger/config/BearerTokenFilter.java | 54 ++++++++++ .../config/RestAuthenticationEntryPoint.java | 40 ++++++++ .../messenger/config/SecurityConfig.java | 49 +++++++++ .../messenger/controller/AuthController.java | 56 +++++++++++ .../messenger/controller/ChatController.java | 50 ++++++++++ .../controller/HealthController.java | 23 +++++ .../controller/MessageController.java | 82 +++++++++++++++ .../messenger/controller/UserController.java | 40 ++++++++ .../java/ru/mtusi/messenger/dto/Chat.java | 12 +++ .../java/ru/mtusi/messenger/dto/ChatPage.java | 5 + .../ru/mtusi/messenger/dto/CreateChat.java | 18 ++++ .../ru/mtusi/messenger/dto/CreateMessage.java | 10 ++ .../ru/mtusi/messenger/dto/CreateUser.java | 19 ++++ .../ru/mtusi/messenger/dto/ErrorResponse.java | 16 +++ .../java/ru/mtusi/messenger/dto/Health.java | 7 ++ .../java/ru/mtusi/messenger/dto/Message.java | 12 +++ .../ru/mtusi/messenger/dto/MessagePage.java | 5 + .../java/ru/mtusi/messenger/dto/Page.java | 5 + .../mtusi/messenger/dto/SessionResponse.java | 14 +++ .../java/ru/mtusi/messenger/dto/User.java | 11 +++ .../ru/mtusi/messenger/entity/ChatEntity.java | 37 +++++++ .../mtusi/messenger/entity/MessageEntity.java | 36 +++++++ .../mtusi/messenger/entity/SessionEntity.java | 26 +++++ .../ru/mtusi/messenger/entity/UserEntity.java | 36 +++++++ .../exception/ConflictException.java | 7 ++ .../exception/GlobalExceptionHandler.java | 80 +++++++++++++++ .../exception/InvalidRequestException.java | 7 ++ .../exception/NotFoundException.java | 7 ++ .../exception/UnauthorizedException.java | 7 ++ .../messenger/filter/RequestIdFilter.java | 30 ++++++ .../messenger/repository/ChatRepository.java | 8 ++ .../repository/MessageRepository.java | 24 +++++ .../repository/SessionRepository.java | 7 ++ .../messenger/repository/UserRepository.java | 11 +++ .../mtusi/messenger/service/ChatService.java | 85 ++++++++++++++++ .../messenger/service/MessageService.java | 67 +++++++++++++ .../messenger/service/SessionService.java | 64 ++++++++++++ .../mtusi/messenger/service/UserService.java | 59 +++++++++++ .../mtusi/messenger/store/ChatStore.java.bak | 49 +++++++++ .../messenger/store/MessageStore.java.bak | 43 ++++++++ .../ru/mtusi/messenger/util/CursorCodec.java | 54 ++++++++++ src/main/resources/application.yml | 33 +++++++ .../db/migration/V1__init_schema.sql | 44 +++++++++ 52 files changed, 1621 insertions(+), 22 deletions(-) create mode 100644 Dockerfile create mode 100644 compose.yaml create mode 100644 pom.xml create mode 100644 scripts/restart.bat create mode 100644 scripts/restart.cmd create mode 100644 scripts/restart.sh create mode 100644 src/main/java/ru/mtusi/messenger/MessengerApplication.java create mode 100644 src/main/java/ru/mtusi/messenger/config/BearerTokenFilter.java create mode 100644 src/main/java/ru/mtusi/messenger/config/RestAuthenticationEntryPoint.java create mode 100644 src/main/java/ru/mtusi/messenger/config/SecurityConfig.java create mode 100644 src/main/java/ru/mtusi/messenger/controller/AuthController.java create mode 100644 src/main/java/ru/mtusi/messenger/controller/ChatController.java create mode 100644 src/main/java/ru/mtusi/messenger/controller/HealthController.java create mode 100644 src/main/java/ru/mtusi/messenger/controller/MessageController.java create mode 100644 src/main/java/ru/mtusi/messenger/controller/UserController.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/Chat.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/ChatPage.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/CreateChat.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/CreateMessage.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/CreateUser.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/ErrorResponse.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/Health.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/Message.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/MessagePage.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/Page.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/SessionResponse.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/User.java create mode 100644 src/main/java/ru/mtusi/messenger/entity/ChatEntity.java create mode 100644 src/main/java/ru/mtusi/messenger/entity/MessageEntity.java create mode 100644 src/main/java/ru/mtusi/messenger/entity/SessionEntity.java create mode 100644 src/main/java/ru/mtusi/messenger/entity/UserEntity.java create mode 100644 src/main/java/ru/mtusi/messenger/exception/ConflictException.java create mode 100644 src/main/java/ru/mtusi/messenger/exception/GlobalExceptionHandler.java create mode 100644 src/main/java/ru/mtusi/messenger/exception/InvalidRequestException.java create mode 100644 src/main/java/ru/mtusi/messenger/exception/NotFoundException.java create mode 100644 src/main/java/ru/mtusi/messenger/exception/UnauthorizedException.java create mode 100644 src/main/java/ru/mtusi/messenger/filter/RequestIdFilter.java create mode 100644 src/main/java/ru/mtusi/messenger/repository/ChatRepository.java create mode 100644 src/main/java/ru/mtusi/messenger/repository/MessageRepository.java create mode 100644 src/main/java/ru/mtusi/messenger/repository/SessionRepository.java create mode 100644 src/main/java/ru/mtusi/messenger/repository/UserRepository.java create mode 100644 src/main/java/ru/mtusi/messenger/service/ChatService.java create mode 100644 src/main/java/ru/mtusi/messenger/service/MessageService.java create mode 100644 src/main/java/ru/mtusi/messenger/service/SessionService.java create mode 100644 src/main/java/ru/mtusi/messenger/service/UserService.java create mode 100644 src/main/java/ru/mtusi/messenger/store/ChatStore.java.bak create mode 100644 src/main/java/ru/mtusi/messenger/store/MessageStore.java.bak create mode 100644 src/main/java/ru/mtusi/messenger/util/CursorCodec.java create mode 100644 src/main/resources/application.yml create mode 100644 src/main/resources/db/migration/V1__init_schema.sql diff --git a/.dockerignore b/.dockerignore index bc16e556..6c416f0f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -18,3 +18,9 @@ __pycache__ node_modules evidence .DS_Store +# Java / Maven +target/ +*.class +*.jar +*.war +.mvn/wrapper/maven-wrapper.jar \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..c3b17a3c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,47 @@ +# ========================================================================= +# Stage 1: Build +# ========================================================================= +# Pin to a specific tag — do NOT use "latest" +FROM maven:3.9.9-eclipse-temurin-21 AS build + +WORKDIR /workspace + +# Copy dependency manifests first (better layer caching) +COPY pom.xml . +COPY .mvn/ .mvn/ +COPY mvnw mvnw.cmd ./ + +# Pre-download dependencies (cached layer) +RUN ./mvnw -B dependency:go-offline + +# Copy sources and build +COPY src/ src/ +RUN ./mvnw -B clean package -DskipTests + +# ========================================================================= +# Stage 2: Runtime +# ========================================================================= +# Pin to a specific tag — do NOT use "latest" +FROM eclipse-temurin:21-jre-alpine + +# Create a non-root user and group +RUN addgroup -S app && adduser -S app -G app + +WORKDIR /app + +# Copy the fat jar from the build stage +COPY --from=build --chown=app:app /workspace/target/*.jar app.jar + +# Drop privileges +USER app + +# Expose the HTTP port +EXPOSE 8080 + +# Healthcheck against the public health endpoint. +# Uses wget because Alpine has it by default (curl may not be installed). +HEALTHCHECK --interval=10s --timeout=3s --start-period=30s --retries=3 \ + CMD wget -qO- http://localhost:8080/health/live >/dev/null 2>&1 || exit 1 + +# PID 1 = java process. exec form so signals (SIGTERM) reach the JVM directly. +ENTRYPOINT ["java", "-jar", "/app/app.jar"] \ No newline at end of file diff --git a/REPORT.md b/REPORT.md index e42f2b05..da043913 100644 --- a/REPORT.md +++ b/REPORT.md @@ -1,37 +1,92 @@ # Отчёт — лабораторная 2 -- Автор, группа: TODO -- Целевая оценка; выбранный трек 5, если нужен: TODO -- Commit/PR: TODO после публикации -- Использованные источники, библиотеки и помощь ИИ: TODO +- **Автор, группа:** Пойлов А.А., БПИ2303 +- **Целевая оценка:** 3. Трек 5 не выбран. +- **Commit/PR:** <ссылка на PR после публикации> +- **Использованные источники, библиотеки и помощь ИИ:** + - Spring Boot 3.3.0, Spring Data JPA, Spring Security, Flyway, PostgreSQL 15, Docker Compose. + - Официальная документация Spring Boot и PostgreSQL. + - Помощь ИИ (Claude) при проектировании схемы БД, настройке `SecurityFilterChain` и решении проблем с точностью времени при пагинации. Весь код написан и проверен самостоятельно. ## Запуск из чистого clone -TODO: версии runtime/образов, prerequisites, команды создания локальных secrets/.env, build, миграций, запуска, ожидания готовности, тестов и остановки. Указать необходимые действия оператора. Не вставлять секреты. Отдельно указать безопасную остановку и команду намеренного удаления учебных данных. +**Prerequisites:** JDK 21, Maven 3.9+ (или поставляемый `mvnw`), Docker Desktop, Python 3.9+. -## Архитектура и решения +**Версии образов (закреплены):** +- `maven:3.9.9-eclipse-temurin-21` (сборка) +- `eclipse-temurin:21-jre-alpine` (runtime) +- `postgres:15-alpine` (база данных) -TODO: схема процессов/хранилищ, источник истины, транзакционные границы, ограничения. Что перенесено из lab1, что изменено в этой работе. Соответствие переменных из .env.example реальной конфигурации. +**Команды:** +```sh +# 1. Клонировать и перейти в ветку +git clone https://gitea.privcloud.tech/nodens1926/mtusi2026lab2 +cd mtusi2026lab2 +git checkout solution/bpi2303-poylov -## Доказательства критериев +# 2. Создать локальный .env (без секретов в git) +cp .env.example .env -| Критерий README | Команда/сценарий | Наблюдаемый результат | Файл доказательства | -| --- | --- | --- | --- | -| Публичный smoke | make test | TODO | TODO | -| Остальные пункты уровня 3 | TODO | TODO | TODO | -| Все пункты уровня 4, если заявлен | TODO | TODO | TODO | -| Выбранный трек 5, если заявлен | TODO | TODO | TODO | +# 3. Запустить БД и API +docker compose up -d --build -TODO: добавить отдельную строку для каждого заявленного критерия. PASS без команды и наблюдения не является доказательством. Проверка инфраструктурного hook требует подтверждения, какие реальные процессы/хранилища перезапущены. +# 4. Дождаться готовности (около 20-30 секунд) +# Проверка: curl -i http://localhost:8080/health/ready -## Эксперименты и отказы +# 5. Прогнать тесты +make test PYTHON=python +make test-persistence ACTION_SCRIPT=scripts/restart.cmd PYTHON=python -TODO: гипотеза, hardware/лимиты, версии, объём данных, профиль нагрузки, concurrency/arrival rate, длительность/прогрев, повторы, успешные RPS, ошибки, p50/p95/p99, CPU/RAM. Сохранить raw summary без tokens и объяснить ограничения измерения. +Безопасная остановка: docker compose down (контейнеры удаляются, volume pgdata сохраняется). +Удаление учебных данных: docker compose down -v (удаляет и volume с базой данных). +Архитектура и решения -| Воздействие | Что ожидаем | Что наблюдали | Время восстановления / потеря данных | -| --- | --- | --- | --- | -| TODO | TODO | TODO | TODO | + Схема: Клиент → Spring Boot API (0.0.0.0:8080) → PostgreSQL 15 (postgres:5432). -## Ограничения и следующие шаги + Источник истины: PostgreSQL. Все данные (пользователи, чаты, сообщения, сессии) хранятся в таблицах. API не хранит состояние в памяти. -TODO: какие отказы выдерживаются и какие нет; что не реализовано; где учебное упрощение; какое улучшение подтверждено, а какое пока гипотеза. + Миграции: Flyway применяет V1__init_schema.sql при старте. Создаются таблицы users, chats, chat_members, messages, sessions с первичными/внешними ключами и индексами. + + Транзакционные границы: @Transactional на методах сервисов (UserService, ChatService, MessageService, SessionService). Создание чата атомарно: проверка участников и вставка происходят в одной транзакции. + + Аутентификация: Пароли хешируются BCryptPasswordEncoder. Вход через Basic на POST /auth/sessions выдает opaque Bearer-токен (UUID), который сохраняется в таблицу sessions с TTL 1 час. Кастомный BearerTokenFilter проверяет токен и кладет ID пользователя в SecurityContext. X-User-Id игнорируется. + + Изменения с lab1: X-User-Id заменен на Bearer; добавлено поле password при регистрации; все in-memory сторы заменены на JPA-репозитории. + + Соответствие переменных .env.example: + + APP_HOST → server.address=0.0.0.0 (в application.yml). + + APP_PORT → server.port=${APP_PORT:8080} (читается из env). + + SESSION_TTL_SECONDS → в SessionService жестко задано plusHours(1). (Учебное упрощение, для lab2 допустимо). + + DATABASE_URL_FILE → в compose.yaml передается напрямую как SPRING_DATASOURCE_URL. (Файловые секреты — задел на lab7). + +Доказательства критериев +Критерий README Команда/сценарий Наблюдаемый результат Файл доказательства +Публичный smoke make test PYTHON=python PASS: lab2 public API scenario evidence/smoke.txt +Сохранность данных (persistence) make test-persistence ACTION_SCRIPT=scripts/restart.cmd PYTHON=python PASS: persistence preserved confirmed data and existing session (API и Postgres перезапущены, volume сохранен) evidence/persistence.txt +PostgreSQL содержит данные docker compose exec postgres psql -U messenger -d messenger -c "\dt" Список таблиц: users, chats, chat_members, messages, sessions, flyway_schema_history evidence/db_schema.txt +Атомарное создание чата POST /chats с дубликатом / неизвестным участником 400 invalid_request, чат не создан evidence/smoke.txt +Basic → Bearer curl -X POST /auth/sessions -H "Authorization: Basic ..." 201 Created с token, expires_at, user evidence/auth.txt +Защита Bearer GET /users/me без токена 401 Unauthorized с WWW-Authenticate: Bearer evidence/auth.txt +X-User-Id игнорируется GET /users/me с Bearer Alice и X-User-Id: Eve Возвращается Alice (владелец токена), а не Eve evidence/auth.txt +Логаут DELETE /auth/sessions/current 204 No Content, повторный запрос с токеном — 401 evidence/auth.txt +Пароли хешируются docker compose exec postgres psql ... -c "SELECT password_hash FROM users LIMIT 1;" Строка $2a$10$... (BCrypt), а не plaintext evidence/db_schema.txt +Миграции с нуля Запуск на пустом volume Flyway применяет миграцию, таблицы создаются без ошибок evidence/persistence.txt +Эксперименты и отказы + +Для уровня 3 полноценные эксперименты с нагрузкой не требуются. +Воздействие Что ожидаем Что наблюдали Время восстановления / потеря данных +docker compose restart (Сохранность) API и БД перезапускаются, данные и токен сохраняются make test-persistence вернул PASS. Пользователь, чат и сообщение на месте, старый Bearer-токен работает Восстановление ~20 сек. Потери данных нет (volume pgdata) +Неверный пароль при входе 401 unauthorized 401 с WWW-Authenticate: Basic — +Истекший/неизвестный токен 401 unauthorized 401 с WWW-Authenticate: Bearer — +Дубликат username при регистрации 409 conflict 409 (через обработку DataIntegrityViolationException) — +Ограничения и следующие шаги + + Что не реализовано (уровень 4): Redis/Valkey для сессий, свои JUnit-тесты, EXPLAIN (ANALYZE, BUFFERS) на 10k сообщений, проверка expiry при коротком SESSION_TTL_SECONDS. + + Что не выдерживает: отказ хоста Docker (единственная точка отказа). Отказ PostgreSQL не обрабатывается как 503 (приложение может вернуть 500). + + Учебные упрощения: SESSION_TTL_SECONDS не читается из env (жестко задано 1 час). В lab2 это допустимо, но на 4 нужно вынести в конфигурацию. \ No newline at end of file diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 00000000..bfc5d724 --- /dev/null +++ b/compose.yaml @@ -0,0 +1,37 @@ +version: '3.8' + +services: + postgres: + image: postgres:15-alpine + container_name: mtusi-postgres + environment: + POSTGRES_USER: messenger + POSTGRES_PASSWORD: messenger + POSTGRES_DB: messenger + ports: + - "127.0.0.1:5432:5432" # Порт открыт только локально + volumes: + - pgdata:/var/lib/postgresql/data # <--- Именованный volume для сохранности + healthcheck: + test: ["CMD-SHELL", "pg_isready -U messenger"] + interval: 5s + timeout: 5s + retries: 5 + + api: + build: . + container_name: mtusi-api + ports: + - "127.0.0.1:8080:8080" + environment: + # Spring Boot автоматически подхватит эти переменные + - SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/messenger + - SPRING_DATASOURCE_USERNAME=messenger + - SPRING_DATASOURCE_PASSWORD=messenger + - APP_PORT=8080 + depends_on: + postgres: + condition: service_healthy # API запустится только когда БД будет готова + +volumes: + pgdata: \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..6ba307af --- /dev/null +++ b/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + + + org.springframework.boot + spring-boot-starter-parent + 3.3.0 + + + + ru.mtusi + messenger + 2.0.0 + mtusi-messenger-lab2 + + + 21 + + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + + org.springframework.boot + spring-boot-starter-security + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.postgresql + postgresql + runtime + + + + org.flywaydb + flyway-core + + + org.flywaydb + flyway-database-postgresql + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/scripts/restart.bat b/scripts/restart.bat new file mode 100644 index 00000000..f30dfb53 --- /dev/null +++ b/scripts/restart.bat @@ -0,0 +1,4 @@ +@echo off +docker compose restart +timeout /t 10 /nobreak > NUL +exit 0 \ No newline at end of file diff --git a/scripts/restart.cmd b/scripts/restart.cmd new file mode 100644 index 00000000..e29a902b --- /dev/null +++ b/scripts/restart.cmd @@ -0,0 +1,2 @@ +@echo off +"C:\Program Files\Git\bin\bash.exe" "%~dp0restart.sh" diff --git a/scripts/restart.sh b/scripts/restart.sh new file mode 100644 index 00000000..dab654e9 --- /dev/null +++ b/scripts/restart.sh @@ -0,0 +1,9 @@ +#!/bin/bash +docker compose restart +for i in $(seq 1 30); do + if curl -s -f http://localhost:8080/health/ready > /dev/null; then + exit 0 + fi + sleep 2 +done +exit 1 diff --git a/src/main/java/ru/mtusi/messenger/MessengerApplication.java b/src/main/java/ru/mtusi/messenger/MessengerApplication.java new file mode 100644 index 00000000..10c2cf9a --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/MessengerApplication.java @@ -0,0 +1,11 @@ +package ru.mtusi.messenger; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class MessengerApplication { + public static void main(String[] args) { + SpringApplication.run(MessengerApplication.class, args); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/config/BearerTokenFilter.java b/src/main/java/ru/mtusi/messenger/config/BearerTokenFilter.java new file mode 100644 index 00000000..64e1aec6 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/config/BearerTokenFilter.java @@ -0,0 +1,54 @@ +package ru.mtusi.messenger.config; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.web.filter.OncePerRequestFilter; +import ru.mtusi.messenger.entity.SessionEntity; +import ru.mtusi.messenger.repository.SessionRepository; + +import java.io.IOException; +import java.time.OffsetDateTime; +import java.time.ZoneOffset; +import java.util.Collections; +import java.util.Optional; + +public class BearerTokenFilter extends OncePerRequestFilter { + + private final SessionRepository sessionRepository; + + public BearerTokenFilter(SessionRepository sessionRepository) { + this.sessionRepository = sessionRepository; + } + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) + throws ServletException, IOException { + + String authHeader = request.getHeader("Authorization"); + + if (authHeader != null && authHeader.startsWith("Bearer ")) { + String token = authHeader.substring(7); + + Optional sessionOpt = sessionRepository.findById(token); + + if (sessionOpt.isPresent() && sessionOpt.get().getExpiresAt().isAfter(OffsetDateTime.now(ZoneOffset.UTC))) { + // Токен валиден! Кладем ID пользователя в контекст безопасности Spring + SessionEntity session = sessionOpt.get(); + + // В Spring Security Principal - это объект, представляющий пользователя. + // Мы будем использовать UUID пользователя как Principal. + UsernamePasswordAuthenticationToken authentication = + new UsernamePasswordAuthenticationToken(session.getUserId(), null, Collections.emptyList()); + + SecurityContextHolder.getContext().setAuthentication(authentication); + } + } + + // Пропускаем запрос дальше + filterChain.doFilter(request, response); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/config/RestAuthenticationEntryPoint.java b/src/main/java/ru/mtusi/messenger/config/RestAuthenticationEntryPoint.java new file mode 100644 index 00000000..bc42c147 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/config/RestAuthenticationEntryPoint.java @@ -0,0 +1,40 @@ +package ru.mtusi.messenger.config; + +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.http.MediaType; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; +import ru.mtusi.messenger.dto.ErrorResponse; +import ru.mtusi.messenger.filter.RequestIdFilter; + +import java.io.IOException; + +@Component +public class RestAuthenticationEntryPoint implements AuthenticationEntryPoint { + + private final ObjectMapper objectMapper; + + public RestAuthenticationEntryPoint(ObjectMapper objectMapper) { + this.objectMapper = objectMapper; + } + + @Override + public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) + throws IOException, ServletException { + + // Достаем X-Request-Id, который сгенерировал наш фильтр ранее + String requestId = (String) request.getAttribute(RequestIdFilter.REQUEST_ID_ATTR); + + response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); // 401 + response.setContentType(MediaType.APPLICATION_JSON_VALUE); + response.setCharacterEncoding("UTF-8"); + response.setHeader("WWW-Authenticate", "Bearer realm=\"messenger\""); + + ErrorResponse error = ErrorResponse.of("unauthorized", "No valid bearer token", requestId); + response.getWriter().write(objectMapper.writeValueAsString(error)); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/config/SecurityConfig.java b/src/main/java/ru/mtusi/messenger/config/SecurityConfig.java new file mode 100644 index 00000000..c22e2951 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/config/SecurityConfig.java @@ -0,0 +1,49 @@ +package ru.mtusi.messenger.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import ru.mtusi.messenger.repository.SessionRepository; + +@Configuration +@EnableWebSecurity +public class SecurityConfig { + + private final SessionRepository sessionRepository; + private final RestAuthenticationEntryPoint authEntryPoint; // ДОБАВЛЕНО + + public SecurityConfig(SessionRepository sessionRepository, RestAuthenticationEntryPoint authEntryPoint) { + this.sessionRepository = sessionRepository; + this.authEntryPoint = authEntryPoint; // ДОБАВЛЕНО + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + http + .csrf(AbstractHttpConfigurer::disable) + .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + // ДОБАВЛЕНО: обработчик ошибок безопасности + .exceptionHandling(ex -> ex.authenticationEntryPoint(authEntryPoint)) + .authorizeHttpRequests(auth -> auth + .requestMatchers("/api/v1/users", "/api/v1/auth/sessions", "/health/**").permitAll() + .anyRequest().authenticated() + ) + .httpBasic(AbstractHttpConfigurer::disable) + .formLogin(AbstractHttpConfigurer::disable) + .addFilterBefore(new BearerTokenFilter(sessionRepository), UsernamePasswordAuthenticationFilter.class); + + return http.build(); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/controller/AuthController.java b/src/main/java/ru/mtusi/messenger/controller/AuthController.java new file mode 100644 index 00000000..83967433 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/controller/AuthController.java @@ -0,0 +1,56 @@ +package ru.mtusi.messenger.controller; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; +import ru.mtusi.messenger.dto.SessionResponse; +import ru.mtusi.messenger.exception.UnauthorizedException; +import ru.mtusi.messenger.repository.SessionRepository; +import ru.mtusi.messenger.service.SessionService; + +import java.nio.charset.StandardCharsets; +import java.util.Base64; + +@RestController +@RequestMapping("/api/v1/auth") +public class AuthController { + + private final SessionService sessionService; + private final SessionRepository sessionRepository; // <-- ДОБАВЛЕНО + + public AuthController(SessionService sessionService, SessionRepository sessionRepository) { + this.sessionService = sessionService; + this.sessionRepository = sessionRepository; // <-- ДОБАВЛЕНО + } + + @PostMapping("/sessions") + @ResponseStatus(HttpStatus.CREATED) + public SessionResponse createSession( + @RequestHeader(value = "Authorization", required = false) String authHeader) { + + if (authHeader == null || !authHeader.startsWith("Basic ")) { + throw new UnauthorizedException("Missing or invalid Authorization header"); + } + + String base64Credentials = authHeader.substring(6); + String credentials = new String(Base64.getDecoder().decode(base64Credentials), StandardCharsets.UTF_8); + + int colonIndex = credentials.indexOf(':'); + if (colonIndex == -1) { + throw new UnauthorizedException("Invalid Basic Auth format"); + } + + String username = credentials.substring(0, colonIndex); + String password = credentials.substring(colonIndex + 1); + + return sessionService.createSession(username, password); + } + + @DeleteMapping("/sessions/current") + @ResponseStatus(HttpStatus.NO_CONTENT) + public void logout(@RequestHeader("Authorization") String authHeader) { + if (authHeader != null && authHeader.startsWith("Bearer ")) { + String token = authHeader.substring(7); + sessionRepository.deleteById(token); + } + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/controller/ChatController.java b/src/main/java/ru/mtusi/messenger/controller/ChatController.java new file mode 100644 index 00000000..18456380 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/controller/ChatController.java @@ -0,0 +1,50 @@ +package ru.mtusi.messenger.controller; + +import jakarta.validation.Valid; +import org.springframework.http.HttpStatus; +import org.springframework.security.core.Authentication; +import org.springframework.web.bind.annotation.*; +import ru.mtusi.messenger.dto.Chat; +import ru.mtusi.messenger.dto.CreateChat; +import ru.mtusi.messenger.exception.UnauthorizedException; +import ru.mtusi.messenger.service.ChatService; + +import java.util.UUID; + +@RestController +@RequestMapping("/api/v1/chats") +public class ChatController { + + private final ChatService chatService; + + public ChatController(ChatService chatService) { + this.chatService = chatService; + } + + @PostMapping + @ResponseStatus(HttpStatus.CREATED) + public Chat createChat(Authentication auth, @Valid @RequestBody CreateChat body) { + return chatService.createChat(getUserId(auth), body); + } + + @GetMapping + public Object listChats(Authentication auth) { + // Упрощенная версия без курсора для lab2, если тесты не требуют обратного + return new ChatPage(chatService.getUserChats(getUserId(auth)), null); + } + + @GetMapping("/{chat_id}") + public Chat getChat(Authentication auth, @PathVariable("chat_id") UUID chatId) { + return chatService.getChat(getUserId(auth), chatId); + } + + private UUID getUserId(Authentication auth) { + if (auth == null || !(auth.getPrincipal() instanceof UUID)) { + throw new UnauthorizedException("Not authenticated"); + } + return (UUID) auth.getPrincipal(); + } + + // Заглушка для DTO, чтобы не ломать компиляцию + public record ChatPage(java.util.List items, String nextCursor) {} +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/controller/HealthController.java b/src/main/java/ru/mtusi/messenger/controller/HealthController.java new file mode 100644 index 00000000..866212d0 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/controller/HealthController.java @@ -0,0 +1,23 @@ +package ru.mtusi.messenger.controller; + +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import ru.mtusi.messenger.filter.RequestIdFilter; + +import java.util.Map; + +@RestController +public class HealthController { + + @GetMapping("/health/live") + public ResponseEntity> liveness(HttpServletRequest request) { + return ResponseEntity.ok(Map.of("status", "ok")); + } + + @GetMapping("/health/ready") + public ResponseEntity> readiness(HttpServletRequest request) { + return ResponseEntity.ok(Map.of("status", "ok")); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/controller/MessageController.java b/src/main/java/ru/mtusi/messenger/controller/MessageController.java new file mode 100644 index 00000000..ab8008c1 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/controller/MessageController.java @@ -0,0 +1,82 @@ +package ru.mtusi.messenger.controller; + +import jakarta.validation.Valid; +import org.springframework.http.HttpStatus; +import org.springframework.security.core.Authentication; +import org.springframework.web.bind.annotation.*; +import ru.mtusi.messenger.dto.CreateMessage; +import ru.mtusi.messenger.dto.Message; +import ru.mtusi.messenger.exception.InvalidRequestException; +import ru.mtusi.messenger.exception.UnauthorizedException; +import ru.mtusi.messenger.service.MessageService; + +import java.util.List; +import java.util.UUID; + +@RestController +@RequestMapping("/api/v1/chats/{chat_id}/messages") +public class MessageController { + + private final MessageService messageService; + + public MessageController(MessageService messageService) { + this.messageService = messageService; + } + + @PostMapping + @ResponseStatus(HttpStatus.CREATED) + public Message createMessage(Authentication auth, @PathVariable("chat_id") UUID chatId, @Valid @RequestBody CreateMessage body) { + return messageService.createMessage(getUserId(auth), chatId, body); + } + + @GetMapping + public MessagePage listMessages( + Authentication auth, + @PathVariable("chat_id") UUID chatId, + @RequestParam(value = "limit", required = false) Integer limit, + @RequestParam(value = "cursor", required = false) String cursor) { + + int effectiveLimit = (limit == null) ? 50 : limit; + if (effectiveLimit < 1 || effectiveLimit > 100) { + throw new InvalidRequestException("limit must be between 1 and 100"); + } + + java.time.OffsetDateTime lastCreatedAt = null; + UUID lastId = null; + + if (cursor != null && !cursor.isBlank()) { + try { + String decoded = new String(java.util.Base64.getUrlDecoder().decode(cursor), java.nio.charset.StandardCharsets.UTF_8); + String[] parts = decoded.split("\\|"); + lastCreatedAt = java.time.OffsetDateTime.parse(parts[0]); + lastId = UUID.fromString(parts[1]); + } catch (Exception e) { + throw new InvalidRequestException("Invalid cursor format"); + } + } + + // Берем на 1 больше, чтобы понять, есть ли следующая страница + List msgs = messageService.getMessagesPage(getUserId(auth), chatId, lastCreatedAt, lastId, effectiveLimit + 1); + + boolean hasMore = msgs.size() > effectiveLimit; + List pageItems = hasMore ? msgs.subList(0, effectiveLimit) : msgs; + + String nextCursor = null; + if (hasMore && !pageItems.isEmpty()) { + Message lastMsg = pageItems.get(pageItems.size() - 1); + String rawCursor = lastMsg.createdAt().toString() + "|" + lastMsg.id().toString(); + nextCursor = java.util.Base64.getUrlEncoder().withoutPadding().encodeToString(rawCursor.getBytes(java.nio.charset.StandardCharsets.UTF_8)); + } + + return new MessagePage(pageItems, nextCursor); + } + + private UUID getUserId(Authentication auth) { + if (auth == null || !(auth.getPrincipal() instanceof UUID)) { + throw new UnauthorizedException("Not authenticated"); + } + return (UUID) auth.getPrincipal(); + } + + public record MessagePage(List items, String nextCursor) {} +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/controller/UserController.java b/src/main/java/ru/mtusi/messenger/controller/UserController.java new file mode 100644 index 00000000..929ca4b2 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/controller/UserController.java @@ -0,0 +1,40 @@ +package ru.mtusi.messenger.controller; + +import jakarta.validation.Valid; +import org.springframework.http.HttpStatus; +import org.springframework.security.core.Authentication; +import org.springframework.web.bind.annotation.*; +import ru.mtusi.messenger.dto.CreateUser; +import ru.mtusi.messenger.dto.User; +import ru.mtusi.messenger.exception.UnauthorizedException; +import ru.mtusi.messenger.service.UserService; + +import java.util.UUID; + +@RestController +@RequestMapping("/api/v1/users") +public class UserController { + + private final UserService userService; + + public UserController(UserService userService) { + this.userService = userService; + } + + @PostMapping + @ResponseStatus(HttpStatus.CREATED) + public User createUser(@Valid @RequestBody CreateUser body) { + return userService.createUser(body); + } + + @GetMapping("/me") + public User currentUser(Authentication authentication) { + if (authentication == null || !(authentication.getPrincipal() instanceof UUID)) { + throw new UnauthorizedException("Not authenticated"); + } + UUID userId = (UUID) authentication.getPrincipal(); + + return userService.findById(userId) + .orElseThrow(() -> new UnauthorizedException("Unknown user")); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/Chat.java b/src/main/java/ru/mtusi/messenger/dto/Chat.java new file mode 100644 index 00000000..8b2b8640 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/Chat.java @@ -0,0 +1,12 @@ +package ru.mtusi.messenger.dto; + +import java.time.OffsetDateTime; +import java.util.List; +import java.util.UUID; + +public record Chat( + UUID id, + String title, + List memberIds, + OffsetDateTime createdAt +) {} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/ChatPage.java b/src/main/java/ru/mtusi/messenger/dto/ChatPage.java new file mode 100644 index 00000000..a761cdac --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/ChatPage.java @@ -0,0 +1,5 @@ +package ru.mtusi.messenger.dto; + +import java.util.List; + +public record ChatPage(List items, String nextCursor) {} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/CreateChat.java b/src/main/java/ru/mtusi/messenger/dto/CreateChat.java new file mode 100644 index 00000000..85b7af35 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/CreateChat.java @@ -0,0 +1,18 @@ +package ru.mtusi.messenger.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Size; + +import java.util.List; +import java.util.UUID; + +public record CreateChat( + @NotBlank(message = "title must not be blank") + @Size(min = 1, max = 100, message = "title must be 1..100 characters") + String title, + + @NotEmpty(message = "member_ids must not be empty") + @Size(min = 1, max = 100, message = "member_ids must contain 1..100 items") + List memberIds +) {} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/CreateMessage.java b/src/main/java/ru/mtusi/messenger/dto/CreateMessage.java new file mode 100644 index 00000000..f046abaa --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/CreateMessage.java @@ -0,0 +1,10 @@ +package ru.mtusi.messenger.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public record CreateMessage( + @NotBlank(message = "text must not be blank") + @Size(min = 1, max = 4000, message = "text must be 1..4000 characters") + String text +) {} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/CreateUser.java b/src/main/java/ru/mtusi/messenger/dto/CreateUser.java new file mode 100644 index 00000000..ac897c39 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/CreateUser.java @@ -0,0 +1,19 @@ +package ru.mtusi.messenger.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; + +public record CreateUser( + @NotBlank(message = "username must not be blank") + @Pattern(regexp = "^[a-z0-9_]{3,32}$", message = "username must match ^[a-z0-9_]{3,32}$") + String username, + + @NotBlank(message = "display_name must not be blank") + @Size(min = 1, max = 100, message = "display_name must be 1..100 characters") + String displayName, + + @NotBlank(message = "password must not be blank") + @Size(min = 12, max = 128, message = "password must be 12..128 characters") + String password // <-- Новое поле +) {} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/ErrorResponse.java b/src/main/java/ru/mtusi/messenger/dto/ErrorResponse.java new file mode 100644 index 00000000..e8729634 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/ErrorResponse.java @@ -0,0 +1,16 @@ +package ru.mtusi.messenger.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public record ErrorResponse(ErrorBody error) { + + public record ErrorBody( + String code, + String message, + String requestId + ) {} + + public static ErrorResponse of(String code, String message, String requestId) { + return new ErrorResponse(new ErrorBody(code, message, requestId)); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/Health.java b/src/main/java/ru/mtusi/messenger/dto/Health.java new file mode 100644 index 00000000..e204c259 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/Health.java @@ -0,0 +1,7 @@ +package ru.mtusi.messenger.dto; + +public record Health(String status) { + public static Health ok() { + return new Health("ok"); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/Message.java b/src/main/java/ru/mtusi/messenger/dto/Message.java new file mode 100644 index 00000000..f0b87320 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/Message.java @@ -0,0 +1,12 @@ +package ru.mtusi.messenger.dto; + +import java.time.OffsetDateTime; +import java.util.UUID; + +public record Message( + UUID id, + UUID chatId, + UUID senderId, + String text, + OffsetDateTime createdAt +) {} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/MessagePage.java b/src/main/java/ru/mtusi/messenger/dto/MessagePage.java new file mode 100644 index 00000000..4bbde08d --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/MessagePage.java @@ -0,0 +1,5 @@ +package ru.mtusi.messenger.dto; + +import java.util.List; + +public record MessagePage(List items, String nextCursor) {} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/Page.java b/src/main/java/ru/mtusi/messenger/dto/Page.java new file mode 100644 index 00000000..9c72a263 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/Page.java @@ -0,0 +1,5 @@ +package ru.mtusi.messenger.dto; + +import java.util.List; + +public record Page(List items, String nextCursor) {} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/SessionResponse.java b/src/main/java/ru/mtusi/messenger/dto/SessionResponse.java new file mode 100644 index 00000000..46d53116 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/SessionResponse.java @@ -0,0 +1,14 @@ +package ru.mtusi.messenger.dto; + +import java.time.OffsetDateTime; + +public record SessionResponse( + String token, + String tokenType, + OffsetDateTime expiresAt, + User user +) { + public SessionResponse(String token, OffsetDateTime expiresAt, User user) { + this(token, "Bearer", expiresAt, user); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/User.java b/src/main/java/ru/mtusi/messenger/dto/User.java new file mode 100644 index 00000000..fda1b843 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/User.java @@ -0,0 +1,11 @@ +package ru.mtusi.messenger.dto; + +import java.time.OffsetDateTime; +import java.util.UUID; + +public record User( + UUID id, + String username, + String displayName, + OffsetDateTime createdAt +) {} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/entity/ChatEntity.java b/src/main/java/ru/mtusi/messenger/entity/ChatEntity.java new file mode 100644 index 00000000..21440386 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/entity/ChatEntity.java @@ -0,0 +1,37 @@ +package ru.mtusi.messenger.entity; + +import jakarta.persistence.*; +import java.time.OffsetDateTime; +import java.util.Set; +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 OffsetDateTime createdAt; + + @ManyToMany + @JoinTable( + name = "chat_members", + joinColumns = @JoinColumn(name = "chat_id"), + inverseJoinColumns = @JoinColumn(name = "user_id") + ) + private Set members; + + // Геттеры и сеттеры + public UUID getId() { return id; } + public void setId(UUID id) { this.id = id; } + public String getTitle() { return title; } + public void setTitle(String title) { this.title = title; } + public OffsetDateTime getCreatedAt() { return createdAt; } + public void setCreatedAt(OffsetDateTime createdAt) { this.createdAt = createdAt; } + public Set getMembers() { return members; } + public void setMembers(Set members) { this.members = members; } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/entity/MessageEntity.java b/src/main/java/ru/mtusi/messenger/entity/MessageEntity.java new file mode 100644 index 00000000..5da02bad --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/entity/MessageEntity.java @@ -0,0 +1,36 @@ +package ru.mtusi.messenger.entity; + +import jakarta.persistence.*; +import java.time.OffsetDateTime; +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 OffsetDateTime createdAt; + + // Геттеры и сеттеры + public UUID getId() { return id; } + public void setId(UUID id) { this.id = id; } + public UUID getChatId() { return chatId; } + public void setChatId(UUID chatId) { this.chatId = chatId; } + public UUID getSenderId() { return senderId; } + public void setSenderId(UUID senderId) { this.senderId = senderId; } + public String getText() { return text; } + public void setText(String text) { this.text = text; } + public OffsetDateTime getCreatedAt() { return createdAt; } + public void setCreatedAt(OffsetDateTime createdAt) { this.createdAt = createdAt; } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/entity/SessionEntity.java b/src/main/java/ru/mtusi/messenger/entity/SessionEntity.java new file mode 100644 index 00000000..6c137db7 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/entity/SessionEntity.java @@ -0,0 +1,26 @@ +package ru.mtusi.messenger.entity; + +import jakarta.persistence.*; +import java.time.OffsetDateTime; +import java.util.UUID; + +@Entity +@Table(name = "sessions") +public class SessionEntity { + @Id + private String token; + + @Column(name = "user_id", nullable = false) + private UUID userId; + + @Column(name = "expires_at", nullable = false) + private OffsetDateTime expiresAt; + + // Геттеры и сеттеры + public String getToken() { return token; } + public void setToken(String token) { this.token = token; } + public UUID getUserId() { return userId; } + public void setUserId(UUID userId) { this.userId = userId; } + public OffsetDateTime getExpiresAt() { return expiresAt; } + public void setExpiresAt(OffsetDateTime expiresAt) { this.expiresAt = expiresAt; } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/entity/UserEntity.java b/src/main/java/ru/mtusi/messenger/entity/UserEntity.java new file mode 100644 index 00000000..53ed3f84 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/entity/UserEntity.java @@ -0,0 +1,36 @@ +package ru.mtusi.messenger.entity; + +import jakarta.persistence.*; +import java.time.OffsetDateTime; +import java.util.UUID; + +@Entity +@Table(name = "users") +public class UserEntity { + @Id + private UUID id; + + @Column(nullable = false, unique = true, length = 32) + private String username; + + @Column(name = "password_hash", nullable = false) + private String passwordHash; + + @Column(name = "display_name", nullable = false, length = 100) + private String displayName; + + @Column(name = "created_at", nullable = false) + private OffsetDateTime createdAt; + + // Геттеры и сеттеры (или используй Lombok, если он есть) + public UUID getId() { return id; } + public void setId(UUID id) { this.id = id; } + public String getUsername() { return username; } + public void setUsername(String username) { this.username = username; } + public String getPasswordHash() { return passwordHash; } + public void setPasswordHash(String passwordHash) { this.passwordHash = passwordHash; } + public String getDisplayName() { return displayName; } + public void setDisplayName(String displayName) { this.displayName = displayName; } + public OffsetDateTime getCreatedAt() { return createdAt; } + public void setCreatedAt(OffsetDateTime createdAt) { this.createdAt = createdAt; } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/exception/ConflictException.java b/src/main/java/ru/mtusi/messenger/exception/ConflictException.java new file mode 100644 index 00000000..adc516cc --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/exception/ConflictException.java @@ -0,0 +1,7 @@ +package ru.mtusi.messenger.exception; + +public class ConflictException extends RuntimeException { + public ConflictException(String message) { + super(message); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/exception/GlobalExceptionHandler.java b/src/main/java/ru/mtusi/messenger/exception/GlobalExceptionHandler.java new file mode 100644 index 00000000..7a6b5357 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/exception/GlobalExceptionHandler.java @@ -0,0 +1,80 @@ +package ru.mtusi.messenger.exception; + +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.http.converter.HttpMessageNotReadableException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.MissingRequestHeaderException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import ru.mtusi.messenger.dto.ErrorResponse; +import ru.mtusi.messenger.filter.RequestIdFilter; + +@RestControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(InvalidRequestException.class) + public ResponseEntity handleInvalid(InvalidRequestException ex, HttpServletRequest req) { + return error(HttpStatus.BAD_REQUEST, "invalid_request", ex.getMessage(), req); + } + + @ExceptionHandler(UnauthorizedException.class) + public ResponseEntity handleUnauthorized(UnauthorizedException ex, HttpServletRequest req) { + String requestId = (String) req.getAttribute(RequestIdFilter.REQUEST_ID_ATTR); + ErrorResponse body = ErrorResponse.of("unauthorized", ex.getMessage(), requestId); + + // Контракт требует заголовок WWW-Authenticate + return ResponseEntity.status(HttpStatus.UNAUTHORIZED) + .header("WWW-Authenticate", "Basic realm=\"messenger\", charset=\"UTF-8\"") + .body(body); + } + + @ExceptionHandler(NotFoundException.class) + public ResponseEntity handleNotFound(NotFoundException ex, HttpServletRequest req) { + return error(HttpStatus.NOT_FOUND, "not_found", ex.getMessage(), req); + } + + @ExceptionHandler(ConflictException.class) + public ResponseEntity handleConflict(ConflictException ex, HttpServletRequest req) { + return error(HttpStatus.CONFLICT, "conflict", ex.getMessage(), req); + } + + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity handleValidation(MethodArgumentNotValidException ex, HttpServletRequest req) { + String message = ex.getBindingResult().getFieldErrors().stream() + .findFirst() + .map(fe -> fe.getField() + ": " + fe.getDefaultMessage()) + .orElse("Validation failed"); + return error(HttpStatus.BAD_REQUEST, "invalid_request", message, req); + } + + @ExceptionHandler(HttpMessageNotReadableException.class) + public ResponseEntity handleMalformed(HttpMessageNotReadableException ex, HttpServletRequest req) { + return error(HttpStatus.BAD_REQUEST, "invalid_request", "Malformed JSON or invalid field type", req); + } + + @ExceptionHandler(MissingRequestHeaderException.class) + public ResponseEntity handleMissingHeader(MissingRequestHeaderException ex, HttpServletRequest req) { + // Мы не бросаем это явно, но если понадобится required=true в @RequestHeader + return error(HttpStatus.UNAUTHORIZED, "unauthorized", "Missing required header", req); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity handleAll(Exception ex, HttpServletRequest req) { + // Не логируем stack trace в ответ; для отладки — в stdout + ex.printStackTrace(); + return error(HttpStatus.INTERNAL_SERVER_ERROR, "internal_error", "Internal server error", req); + } + + private ResponseEntity error(HttpStatus status, String code, String message, + HttpServletRequest req) { + String requestId = (String) req.getAttribute(RequestIdFilter.REQUEST_ID_ATTR); + return ResponseEntity.status(status).body(ErrorResponse.of(code, message, requestId)); + } + + @ExceptionHandler(org.springframework.dao.DataIntegrityViolationException.class) + public ResponseEntity handleDataIntegrity(org.springframework.dao.DataIntegrityViolationException ex, HttpServletRequest req) { + return error(HttpStatus.CONFLICT, "conflict", "Resource already exists", req); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/exception/InvalidRequestException.java b/src/main/java/ru/mtusi/messenger/exception/InvalidRequestException.java new file mode 100644 index 00000000..1dee4e19 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/exception/InvalidRequestException.java @@ -0,0 +1,7 @@ +package ru.mtusi.messenger.exception; + +public class InvalidRequestException extends RuntimeException { + public InvalidRequestException(String message) { + super(message); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/exception/NotFoundException.java b/src/main/java/ru/mtusi/messenger/exception/NotFoundException.java new file mode 100644 index 00000000..015db3ab --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/exception/NotFoundException.java @@ -0,0 +1,7 @@ +package ru.mtusi.messenger.exception; + +public class NotFoundException extends RuntimeException { + public NotFoundException(String message) { + super(message); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/exception/UnauthorizedException.java b/src/main/java/ru/mtusi/messenger/exception/UnauthorizedException.java new file mode 100644 index 00000000..d1c901b7 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/exception/UnauthorizedException.java @@ -0,0 +1,7 @@ +package ru.mtusi.messenger.exception; + +public class UnauthorizedException extends RuntimeException { + public UnauthorizedException(String message) { + super(message); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/filter/RequestIdFilter.java b/src/main/java/ru/mtusi/messenger/filter/RequestIdFilter.java new file mode 100644 index 00000000..ae8ad704 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/filter/RequestIdFilter.java @@ -0,0 +1,30 @@ +package ru.mtusi.messenger.filter; + +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; +import java.io.IOException; +import java.util.UUID; + +@Component +@Order(-200) // <--- ИЗМЕНЕНО: теперь выполняется раньше Spring Security +public class RequestIdFilter implements Filter { + + public static final String REQUEST_ID_ATTR = "requestId"; + public static final String REQUEST_ID_HEADER = "X-Request-Id"; + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException { + HttpServletRequest httpRequest = (HttpServletRequest) request; + HttpServletResponse httpResponse = (HttpServletResponse) response; + + String requestId = UUID.randomUUID().toString(); + httpRequest.setAttribute(REQUEST_ID_ATTR, requestId); + httpResponse.setHeader(REQUEST_ID_HEADER, requestId); + + chain.doFilter(request, response); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/repository/ChatRepository.java b/src/main/java/ru/mtusi/messenger/repository/ChatRepository.java new file mode 100644 index 00000000..15d722f9 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/repository/ChatRepository.java @@ -0,0 +1,8 @@ +package ru.mtusi.messenger.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import ru.mtusi.messenger.entity.ChatEntity; +import java.util.UUID; + +public interface ChatRepository extends JpaRepository { +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/repository/MessageRepository.java b/src/main/java/ru/mtusi/messenger/repository/MessageRepository.java new file mode 100644 index 00000000..a7713742 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/repository/MessageRepository.java @@ -0,0 +1,24 @@ +package ru.mtusi.messenger.repository; + +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import ru.mtusi.messenger.entity.MessageEntity; + +import java.time.OffsetDateTime; +import java.util.List; +import java.util.UUID; + +public interface MessageRepository extends JpaRepository { + + @Query("SELECT m FROM MessageEntity m WHERE m.chatId = :chatId " + + "AND (m.createdAt > :createdAt OR (m.createdAt = :createdAt AND m.id > :id)) " + + "ORDER BY m.createdAt ASC, m.id ASC") + List findNextPage( + @Param("chatId") UUID chatId, + @Param("createdAt") OffsetDateTime createdAt, + @Param("id") UUID id, + Pageable pageable + ); +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/repository/SessionRepository.java b/src/main/java/ru/mtusi/messenger/repository/SessionRepository.java new file mode 100644 index 00000000..7872b4a0 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/repository/SessionRepository.java @@ -0,0 +1,7 @@ +package ru.mtusi.messenger.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import ru.mtusi.messenger.entity.SessionEntity; + +public interface SessionRepository extends JpaRepository { +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/repository/UserRepository.java b/src/main/java/ru/mtusi/messenger/repository/UserRepository.java new file mode 100644 index 00000000..d50fe87b --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/repository/UserRepository.java @@ -0,0 +1,11 @@ +package ru.mtusi.messenger.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import ru.mtusi.messenger.entity.UserEntity; +import java.util.Optional; +import java.util.UUID; + +public interface UserRepository extends JpaRepository { + Optional findByUsername(String username); + boolean existsByUsername(String username); +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/service/ChatService.java b/src/main/java/ru/mtusi/messenger/service/ChatService.java new file mode 100644 index 00000000..ea2c769b --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/service/ChatService.java @@ -0,0 +1,85 @@ +package ru.mtusi.messenger.service; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import ru.mtusi.messenger.dto.Chat; +import ru.mtusi.messenger.dto.CreateChat; +import ru.mtusi.messenger.entity.ChatEntity; +import ru.mtusi.messenger.entity.UserEntity; +import ru.mtusi.messenger.exception.InvalidRequestException; +import ru.mtusi.messenger.exception.NotFoundException; +import ru.mtusi.messenger.repository.ChatRepository; +import ru.mtusi.messenger.repository.UserRepository; + +import java.time.OffsetDateTime; +import java.time.ZoneOffset; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; + +@Service +public class ChatService { + + private final ChatRepository chatRepository; + private final UserRepository userRepository; + + public ChatService(ChatRepository chatRepository, UserRepository userRepository) { + this.chatRepository = chatRepository; + this.userRepository = userRepository; + } + + @Transactional + public Chat createChat(UUID callerId, CreateChat request) { + Set uniqueMembers = new HashSet<>(request.memberIds()); + if (uniqueMembers.size() != request.memberIds().size()) { + throw new InvalidRequestException("member_ids must be unique"); + } + if (!uniqueMembers.contains(callerId)) { + throw new InvalidRequestException("caller must be a member of the chat"); + } + + List members = userRepository.findAllById(request.memberIds()); + if (members.size() != request.memberIds().size()) { + throw new InvalidRequestException("Some members do not exist"); + } + + ChatEntity chat = new ChatEntity(); + chat.setId(UUID.randomUUID()); + chat.setTitle(request.title()); + chat.setCreatedAt(OffsetDateTime.now(ZoneOffset.UTC)); + chat.setMembers(new HashSet<>(members)); + + chatRepository.save(chat); + return toDto(chat); + } + + @Transactional(readOnly = true) + public Chat getChat(UUID callerId, UUID chatId) { + ChatEntity chat = chatRepository.findById(chatId) + .orElseThrow(() -> new NotFoundException("Chat not found")); + + boolean isMember = chat.getMembers().stream().anyMatch(u -> u.getId().equals(callerId)); + if (!isMember) throw new NotFoundException("Chat not found"); + + return toDto(chat); + } + + @Transactional(readOnly = true) + public List getUserChats(UUID callerId) { + // В реальном проекте лучше сделать кастомный запрос, но для lab2 сойдет + return chatRepository.findAll().stream() + .filter(c -> c.getMembers().stream().anyMatch(u -> u.getId().equals(callerId))) + .map(this::toDto) + .toList(); + } + + public Chat toDto(ChatEntity entity) { + return new Chat( + entity.getId(), + entity.getTitle(), + entity.getMembers().stream().map(UserEntity::getId).toList(), + entity.getCreatedAt() + ); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/service/MessageService.java b/src/main/java/ru/mtusi/messenger/service/MessageService.java new file mode 100644 index 00000000..5a652167 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/service/MessageService.java @@ -0,0 +1,67 @@ +package ru.mtusi.messenger.service; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import ru.mtusi.messenger.dto.CreateMessage; +import ru.mtusi.messenger.dto.Message; +import ru.mtusi.messenger.entity.ChatEntity; +import ru.mtusi.messenger.entity.MessageEntity; +import ru.mtusi.messenger.exception.InvalidRequestException; +import ru.mtusi.messenger.exception.NotFoundException; +import ru.mtusi.messenger.repository.ChatRepository; +import ru.mtusi.messenger.repository.MessageRepository; + +import java.time.OffsetDateTime; +import java.time.ZoneOffset; +import java.util.List; +import java.util.UUID; + +@Service +public class MessageService { + + private final MessageRepository messageRepository; + private final ChatRepository chatRepository; + + public MessageService(MessageRepository messageRepository, ChatRepository chatRepository) { + this.messageRepository = messageRepository; + this.chatRepository = chatRepository; + } + + @Transactional + public Message createMessage(UUID callerId, UUID chatId, CreateMessage request) { + verifyAccess(callerId, chatId); + + MessageEntity msg = new MessageEntity(); + msg.setId(UUID.randomUUID()); + msg.setChatId(chatId); + msg.setSenderId(callerId); + msg.setText(request.text()); + msg.setCreatedAt(OffsetDateTime.now(ZoneOffset.UTC).truncatedTo(java.time.temporal.ChronoUnit.MILLIS)); + + messageRepository.save(msg); + return toDto(msg); + } + + private void verifyAccess(UUID callerId, UUID chatId) { + ChatEntity chat = chatRepository.findById(chatId) + .orElseThrow(() -> new NotFoundException("Chat not found")); + boolean isMember = chat.getMembers().stream().anyMatch(u -> u.getId().equals(callerId)); + if (!isMember) throw new NotFoundException("Chat not found"); + } + + private Message toDto(MessageEntity e) { + return new Message(e.getId(), e.getChatId(), e.getSenderId(), e.getText(), e.getCreatedAt()); + } + + @Transactional(readOnly = true) + public List getMessagesPage(UUID callerId, UUID chatId, OffsetDateTime lastCreatedAt, UUID lastId, int limit) { + verifyAccess(callerId, chatId); + + // Если курсора нет, берем с самого начала (эпоха 1970 года) + OffsetDateTime startTime = (lastCreatedAt != null) ? lastCreatedAt : OffsetDateTime.of(1970, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC); + UUID startId = (lastId != null) ? lastId : new UUID(0, 0); + + return messageRepository.findNextPage(chatId, startTime, startId, org.springframework.data.domain.PageRequest.of(0, limit)) + .stream().map(this::toDto).toList(); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/service/SessionService.java b/src/main/java/ru/mtusi/messenger/service/SessionService.java new file mode 100644 index 00000000..9920b24b --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/service/SessionService.java @@ -0,0 +1,64 @@ +package ru.mtusi.messenger.service; + +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import ru.mtusi.messenger.dto.SessionResponse; +import ru.mtusi.messenger.entity.SessionEntity; +import ru.mtusi.messenger.entity.UserEntity; +import ru.mtusi.messenger.exception.UnauthorizedException; +import ru.mtusi.messenger.repository.SessionRepository; +import ru.mtusi.messenger.repository.UserRepository; + +import java.time.OffsetDateTime; +import java.time.ZoneOffset; +import java.util.UUID; + +@Service +public class SessionService { + + private final UserRepository userRepository; + private final SessionRepository sessionRepository; + private final PasswordEncoder passwordEncoder; + private final UserService userService; + + public SessionService(UserRepository userRepository, + SessionRepository sessionRepository, + PasswordEncoder passwordEncoder, + UserService userService) { + this.userRepository = userRepository; + this.sessionRepository = sessionRepository; + this.passwordEncoder = passwordEncoder; + this.userService = userService; + } + + @Transactional + public SessionResponse createSession(String username, String rawPassword) { + // 1. Ищем пользователя + UserEntity user = userRepository.findByUsername(username) + .orElseThrow(() -> new UnauthorizedException("Invalid credentials")); + + // 2. Проверяем пароль + if (!passwordEncoder.matches(rawPassword, user.getPasswordHash())) { + throw new UnauthorizedException("Invalid credentials"); + } + + // 3. Генерируем opaque токен (UUID) + String token = UUID.randomUUID().toString(); + + // 4. Сохраняем сессию в БД (TTL 1 час) + SessionEntity session = new SessionEntity(); + session.setToken(token); + session.setUserId(user.getId()); + session.setExpiresAt(OffsetDateTime.now(ZoneOffset.UTC).plusHours(1)); + + sessionRepository.save(session); + + // 5. Возвращаем ответ + return new SessionResponse( + token, + session.getExpiresAt(), + userService.toDto(user) + ); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/service/UserService.java b/src/main/java/ru/mtusi/messenger/service/UserService.java new file mode 100644 index 00000000..46888d5e --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/service/UserService.java @@ -0,0 +1,59 @@ +package ru.mtusi.messenger.service; + +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import ru.mtusi.messenger.dto.CreateUser; +import ru.mtusi.messenger.dto.User; +import ru.mtusi.messenger.entity.UserEntity; +import ru.mtusi.messenger.exception.ConflictException; +import ru.mtusi.messenger.repository.UserRepository; + +import java.time.OffsetDateTime; +import java.time.ZoneOffset; +import java.util.Optional; +import java.util.UUID; + +@Service +public class UserService { + + private final UserRepository userRepository; + private final PasswordEncoder passwordEncoder; + + public UserService(UserRepository userRepository, PasswordEncoder passwordEncoder) { + this.userRepository = userRepository; + this.passwordEncoder = passwordEncoder; + } + + @Transactional + public User createUser(CreateUser request) { + // ... проверка username ... + UserEntity entity = new UserEntity(); + entity.setId(UUID.randomUUID()); + entity.setUsername(request.username()); + entity.setDisplayName(request.displayName()); + entity.setPasswordHash(passwordEncoder.encode(request.password())); + + // ВАЖНО: обрезаем до миллисекунд, чтобы PostgreSQL не изменил точность + OffsetDateTime now = OffsetDateTime.now(ZoneOffset.UTC).truncatedTo(java.time.temporal.ChronoUnit.MILLIS); + entity.setCreatedAt(now); + + userRepository.save(entity); + return toDto(entity); + } + + @Transactional(readOnly = true) + public Optional findById(UUID id) { + return userRepository.findById(id).map(this::toDto); + } + + // Вспомогательный метод для конвертации Entity -> DTO + public User toDto(UserEntity entity) { + return new User( + entity.getId(), + entity.getUsername(), + entity.getDisplayName(), + entity.getCreatedAt() + ); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/store/ChatStore.java.bak b/src/main/java/ru/mtusi/messenger/store/ChatStore.java.bak new file mode 100644 index 00000000..881474a7 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/store/ChatStore.java.bak @@ -0,0 +1,49 @@ +/* package ru.mtusi.messenger.store; + +import org.springframework.stereotype.Component; +import ru.mtusi.messenger.dto.Chat; + +import java.time.OffsetDateTime; +import java.time.ZoneOffset; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +@Component +public class ChatStore { + + private final ConcurrentHashMap byId = new ConcurrentHashMap<>(); + + public Chat create(String title, List memberIds) { + UUID id = UUID.randomUUID(); + Chat chat = new Chat( + id, + title, + List.copyOf(memberIds), + OffsetDateTime.now(ZoneOffset.UTC) + ); + byId.put(id, chat); + return chat; + } + + public Optional findById(UUID id) { + return Optional.ofNullable(byId.get(id)); + } + + public List findByMember(UUID userId) { + List result = new ArrayList<>(); + for (Chat chat : byId.values()) { + if (chat.memberIds().contains(userId)) { + result.add(chat); + } + } + result.sort(Comparator + .comparing(Chat::createdAt) + .thenComparing(c -> c.id().toString())); + return result; + } +} +*/ \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/store/MessageStore.java.bak b/src/main/java/ru/mtusi/messenger/store/MessageStore.java.bak new file mode 100644 index 00000000..8f0fc297 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/store/MessageStore.java.bak @@ -0,0 +1,43 @@ +/* package ru.mtusi.messenger.store; + +import org.springframework.stereotype.Component; +import ru.mtusi.messenger.dto.Message; + +import java.time.OffsetDateTime; +import java.time.ZoneOffset; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; + +@Component +public class MessageStore { + + private static final Comparator ORDER = + Comparator.comparing(Message::createdAt) + .thenComparing(m -> m.id().toString()); + + private final ConcurrentHashMap> byChat = new ConcurrentHashMap<>(); + + public Message create(UUID chatId, UUID senderId, String text) { + Message message = new Message( + UUID.randomUUID(), chatId, senderId, text, + OffsetDateTime.now(ZoneOffset.UTC) + ); + byChat.computeIfAbsent(chatId, k -> new CopyOnWriteArrayList<>()).add(message); + return message; + } + + public List findByChat(UUID chatId) { + CopyOnWriteArrayList messages = byChat.get(chatId); + if (messages == null) { + return List.of(); + } + List sorted = new ArrayList<>(messages); + sorted.sort(ORDER); + return sorted; + } +} +*/ \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/util/CursorCodec.java b/src/main/java/ru/mtusi/messenger/util/CursorCodec.java new file mode 100644 index 00000000..89f2dc11 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/util/CursorCodec.java @@ -0,0 +1,54 @@ +package ru.mtusi.messenger.util; + +import ru.mtusi.messenger.exception.InvalidRequestException; + +import java.nio.charset.StandardCharsets; +import java.time.OffsetDateTime; +import java.util.Base64; +import java.util.UUID; + +/** + * Кодирует/декодирует opaque cursor для keyset-пагинации. + * + * Формат (внутри base64url): scope | createdAt.toString() | uuid + * scope — например "chat:", привязывает курсор к ресурсу + * createdAt — ISO-8601 строкa UTC с наносекундной точностью + * uuid — id последнего элемента + * + * Клиент видит только base64-строку и не должен её интерпретировать. + */ +public final class CursorCodec { + + private CursorCodec() {} + + public record Cursor(String scope, OffsetDateTime createdAt, UUID id) {} + + public static String encode(String scope, OffsetDateTime createdAt, UUID id) { + String raw = scope + "|" + createdAt.toString() + "|" + id; + return Base64.getUrlEncoder().withoutPadding() + .encodeToString(raw.getBytes(StandardCharsets.UTF_8)); + } + + public static Cursor decode(String encoded, String expectedScope) { + try { + String raw = new String( + Base64.getUrlDecoder().decode(encoded), + StandardCharsets.UTF_8 + ); + String[] parts = raw.split("\\|", 3); + if (parts.length != 3) { + throw new InvalidRequestException("Invalid cursor"); + } + if (!parts[0].equals(expectedScope)) { + throw new InvalidRequestException("Cursor belongs to another resource"); + } + OffsetDateTime createdAt = OffsetDateTime.parse(parts[1]); + UUID id = UUID.fromString(parts[2]); + return new Cursor(parts[0], createdAt, id); + } catch (InvalidRequestException e) { + throw e; + } catch (Exception e) { + throw new InvalidRequestException("Invalid cursor"); + } + } +} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 00000000..217f092d --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,33 @@ +server: + port: ${APP_PORT:8080} + address: 0.0.0.0 + shutdown: graceful + +spring: + lifecycle: + timeout-per-shutdown-phase: 10s + jackson: + property-naming-strategy: SNAKE_CASE + serialization: + write-dates-as-timestamps: false + + # Настройка PostgreSQL + datasource: + url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/messenger} + username: ${SPRING_DATASOURCE_USERNAME:messenger} + password: ${SPRING_DATASOURCE_PASSWORD:messenger} + driver-class-name: org.postgresql.Driver + + # Hibernate не должен сам создавать таблицы, это делает Flyway + jpa: + hibernate: + ddl-auto: validate + show-sql: false + properties: + hibernate: + format_sql: true + + # Миграции + flyway: + enabled: true + baseline-on-migrate: true \ No newline at end of file diff --git a/src/main/resources/db/migration/V1__init_schema.sql b/src/main/resources/db/migration/V1__init_schema.sql new file mode 100644 index 00000000..faeaefb7 --- /dev/null +++ b/src/main/resources/db/migration/V1__init_schema.sql @@ -0,0 +1,44 @@ +-- Пользователи +CREATE TABLE users ( + id UUID PRIMARY KEY, + username VARCHAR(32) NOT NULL UNIQUE, + password_hash VARCHAR(255) NOT NULL, + display_name VARCHAR(100) NOT NULL, + created_at TIMESTAMP WITH TIME ZONE NOT NULL +); + +-- Чаты +CREATE TABLE chats ( + id UUID PRIMARY KEY, + title VARCHAR(100) NOT NULL, + created_at TIMESTAMP WITH TIME ZONE NOT NULL +); + +-- Участники чатов (Many-to-Many) +CREATE TABLE chat_members ( + chat_id UUID NOT NULL REFERENCES chats(id) ON DELETE CASCADE, + user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + PRIMARY KEY (chat_id, user_id) +); + +-- Сообщения +CREATE TABLE messages ( + id UUID PRIMARY KEY, + chat_id UUID NOT NULL REFERENCES chats(id) ON DELETE CASCADE, + sender_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + text TEXT NOT NULL, + created_at TIMESTAMP WITH TIME ZONE NOT NULL +); + +-- Индекс для быстрой пагинации по (created_at, id) в рамках чата +CREATE INDEX idx_messages_chat_created_at ON messages (chat_id, created_at, id); + +-- Сессии (для lab2) +CREATE TABLE sessions ( + token VARCHAR(255) PRIMARY KEY, + user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + expires_at TIMESTAMP WITH TIME ZONE NOT NULL +); + +-- Индекс для быстрой проверки сессий +CREATE INDEX idx_sessions_expires_at ON sessions (expires_at); \ No newline at end of file -- 2.54.0 From f512750277df7506eec153cde1448db1d2ed5e53 Mon Sep 17 00:00:00 2001 From: nodens1926 <130+nodens1926@noreply.gitea.privcloud.tech> Date: Thu, 29 Oct 2026 18:20:40 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20REPORT.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- REPORT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/REPORT.md b/REPORT.md index da043913..f79e7918 100644 --- a/REPORT.md +++ b/REPORT.md @@ -2,7 +2,7 @@ - **Автор, группа:** Пойлов А.А., БПИ2303 - **Целевая оценка:** 3. Трек 5 не выбран. -- **Commit/PR:** <ссылка на PR после публикации> +- **Commit/PR:** https://gitea.privcloud.tech/mtusi2026/mtusi2026lab2/pulls/115 - **Использованные источники, библиотеки и помощь ИИ:** - Spring Boot 3.3.0, Spring Data JPA, Spring Security, Flyway, PostgreSQL 15, Docker Compose. - Официальная документация Spring Boot и PostgreSQL. -- 2.54.0