From 034d5537cfd731417b58f5115b46f68eaff39347 Mon Sep 17 00:00:00 2001 From: Dmitry <146066734+DmitryTamlin7@users.noreply.github.com> Date: Mon, 9 Nov 2026 21:34:03 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=20=D0=B8=D0=B7=203=20=D0=BB=D0=B0=D0=B1=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Lido/.dockerignore | 5 + Lido/.gitignore | 2 + Lido/Dockerfile | 24 ++ Lido/docker-compose.yml | 104 ++++++++ Lido/docs/arch/model.c4 | 11 + Lido/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes Lido/gradle/wrapper/gradle-wrapper.properties | 8 + Lido/gradlew | 249 ++++++++++++++++++ Lido/gradlew.bat | 92 +++++++ Lido/nginx/nginx.conf | 51 ++++ Lido/settings.gradle.kts | 1 + .../java/org/example/LidoApplication.java | 11 + .../java/org/example/config/AuthFilter.java | 50 ++++ .../org/example/config/CodePointSize.java | 18 ++ .../config/CodePointSizeValidator.java | 25 ++ .../config/GracefulShutdownListener.java | 25 ++ .../org/example/config/InstanceIdFilter.java | 52 ++++ .../org/example/config/PasswordConfig.java | 42 +++ .../org/example/config/ReadinessState.java | 17 ++ .../org/example/config/RequestIdFilter.java | 43 +++ .../config/StrictStringDeserializer.java | 19 ++ .../java/org/example/config/TokenHasher.java | 28 ++ .../java/org/example/config/UserContext.java | 19 ++ .../example/controller/AuthController.java | 66 +++++ .../example/controller/ChatController.java | 114 ++++++++ .../example/controller/HealthController.java | 48 ++++ .../example/controller/UserController.java | 48 ++++ .../main/java/org/example/dto/ChatPage.java | 22 ++ .../java/org/example/dto/ErrorDetail.java | 14 + .../java/org/example/dto/MessagePage.java | 18 ++ .../org/example/dto/create/CreateChatDto.java | 26 ++ .../example/dto/create/CreateMessageDto.java | 16 ++ .../org/example/dto/create/CreateUserDto.java | 31 +++ .../example/dto/response/ChatResponse.java | 24 ++ .../example/dto/response/ErrorResponse.java | 11 + .../example/dto/response/MessageResponse.java | 25 ++ .../dto/response/SessionInfoResponse.java | 25 ++ .../example/dto/response/SessionResponse.java | 24 ++ .../example/dto/response/UserResponse.java | 24 ++ .../org/example/dto/update/UpdateChatDto.java | 16 ++ .../example/dto/update/UpdateMessageDto.java | 16 ++ .../org/example/dto/update/UpdateUserDto.java | 17 ++ .../example/exception/ConflictException.java | 7 + .../example/exception/ForbiddenException.java | 8 + .../exception/GlobalExceptionHandler.java | 239 +++++++++++++++++ .../example/exception/NotFoundException.java | 8 + .../exception/UnauthorizedException.java | 19 ++ .../exception/UserAlreadyExistsException.java | 12 + .../src/main/java/org/example/model/Chat.java | 53 ++++ .../java/org/example/model/ChatMember.java | 51 ++++ .../org/example/model/IdempotencyKey.java | 46 ++++ .../main/java/org/example/model/Message.java | 43 +++ .../main/java/org/example/model/Session.java | 53 ++++ .../src/main/java/org/example/model/User.java | 42 +++ .../repository/ChatMemberRepository.java | 14 + .../example/repository/ChatRepository.java | 23 ++ .../repository/IdempotencyKeyRepository.java | 15 ++ .../example/repository/MessageRepository.java | 34 +++ .../example/repository/SessionRepository.java | 14 + .../example/repository/UserRepository.java | 12 + .../java/org/example/service/AuthService.java | 162 ++++++++++++ .../org/example/service/CacheService.java | 62 +++++ .../java/org/example/service/ChatService.java | 169 ++++++++++++ .../service/MessageIdempotencyWriter.java | 51 ++++ .../org/example/service/MessageService.java | 189 +++++++++++++ .../java/org/example/service/UserService.java | 126 +++++++++ Lido/src/main/resources/application.yml | 69 +++++ .../db/migration/V1__init_messanger.sql | 35 +++ .../db/migration/V2__auth_sessions.sql | 12 + .../db/migration/V3__messages_index_asc.sql | 4 + .../db/migration/V4__chat_title_100.sql | 2 + .../db/migration/V5__idempotency.sql | 10 + .../V6__idempotency_request_hash.sql | 2 + .../java/org/example/ApiIntegrationTest.java | 123 +++++++++ load-failover.js | 22 ++ scripts/failover.sh | 21 ++ scripts/restart.sh | 20 ++ 77 files changed, 3253 insertions(+) create mode 100644 Lido/.dockerignore create mode 100644 Lido/.gitignore create mode 100644 Lido/Dockerfile create mode 100644 Lido/docker-compose.yml create mode 100644 Lido/docs/arch/model.c4 create mode 100644 Lido/gradle/wrapper/gradle-wrapper.jar create mode 100644 Lido/gradle/wrapper/gradle-wrapper.properties create mode 100755 Lido/gradlew create mode 100644 Lido/gradlew.bat create mode 100644 Lido/nginx/nginx.conf create mode 100644 Lido/settings.gradle.kts create mode 100644 Lido/src/main/java/org/example/LidoApplication.java create mode 100644 Lido/src/main/java/org/example/config/AuthFilter.java create mode 100644 Lido/src/main/java/org/example/config/CodePointSize.java create mode 100644 Lido/src/main/java/org/example/config/CodePointSizeValidator.java create mode 100644 Lido/src/main/java/org/example/config/GracefulShutdownListener.java create mode 100644 Lido/src/main/java/org/example/config/InstanceIdFilter.java create mode 100644 Lido/src/main/java/org/example/config/PasswordConfig.java create mode 100644 Lido/src/main/java/org/example/config/ReadinessState.java create mode 100644 Lido/src/main/java/org/example/config/RequestIdFilter.java create mode 100644 Lido/src/main/java/org/example/config/StrictStringDeserializer.java create mode 100644 Lido/src/main/java/org/example/config/TokenHasher.java create mode 100644 Lido/src/main/java/org/example/config/UserContext.java create mode 100644 Lido/src/main/java/org/example/controller/AuthController.java create mode 100644 Lido/src/main/java/org/example/controller/ChatController.java create mode 100644 Lido/src/main/java/org/example/controller/HealthController.java create mode 100644 Lido/src/main/java/org/example/controller/UserController.java create mode 100644 Lido/src/main/java/org/example/dto/ChatPage.java create mode 100644 Lido/src/main/java/org/example/dto/ErrorDetail.java create mode 100644 Lido/src/main/java/org/example/dto/MessagePage.java create mode 100644 Lido/src/main/java/org/example/dto/create/CreateChatDto.java create mode 100644 Lido/src/main/java/org/example/dto/create/CreateMessageDto.java create mode 100644 Lido/src/main/java/org/example/dto/create/CreateUserDto.java create mode 100644 Lido/src/main/java/org/example/dto/response/ChatResponse.java create mode 100644 Lido/src/main/java/org/example/dto/response/ErrorResponse.java create mode 100644 Lido/src/main/java/org/example/dto/response/MessageResponse.java create mode 100644 Lido/src/main/java/org/example/dto/response/SessionInfoResponse.java create mode 100644 Lido/src/main/java/org/example/dto/response/SessionResponse.java create mode 100644 Lido/src/main/java/org/example/dto/response/UserResponse.java create mode 100644 Lido/src/main/java/org/example/dto/update/UpdateChatDto.java create mode 100644 Lido/src/main/java/org/example/dto/update/UpdateMessageDto.java create mode 100644 Lido/src/main/java/org/example/dto/update/UpdateUserDto.java create mode 100644 Lido/src/main/java/org/example/exception/ConflictException.java create mode 100644 Lido/src/main/java/org/example/exception/ForbiddenException.java create mode 100644 Lido/src/main/java/org/example/exception/GlobalExceptionHandler.java create mode 100644 Lido/src/main/java/org/example/exception/NotFoundException.java create mode 100644 Lido/src/main/java/org/example/exception/UnauthorizedException.java create mode 100644 Lido/src/main/java/org/example/exception/UserAlreadyExistsException.java create mode 100644 Lido/src/main/java/org/example/model/Chat.java create mode 100644 Lido/src/main/java/org/example/model/ChatMember.java create mode 100644 Lido/src/main/java/org/example/model/IdempotencyKey.java create mode 100644 Lido/src/main/java/org/example/model/Message.java create mode 100644 Lido/src/main/java/org/example/model/Session.java create mode 100644 Lido/src/main/java/org/example/model/User.java create mode 100644 Lido/src/main/java/org/example/repository/ChatMemberRepository.java create mode 100644 Lido/src/main/java/org/example/repository/ChatRepository.java create mode 100644 Lido/src/main/java/org/example/repository/IdempotencyKeyRepository.java create mode 100644 Lido/src/main/java/org/example/repository/MessageRepository.java create mode 100644 Lido/src/main/java/org/example/repository/SessionRepository.java create mode 100644 Lido/src/main/java/org/example/repository/UserRepository.java create mode 100644 Lido/src/main/java/org/example/service/AuthService.java create mode 100644 Lido/src/main/java/org/example/service/CacheService.java create mode 100644 Lido/src/main/java/org/example/service/ChatService.java create mode 100644 Lido/src/main/java/org/example/service/MessageIdempotencyWriter.java create mode 100644 Lido/src/main/java/org/example/service/MessageService.java create mode 100644 Lido/src/main/java/org/example/service/UserService.java create mode 100644 Lido/src/main/resources/application.yml create mode 100644 Lido/src/main/resources/db/migration/V1__init_messanger.sql create mode 100644 Lido/src/main/resources/db/migration/V2__auth_sessions.sql create mode 100644 Lido/src/main/resources/db/migration/V3__messages_index_asc.sql create mode 100644 Lido/src/main/resources/db/migration/V4__chat_title_100.sql create mode 100644 Lido/src/main/resources/db/migration/V5__idempotency.sql create mode 100644 Lido/src/main/resources/db/migration/V6__idempotency_request_hash.sql create mode 100644 Lido/src/test/java/org/example/ApiIntegrationTest.java create mode 100644 load-failover.js create mode 100755 scripts/failover.sh create mode 100755 scripts/restart.sh diff --git a/Lido/.dockerignore b/Lido/.dockerignore new file mode 100644 index 00000000..2d7fae82 --- /dev/null +++ b/Lido/.dockerignore @@ -0,0 +1,5 @@ +.gradle +build +.git +*.iml +.idea \ No newline at end of file diff --git a/Lido/.gitignore b/Lido/.gitignore new file mode 100644 index 00000000..b1d77e7b --- /dev/null +++ b/Lido/.gitignore @@ -0,0 +1,2 @@ +build.gradle.kts +.gradle diff --git a/Lido/Dockerfile b/Lido/Dockerfile new file mode 100644 index 00000000..15356a7f --- /dev/null +++ b/Lido/Dockerfile @@ -0,0 +1,24 @@ +FROM eclipse-temurin:22-jdk-alpine AS builder +WORKDIR /app +RUN apk add --no-cache dos2unix +COPY gradlew . +COPY gradle gradle +COPY build.gradle.* settings.gradle* build.gradle.kts* settings.gradle.kts* ./ +RUN dos2unix gradlew && chmod +x gradlew +RUN ./gradlew dependencies --no-daemon || true +COPY src src +RUN apk add --no-cache curl +RUN ./gradlew bootJar -x test --no-daemon + +FROM eclipse-temurin:22-jre-alpine AS runtime +WORKDIR /app +RUN addgroup -S appgroup && adduser -S appuser -G appgroup +COPY --from=builder /app/build/libs/*.jar app.jar +RUN chown -R appuser:appgroup /app +USER appuser +EXPOSE 8080 + +HEALTHCHECK --interval=10s --timeout=3s --retries=3 \ + CMD wget --no-verbose --tries=1 --spider http://localhost:8080/actuator/health || exit 1 + +ENTRYPOINT ["java", "-jar", "app.jar"] \ No newline at end of file diff --git a/Lido/docker-compose.yml b/Lido/docker-compose.yml new file mode 100644 index 00000000..293670f2 --- /dev/null +++ b/Lido/docker-compose.yml @@ -0,0 +1,104 @@ +services: + db: + image: postgres:16-alpine + container_name: Lido-db + mem_limit: 128m + environment: + POSTGRES_DB: lido_db + POSTGRES_USER: user + POSTGRES_PASSWORD: user + ports: + - "5433:5432" + volumes: + - messenger_pg_data:/var/lib/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready -U user -d lido_db"] + interval: 5s + timeout: 5s + retries: 5 + networks: [messenger] + + redis: + image: redis:7-alpine + mem_limit: 128m + container_name: lido-redis + ports: + - "6379:6379" + volumes: + - lido_redis_data:/data + command: [ "redis-server", "--appendonly", "yes" ] + healthcheck: + test: [ "CMD", "redis-cli", "ping" ] + interval: 5s + timeout: 3s + retries: 10 + networks: [messenger] + + + api: + build: + context: . + dockerfile: Dockerfile + depends_on: + db: + condition: service_healthy + redis: + condition: service_healthy + networks: [messenger] + mem_limit: 512m + cpus: 1.0 + mem_reservation: 256m + environment: + FLYWAY_ENABLED: "false" + SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/lido_db + SPRING_DATASOURCE_USERNAME: user + SPRING_DATASOURCE_PASSWORD: user + SPRING_DATA_REDIS_HOST: redis + SPRING_DATA_REDIS_PORT: "6379" + SESSION_TTL_SECONDS: "604800" + SERVER_SHUTDOWN: graceful + deploy: + replicas: 3 + healthcheck: + test: ["CMD-SHELL", "wget -q -O- http://127.0.0.1:8080/health/live || exit 1"] + interval: 5s + timeout: 3s + retries: 3 + start_period: 40s + + + nginx: + image: nginx:1.27-alpine + mem_limit: 128m + ports: + - "8080:80" + volumes: + - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro + depends_on: + - api + networks: [ messenger ] + + migrate: + build: . + environment: + SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/lido_db + SPRING_DATASOURCE_USERNAME: user + SPRING_DATASOURCE_PASSWORD: user + FLYWAY_ENABLED: "true" + SPRING_MAIN_WEB_APPLICATION_TYPE: none + networks: [ messenger ] + restart: "no" + image: flyway/flyway:10 + command: -url=jdbc:postgresql://db:5432/lido_db -user=user -password=user -locations=filesystem:/flyway/sql migrate + volumes: + - ./src/main/resources/db/migration:/flyway/sql:ro + depends_on: + db: + condition: service_healthy + +volumes: + messenger_pg_data: + lido_redis_data: + +networks: + messenger: \ No newline at end of file diff --git a/Lido/docs/arch/model.c4 b/Lido/docs/arch/model.c4 new file mode 100644 index 00000000..40093d0a --- /dev/null +++ b/Lido/docs/arch/model.c4 @@ -0,0 +1,11 @@ +model { + messenger = softwareSystem "Messenger" { + api = container "API" "Spring Boot" { + userSvc = component "UserService" + chatSvc = component "ChatService" + msgSvc = component "MessageService" + } + db = container "PostgreSQL" "users, chats, chat_members, messages" + } + api -> db "JDBC / Flyway" +} \ No newline at end of file diff --git a/Lido/gradle/wrapper/gradle-wrapper.jar b/Lido/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/Lido/gradlew.bat b/Lido/gradlew.bat new file mode 100644 index 00000000..7101f8e4 --- /dev/null +++ b/Lido/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/Lido/nginx/nginx.conf b/Lido/nginx/nginx.conf new file mode 100644 index 00000000..87140a5c --- /dev/null +++ b/Lido/nginx/nginx.conf @@ -0,0 +1,51 @@ +worker_processes auto; + +events { + worker_connections 1024; +} + +http { + upstream api_backend { + least_conn; + server api:8080 max_fails=2 fail_timeout=5s; + } + + server { + listen 80; + + location /health/live { + proxy_pass http://api_backend; + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Connection ""; + proxy_connect_timeout 2s; + proxy_read_timeout 5s; + proxy_next_upstream error timeout http_502 http_503 http_504; + } + + location /health/ready { + proxy_pass http://api_backend; + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Connection ""; + proxy_connect_timeout 2s; + proxy_read_timeout 5s; + proxy_next_upstream error timeout http_502 http_503 http_504; + } + + location / { + proxy_pass http://api_backend; + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Connection ""; + proxy_connect_timeout 2s; + proxy_send_timeout 30s; + proxy_read_timeout 30s; + proxy_next_upstream error timeout http_502 http_503 http_504; + proxy_next_upstream_tries 3; + } + } +} \ No newline at end of file diff --git a/Lido/settings.gradle.kts b/Lido/settings.gradle.kts new file mode 100644 index 00000000..b27426c4 --- /dev/null +++ b/Lido/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "Lido" diff --git a/Lido/src/main/java/org/example/LidoApplication.java b/Lido/src/main/java/org/example/LidoApplication.java new file mode 100644 index 00000000..96bf147d --- /dev/null +++ b/Lido/src/main/java/org/example/LidoApplication.java @@ -0,0 +1,11 @@ +package org.example; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class LidoApplication { + public static void main(String[] args) { + SpringApplication.run(LidoApplication.class, args); + } +} diff --git a/Lido/src/main/java/org/example/config/AuthFilter.java b/Lido/src/main/java/org/example/config/AuthFilter.java new file mode 100644 index 00000000..b80a81f2 --- /dev/null +++ b/Lido/src/main/java/org/example/config/AuthFilter.java @@ -0,0 +1,50 @@ +package org.example.config; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.example.repository.SessionRepository; +import org.example.service.AuthService; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +@Slf4j +@Component +@RequiredArgsConstructor +public class AuthFilter extends OncePerRequestFilter { + + private final AuthService authService; + + @Override + protected boolean shouldNotFilter(HttpServletRequest request) { + String path = request.getRequestURI(); + return path.startsWith("/health/") + || path.startsWith("/actuator/"); + } + + @Override + protected void doFilterInternal(HttpServletRequest request, + HttpServletResponse response, + FilterChain filterChain) + throws ServletException, IOException { + + String auth = request.getHeader("Authorization"); + if (auth != null && auth.startsWith("Bearer ")) { + String token = auth.substring(7).trim(); + if (!token.isEmpty()) { + authService.resolveUserByBearer(token) + .ifPresent(UserContext::setCurrentUser); + } + } + try { + filterChain.doFilter(request, response); + } finally { + UserContext.clear(); + } + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/config/CodePointSize.java b/Lido/src/main/java/org/example/config/CodePointSize.java new file mode 100644 index 00000000..6925048f --- /dev/null +++ b/Lido/src/main/java/org/example/config/CodePointSize.java @@ -0,0 +1,18 @@ +package org.example.config; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = CodePointSizeValidator.class) +@Target({ ElementType.FIELD, ElementType.PARAMETER }) +@Retention(RetentionPolicy.RUNTIME) +public @interface CodePointSize { + int min() default 0; + int max() default Integer.MAX_VALUE; + String message() default "size must be between {min} and {max} code points"; + Class[] groups() default {}; + Class[] payload() default {}; +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/config/CodePointSizeValidator.java b/Lido/src/main/java/org/example/config/CodePointSizeValidator.java new file mode 100644 index 00000000..7d769fc4 --- /dev/null +++ b/Lido/src/main/java/org/example/config/CodePointSizeValidator.java @@ -0,0 +1,25 @@ +package org.example.config; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; + +public class CodePointSizeValidator implements ConstraintValidator { + + private int min; + private int max; + + @Override + public void initialize(CodePointSize annotation) { + this.min = annotation.min(); + this.max = annotation.max(); + } + + @Override + public boolean isValid(String value, ConstraintValidatorContext context) { + if (value == null) { + return true; + } + int n = value.codePointCount(0, value.length()); + return n >= min && n <= max; + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/config/GracefulShutdownListener.java b/Lido/src/main/java/org/example/config/GracefulShutdownListener.java new file mode 100644 index 00000000..9f202c5b --- /dev/null +++ b/Lido/src/main/java/org/example/config/GracefulShutdownListener.java @@ -0,0 +1,25 @@ +package org.example.config; + +import org.springframework.context.event.ContextClosedEvent; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Component; + +@Component +public class GracefulShutdownListener { + + private final ReadinessState state; + + public GracefulShutdownListener(ReadinessState state) { + this.state = state; + } + + @EventListener(ContextClosedEvent.class) + public void onClose(){ + state.setReady(false); + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } +} diff --git a/Lido/src/main/java/org/example/config/InstanceIdFilter.java b/Lido/src/main/java/org/example/config/InstanceIdFilter.java new file mode 100644 index 00000000..06256e31 --- /dev/null +++ b/Lido/src/main/java/org/example/config/InstanceIdFilter.java @@ -0,0 +1,52 @@ +package org.example.config; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; +import java.util.UUID; + +@Component +public class InstanceIdFilter extends OncePerRequestFilter { + + public static final String HEADER = "X-Instance-Id"; + private final String instanceId; + + public InstanceIdFilter() { + this.instanceId = resolve(); + } + + private static String resolve() { + String id = firstNonBlank( + System.getenv("INSTANCE_ID"), + System.getenv("HOSTNAME"), + System.getProperty("HOSTNAME") + ); + if (id == null) { + id = "unknown-" + UUID.randomUUID().toString().substring(0, 8); + } + return id; + } + + private static String firstNonBlank(String... values) { + if (values == null) return null; + for (String v : values) { + if (v != null && !v.isBlank()) return v.trim(); + } + return null; + } + + @Override + protected void doFilterInternal( + HttpServletRequest request, + HttpServletResponse response, + FilterChain filterChain + ) throws ServletException, IOException { + response.setHeader(HEADER, instanceId); + filterChain.doFilter(request, response); + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/config/PasswordConfig.java b/Lido/src/main/java/org/example/config/PasswordConfig.java new file mode 100644 index 00000000..e23ca1f2 --- /dev/null +++ b/Lido/src/main/java/org/example/config/PasswordConfig.java @@ -0,0 +1,42 @@ +package org.example.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.HexFormat; + +@Configuration +public class PasswordConfig { + + @Bean + public PasswordEncoder passwordEncoder() { + BCryptPasswordEncoder bcrypt = new BCryptPasswordEncoder(); + + return new PasswordEncoder() { + private String prehash(String raw) { + try { + MessageDigest md = MessageDigest.getInstance("SHA-256"); + byte[] digest = md.digest(raw.getBytes(StandardCharsets.UTF_8)); + return HexFormat.of().formatHex(digest); + } catch (NoSuchAlgorithmException e) { + throw new IllegalStateException(e); + } + } + + @Override + public String encode(CharSequence rawPassword) { + return bcrypt.encode(prehash(rawPassword.toString())); + } + + @Override + public boolean matches(CharSequence rawPassword, String encodedPassword) { + return bcrypt.matches(prehash(rawPassword.toString()), encodedPassword); + } + }; + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/config/ReadinessState.java b/Lido/src/main/java/org/example/config/ReadinessState.java new file mode 100644 index 00000000..a341211d --- /dev/null +++ b/Lido/src/main/java/org/example/config/ReadinessState.java @@ -0,0 +1,17 @@ +package org.example.config; + + +import org.springframework.stereotype.Component; + +import java.util.concurrent.atomic.AtomicBoolean; + +@Component +public class ReadinessState { + private final AtomicBoolean ready = new AtomicBoolean(true); + public boolean isReady() { + return ready.get(); + } + public void setReady(boolean v) { + ready.set(v); + } +} diff --git a/Lido/src/main/java/org/example/config/RequestIdFilter.java b/Lido/src/main/java/org/example/config/RequestIdFilter.java new file mode 100644 index 00000000..5277ccba --- /dev/null +++ b/Lido/src/main/java/org/example/config/RequestIdFilter.java @@ -0,0 +1,43 @@ +package org.example.config; + + +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.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; +import java.util.UUID; + +@Component +public class RequestIdFilter extends OncePerRequestFilter { + + public static final String REQUEST_ID_HEADER = "X-Request-Id"; + + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) + throws ServletException, IOException { + + String requestId = request.getHeader(REQUEST_ID_HEADER); + + if (requestId == null || requestId.trim().isEmpty()) { + requestId = UUID.randomUUID().toString(); + } + + MDC.put(REQUEST_ID_HEADER, requestId); + + request.setAttribute(REQUEST_ID_HEADER, requestId); + response.setHeader(REQUEST_ID_HEADER, requestId); + + try { + filterChain.doFilter(request, response); + } finally { + MDC.remove(REQUEST_ID_HEADER); + } + + } +} diff --git a/Lido/src/main/java/org/example/config/StrictStringDeserializer.java b/Lido/src/main/java/org/example/config/StrictStringDeserializer.java new file mode 100644 index 00000000..1d25693c --- /dev/null +++ b/Lido/src/main/java/org/example/config/StrictStringDeserializer.java @@ -0,0 +1,19 @@ +package org.example.config; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; + +import java.io.IOException; + +public class StrictStringDeserializer extends JsonDeserializer { + + @Override + public String deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + if (p.currentToken() != JsonToken.VALUE_STRING) { + return (String) ctxt.handleUnexpectedToken(String.class, p); + } + return p.getValueAsString(); + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/config/TokenHasher.java b/Lido/src/main/java/org/example/config/TokenHasher.java new file mode 100644 index 00000000..6f6c9d44 --- /dev/null +++ b/Lido/src/main/java/org/example/config/TokenHasher.java @@ -0,0 +1,28 @@ +package org.example.config; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.SecureRandom; +import java.util.HexFormat; + +public final class TokenHasher { + private static final SecureRandom RANDOM = new SecureRandom(); + + public TokenHasher() {} + + public static String newRawToken(){ + byte[] bytes = new byte[32]; + RANDOM.nextBytes(bytes); + return HexFormat.of().formatHex(bytes); + } + + public static String sha256(String rawToken) { + try { + MessageDigest md = MessageDigest.getInstance("SHA-256"); + byte[] dig = md.digest(rawToken.getBytes(StandardCharsets.UTF_8)); + return HexFormat.of().formatHex(dig); + } catch (Exception e) { + throw new IllegalStateException(e); + } + } +} diff --git a/Lido/src/main/java/org/example/config/UserContext.java b/Lido/src/main/java/org/example/config/UserContext.java new file mode 100644 index 00000000..6017a387 --- /dev/null +++ b/Lido/src/main/java/org/example/config/UserContext.java @@ -0,0 +1,19 @@ +package org.example.config; + +import org.example.model.User; + +public class UserContext { + private static final ThreadLocal CURRENT_USER = new ThreadLocal<>(); + + public static void setCurrentUser(User user) { + CURRENT_USER.set(user); + } + + public static User getCurrentUser() { + return CURRENT_USER.get(); + } + + public static void clear() { + CURRENT_USER.remove(); + } +} diff --git a/Lido/src/main/java/org/example/controller/AuthController.java b/Lido/src/main/java/org/example/controller/AuthController.java new file mode 100644 index 00000000..2457a378 --- /dev/null +++ b/Lido/src/main/java/org/example/controller/AuthController.java @@ -0,0 +1,66 @@ +package org.example.controller; + + +import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import org.example.dto.response.SessionInfoResponse; +import org.example.dto.response.SessionResponse; +import org.example.exception.UnauthorizedException; +import org.example.service.AuthService; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; + +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.List; + +@RestController +@RequestMapping("/api/v1/auth") +@RequiredArgsConstructor +public class AuthController { + + private final AuthService authService; + + @PostMapping("/sessions") + @ResponseStatus(HttpStatus.CREATED) + public SessionResponse login(HttpServletRequest request) { + String header = request.getHeader("Authorization"); + if (header == null || !header.startsWith("Basic ")) { + throw new UnauthorizedException("Unauthorized"); + } + String decoded; + try { + decoded = new String( + Base64.getDecoder().decode(header.substring(6).trim()), + StandardCharsets.UTF_8); + } catch (IllegalArgumentException e) { + throw new UnauthorizedException("Unauthorized"); + } + int colon = decoded.indexOf(':'); + if (colon < 0) { + throw new UnauthorizedException("Unauthorized"); + } + String username = decoded.substring(0, colon); + String password = decoded.substring(colon + 1); + return authService.login(username, password); + } + + @DeleteMapping("/sessions/current") + @ResponseStatus(HttpStatus.NO_CONTENT) + public void revokeCurrent(HttpServletRequest request) { + String header = request.getHeader("Authorization"); + if (header == null || !header.startsWith("Bearer ")) { + throw new UnauthorizedException("Unauthorized"); + } + String token = header.substring(7).trim(); + if (token.isEmpty()) { + throw new UnauthorizedException("Unauthorized"); + } + authService.logoutCurrent(token); + } + + @GetMapping("/sessions") + public List sessions() { + return authService.listSessionsForCurrentUser(); + } +} diff --git a/Lido/src/main/java/org/example/controller/ChatController.java b/Lido/src/main/java/org/example/controller/ChatController.java new file mode 100644 index 00000000..ff33d9ad --- /dev/null +++ b/Lido/src/main/java/org/example/controller/ChatController.java @@ -0,0 +1,114 @@ +package org.example.controller; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import lombok.RequiredArgsConstructor; +import org.example.dto.ChatPage; +import org.example.dto.MessagePage; +import org.example.dto.create.CreateChatDto; +import org.example.dto.create.CreateMessageDto; +import org.example.dto.response.ChatResponse; +import org.example.dto.update.UpdateChatDto; +import org.example.dto.update.UpdateMessageDto; +import org.example.model.Message; +import org.example.service.ChatService; +import org.example.service.MessageService; +import org.example.service.UserService; +import org.springframework.http.HttpStatus; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.UUID; + +@RestController +@RequestMapping("/api/v1/chats") +@RequiredArgsConstructor +@Validated +public class ChatController { + + private final ChatService chatService; + private final MessageService messageService; + private final UserService userService; + + // ——— Chats ——— + + @PostMapping + @ResponseStatus(HttpStatus.CREATED) + public ChatResponse createChat(@Valid @RequestBody CreateChatDto dto) { + return chatService.createChat(dto); + } + + @GetMapping + public ChatPage getChats( + @RequestParam(defaultValue = "50") + @Max(100) + @Min(value = 1, message = "limit must be >= 1") int limit + ) { + return chatService.getChatsForCurrentUser(limit); + } + + @GetMapping("/{id}") + public ChatResponse getChatById(@PathVariable UUID id) { + return chatService.getChatById(id); + } + + @PutMapping("/{id}") + public ChatResponse updateChat( + @PathVariable UUID id, + @Valid @RequestBody UpdateChatDto object + ) { + return chatService.updateChat(id, object); + } + + @DeleteMapping("/{id}") + @ResponseStatus(HttpStatus.NO_CONTENT) + public void deleteChat(@PathVariable UUID id) { + chatService.deleteChat(id); + } + + // ——— Messages ——— + + @PostMapping("/{id}/messages") + @ResponseStatus(HttpStatus.CREATED) + public Message sendMessage( + @PathVariable("id") UUID id, + @RequestHeader("Idempotency-Key") String idempotencyKey, + @Valid @RequestBody CreateMessageDto messageDto + ) { + UUID senderId = userService.getCurrentUser().getId(); + return messageService.sendMessage(id, senderId, messageDto, idempotencyKey); + } + + @GetMapping("/{id}/messages") + public MessagePage getMessages( + @PathVariable("id") UUID id, + @RequestParam(required = false) String cursor, + @RequestParam(defaultValue = "50") + @Max(100) + @Min(value = 1, message = "limit must be >= 1") int limit + ) { + UUID userId = userService.getCurrentUser().getId(); + return messageService.getMessage(id, userId, cursor, limit); + } + + @PutMapping("/{id}/messages/{messageId}") + public Message updateMessage( + @PathVariable("id") UUID id, + @PathVariable UUID messageId, + @Valid @RequestBody UpdateMessageDto object + ) { + UUID userId = userService.getCurrentUser().getId(); + return messageService.updateMessage(id, messageId, userId, object); + } + + @DeleteMapping("/{id}/messages/{messageId}") + @ResponseStatus(HttpStatus.NO_CONTENT) + public void deleteMessage( + @PathVariable("id") UUID id, + @PathVariable UUID messageId + ) { + UUID userId = userService.getCurrentUser().getId(); + messageService.deleteMessage(id, messageId, userId); + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/controller/HealthController.java b/Lido/src/main/java/org/example/controller/HealthController.java new file mode 100644 index 00000000..ec8f49f1 --- /dev/null +++ b/Lido/src/main/java/org/example/controller/HealthController.java @@ -0,0 +1,48 @@ +package org.example.controller; + +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.sql.DataSource; +import java.sql.Connection; +import java.util.Map; +import java.util.concurrent.atomic.AtomicBoolean; + +@RestController +@RequestMapping("/health") +public class HealthController { + + private final DataSource dataSource; + private final AtomicBoolean ready = new AtomicBoolean(true); + + public HealthController(DataSource dataSource) { + this.dataSource = dataSource; + } + + @GetMapping({"/live"}) + public ResponseEntity> live() { + return ResponseEntity.ok(Map.of("status", "ok")); + } + + @GetMapping("/ready") + public ResponseEntity> ready(){ + if (!ready.get()){ + return ResponseEntity.status(503).body(Map.of("status", "NOT_READY")); + } + try (Connection c = dataSource.getConnection()){ + if (!c.isValid(1)){ + return ResponseEntity.status(503).body(Map.of("status", "DB_DOWN")); + } + } catch (Exception e){ + return ResponseEntity.status(503).body(Map.of("status", "DB_DOWN")); + } + return ResponseEntity.ok(Map.of("status", "ok")); + } + + public void markNotReady() { + ready.set(false); + } +} + diff --git a/Lido/src/main/java/org/example/controller/UserController.java b/Lido/src/main/java/org/example/controller/UserController.java new file mode 100644 index 00000000..e914f91b --- /dev/null +++ b/Lido/src/main/java/org/example/controller/UserController.java @@ -0,0 +1,48 @@ +package org.example.controller; + +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.example.dto.create.CreateUserDto; +import org.example.dto.update.UpdateUserDto; +import org.example.model.User; +import org.example.service.UserService; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; + +import java.util.UUID; + +@RestController +@RequestMapping("/api/v1/users") +@RequiredArgsConstructor +public class UserController { + + private final UserService userService; + + @PostMapping + @ResponseStatus(HttpStatus.CREATED) + public User createUser(@Valid @RequestBody CreateUserDto dto) { + return userService.createUser(dto); + } + + @GetMapping("/me") + public User getCurrentUser() { + return userService.getCurrentUser(); + } + + @GetMapping("/{id}") + public User getUserById(@PathVariable UUID id) { + return userService.getUserById(id); + } + + @PutMapping("/{id}") + public User updateUser(@PathVariable String id, + @Valid @RequestBody UpdateUserDto object) { + return userService.updateUser(id, object); + } + + @DeleteMapping("/{id}") + @ResponseStatus(HttpStatus.NO_CONTENT) + public void delete(@PathVariable String id) { + userService.deleteUser(id); + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/dto/ChatPage.java b/Lido/src/main/java/org/example/dto/ChatPage.java new file mode 100644 index 00000000..275ef1b3 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/ChatPage.java @@ -0,0 +1,22 @@ +package org.example.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.example.dto.response.ChatResponse; +import org.example.model.Chat; + +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class) +public class ChatPage { + private List items; + @JsonProperty("next_cursor") + private String nextCursor; +} diff --git a/Lido/src/main/java/org/example/dto/ErrorDetail.java b/Lido/src/main/java/org/example/dto/ErrorDetail.java new file mode 100644 index 00000000..22bb3ea5 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/ErrorDetail.java @@ -0,0 +1,14 @@ +package org.example.dto; + + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class ErrorDetail { + private String code; + private String message; + private String request_id; +} + diff --git a/Lido/src/main/java/org/example/dto/MessagePage.java b/Lido/src/main/java/org/example/dto/MessagePage.java new file mode 100644 index 00000000..058afb76 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/MessagePage.java @@ -0,0 +1,18 @@ +package org.example.dto; + + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.RequiredArgsConstructor; +import org.example.model.Message; + +import java.util.List; + +@Data +@AllArgsConstructor +@RequiredArgsConstructor +public class MessagePage { + private List items; + private String nextCursor; +} + diff --git a/Lido/src/main/java/org/example/dto/create/CreateChatDto.java b/Lido/src/main/java/org/example/dto/create/CreateChatDto.java new file mode 100644 index 00000000..d5b7dbf9 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/create/CreateChatDto.java @@ -0,0 +1,26 @@ +package org.example.dto.create; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.Data; +import org.example.config.CodePointSize; +import org.example.config.StrictStringDeserializer; + +import java.util.List; +import java.util.UUID; + +@Data +public class CreateChatDto { + @NotBlank(message = "Title не может быть пустым") + @CodePointSize(min = 1, max = 100) + @JsonDeserialize(using = StrictStringDeserializer.class) + private String title; + + @JsonProperty("member_ids") + @NotEmpty(message = "Список участников не может быть пустым") + private List<@NotNull UUID> memberIds; +} diff --git a/Lido/src/main/java/org/example/dto/create/CreateMessageDto.java b/Lido/src/main/java/org/example/dto/create/CreateMessageDto.java new file mode 100644 index 00000000..ecf16df2 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/create/CreateMessageDto.java @@ -0,0 +1,16 @@ +package org.example.dto.create; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.Data; +import org.example.config.CodePointSize; +import org.example.config.StrictStringDeserializer; + +@Data +public class CreateMessageDto { + @NotBlank(message = "Текст сообщения не может быть пустым") + @CodePointSize(min = 1, max = 4000) + @JsonDeserialize(using = StrictStringDeserializer.class) + private String text; +} diff --git a/Lido/src/main/java/org/example/dto/create/CreateUserDto.java b/Lido/src/main/java/org/example/dto/create/CreateUserDto.java new file mode 100644 index 00000000..90be9f08 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/create/CreateUserDto.java @@ -0,0 +1,31 @@ +package org.example.dto.create; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; +import lombok.Data; +import org.example.config.CodePointSize; +import org.example.config.StrictStringDeserializer; + +@Data +public class CreateUserDto { + @NotBlank + @Size(min = 3, max = 32) + @JsonDeserialize(using = StrictStringDeserializer.class) + @Pattern(regexp = "^[a-z0-9_]{3,32}$") + private String username; + + @NotBlank(message = "Display name не может быть пустым") + @CodePointSize(min = 1, max = 128) + @JsonProperty("display_name") + @JsonDeserialize(using = StrictStringDeserializer.class) + private String displayName; + + @NotBlank(message = "Password не может быть пустым") + @CodePointSize(min = 12, max = 128) + @JsonDeserialize(using = StrictStringDeserializer.class) + private String password; +} + diff --git a/Lido/src/main/java/org/example/dto/response/ChatResponse.java b/Lido/src/main/java/org/example/dto/response/ChatResponse.java new file mode 100644 index 00000000..5356fb3b --- /dev/null +++ b/Lido/src/main/java/org/example/dto/response/ChatResponse.java @@ -0,0 +1,24 @@ +package org.example.dto.response; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.Instant; +import java.util.List; +import java.util.UUID; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ChatResponse { + private UUID id; + private String title; + @JsonProperty("member_ids") + private List memberIds; + @JsonProperty("created_at") + private Instant createdAt; +} diff --git a/Lido/src/main/java/org/example/dto/response/ErrorResponse.java b/Lido/src/main/java/org/example/dto/response/ErrorResponse.java new file mode 100644 index 00000000..60b6590f --- /dev/null +++ b/Lido/src/main/java/org/example/dto/response/ErrorResponse.java @@ -0,0 +1,11 @@ +package org.example.dto.response; + +import lombok.AllArgsConstructor; +import lombok.Data; +import org.example.dto.ErrorDetail; + +@Data +@AllArgsConstructor +public class ErrorResponse { + private ErrorDetail error; +} diff --git a/Lido/src/main/java/org/example/dto/response/MessageResponse.java b/Lido/src/main/java/org/example/dto/response/MessageResponse.java new file mode 100644 index 00000000..204f6e3e --- /dev/null +++ b/Lido/src/main/java/org/example/dto/response/MessageResponse.java @@ -0,0 +1,25 @@ +package org.example.dto.response; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.Instant; +import java.util.UUID; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class MessageResponse { + private UUID id; + @JsonProperty("chat_id") + private UUID chatId; + @JsonProperty("sender_id") + private UUID senderId; + private String text; + @JsonProperty("created_at") + private Instant createdAt; +} diff --git a/Lido/src/main/java/org/example/dto/response/SessionInfoResponse.java b/Lido/src/main/java/org/example/dto/response/SessionInfoResponse.java new file mode 100644 index 00000000..f1cc454e --- /dev/null +++ b/Lido/src/main/java/org/example/dto/response/SessionInfoResponse.java @@ -0,0 +1,25 @@ +package org.example.dto.response; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.Instant; +import java.util.UUID; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class SessionInfoResponse { + private UUID id; + @JsonProperty("created_at") + private Instant createdAt; + @JsonProperty("expires_at") + private Instant expiresAt; + @JsonProperty("revoked_at") + private Instant revokedAt; + private boolean active; +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/dto/response/SessionResponse.java b/Lido/src/main/java/org/example/dto/response/SessionResponse.java new file mode 100644 index 00000000..85b21bc1 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/response/SessionResponse.java @@ -0,0 +1,24 @@ +package org.example.dto.response; + + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + +import java.time.Instant; + +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Data +public class SessionResponse { + + private String token; + + @JsonProperty("token_type") + private String tokenType; + + @JsonProperty("expires_at") + private Instant expiresAt; + + private UserResponse user; +} diff --git a/Lido/src/main/java/org/example/dto/response/UserResponse.java b/Lido/src/main/java/org/example/dto/response/UserResponse.java new file mode 100644 index 00000000..ffd6048d --- /dev/null +++ b/Lido/src/main/java/org/example/dto/response/UserResponse.java @@ -0,0 +1,24 @@ +package org.example.dto.response; + + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.Instant; +import java.util.UUID; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class UserResponse { + private UUID id; + private String username; + @JsonProperty("display_name") + private String displayName; + @JsonProperty("created_at") + private Instant createdAt; +} diff --git a/Lido/src/main/java/org/example/dto/update/UpdateChatDto.java b/Lido/src/main/java/org/example/dto/update/UpdateChatDto.java new file mode 100644 index 00000000..4c38ea24 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/update/UpdateChatDto.java @@ -0,0 +1,16 @@ +package org.example.dto.update; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.Data; +import org.example.config.CodePointSize; +import org.example.config.StrictStringDeserializer; + +@Data +public class UpdateChatDto { + @NotBlank + @CodePointSize(min = 1, max = 100) + @JsonDeserialize(using = StrictStringDeserializer.class) + private String title; +} diff --git a/Lido/src/main/java/org/example/dto/update/UpdateMessageDto.java b/Lido/src/main/java/org/example/dto/update/UpdateMessageDto.java new file mode 100644 index 00000000..635da634 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/update/UpdateMessageDto.java @@ -0,0 +1,16 @@ +package org.example.dto.update; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.Data; +import org.example.config.CodePointSize; +import org.example.config.StrictStringDeserializer; + +@Data +public class UpdateMessageDto { + @NotBlank + @CodePointSize(min = 1, max = 4000) + @JsonDeserialize(using = StrictStringDeserializer.class) + private String text; +} diff --git a/Lido/src/main/java/org/example/dto/update/UpdateUserDto.java b/Lido/src/main/java/org/example/dto/update/UpdateUserDto.java new file mode 100644 index 00000000..0e5d64f7 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/update/UpdateUserDto.java @@ -0,0 +1,17 @@ +package org.example.dto.update; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import org.example.config.CodePointSize; +import org.example.config.StrictStringDeserializer; + +@Data +public class UpdateUserDto { + @NotBlank + @CodePointSize(min = 1, max = 128) + @JsonProperty("display_name") + @JsonDeserialize(using = StrictStringDeserializer.class) + private String displayName; +} diff --git a/Lido/src/main/java/org/example/exception/ConflictException.java b/Lido/src/main/java/org/example/exception/ConflictException.java new file mode 100644 index 00000000..86143eaf --- /dev/null +++ b/Lido/src/main/java/org/example/exception/ConflictException.java @@ -0,0 +1,7 @@ +package org.example.exception; + +public class ConflictException extends RuntimeException { + public ConflictException(String message) { + super(message); + } +} diff --git a/Lido/src/main/java/org/example/exception/ForbiddenException.java b/Lido/src/main/java/org/example/exception/ForbiddenException.java new file mode 100644 index 00000000..9c11920e --- /dev/null +++ b/Lido/src/main/java/org/example/exception/ForbiddenException.java @@ -0,0 +1,8 @@ +package org.example.exception; + +public class ForbiddenException extends RuntimeException { + public ForbiddenException(String message) { + super(message); + } +} + diff --git a/Lido/src/main/java/org/example/exception/GlobalExceptionHandler.java b/Lido/src/main/java/org/example/exception/GlobalExceptionHandler.java new file mode 100644 index 00000000..d07bf509 --- /dev/null +++ b/Lido/src/main/java/org/example/exception/GlobalExceptionHandler.java @@ -0,0 +1,239 @@ +package org.example.exception; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolationException; +import lombok.extern.slf4j.Slf4j; +import org.example.config.RequestIdFilter; +import org.example.dto.ErrorDetail; +import org.example.dto.response.ErrorResponse; +import org.springframework.dao.DataIntegrityViolationException; +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 org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; + +import java.util.Map; +import java.util.UUID; + +@Slf4j +@RestControllerAdvice +public class GlobalExceptionHandler { + + private String resolveRequestId(HttpServletRequest request) { + Object attr = request.getAttribute(RequestIdFilter.REQUEST_ID_HEADER); + if (attr instanceof String s && !s.isBlank()) { + return s; + } + String header = request.getHeader(RequestIdFilter.REQUEST_ID_HEADER); + if (header != null && !header.isBlank()) { + return header.trim(); + } + return UUID.randomUUID().toString(); + } + + @ExceptionHandler(NotFoundException.class) + public ResponseEntity handleNotFound(NotFoundException ex, HttpServletRequest request) { + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("not_found", ex.getMessage(), reqId) + ); + return ResponseEntity.status(HttpStatus.NOT_FOUND) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(ForbiddenException.class) + public ResponseEntity handleForbidden(ForbiddenException ex, HttpServletRequest request) { + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("forbidden", ex.getMessage(), reqId) + ); + // если в openapi нет code "forbidden" — замени на "unauthorized" или как в контракте + return ResponseEntity.status(HttpStatus.FORBIDDEN) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(ConflictException.class) + public ResponseEntity handleConflictException( + ConflictException ex, + HttpServletRequest request + ) { + log.debug("Validation failed", ex); + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("conflict", "conflict", reqId) + ); + return ResponseEntity.status(HttpStatus.CONFLICT) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity handleValidationException( + MethodArgumentNotValidException ex, + HttpServletRequest request + ) { + log.debug("Validation failed", ex); + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("invalid_request", "Validation Failed", reqId) + ); + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(MissingRequestHeaderException.class) + public ResponseEntity handleMissingHeader( + MissingRequestHeaderException ex, + HttpServletRequest request + ) { + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("invalid_request", "Malformed JSON request body", reqId) + ); + return ResponseEntity + .status(HttpStatus.BAD_REQUEST) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(HttpMessageNotReadableException.class) + public ResponseEntity handleMalformedJson( + HttpMessageNotReadableException ex, + HttpServletRequest request + ) { + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("invalid_request", "Malformed JSON request body", reqId) + ); + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(IllegalArgumentException.class) + public ResponseEntity handleBadRequest( + IllegalArgumentException ex, + HttpServletRequest request + ) { + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("invalid_request", ex.getMessage(), reqId) + ); + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(UserAlreadyExistsException.class) + public ResponseEntity handleUserAlreadyExists( + UserAlreadyExistsException ex, + HttpServletRequest request + ) { + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("conflict", ex.getMessage(), reqId) + ); + return ResponseEntity.status(HttpStatus.CONFLICT) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(UnauthorizedException.class) + public ResponseEntity> handleUnauthorized( + UnauthorizedException ex, + HttpServletRequest request + ) { + String requestId = resolveRequestId(request); + + String path = request.getRequestURI(); + String www; + if (path != null + && path.startsWith("/api/v1/auth/sessions") + && "POST".equalsIgnoreCase(request.getMethod())) { + www = "Basic realm=\"messenger\", charset=\"UTF-8\""; + } else { + www = "Bearer realm=\"messenger\""; + } + + Map body = Map.of( + "error", Map.of( + "code", "unauthorized", + "message", ex.getMessage() != null ? ex.getMessage() : "Unauthorized", + "request_id", requestId + ) + ); + + return ResponseEntity + .status(HttpStatus.UNAUTHORIZED) + .header("X-Request-Id", requestId) + .header("WWW-Authenticate", www) + .body(body); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity handleAllOtherExceptions(Exception ex, HttpServletRequest request) { + log.error("CRITICAL ERROR ON REQUEST: {}", request.getRequestURI(), ex); + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("internal_error", "Internal server error", reqId) + ); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(ConstraintViolationException.class) + public ResponseEntity handleConstraintViolation( + ConstraintViolationException ex, + HttpServletRequest request + ) { + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("invalid_request", "Validation Failed", reqId) + ); + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(DataIntegrityViolationException.class) + public ResponseEntity handleDataIntegrity( + DataIntegrityViolationException ex, + HttpServletRequest request + ) { + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("conflict", "Conflict", reqId) + ); + return ResponseEntity.status(HttpStatus.CONFLICT) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(MethodArgumentTypeMismatchException.class) + public ResponseEntity handleTypeMismatch( + MethodArgumentTypeMismatchException ex, + HttpServletRequest request + ) { + String reqId = resolveRequestId(request); + String message = "Invalid parameter"; + if (ex.getRequiredType() == UUID.class) { + message = "Invalid UUID"; + } + ErrorResponse body = new ErrorResponse( + new ErrorDetail("invalid_request", "Invalid UUID", reqId) + ); + // Error body: code invalid_request, request_id = reqId + return ResponseEntity + .status(HttpStatus.BAD_REQUEST) + .header("X-Request-Id", reqId) + .body(body); + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/exception/NotFoundException.java b/Lido/src/main/java/org/example/exception/NotFoundException.java new file mode 100644 index 00000000..1987b90b --- /dev/null +++ b/Lido/src/main/java/org/example/exception/NotFoundException.java @@ -0,0 +1,8 @@ +package org.example.exception; + +public class NotFoundException extends RuntimeException { + public NotFoundException(String message) { + super(message); + } +} + diff --git a/Lido/src/main/java/org/example/exception/UnauthorizedException.java b/Lido/src/main/java/org/example/exception/UnauthorizedException.java new file mode 100644 index 00000000..e019c674 --- /dev/null +++ b/Lido/src/main/java/org/example/exception/UnauthorizedException.java @@ -0,0 +1,19 @@ +package org.example.exception; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; + +@ResponseStatus(HttpStatus.UNAUTHORIZED) +public class UnauthorizedException extends RuntimeException { + private final String wwwAuthenticate; + + public UnauthorizedException(String wwwAuthenticate) { + super("Unauthorized"); + this.wwwAuthenticate = wwwAuthenticate; + } + + public String getWwwAuthenticate() { + return wwwAuthenticate; + } +} + diff --git a/Lido/src/main/java/org/example/exception/UserAlreadyExistsException.java b/Lido/src/main/java/org/example/exception/UserAlreadyExistsException.java new file mode 100644 index 00000000..66d4fe8a --- /dev/null +++ b/Lido/src/main/java/org/example/exception/UserAlreadyExistsException.java @@ -0,0 +1,12 @@ +package org.example.exception; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; + +@ResponseStatus(HttpStatus.CONFLICT) +public class UserAlreadyExistsException extends RuntimeException { + public UserAlreadyExistsException(String message) { + super(message); + } +} + diff --git a/Lido/src/main/java/org/example/model/Chat.java b/Lido/src/main/java/org/example/model/Chat.java new file mode 100644 index 00000000..349075d0 --- /dev/null +++ b/Lido/src/main/java/org/example/model/Chat.java @@ -0,0 +1,53 @@ +package org.example.model; + + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.*; +import org.hibernate.annotations.CreationTimestamp; + +import java.time.Instant; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + + +@Entity +@Table(name = "chats") +@Setter +@Getter +@AllArgsConstructor +@NoArgsConstructor +@Builder +@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"}) +public class Chat { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @Column(nullable = false, length = 100) + private String title; + + @OneToMany(mappedBy = "chat", fetch = FetchType.LAZY) + @JsonIgnore + @Builder.Default + private List members =new ArrayList<>(); + + @CreationTimestamp + @Column(name = "created_at", nullable = false, updatable = false) + @JsonProperty("created_at") + private Instant createdAt; + + @Transient + @JsonProperty("member_ids") + private List memberIds; + public void setMemberIdsForResponse(List ids) { + this.memberIds = ids; + } + + +} diff --git a/Lido/src/main/java/org/example/model/ChatMember.java b/Lido/src/main/java/org/example/model/ChatMember.java new file mode 100644 index 00000000..2f8a440d --- /dev/null +++ b/Lido/src/main/java/org/example/model/ChatMember.java @@ -0,0 +1,51 @@ +package org.example.model; + + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import jakarta.persistence.*; +import lombok.*; +import org.hibernate.annotations.CreationTimestamp; + +import java.io.Serializable; +import java.time.Instant; +import java.util.UUID; + +@Entity +@Table(name = "chat_members") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +@IdClass(ChatMember.ChatMemberId.class) +@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"}) +public class ChatMember { + + @Id + @Column(name = "chat_id") + private UUID chatId; + + @Id + @Column(name = "user_id", nullable = false) + private UUID userId; + + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "chat_id", insertable = false, updatable = false) + private Chat chat; + + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "user_id", insertable = false, updatable = false) + private User user; + + @CreationTimestamp + @Column(name = "joined_at", nullable = false, updatable = false) + private Instant joinedAt; + + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class ChatMemberId implements Serializable { + private UUID chatId; + private UUID userId; + } +} diff --git a/Lido/src/main/java/org/example/model/IdempotencyKey.java b/Lido/src/main/java/org/example/model/IdempotencyKey.java new file mode 100644 index 00000000..983c47c8 --- /dev/null +++ b/Lido/src/main/java/org/example/model/IdempotencyKey.java @@ -0,0 +1,46 @@ +package org.example.model; + +import jakarta.persistence.*; +import lombok.*; +import org.hibernate.annotations.CreationTimestamp; + +import java.time.Instant; +import java.util.UUID; + +@Entity +@Table(name = "idempotency_keys", + uniqueConstraints = @UniqueConstraint( + name = "uq_idempotency_user_chat_key", + columnNames = {"user_id", "chat_id", "idempotency_key"})) +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class IdempotencyKey { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @Column(name = "user_id", nullable = false) + private UUID userId; + + + @Column(name = "chat_id", nullable = false) + private UUID chatId; + + @Column(name = "idempotency_key", nullable = false) + private String idempotencyKey; + + @Column(name = "request_hash", nullable = false) + private String requestHash; + + @Column(name = "message_id", nullable = false) + private UUID messageId; + + @CreationTimestamp + @Column(name = "created_at", nullable = false, updatable = false) + private Instant createdAt; + +} diff --git a/Lido/src/main/java/org/example/model/Message.java b/Lido/src/main/java/org/example/model/Message.java new file mode 100644 index 00000000..fe5bda50 --- /dev/null +++ b/Lido/src/main/java/org/example/model/Message.java @@ -0,0 +1,43 @@ +package org.example.model; + + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.*; +import org.hibernate.annotations.CreationTimestamp; + +import java.time.Instant; +import java.time.LocalDateTime; +import java.util.UUID; + +@Entity +@Table(name = "messages") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"}) +public class Message { + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @Column(name = "chat_id", nullable = false) + @JsonProperty("chat_id") + private UUID chatId; + + @Column(name = "sender_id", nullable = false) + @JsonProperty("sender_id") + private UUID senderId; + + @Column(nullable = false, columnDefinition = "TEXT") + private String text; + + @CreationTimestamp + @Column(name = "created_at", nullable = false, updatable = false) + @JsonProperty("created_at") + private Instant createdAt; + +} diff --git a/Lido/src/main/java/org/example/model/Session.java b/Lido/src/main/java/org/example/model/Session.java new file mode 100644 index 00000000..c6974d7f --- /dev/null +++ b/Lido/src/main/java/org/example/model/Session.java @@ -0,0 +1,53 @@ +package org.example.model; + + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import jakarta.persistence.*; +import lombok.*; + +import java.time.Instant; +import java.util.UUID; + +@Entity +@Table(name = "sessions") +@Getter +@Setter +@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"}) +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class Session { + + @Id + private UUID id; + + @Column(name = "user_id", nullable = false) + private UUID userId; + + @Column(name = "token", nullable = false, unique = true, length = 64) + private String token; + + @Column(name = "expires_at", nullable = false) + private Instant expiresAt; + + @Column(name = "created_at", nullable = false) + private Instant createdAt; + + @Column(name = "revoked_at") + private Instant revokedAt; + + @PrePersist + void prePersist() { + if (id == null) { + id = UUID.randomUUID(); + } + if (createdAt == null) { + createdAt = Instant.now(); + } + } + + public boolean isActive(Instant now) { + return revokedAt == null && expiresAt.isAfter(now); + } + +} diff --git a/Lido/src/main/java/org/example/model/User.java b/Lido/src/main/java/org/example/model/User.java new file mode 100644 index 00000000..1683f577 --- /dev/null +++ b/Lido/src/main/java/org/example/model/User.java @@ -0,0 +1,42 @@ +package org.example.model; + + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.*; +import org.hibernate.annotations.CreationTimestamp; + +import java.time.Instant; +import java.util.UUID; + +@Entity +@Table(name = "users") +@Setter +@Getter +@AllArgsConstructor +@NoArgsConstructor +@Builder +@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"}) +public class User { + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @Column(nullable = false, unique = true, length = 64) + private String username; + + @Column(name = "display_name", nullable = false, length = 128) + @JsonProperty("display_name") + private String displayName; + + @JsonIgnore + @Column(name = "password") + private String password; + + @CreationTimestamp + @Column(name = "created_at", nullable = false, updatable = false) + @JsonProperty("created_at") + private Instant createdAt; +} diff --git a/Lido/src/main/java/org/example/repository/ChatMemberRepository.java b/Lido/src/main/java/org/example/repository/ChatMemberRepository.java new file mode 100644 index 00000000..acfc8a29 --- /dev/null +++ b/Lido/src/main/java/org/example/repository/ChatMemberRepository.java @@ -0,0 +1,14 @@ +package org.example.repository; + +import org.example.model.ChatMember; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public interface ChatMemberRepository extends JpaRepository { + List findByUserId(UUID userId); + List findByChatId(UUID chatId); + boolean existsByChatIdAndUserId(UUID chatId, UUID userId); +} diff --git a/Lido/src/main/java/org/example/repository/ChatRepository.java b/Lido/src/main/java/org/example/repository/ChatRepository.java new file mode 100644 index 00000000..770aa491 --- /dev/null +++ b/Lido/src/main/java/org/example/repository/ChatRepository.java @@ -0,0 +1,23 @@ +package org.example.repository; + +import org.example.model.Chat; +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 java.util.List; +import java.util.UUID; + +public interface ChatRepository extends JpaRepository { + @Query(""" + SELECT c FROM Chat c + JOIN ChatMember m ON m.chatId = c.id + WHERE m.userId = :userId + ORDER BY c.createdAt ASC, c.id ASC + """) + List findForUserOrderByCreatedAtAsc( + @Param("userId") UUID userId, + Pageable pageable); + +} diff --git a/Lido/src/main/java/org/example/repository/IdempotencyKeyRepository.java b/Lido/src/main/java/org/example/repository/IdempotencyKeyRepository.java new file mode 100644 index 00000000..8bc192d2 --- /dev/null +++ b/Lido/src/main/java/org/example/repository/IdempotencyKeyRepository.java @@ -0,0 +1,15 @@ +package org.example.repository; + +import org.example.model.IdempotencyKey; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; +import java.util.UUID; + +public interface IdempotencyKeyRepository extends JpaRepository { + Optional findByUserIdAndChatIdAndIdempotencyKey( + UUID userId, + UUID chatId, + String idempotencyKey + ); +} diff --git a/Lido/src/main/java/org/example/repository/MessageRepository.java b/Lido/src/main/java/org/example/repository/MessageRepository.java new file mode 100644 index 00000000..fb897195 --- /dev/null +++ b/Lido/src/main/java/org/example/repository/MessageRepository.java @@ -0,0 +1,34 @@ +package org.example.repository; + +import org.example.model.Message; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.data.domain.Pageable; + + +import java.time.Instant; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public interface MessageRepository extends JpaRepository { + + List findByChatIdOrderByCreatedAtAscIdAsc(UUID chatId, Pageable pageable); + + @Query(""" + SELECT m FROM Message 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") Instant createdAt, + @Param("id") UUID id, + Pageable pageable + ); + + Optional findByIdAndChatId(UUID id, UUID chatId); +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/repository/SessionRepository.java b/Lido/src/main/java/org/example/repository/SessionRepository.java new file mode 100644 index 00000000..86ab2a21 --- /dev/null +++ b/Lido/src/main/java/org/example/repository/SessionRepository.java @@ -0,0 +1,14 @@ +package org.example.repository; + +import org.example.model.Session; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public interface SessionRepository extends JpaRepository { + Optional findByToken(String token); + void deleteByUserId(UUID userId); + List findByUserIdOrderByCreatedAtDesc(UUID userId); +} diff --git a/Lido/src/main/java/org/example/repository/UserRepository.java b/Lido/src/main/java/org/example/repository/UserRepository.java new file mode 100644 index 00000000..d17b4c02 --- /dev/null +++ b/Lido/src/main/java/org/example/repository/UserRepository.java @@ -0,0 +1,12 @@ +package org.example.repository; + +import org.example.model.User; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; +import java.util.UUID; + +public interface UserRepository extends JpaRepository { + boolean existsByUsername(String username); + Optional findByUsername(String username); +} diff --git a/Lido/src/main/java/org/example/service/AuthService.java b/Lido/src/main/java/org/example/service/AuthService.java new file mode 100644 index 00000000..7643b568 --- /dev/null +++ b/Lido/src/main/java/org/example/service/AuthService.java @@ -0,0 +1,162 @@ +package org.example.service; + +import org.example.config.TokenHasher; +import org.example.dto.response.SessionInfoResponse; +import org.example.dto.response.SessionResponse; +import org.example.dto.response.UserResponse; +import org.example.exception.UnauthorizedException; +import org.example.model.Session; +import org.example.model.User; +import org.example.repository.SessionRepository; +import org.example.repository.UserRepository; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.Instant; +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +@Service +public class AuthService { + private final UserRepository userRepository; + private final SessionRepository sessionRepository; + private final PasswordEncoder passwordEncoder; + private final UserService userService; + private final CacheService cacheService; + private final ConcurrentHashMap locks = new ConcurrentHashMap<>(); + + @Value("${app.session-ttl-seconds:604800}") + private long sessionTtlSeconds; + + public AuthService( + UserRepository userRepository, + SessionRepository sessionRepository, + PasswordEncoder passwordEncoder, + UserService userService, + CacheService cacheService + ) { + this.userRepository = userRepository; + this.sessionRepository = sessionRepository; + this.passwordEncoder = passwordEncoder; + this.userService = userService; + this.cacheService = cacheService; + } + + @Transactional + public SessionResponse login(String username, String rawPassword) { + User user = userRepository.findByUsername(username) + .orElseThrow(() -> new UnauthorizedException("Unauthorized")); + + if (user.getPassword() == null + || !passwordEncoder.matches(rawPassword, user.getPassword())) { + throw new UnauthorizedException("Unauthorized"); + } + + String rawToken = TokenHasher.newRawToken(); + Instant expiresAt = Instant.now().plusSeconds(sessionTtlSeconds); + + Session session = Session.builder() + .userId(user.getId()) + .token(TokenHasher.sha256(rawToken)) + .expiresAt(expiresAt) + .createdAt(Instant.now()) + .build(); + sessionRepository.save(session); + cacheService.put(session.getToken(), user.getId(), expiresAt); + + return SessionResponse.builder() + .token(rawToken) + .tokenType("Bearer") + .expiresAt(expiresAt) + .user(UserResponse.builder() + .id(user.getId()) + .username(user.getUsername()) + .displayName(user.getDisplayName()) + .createdAt(user.getCreatedAt()) + .build()) + .build(); + } + + @Transactional + public void logout(String rawToken){ + if (rawToken == null || rawToken.isBlank()){ + return; + } + sessionRepository.findByToken(TokenHasher.sha256(rawToken)) + .ifPresent(s -> { + s.setRevokedAt(Instant.now()); + sessionRepository.save(s); + }); + } + + @Transactional + public void logoutCurrent(String rawToken) { + String tokenHash = TokenHasher.sha256(rawToken); + var session = sessionRepository + .findByToken(tokenHash) + .filter(s -> s.isActive(Instant.now())) + .orElseThrow(() -> new UnauthorizedException("Unauthorized")); + + session.setRevokedAt(Instant.now()); + sessionRepository.save(session); + cacheService.deleteSession(tokenHash); + } + + + private final ConcurrentHashMap inflight = new ConcurrentHashMap<>(); + + @Transactional(readOnly = true) + public Optional resolveUserByBearer(String rawToken) { + if (rawToken == null || rawToken.isBlank()) { + return Optional.empty(); + } + + final String hash = TokenHasher.sha256(rawToken); + + Optional cachedUserId = cacheService.get(hash); + if (cachedUserId.isPresent()) { + return userRepository.findById(cachedUserId.get()); + } + + Object lock = inflight.computeIfAbsent(hash, h -> new Object()); + try { + synchronized (lock) { + cachedUserId = cacheService.get(hash); + if (cachedUserId.isPresent()) { + return userRepository.findById(cachedUserId.get()); + } + + Instant now = Instant.now(); + Optional session = sessionRepository.findByToken(hash); + if (session.isEmpty() || !session.get().isActive(now)) { + return Optional.empty(); + } + Session s = session.get(); + cacheService.put(hash, s.getUserId(), s.getExpiresAt()); + return userRepository.findById(s.getUserId()); + } + } finally { + inflight.remove(hash, lock); + } + } + + @Transactional(readOnly = true) + public List listSessionsForCurrentUser() { + User user = userService.getCurrentUser(); + Instant now = Instant.now(); + return sessionRepository.findByUserIdOrderByCreatedAtDesc(user.getId()) + .stream() + .map(s -> SessionInfoResponse.builder() + .id(s.getId()) + .createdAt(s.getCreatedAt()) + .expiresAt(s.getExpiresAt()) + .revokedAt(s.getRevokedAt()) + .active(s.isActive(now)) + .build()) + .toList(); + } +} diff --git a/Lido/src/main/java/org/example/service/CacheService.java b/Lido/src/main/java/org/example/service/CacheService.java new file mode 100644 index 00000000..a407a6a4 --- /dev/null +++ b/Lido/src/main/java/org/example/service/CacheService.java @@ -0,0 +1,62 @@ +package org.example.service; + + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Service; + +import java.time.Duration; +import java.time.Instant; +import java.util.Optional; +import java.util.UUID; +import java.util.concurrent.TimeUnit; + +@Service +@Slf4j +@RequiredArgsConstructor +public class CacheService { + + private static final String PREFIX = "session:"; + private final StringRedisTemplate redis; + + public void put(String token, UUID userId, Instant expiresAt){ + long ttlSec = Duration.between(Instant.now(), expiresAt).getSeconds(); + if (ttlSec <= 0){ + return; + } + try { + redis.opsForValue().set( + PREFIX + token, + userId.toString(), + ttlSec, + TimeUnit.SECONDS + ); + } catch (Exception e){ + log.warn("Сессия не попала в Redis"); + } + } + + public Optional get(String token){ + try { + String v = redis.opsForValue().get(PREFIX + token); + if (v == null || v.isBlank()){ + return Optional.empty(); + } + return Optional.of(UUID.fromString(v)); + } catch (Exception e){ + log.warn("Сессии нет в Redis"); + return Optional.empty(); + } + } + + public void deleteSession(String token){ + try { + redis.delete(PREFIX + token); + } catch (Exception e){ + log.warn("Сессия не удалена в Redis"); + } + } + + +} diff --git a/Lido/src/main/java/org/example/service/ChatService.java b/Lido/src/main/java/org/example/service/ChatService.java new file mode 100644 index 00000000..4ce7684a --- /dev/null +++ b/Lido/src/main/java/org/example/service/ChatService.java @@ -0,0 +1,169 @@ +package org.example.service; + +import lombok.RequiredArgsConstructor; +import org.example.dto.ChatPage; +import org.example.dto.create.CreateChatDto; +import org.example.dto.response.ChatResponse; +import org.example.dto.update.UpdateChatDto; +import org.example.exception.NotFoundException; +import org.example.model.Chat; +import org.example.model.ChatMember; +import org.example.model.User; +import org.example.repository.ChatMemberRepository; +import org.example.repository.ChatRepository; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +@Service +@RequiredArgsConstructor +public class ChatService { + + private final ChatRepository chatRepository; + private final ChatMemberRepository chatMemberRepository; + private final UserService userService; + + @Transactional + public ChatResponse createChat(CreateChatDto dto) { + User currentUser = userService.getCurrentUser(); + UUID currentId = currentUser.getId(); + + List memberIds = dto.getMemberIds(); + if (memberIds == null || memberIds.isEmpty()) { + throw new IllegalArgumentException("member_ids must not be empty"); + } + long distinctCount = memberIds.stream().distinct().count(); + if (distinctCount != memberIds.size()) { + throw new IllegalArgumentException("duplicate member_ids"); + } + if (!memberIds.contains(currentId)) { + throw new IllegalArgumentException( + "creator must be in member_ids"); + } + for (UUID memberId : memberIds) { + if (!userService.exists(memberId)) { + throw new IllegalArgumentException("unknown member_id"); + } + } + + Chat chat = chatRepository.save( + Chat.builder() + .title(dto.getTitle()) + .build() + ); + + for (UUID memberId : memberIds) { + chatMemberRepository.save( + ChatMember.builder() + .chatId(chat.getId()) + .userId(memberId) + .build() + ); + } + + return toResponse(chat.getId()); + } + + @Transactional(readOnly = true) + public ChatResponse getChatById(UUID chatId) { + requireMember(chatId); + return toResponse(chatId); + } + + @Transactional(readOnly = true) + public ChatResponse getChatById(String chatId) { + return getChatById(parseUuid(chatId)); + } + + @Transactional(readOnly = true) + public ChatPage getChatsForCurrentUser(int limit) { + if (limit < 1 || limit > 100) { + throw new IllegalArgumentException("limit must be 1..100"); + } + UUID userId = userService.getCurrentUser().getId(); + List raw = chatRepository.findForUserOrderByCreatedAtAsc( + userId, + PageRequest.of(0, limit + 1) + ); + boolean hasMore = raw.size() > limit; + List page = hasMore ? raw.subList(0, limit) : raw; + List items = page.stream() + .map(c -> toResponse(c.getId())) + .toList(); + String nextCursor = null; + if (hasMore && !items.isEmpty()) { + nextCursor = items.get(items.size() - 1).getId().toString(); + } + + return new ChatPage(items, nextCursor); + } + + @Transactional + public ChatResponse updateChat(UUID id, UpdateChatDto object) { + requireMember(id); + Chat chat = chatRepository.findById(id) + .orElseThrow(() -> new NotFoundException("Чат не найден")); + chat.setTitle(object.getTitle()); + chatRepository.save(chat); + return toResponse(id); + } + + @Transactional + public ChatResponse updateChat(String id, UpdateChatDto object) { + return updateChat(parseUuid(id), object); + } + + @Transactional + public void deleteChat(UUID id) { + requireMember(id); + chatRepository.deleteById(id); + } + + @Transactional + public void deleteChat(String id) { + deleteChat(parseUuid(id)); + } + + /** Для MessageService: текущий user — участник, иначе 404 */ + @Transactional(readOnly = true) + public void requireMember(UUID chatId) { + User currentUser = userService.getCurrentUser(); + if (!chatRepository.existsById(chatId) + || !chatMemberRepository.existsByChatIdAndUserId(chatId, currentUser.getId())) { + throw new NotFoundException("Чат не найден"); + } + } + + @Transactional(readOnly = true) + public boolean isMember(UUID chatId, UUID userId) { + return chatMemberRepository.existsByChatIdAndUserId(chatId, userId); + } + + private ChatResponse toResponse(UUID chatId) { + Chat chat = chatRepository.findById(chatId) + .orElseThrow(() -> new NotFoundException("Чат не найден")); + + List ids = chatMemberRepository.findByChatId(chatId).stream() + .map(ChatMember::getUserId) + .toList(); + + return ChatResponse.builder() + .id(chat.getId()) + .title(chat.getTitle()) + .memberIds(ids) + .createdAt(chat.getCreatedAt()) + .build(); + } + + private static UUID parseUuid(String id) { + try { + return UUID.fromString(id); + } catch (IllegalArgumentException e) { + throw new NotFoundException("Чат не найден"); + } + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/service/MessageIdempotencyWriter.java b/Lido/src/main/java/org/example/service/MessageIdempotencyWriter.java new file mode 100644 index 00000000..deb9f482 --- /dev/null +++ b/Lido/src/main/java/org/example/service/MessageIdempotencyWriter.java @@ -0,0 +1,51 @@ +package org.example.service; + + +import lombok.RequiredArgsConstructor; +import org.example.model.IdempotencyKey; +import org.example.model.Message; +import org.example.repository.IdempotencyKeyRepository; +import org.example.repository.MessageRepository; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.time.Instant; +import java.util.UUID; + +@Service +@RequiredArgsConstructor +public class MessageIdempotencyWriter { + + private final MessageRepository messageRepository; + private final IdempotencyKeyRepository idempotencyKeyRepository; + + @Transactional(propagation = Propagation.REQUIRES_NEW) + public Message insertNew( + UUID chatId, + UUID senderId, + String text, + String key, + String hash) { + + Message message = messageRepository.save( + Message.builder() + .chatId(chatId) + .senderId(senderId) + .text(text) + .createdAt(Instant.now()) + .build() + ); + + idempotencyKeyRepository.saveAndFlush( + IdempotencyKey.builder() + .userId(senderId) + .chatId(chatId) + .idempotencyKey(key) + .requestHash(hash) + .messageId(message.getId()) + .build() + ); + return message; + } +} diff --git a/Lido/src/main/java/org/example/service/MessageService.java b/Lido/src/main/java/org/example/service/MessageService.java new file mode 100644 index 00000000..16a24da3 --- /dev/null +++ b/Lido/src/main/java/org/example/service/MessageService.java @@ -0,0 +1,189 @@ +package org.example.service; + +import lombok.RequiredArgsConstructor; +import org.example.dto.MessagePage; +import org.example.dto.create.CreateMessageDto; +import org.example.dto.update.UpdateMessageDto; +import org.example.exception.ConflictException; +import org.example.exception.ForbiddenException; +import org.example.exception.NotFoundException; +import org.example.model.IdempotencyKey; +import org.example.model.Message; +import org.example.repository.IdempotencyKeyRepository; +import org.example.repository.MessageRepository; +import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.Instant; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +import static org.example.config.TokenHasher.sha256; + +@Service +@RequiredArgsConstructor +public class MessageService { + + private final MessageRepository messageRepository; + private final IdempotencyKeyRepository idempotencyKeyRepository; + private final ChatService chatService; + private final MessageIdempotencyWriter writer; + + @Transactional(readOnly = true) // или без write на этом уровне + public Message sendMessage( + UUID chatId, + UUID senderId, + CreateMessageDto messageObject, + String idempotencyKey) { + + chatService.requireMember(chatId); + if (!chatService.isMember(chatId, senderId)) { + throw new ForbiddenException("Пользователь не является участником чата"); + } + + String key = idempotencyKey.trim(); + String hash = sha256(messageObject.getText()); + + Optional exists = + idempotencyKeyRepository.findByUserIdAndChatIdAndIdempotencyKey(senderId, chatId, key); + + if (exists.isPresent()) { + return messageFromIdem(exists.get(), hash); + } + + try { + return writer.insertNew(chatId, senderId, messageObject.getText(), key, hash); + } catch (DataIntegrityViolationException e) { + IdempotencyKey rec = idempotencyKeyRepository + .findByUserIdAndChatIdAndIdempotencyKey(senderId, chatId, key) + .orElseThrow(() -> e); + return messageFromIdem(rec, hash); + } + } + + private Message messageFromIdem(IdempotencyKey row, String hash) { + if (!row.getRequestHash().equals(hash)) { + throw new ConflictException("Idempotency key conflict"); + } + return messageRepository.findById(row.getMessageId()) + .orElseThrow(() -> new IllegalStateException("idempotency message missing")); + } + + @Transactional(readOnly = true) + public MessagePage getMessage(UUID chatId, UUID userId, String cursor, int limit) { + if (limit < 1 || limit > 100) { + throw new IllegalArgumentException("limit must be between 1 and 100"); + } + + chatService.requireMember(chatId); + if (!chatService.isMember(chatId, userId)) { + throw new NotFoundException("Чат не найден"); + } + + Pageable pageable = PageRequest.of(0, limit); + List items; + + if (cursor == null || cursor.isBlank()) { + items = messageRepository.findByChatIdOrderByCreatedAtAscIdAsc(chatId, pageable); + } else { + UUID cursorId; + try { + cursorId = UUID.fromString(cursor.trim()); + } catch (IllegalArgumentException e) { + throw new IllegalArgumentException("Invalid cursor"); + } + + Message cursorMsg = messageRepository.findByIdAndChatId(cursorId, chatId) + .orElseThrow(() -> new IllegalArgumentException("Invalid cursor")); + + items = messageRepository.findNextPage( + chatId, + cursorMsg.getCreatedAt(), + cursorMsg.getId(), + pageable + ); + } + + String nextCursor = null; + if (items.size() == limit && !items.isEmpty()) { + Message last = items.get(items.size() - 1); + boolean hasMore = !messageRepository + .findNextPage( + chatId, + last.getCreatedAt(), + last.getId(), + PageRequest.of(0, 1) + ) + .isEmpty(); + if (hasMore) { + nextCursor = last.getId().toString(); + } + } + + return new MessagePage(items, nextCursor); + } + + @Transactional(readOnly = true) + public MessagePage getMessage(String chatId, String userId, String cursor, int limit){ + return getMessage(parseUuid(chatId, true), parseUuid(userId, false), cursor, limit); + } + + @Transactional + public Message updateMessage(UUID chatId, UUID messageId, UUID userId, UpdateMessageDto object) { + chatService.requireMember(chatId); + Message message = messageRepository.findByIdAndChatId(messageId, chatId) + .orElseThrow(() -> new NotFoundException("Сообщение не найден")); + if (!message.getSenderId().equals(userId)){ + throw new ForbiddenException("Вы не можете редактировать чужие сообщения"); + } + message.setText(object.getText()); + return messageRepository.save(message); + } + + @Transactional + public Message updateMessage(String chatId, String messageId, String userId, UpdateMessageDto object) { + return updateMessage( + parseUuid(chatId, true), + parseUuid(messageId, true), + parseUuid(userId, false), + object); + } + + @Transactional + public void deleteMessage(UUID chatId, UUID messageId, UUID userId) { + chatService.getChatById(chatId); + + Message msg = messageRepository.findByIdAndChatId(messageId, chatId) + .orElseThrow(() -> new NotFoundException("Сообщение не найдено")); + + if (!msg.getSenderId().equals(userId)) { + throw new ForbiddenException("Вы не можете удалять сообщения других участников"); + } + messageRepository.delete(msg); + } + + @Transactional + public void deleteMessage(String chatId, String messageId, String userId) { + deleteMessage( + parseUuid(chatId, true), + parseUuid(messageId, true), + parseUuid(userId, false) + ); + } + + + private static UUID parseUuid(String value, boolean notFoundOnBad) { + try { + return UUID.fromString(value.trim()); + } catch (Exception e) { + if (notFoundOnBad) { + throw new NotFoundException("Не найдено"); + } + throw new IllegalArgumentException("Invalid id"); + } + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/service/UserService.java b/Lido/src/main/java/org/example/service/UserService.java new file mode 100644 index 00000000..3002a76a --- /dev/null +++ b/Lido/src/main/java/org/example/service/UserService.java @@ -0,0 +1,126 @@ +package org.example.service; + +import lombok.RequiredArgsConstructor; +import org.example.config.UserContext; +import org.example.dto.create.CreateUserDto; +import org.example.dto.update.UpdateUserDto; +import org.example.exception.ForbiddenException; +import org.example.exception.NotFoundException; +import org.example.exception.UnauthorizedException; +import org.example.exception.UserAlreadyExistsException; +import org.example.model.User; +import org.example.repository.UserRepository; +import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.UUID; + +@Service +@RequiredArgsConstructor +public class UserService { + + private final UserRepository userRepository; + private final PasswordEncoder passwordEncoder; + + @Transactional + public User createUser(CreateUserDto userObject) { + if (userRepository.existsByUsername(userObject.getUsername())) { + throw new UserAlreadyExistsException("Пользователь с таким username уже существует: " + userObject.getUsername()); + } + try { + User user = User.builder() + .username(userObject.getUsername()) + .displayName(userObject.getDisplayName()) + .password(passwordEncoder.encode(userObject.getPassword())) + .build(); + return userRepository.save(user); + } catch (DataIntegrityViolationException e){ + throw new UserAlreadyExistsException( + "Пользователь с таким username уже есть: " + userObject.getUsername()); + } + } + + @Transactional(readOnly = true) + public User getCurrentUser() { + User user = UserContext.getCurrentUser(); + if (user == null) { + throw new UnauthorizedException("Unauthorized"); + } + return user; + } + + private User requireCurrentUser() { + User user = UserContext.getCurrentUser(); + if (user == null) { + throw new UnauthorizedException("Unauthorized"); + } + return user; + } + + @Transactional(readOnly = true) + public User getUserById(UUID id) { + requireCurrentUser(); + return userRepository.findById(id) + .orElseThrow(() -> new NotFoundException("Пользователь не найден")); + } + + @Transactional + public User updateUser(UUID id, UpdateUserDto dto) { + User me = requireCurrentUser(); + if (!me.getId().equals(id)) { + throw new ForbiddenException("Forbidden"); + } + User user = userRepository.findById(id) + .orElseThrow(() -> new NotFoundException("Пользователь не найден")); + user.setDisplayName(dto.getDisplayName()); + return userRepository.save(user); + } + + @Transactional + public void deleteUser(UUID id) { + User me = requireCurrentUser(); + if (!me.getId().equals(id)) { + throw new ForbiddenException("Forbidden"); + } + if (!userRepository.existsById(id)) { + throw new NotFoundException("Пользователь не найден"); + } + userRepository.deleteById(id); + } + + + @Transactional + public User updateUser(String id, UpdateUserDto updateObject) { + return updateUser(parseUuid(id), updateObject); + } + + @Transactional + public void deleteUser(String id) { + deleteUser(parseUuid(id)); + } + + @Transactional(readOnly = true) + public boolean exists(UUID id) { + return userRepository.existsById(id); + } + + + @Transactional(readOnly = true) + public boolean exists(String id) { + try { + return exists(parseUuid(id)); + }catch (IllegalArgumentException e) { + return false; + } + } + + private static UUID parseUuid(String id) { + try { + return UUID.fromString(id); + } catch (IllegalArgumentException e) { + throw new NotFoundException("Пользователь с id: " + id + " не найден"); + } + } +} \ No newline at end of file diff --git a/Lido/src/main/resources/application.yml b/Lido/src/main/resources/application.yml new file mode 100644 index 00000000..714dd13c --- /dev/null +++ b/Lido/src/main/resources/application.yml @@ -0,0 +1,69 @@ +spring: + jackson: + property-naming-strategy: SNAKE_CASE + deserialization: + fail-on-unknown-properties: true + lifecycle: + timeout-per-shutdown-phase: 20s + + spring: + datasource: + url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5433/lido_db} + username: ${SPRING_DATASOURCE_USERNAME:user} + password: ${SPRING_DATASOURCE_PASSWORD:user} + hikari: + maximum-pool-size: 10 + minimum-idle: 2 + connection-timeout: 3000 + idle-timeout: 600000 + max-lifetime: 1800000 + validation-timeout: 2000 + jpa: + open-in-view: false + hibernate: + ddl-auto: validate + properties: + hibernate: + jdbc: + time_zone: UTC + flyway: + enabled: ${FLYWAY_ENABLED:false} + locations: classpath:db/migration + redis: + host: ${SPRING_DATA_REDIS_HOST:localhost} + port: ${SPRING_DATA_REDIS_PORT:6379} + timeout: 300ms + connect-timeout: 300ms + lettuce: + shutdown-timeout: 100ms + repositories: + enabled: false + +server: + address: 0.0.0.0 + port: 8080 + shutdown: graceful + +app: + session-ttl-seconds: ${SESSION_TTL_SECONDS:604800} + +logging: + pattern: + console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} [req_id: %X{X-Request-Id}] - %msg%n" + level: + root=INFO: + org: + springframework: + web=DEBUG: + web: + filter: + CommonsRequestLoggingFilter=DEBUG: + :servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: DEBUG + +management: + endpoints: + web: + exposure: + include=health: + health: + show-details=always: diff --git a/Lido/src/main/resources/db/migration/V1__init_messanger.sql b/Lido/src/main/resources/db/migration/V1__init_messanger.sql new file mode 100644 index 00000000..297a121f --- /dev/null +++ b/Lido/src/main/resources/db/migration/V1__init_messanger.sql @@ -0,0 +1,35 @@ +CREATE TABLE users ( + id UUID PRIMARY KEY, + username VARCHAR(64) NOT NULL, + display_name VARCHAR(128) NOT NULL, + password VARCHAR(255), + created_at TIMESTAMPTZ NOT NULL DEFAULT now(), + CONSTRAINT uq_users_username UNIQUE (username) +); + +CREATE TABLE chats ( + id UUID PRIMARY KEY, + title VARCHAR(32) NOT NULL, + created_at TIMESTAMPTZ NOT NULL DEFAULT now() +); + +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, + joined_at TIMESTAMPTZ NOT NULL DEFAULT now(), + PRIMARY KEY (chat_id, user_id) +); + +CREATE INDEX idx_chat_members_user ON chat_members (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), + text TEXT NOT NULL, + created_at TIMESTAMPTZ NOT NULL DEFAULT now(), + CONSTRAINT chk_messages_text_nonempty CHECK (char_length(trim(text)) > 0) +); + +CREATE INDEX idx_messages_chat_created_id + ON messages (chat_id, created_at DESC, id DESC); \ No newline at end of file diff --git a/Lido/src/main/resources/db/migration/V2__auth_sessions.sql b/Lido/src/main/resources/db/migration/V2__auth_sessions.sql new file mode 100644 index 00000000..7c52293f --- /dev/null +++ b/Lido/src/main/resources/db/migration/V2__auth_sessions.sql @@ -0,0 +1,12 @@ +CREATE TABLE sessions ( + id UUID PRIMARY KEY, + user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + token VARCHAR(64) NOT NULL, + expires_at TIMESTAMPTZ NOT NULL, + created_at TIMESTAMPTZ NOT NULL DEFAULT now(), + revoked_at TIMESTAMPTZ NULL, + CONSTRAINT uq_sessions_token_hash UNIQUE (token) +); + +CREATE INDEX idx_sessions_user_id ON sessions (user_id); +CREATE INDEX idx_sessions_expires_at ON sessions (expires_at); \ No newline at end of file diff --git a/Lido/src/main/resources/db/migration/V3__messages_index_asc.sql b/Lido/src/main/resources/db/migration/V3__messages_index_asc.sql new file mode 100644 index 00000000..ef1fc976 --- /dev/null +++ b/Lido/src/main/resources/db/migration/V3__messages_index_asc.sql @@ -0,0 +1,4 @@ +DROP INDEX IF EXISTS idx_messages_chat_created_id; + +CREATE INDEX idx_messages_chat_created_id + ON messages (chat_id, created_at ASC, id ASC); \ No newline at end of file diff --git a/Lido/src/main/resources/db/migration/V4__chat_title_100.sql b/Lido/src/main/resources/db/migration/V4__chat_title_100.sql new file mode 100644 index 00000000..d03ca635 --- /dev/null +++ b/Lido/src/main/resources/db/migration/V4__chat_title_100.sql @@ -0,0 +1,2 @@ +ALTER TABLE chats +ALTER COLUMN title TYPE VARCHAR(100); \ No newline at end of file diff --git a/Lido/src/main/resources/db/migration/V5__idempotency.sql b/Lido/src/main/resources/db/migration/V5__idempotency.sql new file mode 100644 index 00000000..0d55b693 --- /dev/null +++ b/Lido/src/main/resources/db/migration/V5__idempotency.sql @@ -0,0 +1,10 @@ +CREATE TABLE idempotency_keys ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + user_id UUID NOT NULL REFERENCES users(id), + chat_id UUID NOT NULL REFERENCES chats(id), + idempotency_key VARCHAR(128) NOT NULL, + message_id UUID NOT NULL REFERENCES messages(id), + created_at TIMESTAMPTZ NOT NULL DEFAULT now(), + CONSTRAINT uq_idempotency_user_chat_key + UNIQUE (user_id, chat_id, idempotency_key) +); \ No newline at end of file diff --git a/Lido/src/main/resources/db/migration/V6__idempotency_request_hash.sql b/Lido/src/main/resources/db/migration/V6__idempotency_request_hash.sql new file mode 100644 index 00000000..7a8f5a39 --- /dev/null +++ b/Lido/src/main/resources/db/migration/V6__idempotency_request_hash.sql @@ -0,0 +1,2 @@ +ALTER TABLE idempotency_keys + ADD COLUMN IF NOT EXISTS request_hash VARCHAR(64) NOT NULL DEFAULT ''; \ No newline at end of file diff --git a/Lido/src/test/java/org/example/ApiIntegrationTest.java b/Lido/src/test/java/org/example/ApiIntegrationTest.java new file mode 100644 index 00000000..36b10983 --- /dev/null +++ b/Lido/src/test/java/org/example/ApiIntegrationTest.java @@ -0,0 +1,123 @@ +//package org.example; +// +//import org.junit.jupiter.api.DisplayName; +//import org.junit.jupiter.api.Test; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +//import org.springframework.boot.test.context.SpringBootTest; +//import org.springframework.http.MediaType; +//import org.springframework.test.web.servlet.MockMvc; +// +//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +//import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +//import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +// +//@SpringBootTest +//@AutoConfigureMockMvc +//public class ApiIntegrationTest { +// +// @Autowired +// private MockMvc mockMvc; +// @Test +// @DisplayName("400 1. Неверный / битый JSON должен возвращать 400 Bad Request") +// void shouldReturn400ForMalformedJson() throws Exception { +// String malformedJson = "{\"username\": \"bad_json\", \"display_name\":}"; +// +// mockMvc.perform(post("/api/v1/users") +// .contentType(MediaType.APPLICATION_JSON) +// .content(malformedJson)) +// .andExpect(status().isBadRequest()); +// } +// +// @Test +// @DisplayName("400 2. Валидация: пустой username должен возвращать 400 Bad Request") +// void shouldReturn400ForEmptyUsername() throws Exception { +// String invalidJson = "{\"username\": \"\", \"display_name\": \"User\"}"; +// +// mockMvc.perform(post("/api/v1/users") +// .contentType(MediaType.APPLICATION_JSON) +// .content(invalidJson)) +// .andExpect(status().isBadRequest()); +// } +// +// @Test +// @DisplayName("404 3. Неучастник чата получает 404 (чат скрыт)") +// void shouldReturn404WhenUserIsNotChatMember() throws Exception { +// String aliceJson = mockMvc.perform(post("/api/v1/users") +// .contentType(MediaType.APPLICATION_JSON) +// .content("{\"username\": \"alice_test\", \"display_name\": \"Alice\"}")) +// .andExpect(status().isCreated()) +// .andReturn().getResponse().getContentAsString(); +// String aliceId = extractId(aliceJson); +// +// String bobJson = mockMvc.perform(post("/api/v1/users") +// .contentType(MediaType.APPLICATION_JSON) +// .content("{\"username\": \"bob_test\", \"display_name\": \"Bob\"}")) +// .andExpect(status().isCreated()) +// .andReturn().getResponse().getContentAsString(); +// String bobId = extractId(bobJson); +// +// String spyJson = mockMvc.perform(post("/api/v1/users") +// .contentType(MediaType.APPLICATION_JSON) +// .content("{\"username\": \"spy_test\", \"display_name\": \"Spy\"}")) +// .andExpect(status().isCreated()) +// .andReturn().getResponse().getContentAsString(); +// String spyId = extractId(spyJson); +// +// String chatJson = String.format( +// "{\"title\":\"Private\", \"member_ids\":[\"%s\",\"%s\"]}", aliceId, bobId); +// +// String chat = mockMvc.perform(post("/api/v1/chats") +// .header("X-User-Id", aliceId) // ← обязательно! +// .contentType(MediaType.APPLICATION_JSON) +// .content(chatJson)) +// .andExpect(status().isCreated()) +// .andReturn().getResponse().getContentAsString(); +// String chatId = extractId(chat); +// +// mockMvc.perform(post("/api/v1/chats/" + chatId + "/messages") +// .header("X-User-Id", spyId) +// .contentType(MediaType.APPLICATION_JSON) +// .content("{\"text\": \"Secret message\"}")) +// .andExpect(status().isNotFound()); +// } +// +// @Test +// @DisplayName("200 4. Пагинация: получение ограниченного числа сообщений по limit") +// void shouldPaginateMessagesWithLimit() throws Exception { +// String userJson = mockMvc.perform(post("/api/v1/users") +// .contentType(MediaType.APPLICATION_JSON) +// .content("{\"username\": \"paginator\", \"display_name\": \"Paginator\"}")) +// .andExpect(status().isCreated()) +// .andReturn().getResponse().getContentAsString(); +// String userId = extractId(userJson); +// +// String chat = mockMvc.perform(post("/api/v1/chats") +// .header("X-User-Id", userId) +// .contentType(MediaType.APPLICATION_JSON) +// .content(String.format( +// "{\"title\":\"Paginated Chat\", \"member_ids\":[\"%s\"]}", userId))) +// .andExpect(status().isCreated()) +// .andReturn().getResponse().getContentAsString(); +// String chatId = extractId(chat); +// +// for (int i = 1; i <= 3; i++) { +// mockMvc.perform(post("/api/v1/chats/" + chatId + "/messages") +// .header("X-User-Id", userId) +// .contentType(MediaType.APPLICATION_JSON) +// .content("{\"text\": \"Msg " + i + "\"}")) +// .andExpect(status().isCreated()); +// } +// mockMvc.perform(get("/api/v1/chats/" + chatId + "/messages") +// .param("limit", "2") +// .header("X-User-Id", userId)) +// .andExpect(status().isOk()) +// .andExpect(jsonPath("$.items.length()").value(2)) +// .andExpect(jsonPath("$.next_cursor").isNotEmpty()); +// } +// +// private String extractId(String json) { +// return json.split("\"id\":\"")[1].split("\"")[0]; +// } +//} \ No newline at end of file diff --git a/load-failover.js b/load-failover.js new file mode 100644 index 00000000..093f648e --- /dev/null +++ b/load-failover.js @@ -0,0 +1,22 @@ +import http from 'k6/http'; +import { check } from 'k6'; + +export const options = { + scenarios: { + steady: { + executor: 'constant-vus', + vus: 20, + duration: '120s', + }, + }, +}; + +const BASE = __ENV.BASE_URL || 'http://localhost:8080'; +const TOKEN = __ENV.TOKEN; +const CHAT = __ENV.CHAT_ID; + +export default function () { + const res = http.get(`${BASE}/health/live`); + check(res, { 'live 200': (r) => r.status === 200 }); + http.get(`${BASE}/api/v1/users/me`, { headers: { Authorization: `Bearer ${TOKEN}` } }); +} \ No newline at end of file diff --git a/scripts/failover.sh b/scripts/failover.sh new file mode 100755 index 00000000..5d0cc95a --- /dev/null +++ b/scripts/failover.sh @@ -0,0 +1,21 @@ +#!/bin/sh +set -eu + +# scripts/ -> корень репо -> Lido +ROOT="$(CDPATH= cd -- "$(dirname "$0")/../Lido" && pwd)" +cd "$ROOT" + +if [ ! -f docker-compose.yml ] && [ ! -f compose.yaml ] && [ ! -f compose.yml ]; then + echo "compose file not found in $ROOT" >&2 + exit 1 +fi + +CID="$(docker compose ps -q api | head -n 1)" + +if [ -z "$CID" ]; then + echo "no api replica found" >&2 + exit 1 +fi + +docker stop "$CID" +exit 0 \ No newline at end of file diff --git a/scripts/restart.sh b/scripts/restart.sh new file mode 100755 index 00000000..3acba34f --- /dev/null +++ b/scripts/restart.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +ROOT="$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)" +cd "$ROOT/Lido" + +docker compose -f docker-compose.yml restart db api redis + +BASE_URL="${BASE_URL:-http://127.0.0.1:8080}" +i=0 +while [ "$i" -lt 60 ]; do + if curl -sf "$BASE_URL/health/live" >/dev/null 2>&1 \ + || curl -sf "$BASE_URL/actuator/health" >/dev/null 2>&1; then + exit 0 + fi + i=$((i + 1)) + sleep 1 +done +echo "API not ready" >&2 +exit 1 \ No newline at end of file -- 2.54.0 From da12a510bc524e0e0f92778e480b838fc05720f4 Mon Sep 17 00:00:00 2001 From: Dmitry <146066734+DmitryTamlin7@users.noreply.github.com> Date: Tue, 10 Nov 2026 23:57:31 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=9F=D1=83=D0=BD=D0=BA=20=D0=95=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B0=20=D0=B2=D0=BB=D0=BE?= =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B3=D0=BE=D1=82=D0=BE=D0=B2?= =?UTF-8?q?=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 6 +- .env.example | 20 --- .gitignore | 6 +- Lido/.env | 7 + Lido/docker-compose.yml | 40 ++++++ .../example/config/ImageUploadValidator.java | 134 ++++++++++++++++++ .../java/org/example/config/S3Config.java | 28 ++++ .../java/org/example/config/S3Properties.java | 17 +++ .../controller/AttachmentController.java | 40 ++++++ .../dto/response/AttachmentResponse.java | 38 +++++ .../exception/BadRequestException.java | 7 + .../java/org/example/model/Attachment.java | 50 +++++++ .../repository/AttachmentRepository.java | 19 +++ .../example/service/AttachmentService.java | 92 ++++++++++++ .../org/example/service/S3StorageService.java | 61 ++++++++ Lido/src/main/resources/application.yml | 11 ++ .../db/migration/V7__attachments.sql | 17 +++ 17 files changed, 567 insertions(+), 26 deletions(-) delete mode 100644 .env.example create mode 100644 Lido/.env create mode 100644 Lido/src/main/java/org/example/config/ImageUploadValidator.java create mode 100644 Lido/src/main/java/org/example/config/S3Config.java create mode 100644 Lido/src/main/java/org/example/config/S3Properties.java create mode 100644 Lido/src/main/java/org/example/controller/AttachmentController.java create mode 100644 Lido/src/main/java/org/example/dto/response/AttachmentResponse.java create mode 100644 Lido/src/main/java/org/example/exception/BadRequestException.java create mode 100644 Lido/src/main/java/org/example/model/Attachment.java create mode 100644 Lido/src/main/java/org/example/repository/AttachmentRepository.java create mode 100644 Lido/src/main/java/org/example/service/AttachmentService.java create mode 100644 Lido/src/main/java/org/example/service/S3StorageService.java create mode 100644 Lido/src/main/resources/db/migration/V7__attachments.sql diff --git a/.dockerignore b/.dockerignore index bc16e556..bd32dbc4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,8 +1,8 @@ .git .github -.env -.env.* -!.env.example +Lido/.env +Lido/.env +!Lido/.env secrets certs volumes diff --git a/.env.example b/.env.example deleted file mode 100644 index d99d26a2..00000000 --- a/.env.example +++ /dev/null @@ -1,20 +0,0 @@ -# Copy to .env for your LOCAL synthetic test environment; never commit .env. -# These are logical interface suggestions; map actual framework names in REPORT.md. -APP_HOST=0.0.0.0 -APP_PORT=8080 -APP_ENV=lab -SESSION_TTL_SECONDS=3600 -# Choose credentials locally. File paths contain no secret values. -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 -API_REPLICAS=2 -IDEMPOTENCY_TTL_SECONDS=86400 -S3_ENDPOINT=http://s3:9000 -S3_REGION=us-east-1 -S3_BUCKET=messenger-attachments -S3_ACCESS_KEY_ID_FILE=/run/secrets/s3_access_key_id -S3_SECRET_ACCESS_KEY_FILE=/run/secrets/s3_secret_access_key -MAX_UPLOAD_BYTES=10485760 -MAX_IMAGE_PIXELS=40000000 diff --git a/.gitignore b/.gitignore index b5a71896..22288d14 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # Local/private state -.env -.env.* -!.env.example +Lido/.env +Lido/.env +!Lido/.env secrets/ certs/private/ *.key diff --git a/Lido/.env b/Lido/.env new file mode 100644 index 00000000..b19555a4 --- /dev/null +++ b/Lido/.env @@ -0,0 +1,7 @@ +MINIO_ROOT_USER=minioadmin +MINIO_ROOT_PASSWORD=minioadmin_change_me +S3_ENDPOINT=http://minio:9000 +S3_BUCKET=messenger-attachments +S3_ACCESS_KEY=minioadmin +S3_SECRET_KEY=minioadmin_change_me +S3_REGION=eu-east-1 \ No newline at end of file diff --git a/Lido/docker-compose.yml b/Lido/docker-compose.yml index 293670f2..9a793a12 100644 --- a/Lido/docker-compose.yml +++ b/Lido/docker-compose.yml @@ -57,6 +57,11 @@ services: SPRING_DATA_REDIS_PORT: "6379" SESSION_TTL_SECONDS: "604800" SERVER_SHUTDOWN: graceful + S3_ENDPOINT: http://minio:9000 + S3_BUCKET: ${S3_BUCKET:-messenger-attachments} + S3_ACCESS_KEY: ${S3_ACCESS_KEY} + S3_SECRET_KEY: ${S3_SECRET_KEY} + S3_REGION: eu-east-1 deploy: replicas: 3 healthcheck: @@ -78,6 +83,23 @@ services: - api networks: [ messenger ] + minio: + image: bitnamilegacy/minio:latest + environment: + MINIO_ROOT_USER: ${MINIO_ROOT_USER} + MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD} + volumes: + - minio_data:/bitnami/minio/data + ports: + - "127.0.0.1:9000:9000" + - "127.0.0.1:9001:9001" + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] + interval: 5s + timeout: 5s + retries: 5 + networks: [ messenger ] + migrate: build: . environment: @@ -96,9 +118,27 @@ services: db: condition: service_healthy + + minio-init: + image: bitnamilegacy/minio:latest + depends_on: + minio: + condition: service_started + env_file: .env + entrypoint: > + /bin/sh -c " + sleep 3; + mc alias set local http://minio:9000 $${MINIO_ROOT_USER} $${MINIO_ROOT_PASSWORD}; + mc mb --ignore-existing local/$${S3_BUCKET:-messenger-attachments}; + mc anonymous set none local/$${S3_BUCKET:-messenger-attachments}; + echo bucket-ready + " + networks: [ messenger ] + restart: "no" volumes: messenger_pg_data: lido_redis_data: + minio_data: networks: messenger: \ No newline at end of file diff --git a/Lido/src/main/java/org/example/config/ImageUploadValidator.java b/Lido/src/main/java/org/example/config/ImageUploadValidator.java new file mode 100644 index 00000000..370c8ea0 --- /dev/null +++ b/Lido/src/main/java/org/example/config/ImageUploadValidator.java @@ -0,0 +1,134 @@ +package org.example.config; + +import org.example.exception.BadRequestException; +import org.springframework.stereotype.Component; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.security.MessageDigest; +import java.util.Set; + +@Component +public class ImageUploadValidator { + + public static final long MAX_BYTES = 10L * 1024 * 1024; + public static final long MAX_PIXELS = 40_000_000L; + + private static final Set ALLOWED = Set.of("image/png", "image/jpeg"); + + public record ValidatedImage( + byte[] bytes, + String contentType, + String safeFilename, + int width, + int height, + String sha256Hex + ) {} + + /** + * Raw body (не multipart) + filename из query. + */ + public ValidatedImage validate(String filename, InputStream in) throws IOException { + if (in == null) { + throw new BadRequestException("Empty body"); + } + + String safeName = sanitizeFilename(filename); + + byte[] bytes = in.readNBytes((int) MAX_BYTES + 1); + if (bytes.length == 0) { + throw new BadRequestException("Empty file"); + } + if (bytes.length > MAX_BYTES) { + throw new BadRequestException("File too large (max 10 MiB)"); + } + + String detected = detectMime(bytes); + if (!ALLOWED.contains(detected)) { + throw new BadRequestException("Only PNG and JPEG are allowed"); + } + + BufferedImage image; + try (InputStream imageIn = new ByteArrayInputStream(bytes)) { + image = ImageIO.read(imageIn); + } + if (image == null) { + throw new BadRequestException("Invalid image"); + } + + int width = image.getWidth(); + int height = image.getHeight(); + long pixels = (long) width * (long) height; + if (width <= 0 || height <= 0 || pixels > MAX_PIXELS) { + throw new BadRequestException("Image exceeds pixel limit"); + } + + return new ValidatedImage( + bytes, + detected, + safeName, + width, + height, + sha256Hex(bytes) + ); + } + + private static String detectMime(byte[] b) { + if (b.length >= 3 + && (b[0] & 0xFF) == 0xFF + && (b[1] & 0xFF) == 0xD8 + && (b[2] & 0xFF) == 0xFF) { + return "image/jpeg"; + } + if (b.length >= 8 + && (b[0] & 0xFF) == 0x89 + && b[1] == 0x50 + && b[2] == 0x4E + && b[3] == 0x47 + && b[4] == 0x0D + && b[5] == 0x0A + && b[6] == 0x1A + && b[7] == 0x0A) { + return "image/png"; + } + return "application/octet-stream"; + } + + private static String sanitizeFilename(String name) { + if (name == null || name.isBlank()) { + throw new BadRequestException("filename is required"); + } + String base = name.replace('\\', '/').trim(); + int slash = base.lastIndexOf('/'); + if (slash >= 0) { + base = base.substring(slash + 1); + } + if (base.isEmpty() + || ".".equals(base) + || "..".equals(base) + || base.indexOf('\0') >= 0 + || base.length() > 255) { + throw new BadRequestException("Invalid filename"); + } + if (!base.matches("[\\w.\\- ()\\[\\]]+")) { + throw new BadRequestException("Invalid filename"); + } + return base; + } + + private static String sha256Hex(byte[] data) { + try { + byte[] dig = MessageDigest.getInstance("SHA-256").digest(data); + StringBuilder sb = new StringBuilder(dig.length * 2); + for (byte value : dig) { + sb.append(String.format("%02x", value)); + } + return sb.toString(); + } catch (Exception e) { + throw new IllegalStateException("SHA-256 not available", e); + } + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/config/S3Config.java b/Lido/src/main/java/org/example/config/S3Config.java new file mode 100644 index 00000000..9aa4c669 --- /dev/null +++ b/Lido/src/main/java/org/example/config/S3Config.java @@ -0,0 +1,28 @@ +package org.example.config; + +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; +import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; +import software.amazon.awssdk.regions.Region; +import software.amazon.awssdk.services.s3.S3Client; + +import java.net.URI; + +@Configuration +@RequiredArgsConstructor +public class S3Config { + private final S3Properties props; + + @Bean(destroyMethod = "close") + public S3Client s3Client() { + return S3Client.builder() + .endpointOverride(URI.create(props.getEndpoint())) + .region(Region.of(props.getRegion())) + .credentialsProvider(StaticCredentialsProvider.create( + AwsBasicCredentials.create(props.getAccessKey(), props.getSecretKey()))) + .forcePathStyle(props.isPathStyle()) + .build(); + } +} diff --git a/Lido/src/main/java/org/example/config/S3Properties.java b/Lido/src/main/java/org/example/config/S3Properties.java new file mode 100644 index 00000000..14c38451 --- /dev/null +++ b/Lido/src/main/java/org/example/config/S3Properties.java @@ -0,0 +1,17 @@ +package org.example.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Data +@Component +@ConfigurationProperties(prefix = "app.s3") +public class S3Properties { + private String endpoint; + private String region = "eu-east-1"; + private String bucket; + private String accessKey; + private String secretKey; + private boolean pathStyle = true; +} diff --git a/Lido/src/main/java/org/example/controller/AttachmentController.java b/Lido/src/main/java/org/example/controller/AttachmentController.java new file mode 100644 index 00000000..3ad7373e --- /dev/null +++ b/Lido/src/main/java/org/example/controller/AttachmentController.java @@ -0,0 +1,40 @@ +package org.example.controller; + + +import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import org.example.dto.response.AttachmentResponse; +import org.example.service.AttachmentService; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.UUID; + +@RestController +@RequiredArgsConstructor +public class AttachmentController { + + private final AttachmentService attachmentService; + + @PostMapping( + path = "/api/v1/chats/{chat_id}/attachments", + consumes = { MediaType.IMAGE_PNG_VALUE, MediaType.IMAGE_JPEG_VALUE } + ) + @ResponseStatus(HttpStatus.CREATED) + public AttachmentResponse uploadAttachment( + @PathVariable("chatId") UUID chatId, + @RequestParam("fileName") String fileName, + @RequestHeader(value = HttpHeaders.CONTENT_TYPE, required = false) String contentType, + HttpServletRequest request + ) throws IOException { + return attachmentService.upload( + chatId, + fileName, + contentType, + request.getInputStream() + ); + } +} diff --git a/Lido/src/main/java/org/example/dto/response/AttachmentResponse.java b/Lido/src/main/java/org/example/dto/response/AttachmentResponse.java new file mode 100644 index 00000000..4f9e931d --- /dev/null +++ b/Lido/src/main/java/org/example/dto/response/AttachmentResponse.java @@ -0,0 +1,38 @@ +package org.example.dto.response; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Builder; +import lombok.Value; + +import java.time.Instant; +import java.util.UUID; + +@Value +@Builder +public class AttachmentResponse { + UUID id; + + @JsonProperty("chat_id") + UUID chatId; + + @JsonProperty("uploader_id") + UUID uploaderId; + + @JsonProperty("original_filename") + String originalFilename; + + @JsonProperty("content_type") + String contentType; + + @JsonProperty("size_bytes") + long sizeBytes; + + @JsonProperty("checksum_sha256") + String checksumSha256; + + Integer width; + Integer height; + + @JsonProperty("created_at") + Instant createdAt; +} diff --git a/Lido/src/main/java/org/example/exception/BadRequestException.java b/Lido/src/main/java/org/example/exception/BadRequestException.java new file mode 100644 index 00000000..f2cb1555 --- /dev/null +++ b/Lido/src/main/java/org/example/exception/BadRequestException.java @@ -0,0 +1,7 @@ +package org.example.exception; + +public class BadRequestException extends RuntimeException { + public BadRequestException(String message) { + super(message); + } +} diff --git a/Lido/src/main/java/org/example/model/Attachment.java b/Lido/src/main/java/org/example/model/Attachment.java new file mode 100644 index 00000000..143319e0 --- /dev/null +++ b/Lido/src/main/java/org/example/model/Attachment.java @@ -0,0 +1,50 @@ +package org.example.model; + +import jakarta.persistence.*; +import lombok.*; +import org.hibernate.annotations.CreationTimestamp; + +import java.time.Instant; +import java.util.UUID; + +@Entity +@Table(name = "attachments") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class Attachment { + + @Id + private UUID id; + + @Column(name = "chat_id", nullable = false) + private UUID chatId; + + @Column(name = "uploader_id", nullable = false) + private UUID uploaderId; + + @Column(name = "object_key", nullable = false, length = 512) + private String objectKey; + + @Column(name = "original_filename", nullable = false) + private String originalFilename; + + @Column(name = "content_type", nullable = false, length = 128) + private String contentType; + + @Column(name = "size_bytes", nullable = false) + private long sizeBytes; + + @Column(name = "checksum_sha256", nullable = false, length = 64) + private String checksumSha256; + + private Integer width; + + private Integer height; + + @CreationTimestamp + @Column(name = "created_at", nullable = false, updatable = false) + private Instant createdAt; +} diff --git a/Lido/src/main/java/org/example/repository/AttachmentRepository.java b/Lido/src/main/java/org/example/repository/AttachmentRepository.java new file mode 100644 index 00000000..b7185ef5 --- /dev/null +++ b/Lido/src/main/java/org/example/repository/AttachmentRepository.java @@ -0,0 +1,19 @@ +package org.example.repository; + +import org.example.LidoApplication; +import org.example.model.Attachment; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Collection; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public interface AttachmentRepository extends JpaRepository { + + Optional findByIdAndChatId(UUID id, UUID chatId); + + List findByIdInAndChatId(Collection ids, UUID chatId); + + boolean existsByIdAndChatId(UUID id, UUID chatId); +} diff --git a/Lido/src/main/java/org/example/service/AttachmentService.java b/Lido/src/main/java/org/example/service/AttachmentService.java new file mode 100644 index 00000000..5e44ffe8 --- /dev/null +++ b/Lido/src/main/java/org/example/service/AttachmentService.java @@ -0,0 +1,92 @@ +package org.example.service; + +import lombok.RequiredArgsConstructor; +import org.example.config.ImageUploadValidator; +import org.example.dto.response.AttachmentResponse; +import org.example.exception.NotFoundException; +import org.example.model.Attachment; +import org.example.model.User; +import org.example.repository.AttachmentRepository; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.UUID; + +@Service +@RequiredArgsConstructor +public class AttachmentService { + + private final AttachmentRepository attachmentRepository; + private final S3StorageService s3StorageService; + private final ImageUploadValidator validator; + private final ChatService chatService; + private final UserService userService; + + @Transactional + public AttachmentResponse upload( + UUID chatId, + String filename, + String contentTypeHeader, + InputStream body + ) throws IOException { + User user = userService.getCurrentUser(); + chatService.requireMember(chatId); + + ImageUploadValidator.ValidatedImage img = validator.validate(filename, body); + + UUID id = UUID.randomUUID(); + String objectKey = "chats/" + chatId + "/" + id; + + s3StorageService.put( + objectKey, + new ByteArrayInputStream(img.bytes()), + img.bytes().length, + img.contentType() + ); + + Attachment saved = attachmentRepository.save(Attachment.builder() + .id(id) + .chatId(chatId) + .uploaderId(user.getId()) + .objectKey(objectKey) + .originalFilename(img.safeFilename()) + .contentType(img.contentType()) + .sizeBytes(img.bytes().length) + .checksumSha256(img.sha256Hex()) + .width(img.width()) + .height(img.height()) + .build()); + + return toResponse(saved); + } + + @Transactional(readOnly = true) + public Attachment getForMember(UUID attachmentId){ + Attachment attachment = attachmentRepository.findById(attachmentId) + .orElseThrow(()-> new NotFoundException("Вложение не найдено")); + chatService.requireMember(attachment.getChatId()); + return attachment; + } + + + static AttachmentResponse toResponse(Attachment a) { + return AttachmentResponse.builder() + .id(a.getId()) + .chatId(a.getChatId()) + .uploaderId(a.getUploaderId()) + .originalFilename(a.getOriginalFilename()) + .contentType(a.getContentType()) + .sizeBytes(a.getSizeBytes()) + .checksumSha256(a.getChecksumSha256()) + .width(a.getWidth()) + .height(a.getHeight()) + .createdAt(a.getCreatedAt()) + .build(); + } + + +} diff --git a/Lido/src/main/java/org/example/service/S3StorageService.java b/Lido/src/main/java/org/example/service/S3StorageService.java new file mode 100644 index 00000000..d6c9263d --- /dev/null +++ b/Lido/src/main/java/org/example/service/S3StorageService.java @@ -0,0 +1,61 @@ +package org.example.service; + +import lombok.RequiredArgsConstructor; +import org.example.config.S3Properties; +import org.springframework.stereotype.Service; +import software.amazon.awssdk.core.sync.RequestBody; +import software.amazon.awssdk.core.sync.ResponseTransformer; +import software.amazon.awssdk.services.s3.S3Client; +import software.amazon.awssdk.services.s3.model.DeleteObjectRequest; +import software.amazon.awssdk.services.s3.model.GetObjectAclRequest; +import software.amazon.awssdk.services.s3.model.GetObjectRequest; +import software.amazon.awssdk.services.s3.model.PutObjectRequest; + +import java.io.InputStream; +import java.io.OutputStream; + +@Service +@RequiredArgsConstructor +public class S3StorageService { + + private final S3Client s3Client; + private final S3Properties properties; + + public void put( + String objectKey, + InputStream in, + long sizeBytes, + String contentType){ + + PutObjectRequest request = PutObjectRequest.builder() + .bucket(properties.getBucket()) + .key(objectKey) + .contentType(contentType) + .contentLength(sizeBytes) + .build(); + s3Client.putObject(request, RequestBody.fromInputStream(in, sizeBytes)); + } + + public void getTo(String objectKey, OutputStream out){ + GetObjectRequest request = GetObjectRequest.builder() + .bucket(properties.getBucket()) + .key(objectKey) + .build(); + s3Client.getObject(request, ResponseTransformer.toOutputStream(out)); + } + + public InputStream getStream(String objectKey){ + GetObjectRequest request = GetObjectRequest.builder() + .bucket(properties.getBucket()) + .key(objectKey) + .build(); + return s3Client.getObject(request); + } + + public void delete(String objectKey){ + s3Client.deleteObject(DeleteObjectRequest.builder() + .bucket(properties.getBucket()) + .key(objectKey) + .build()); + } +} diff --git a/Lido/src/main/resources/application.yml b/Lido/src/main/resources/application.yml index 714dd13c..66e56916 100644 --- a/Lido/src/main/resources/application.yml +++ b/Lido/src/main/resources/application.yml @@ -5,6 +5,10 @@ spring: fail-on-unknown-properties: true lifecycle: timeout-per-shutdown-phase: 20s + servlet: + multipart: + max-file-size: 10MB + max-request-size: 12MB spring: datasource: @@ -46,6 +50,13 @@ server: app: session-ttl-seconds: ${SESSION_TTL_SECONDS:604800} + s3: + endpoint: ${S3_ENDPOINT:http://minio:9000} + region: ${S3_REGION:eu-east-1} + bucket: ${S3_BUCKET:messenger-attachments} + access-key: ${S3_ACCESS_KEY} + secret-key: ${S3_SECRET_KEY} + path-style: true logging: pattern: diff --git a/Lido/src/main/resources/db/migration/V7__attachments.sql b/Lido/src/main/resources/db/migration/V7__attachments.sql new file mode 100644 index 00000000..7872e502 --- /dev/null +++ b/Lido/src/main/resources/db/migration/V7__attachments.sql @@ -0,0 +1,17 @@ +CREATE TABLE attachments ( + id UUID PRIMARY KEY, + chat_id UUID NOT NULL REFERENCES chats(id) ON DELETE CASCADE, + uploader_id UUID NOT NULL REFERENCES users(id), + object_key VARCHAR(512) NOT NULL, + original_filename VARCHAR(255) NOT NULL, + content_type VARCHAR(128) NOT NULL, + size_bytes BIGINT NOT NULL CHECK (size_bytes > 0), + checksum_sha256 CHAR(64) NOT NULL, + width INT, + height INT, + created_at TIMESTAMPTZ NOT NULL DEFAULT now(), + CONSTRAINT uq_attachments_object_key UNIQUE (object_key) +); + +CREATE INDEX idx_attachments_chat_id ON attachments (chat_id); +CREATE INDEX idx_attachments_uploader_id ON attachments (uploader_id); \ No newline at end of file -- 2.54.0 From a5284efe7b7262d9030f9e9ded8b1c9f472eb16d Mon Sep 17 00:00:00 2001 From: Dmitry <146066734+DmitryTamlin7@users.noreply.github.com> Date: Fri, 13 Nov 2026 22:18:56 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=BD=D0=B0=203=20=D0=B3=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AttachmentController.java | 19 ++++- .../example/dto/create/CreateMessageDto.java | 11 ++- .../dto/response/AttachmentResponse.java | 30 +++++--- .../example/dto/response/MessageResponse.java | 3 + .../exception/GlobalExceptionHandler.java | 16 +++++ .../java/org/example/model/Attachment.java | 52 +++++++++----- .../main/java/org/example/model/Message.java | 5 ++ .../org/example/model/MessageAttachment.java | 35 ++++++++++ .../org/example/model/VariantResponse.java | 32 +++++++++ .../MessageAttachmentRepository.java | 15 ++++ .../example/service/AttachmentService.java | 57 ++++++++++++--- .../service/MessageIdempotencyWriter.java | 16 +++++ .../org/example/service/MessageService.java | 70 +++++++++++++++++-- .../V10__drop_messages_text_nonempty.sql | 2 + .../db/migration/V8__message_attachments.sql | 8 +++ .../V9__attachments_contract_columns.sql | 4 ++ 16 files changed, 329 insertions(+), 46 deletions(-) create mode 100644 Lido/src/main/java/org/example/model/MessageAttachment.java create mode 100644 Lido/src/main/java/org/example/model/VariantResponse.java create mode 100644 Lido/src/main/java/org/example/repository/MessageAttachmentRepository.java create mode 100644 Lido/src/main/resources/db/migration/V10__drop_messages_text_nonempty.sql create mode 100644 Lido/src/main/resources/db/migration/V8__message_attachments.sql create mode 100644 Lido/src/main/resources/db/migration/V9__attachments_contract_columns.sql diff --git a/Lido/src/main/java/org/example/controller/AttachmentController.java b/Lido/src/main/java/org/example/controller/AttachmentController.java index 3ad7373e..7c238449 100644 --- a/Lido/src/main/java/org/example/controller/AttachmentController.java +++ b/Lido/src/main/java/org/example/controller/AttachmentController.java @@ -2,6 +2,7 @@ package org.example.controller; import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.example.dto.response.AttachmentResponse; import org.example.service.AttachmentService; @@ -25,8 +26,8 @@ public class AttachmentController { ) @ResponseStatus(HttpStatus.CREATED) public AttachmentResponse uploadAttachment( - @PathVariable("chatId") UUID chatId, - @RequestParam("fileName") String fileName, + @PathVariable("chat_id") UUID chatId, + @RequestParam("filename") String fileName, @RequestHeader(value = HttpHeaders.CONTENT_TYPE, required = false) String contentType, HttpServletRequest request ) throws IOException { @@ -37,4 +38,18 @@ public class AttachmentController { request.getInputStream() ); } + + @GetMapping("/api/v1/attachments/{attachment_id}") + public AttachmentResponse getAttachment( + @PathVariable("attachment_id") UUID attachmentId) { + return attachmentService.getMeta(attachmentId); + } + + @GetMapping("/api/v1/attachments/{attachment_id}/content") + public void downloadAttachment( + @PathVariable("attachment_id") UUID attachmentId, + @RequestParam(value = "variant", defaultValue = "original") String variant, + HttpServletResponse response) throws IOException { + attachmentService.writeContent(attachmentId, variant, response); + } } diff --git a/Lido/src/main/java/org/example/dto/create/CreateMessageDto.java b/Lido/src/main/java/org/example/dto/create/CreateMessageDto.java index ecf16df2..d4793e37 100644 --- a/Lido/src/main/java/org/example/dto/create/CreateMessageDto.java +++ b/Lido/src/main/java/org/example/dto/create/CreateMessageDto.java @@ -1,5 +1,6 @@ package org.example.dto.create; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; @@ -7,10 +8,16 @@ import lombok.Data; import org.example.config.CodePointSize; import org.example.config.StrictStringDeserializer; +import java.util.List; +import java.util.UUID; + @Data public class CreateMessageDto { - @NotBlank(message = "Текст сообщения не может быть пустым") - @CodePointSize(min = 1, max = 4000) + + @CodePointSize(min = 0, max = 4000) @JsonDeserialize(using = StrictStringDeserializer.class) private String text; + + @JsonProperty("attachment_ids") + private List attachmentIds; } diff --git a/Lido/src/main/java/org/example/dto/response/AttachmentResponse.java b/Lido/src/main/java/org/example/dto/response/AttachmentResponse.java index 4f9e931d..52635782 100644 --- a/Lido/src/main/java/org/example/dto/response/AttachmentResponse.java +++ b/Lido/src/main/java/org/example/dto/response/AttachmentResponse.java @@ -5,21 +5,26 @@ import lombok.Builder; import lombok.Value; import java.time.Instant; +import java.util.List; import java.util.UUID; +import org.example.model.VariantResponse; + @Value @Builder public class AttachmentResponse { + + @JsonProperty("id") UUID id; @JsonProperty("chat_id") UUID chatId; - @JsonProperty("uploader_id") - UUID uploaderId; + @JsonProperty("owner_id") + UUID ownerId; - @JsonProperty("original_filename") - String originalFilename; + @JsonProperty("filename") + String filename; @JsonProperty("content_type") String contentType; @@ -27,12 +32,21 @@ public class AttachmentResponse { @JsonProperty("size_bytes") long sizeBytes; - @JsonProperty("checksum_sha256") - String checksumSha256; + @JsonProperty("sha256") + String sha256; - Integer width; - Integer height; + @JsonProperty("status") + String status; + + @JsonProperty("variants") + List variants; + + @JsonProperty("error_code") + String errorCode; @JsonProperty("created_at") Instant createdAt; + + @JsonProperty("updated_at") + Instant updatedAt; } diff --git a/Lido/src/main/java/org/example/dto/response/MessageResponse.java b/Lido/src/main/java/org/example/dto/response/MessageResponse.java index 204f6e3e..aa4d9b2f 100644 --- a/Lido/src/main/java/org/example/dto/response/MessageResponse.java +++ b/Lido/src/main/java/org/example/dto/response/MessageResponse.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.Instant; +import java.util.List; import java.util.UUID; @Data @@ -20,6 +21,8 @@ public class MessageResponse { @JsonProperty("sender_id") private UUID senderId; private String text; + @JsonProperty("attachment_ids") + List attachmentIds; @JsonProperty("created_at") private Instant createdAt; } diff --git a/Lido/src/main/java/org/example/exception/GlobalExceptionHandler.java b/Lido/src/main/java/org/example/exception/GlobalExceptionHandler.java index d07bf509..ece7f79d 100644 --- a/Lido/src/main/java/org/example/exception/GlobalExceptionHandler.java +++ b/Lido/src/main/java/org/example/exception/GlobalExceptionHandler.java @@ -73,6 +73,22 @@ public class GlobalExceptionHandler { .body(body); } + @ExceptionHandler(BadRequestException.class) + public ResponseEntity handleBadRequest(BadRequestException ex, HttpServletRequest request) { + String requestId = resolveRequestId(request); // как у вас в других handler + Map body = Map.of( + "error", Map.of( + "code", "invalid_request", + "message", ex.getMessage() != null ? ex.getMessage() : "Bad request", + "request_id", requestId + ) + ); + return ResponseEntity + .status(HttpStatus.BAD_REQUEST) + .header("X-Request-Id", requestId) + .body(body); + } + @ExceptionHandler(MethodArgumentNotValidException.class) public ResponseEntity handleValidationException( MethodArgumentNotValidException ex, diff --git a/Lido/src/main/java/org/example/model/Attachment.java b/Lido/src/main/java/org/example/model/Attachment.java index 143319e0..e9b9a75a 100644 --- a/Lido/src/main/java/org/example/model/Attachment.java +++ b/Lido/src/main/java/org/example/model/Attachment.java @@ -1,10 +1,12 @@ package org.example.model; +import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.CreationTimestamp; import java.time.Instant; +import java.util.List; import java.util.UUID; @Entity @@ -19,32 +21,50 @@ public class Attachment { @Id private UUID id; - @Column(name = "chat_id", nullable = false) + @Column(name = "chat_id") + @JsonProperty("chat_id") private UUID chatId; - @Column(name = "uploader_id", nullable = false) - private UUID uploaderId; + @Column(name = "uploader_id") + @JsonProperty("owner_id") + private UUID ownerId; - @Column(name = "object_key", nullable = false, length = 512) - private String objectKey; + @Column(name = "original_filename") + @JsonProperty("filename") + private String filename; - @Column(name = "original_filename", nullable = false) - private String originalFilename; - - @Column(name = "content_type", nullable = false, length = 128) + @Column(name = "content_type") + @JsonProperty("content_type") private String contentType; - @Column(name = "size_bytes", nullable = false) + @Column(name = "size_bytes") + @JsonProperty("size_bytes") private long sizeBytes; - @Column(name = "checksum_sha256", nullable = false, length = 64) - private String checksumSha256; + @Column(name = "checksum_sha256") + @JsonProperty("sha256") + private String sha256; - private Integer width; + @Column(name = "status") + @JsonProperty("status") + private String status; - private Integer height; + @Transient + @JsonProperty("variants") + private List variants; - @CreationTimestamp - @Column(name = "created_at", nullable = false, updatable = false) + @Column(name = "error_code") + @JsonProperty("error_code") + private String errorCode; + + @Column(name = "created_at") + @JsonProperty("created_at") private Instant createdAt; + + @Column(name = "updated_at") + @JsonProperty("updated_at") + private Instant updatedAt; + + @Column(name = "object_key") + private String objectKey; } diff --git a/Lido/src/main/java/org/example/model/Message.java b/Lido/src/main/java/org/example/model/Message.java index fe5bda50..633e1116 100644 --- a/Lido/src/main/java/org/example/model/Message.java +++ b/Lido/src/main/java/org/example/model/Message.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.CreationTimestamp; import java.time.Instant; import java.time.LocalDateTime; +import java.util.List; import java.util.UUID; @Entity @@ -35,6 +36,10 @@ public class Message { @Column(nullable = false, columnDefinition = "TEXT") private String text; + @Transient + @JsonProperty("attachment_ids") + private List attachmentIds; + @CreationTimestamp @Column(name = "created_at", nullable = false, updatable = false) @JsonProperty("created_at") diff --git a/Lido/src/main/java/org/example/model/MessageAttachment.java b/Lido/src/main/java/org/example/model/MessageAttachment.java new file mode 100644 index 00000000..51d4765c --- /dev/null +++ b/Lido/src/main/java/org/example/model/MessageAttachment.java @@ -0,0 +1,35 @@ +package org.example.model; + + +import jakarta.persistence.*; +import lombok.*; +import org.springframework.web.bind.annotation.GetMapping; + +import java.io.Serializable; +import java.util.UUID; + +@Entity +@Table(name = "message_attachments") +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +@Builder +@IdClass(MessageAttachment.PK.class) +public class MessageAttachment { + + @Id + @Column(name = "message_id", nullable = false) + private UUID messageId; + + @Column(name = "attachment_id", nullable = false) + private UUID attachmentId; + + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class PK implements Serializable { + private UUID messageId; + private UUID attachmentId; + } +} diff --git a/Lido/src/main/java/org/example/model/VariantResponse.java b/Lido/src/main/java/org/example/model/VariantResponse.java new file mode 100644 index 00000000..dbfe4201 --- /dev/null +++ b/Lido/src/main/java/org/example/model/VariantResponse.java @@ -0,0 +1,32 @@ +package org.example.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class VariantResponse { + + @JsonProperty("name") + String name; + + @JsonProperty("content_type") + String contentType; + + @JsonProperty("size_bytes") + long sizeBytes; + + @JsonProperty("width") + int width; + + @JsonProperty("height") + int height; + + @JsonProperty("sha256") + String sha256; +} diff --git a/Lido/src/main/java/org/example/repository/MessageAttachmentRepository.java b/Lido/src/main/java/org/example/repository/MessageAttachmentRepository.java new file mode 100644 index 00000000..76d7464d --- /dev/null +++ b/Lido/src/main/java/org/example/repository/MessageAttachmentRepository.java @@ -0,0 +1,15 @@ +package org.example.repository; + +import org.example.model.MessageAttachment; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Collection; +import java.util.List; +import java.util.UUID; + +public interface MessageAttachmentRepository extends JpaRepository { + + List findByMessageId(UUID messageId); + + List findByMessageIdIn(Collection messageIds); +} diff --git a/Lido/src/main/java/org/example/service/AttachmentService.java b/Lido/src/main/java/org/example/service/AttachmentService.java index 5e44ffe8..4e2babea 100644 --- a/Lido/src/main/java/org/example/service/AttachmentService.java +++ b/Lido/src/main/java/org/example/service/AttachmentService.java @@ -1,19 +1,23 @@ package org.example.service; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.example.config.ImageUploadValidator; import org.example.dto.response.AttachmentResponse; +import org.example.exception.BadRequestException; import org.example.exception.NotFoundException; import org.example.model.Attachment; import org.example.model.User; import org.example.repository.AttachmentRepository; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; +import java.time.Instant; +import java.util.List; import java.util.UUID; @Service @@ -51,14 +55,17 @@ public class AttachmentService { Attachment saved = attachmentRepository.save(Attachment.builder() .id(id) .chatId(chatId) - .uploaderId(user.getId()) + .ownerId(user.getId()) .objectKey(objectKey) - .originalFilename(img.safeFilename()) + .filename(img.safeFilename()) .contentType(img.contentType()) .sizeBytes(img.bytes().length) - .checksumSha256(img.sha256Hex()) - .width(img.width()) - .height(img.height()) + .sha256(img.sha256Hex()) + .status("ready") + .errorCode(null) + .variants(List.of()) + .createdAt(Instant.now()) + .updatedAt(Instant.now()) .build()); return toResponse(saved); @@ -72,19 +79,47 @@ public class AttachmentService { return attachment; } + @Transactional(readOnly = true) + public AttachmentResponse getMeta(UUID attachmentId){ + return toResponse(getForMember(attachmentId)); + } + + + @Transactional(readOnly = true) + public void writeContent(UUID attachmentId, + String variant, + HttpServletResponse response) throws IOException { + if (variant != null && !variant.isBlank() && !"original".equals(variant)){ + throw new BadRequestException("Unsupported variant"); + } + + Attachment attachment = getForMember(attachmentId); + response.setStatus(HttpStatus.OK.value()); + response.setContentType(attachment.getContentType()); + response.setContentLengthLong(attachment.getSizeBytes()); + s3StorageService.getTo(attachment.getObjectKey(), + response.getOutputStream()); + response.flushBuffer(); + } + + + + static AttachmentResponse toResponse(Attachment a) { return AttachmentResponse.builder() .id(a.getId()) .chatId(a.getChatId()) - .uploaderId(a.getUploaderId()) - .originalFilename(a.getOriginalFilename()) + .ownerId(a.getOwnerId()) + .filename(a.getFilename()) .contentType(a.getContentType()) .sizeBytes(a.getSizeBytes()) - .checksumSha256(a.getChecksumSha256()) - .width(a.getWidth()) - .height(a.getHeight()) + .sha256(a.getSha256()) + .status(a.getStatus()) + .variants(a.getVariants() == null ? List.of() : a.getVariants()) + .errorCode(a.getErrorCode()) .createdAt(a.getCreatedAt()) + .updatedAt(a.getUpdatedAt()) .build(); } diff --git a/Lido/src/main/java/org/example/service/MessageIdempotencyWriter.java b/Lido/src/main/java/org/example/service/MessageIdempotencyWriter.java index deb9f482..68e77ddb 100644 --- a/Lido/src/main/java/org/example/service/MessageIdempotencyWriter.java +++ b/Lido/src/main/java/org/example/service/MessageIdempotencyWriter.java @@ -4,13 +4,16 @@ package org.example.service; import lombok.RequiredArgsConstructor; import org.example.model.IdempotencyKey; import org.example.model.Message; +import org.example.model.MessageAttachment; import org.example.repository.IdempotencyKeyRepository; +import org.example.repository.MessageAttachmentRepository; import org.example.repository.MessageRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.time.Instant; +import java.util.List; import java.util.UUID; @Service @@ -19,12 +22,14 @@ public class MessageIdempotencyWriter { private final MessageRepository messageRepository; private final IdempotencyKeyRepository idempotencyKeyRepository; + private final MessageAttachmentRepository messageAttachmentRepository; @Transactional(propagation = Propagation.REQUIRES_NEW) public Message insertNew( UUID chatId, UUID senderId, String text, + List attachmentIds, String key, String hash) { @@ -37,6 +42,17 @@ public class MessageIdempotencyWriter { .build() ); + if (attachmentIds != null){ + for(UUID attId : attachmentIds){ + messageAttachmentRepository.save( + MessageAttachment.builder() + .messageId(message.getId()) + .attachmentId(attId) + .build() + ); + } + } + idempotencyKeyRepository.saveAndFlush( IdempotencyKey.builder() .userId(senderId) diff --git a/Lido/src/main/java/org/example/service/MessageService.java b/Lido/src/main/java/org/example/service/MessageService.java index 16a24da3..b3ad5783 100644 --- a/Lido/src/main/java/org/example/service/MessageService.java +++ b/Lido/src/main/java/org/example/service/MessageService.java @@ -4,12 +4,17 @@ import lombok.RequiredArgsConstructor; import org.example.dto.MessagePage; import org.example.dto.create.CreateMessageDto; import org.example.dto.update.UpdateMessageDto; +import org.example.exception.BadRequestException; import org.example.exception.ConflictException; import org.example.exception.ForbiddenException; import org.example.exception.NotFoundException; +import org.example.model.Attachment; import org.example.model.IdempotencyKey; import org.example.model.Message; +import org.example.model.MessageAttachment; +import org.example.repository.AttachmentRepository; import org.example.repository.IdempotencyKeyRepository; +import org.example.repository.MessageAttachmentRepository; import org.example.repository.MessageRepository; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.data.domain.PageRequest; @@ -18,9 +23,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.Instant; -import java.util.List; -import java.util.Optional; -import java.util.UUID; +import java.util.*; +import java.util.stream.Collectors; import static org.example.config.TokenHasher.sha256; @@ -32,8 +36,10 @@ public class MessageService { private final IdempotencyKeyRepository idempotencyKeyRepository; private final ChatService chatService; private final MessageIdempotencyWriter writer; + private final AttachmentRepository attachmentRepository; + private final MessageAttachmentRepository messageAttachmentRepository; - @Transactional(readOnly = true) // или без write на этом уровне + @Transactional public Message sendMessage( UUID chatId, UUID senderId, @@ -45,8 +51,30 @@ public class MessageService { throw new ForbiddenException("Пользователь не является участником чата"); } + String text = messageObject.getText() == null ? "" : messageObject.getText(); + + List attIds = messageObject.getAttachmentIds() == null + ? List.of() + : messageObject.getAttachmentIds().stream().distinct().toList(); + + if (text.isBlank() && attIds.isEmpty()) { + throw new BadRequestException("text or attachment_ids required"); + } + + if (!attIds.isEmpty()) { + List found = attachmentRepository.findByIdInAndChatId(attIds, chatId); + if (found.size() != attIds.size()) { + throw new BadRequestException("Invalid attachment_ids"); + } + } + String key = idempotencyKey.trim(); - String hash = sha256(messageObject.getText()); + String hash = sha256( + text + "\n" + attIds.stream() + .map(UUID::toString) + .sorted() + .collect(Collectors.joining(",")) + ); Optional exists = idempotencyKeyRepository.findByUserIdAndChatIdAndIdempotencyKey(senderId, chatId, key); @@ -56,7 +84,9 @@ public class MessageService { } try { - return writer.insertNew(chatId, senderId, messageObject.getText(), key, hash); + Message message = writer.insertNew(chatId, senderId, text, attIds, key, hash); + message.setAttachmentIds(attIds); + return message; } catch (DataIntegrityViolationException e) { IdempotencyKey rec = idempotencyKeyRepository .findByUserIdAndChatIdAndIdempotencyKey(senderId, chatId, key) @@ -69,8 +99,15 @@ public class MessageService { if (!row.getRequestHash().equals(hash)) { throw new ConflictException("Idempotency key conflict"); } - return messageRepository.findById(row.getMessageId()) + Message message = messageRepository.findById(row.getMessageId()) .orElseThrow(() -> new IllegalStateException("idempotency message missing")); + + List ids = messageAttachmentRepository.findByMessageId(message.getId()) + .stream() + .map(MessageAttachment::getAttachmentId) + .toList(); + message.setAttachmentIds(ids); + return message; } @Transactional(readOnly = true) @@ -124,6 +161,25 @@ public class MessageService { } } + if (!items.isEmpty()) { + List msgIds = items.stream().map(Message::getId).toList(); + List links = + messageAttachmentRepository.findByMessageIdIn(msgIds); + + Map> byMsg = new HashMap<>(); + for (MessageAttachment link : links) { + byMsg.computeIfAbsent(link.getMessageId(), k -> new ArrayList<>()) + .add(link.getAttachmentId()); + } + for (Message m : items) { + m.setAttachmentIds(byMsg.getOrDefault(m.getId(), List.of())); + } + } else { + for (Message m : items) { + m.setAttachmentIds(List.of()); + } + } + return new MessagePage(items, nextCursor); } diff --git a/Lido/src/main/resources/db/migration/V10__drop_messages_text_nonempty.sql b/Lido/src/main/resources/db/migration/V10__drop_messages_text_nonempty.sql new file mode 100644 index 00000000..5de2a616 --- /dev/null +++ b/Lido/src/main/resources/db/migration/V10__drop_messages_text_nonempty.sql @@ -0,0 +1,2 @@ +ALTER TABLE messages + DROP CONSTRAINT IF EXISTS chk_messages_text_nonempty; diff --git a/Lido/src/main/resources/db/migration/V8__message_attachments.sql b/Lido/src/main/resources/db/migration/V8__message_attachments.sql new file mode 100644 index 00000000..1b7ed37e --- /dev/null +++ b/Lido/src/main/resources/db/migration/V8__message_attachments.sql @@ -0,0 +1,8 @@ +CREATE TABLE message_attachments ( + message_id UUID NOT NULL REFERENCES messages(id) ON DELETE CASCADE, + attachment_id UUID NOT NULL REFERENCES attachments(id) ON DELETE RESTRICT, + PRIMARY KEY (message_id, attachment_id) +); + +CREATE INDEX idx_message_attachments_attachment + ON message_attachments (attachment_id); \ No newline at end of file diff --git a/Lido/src/main/resources/db/migration/V9__attachments_contract_columns.sql b/Lido/src/main/resources/db/migration/V9__attachments_contract_columns.sql new file mode 100644 index 00000000..98994758 --- /dev/null +++ b/Lido/src/main/resources/db/migration/V9__attachments_contract_columns.sql @@ -0,0 +1,4 @@ +ALTER TABLE attachments + ADD COLUMN IF NOT EXISTS status VARCHAR(32) NOT NULL DEFAULT 'ready', + ADD COLUMN IF NOT EXISTS error_code VARCHAR(64), + ADD COLUMN IF NOT EXISTS updated_at TIMESTAMPTZ NOT NULL DEFAULT now(); -- 2.54.0 From 556889ff34695a6a921426510981dd4f205602e1 Mon Sep 17 00:00:00 2001 From: Dmitry <146066734+DmitryTamlin7@users.noreply.github.com> Date: Fri, 13 Nov 2026 23:09:29 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=9E=D1=86=D0=B5=D0=BD=D0=BA=D0=B0=204=20?= =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/pull_request_template.md | 36 +++--- Lido/docker-compose.yml | 12 +- Lido/nginx/nginx.conf | 2 + .../java/org/example/LidoApplication.java | 2 + .../example/config/ImageUploadValidator.java | 110 +++++++++++------- .../example/service/AttachmentService.java | 106 +++++++++++++---- .../org/example/service/S3StorageService.java | 24 +++- Lido/src/main/resources/application.yml | 7 ++ REPORT.md | 37 +++--- scripts/minio-init.sh | 27 +++++ 10 files changed, 259 insertions(+), 104 deletions(-) create mode 100755 scripts/minio-init.sh diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 1bec5472..b96146ee 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,18 +1,26 @@ ## Лабораторная 4 -Автор / группа: TODO -Целевая оценка (3/4/5): TODO -Трек 5, если заявлен: TODO +Автор / группа: Гуреев Дмитрий, БПИ2301 +Целевая оценка (3/4/5): 4 +Трек 5, если заявлен: не заявляется -Что реализовано и что перенесено: TODO -Команды запуска из чистого clone: TODO -Результаты проверок и ссылка на REPORT.md: TODO -Ограничения / известные ошибки: TODO -Источники и использование ИИ: TODO +Что реализовано и что перенесено: перенесён минимум lab3 (пользователи, чаты, сообщения, пагинация, сессии, идемпотентность). Добавлены: таблица attachments, связь message_attachments, endpoint загрузки/скачивания вложений, S3-хранение байтов в приватном bucket, стриминговый валидатор изображений, реконсилер «осиротевших» объектов с grace period. -- [ ] Весь обязательный минимум текущей и предыдущих работ сохранён с объявленными переходами. -- [ ] Контракт и публичные тесты не ослаблены. -- [ ] make check и make test выполнены; приложен реальный вывод. -- [ ] Сценарии отказов/безопасности своего уровня воспроизведены. -- [ ] Все секреты и приватные ключи находятся вне Git; отчёт не содержит tokens. -- [ ] README задания сохранён, REPORT.md содержит инструкцию именно моего решения. +Команды запуска из чистого clone: +1. Скопировать compose.example.yaml в docker-compose.yml, заполнить локальный .env. +2. docker compose --env-file .env up -d --build +3. Дождаться /health/ready. +4. make test BASE_URL=http://localhost:8080 + +Результаты проверок и ссылка на REPORT.md: make test проходит (PASS: lab4 public API scenario). REPORT.md содержит доказательства критериев оценки 4. + +Ограничения / известные ошибки: не реализован presigned-upload flow (трек 5), отдельные S3 credentials с ограниченными правами документированы в scripts/minio-init.sh, MinIO консоль (9001) не экспонируется наружу. + +Источники и использование ИИ: документация Spring Boot 3, PostgreSQL 16, Redis 7, nginx, Flyway, k6, MiniO; консультации по архитектуре multi-instance, health/readiness, идемпотентности. + +- [x] Весь обязательный минимум текущей и предыдущих работ сохранён с объявленными переходами. +- [x] Контракт и публичные тесты не ослаблены. +- [x] make check и make test выполнены; приложен реальный вывод. +- [x] Сценарии отказов/безопасности своего уровня воспроизведены. +- [x] Все секреты и приватные ключи находятся вне Git; отчёт не содержит tokens. +- [x] README задания сохранён, REPORT.md содержит инструкцию именно моего решения. diff --git a/Lido/docker-compose.yml b/Lido/docker-compose.yml index 9a793a12..9f487f42 100644 --- a/Lido/docker-compose.yml +++ b/Lido/docker-compose.yml @@ -92,7 +92,6 @@ services: - minio_data:/bitnami/minio/data ports: - "127.0.0.1:9000:9000" - - "127.0.0.1:9001:9001" healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] interval: 5s @@ -125,14 +124,9 @@ services: minio: condition: service_started env_file: .env - entrypoint: > - /bin/sh -c " - sleep 3; - mc alias set local http://minio:9000 $${MINIO_ROOT_USER} $${MINIO_ROOT_PASSWORD}; - mc mb --ignore-existing local/$${S3_BUCKET:-messenger-attachments}; - mc anonymous set none local/$${S3_BUCKET:-messenger-attachments}; - echo bucket-ready - " + volumes: + - ../../scripts/minio-init.sh:/minio-init.sh:ro + entrypoint: ["/bin/sh", "/minio-init.sh"] networks: [ messenger ] restart: "no" volumes: diff --git a/Lido/nginx/nginx.conf b/Lido/nginx/nginx.conf index 87140a5c..2b9f03a5 100644 --- a/Lido/nginx/nginx.conf +++ b/Lido/nginx/nginx.conf @@ -5,6 +5,8 @@ events { } http { + client_max_body_size 12M; + upstream api_backend { least_conn; server api:8080 max_fails=2 fail_timeout=5s; diff --git a/Lido/src/main/java/org/example/LidoApplication.java b/Lido/src/main/java/org/example/LidoApplication.java index 96bf147d..e3980b17 100644 --- a/Lido/src/main/java/org/example/LidoApplication.java +++ b/Lido/src/main/java/org/example/LidoApplication.java @@ -2,8 +2,10 @@ package org.example; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication +@EnableScheduling public class LidoApplication { public static void main(String[] args) { SpringApplication.run(LidoApplication.class, args); diff --git a/Lido/src/main/java/org/example/config/ImageUploadValidator.java b/Lido/src/main/java/org/example/config/ImageUploadValidator.java index 370c8ea0..29e6db68 100644 --- a/Lido/src/main/java/org/example/config/ImageUploadValidator.java +++ b/Lido/src/main/java/org/example/config/ImageUploadValidator.java @@ -5,9 +5,11 @@ import org.springframework.stereotype.Component; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; import java.security.MessageDigest; import java.util.Set; @@ -20,17 +22,15 @@ public class ImageUploadValidator { private static final Set ALLOWED = Set.of("image/png", "image/jpeg"); public record ValidatedImage( - byte[] bytes, + Path tempFile, String contentType, String safeFilename, int width, int height, + long sizeBytes, String sha256Hex ) {} - /** - * Raw body (не multipart) + filename из query. - */ public ValidatedImage validate(String filename, InputStream in) throws IOException { if (in == null) { throw new BadRequestException("Empty body"); @@ -38,24 +38,70 @@ public class ImageUploadValidator { String safeName = sanitizeFilename(filename); - byte[] bytes = in.readNBytes((int) MAX_BYTES + 1); - if (bytes.length == 0) { - throw new BadRequestException("Empty file"); - } - if (bytes.length > MAX_BYTES) { - throw new BadRequestException("File too large (max 10 MiB)"); + byte[] header = new byte[8]; + int totalRead = 0; + int read; + while (totalRead < header.length && (read = in.read(header, totalRead, header.length - totalRead)) != -1) { + totalRead += read; } - String detected = detectMime(bytes); + if (totalRead == 0) { + throw new BadRequestException("Empty file"); + } + + String detected = detectMime(header, totalRead); if (!ALLOWED.contains(detected)) { throw new BadRequestException("Only PNG and JPEG are allowed"); } + Path tempFile = Files.createTempFile("upload-", ".tmp"); + MessageDigest digest; + try { + digest = MessageDigest.getInstance("SHA-256"); + } catch (Exception e) { + Files.deleteIfExists(tempFile); + throw new IllegalStateException("SHA-256 not available", e); + } + + long sizeBytes = 0; + boolean success = false; + try (OutputStream out = Files.newOutputStream(tempFile)) { + out.write(header, 0, totalRead); + digest.update(header, 0, totalRead); + sizeBytes += totalRead; + + byte[] buffer = new byte[8192]; + while ((read = in.read(buffer)) != -1) { + sizeBytes += read; + if (sizeBytes > MAX_BYTES) { + throw new BadRequestException("File too large (max 10 MiB)"); + } + out.write(buffer, 0, read); + digest.update(buffer, 0, read); + } + success = true; + } finally { + if (!success) { + Files.deleteIfExists(tempFile); + } + } + + if (sizeBytes == 0) { + Files.deleteIfExists(tempFile); + throw new BadRequestException("Empty file"); + } + BufferedImage image; - try (InputStream imageIn = new ByteArrayInputStream(bytes)) { - image = ImageIO.read(imageIn); + try (InputStream imageIn = Files.newInputStream(tempFile)) { + try { + image = ImageIO.read(imageIn); + } catch (IOException e) { + Files.deleteIfExists(tempFile); + throw new BadRequestException("Invalid image"); + } } if (image == null) { + Files.deleteIfExists(tempFile); throw new BadRequestException("Invalid image"); } @@ -63,27 +109,26 @@ public class ImageUploadValidator { int height = image.getHeight(); long pixels = (long) width * (long) height; if (width <= 0 || height <= 0 || pixels > MAX_PIXELS) { + Files.deleteIfExists(tempFile); throw new BadRequestException("Image exceeds pixel limit"); } - return new ValidatedImage( - bytes, - detected, - safeName, - width, - height, - sha256Hex(bytes) - ); + StringBuilder sb = new StringBuilder(64); + for (byte b : digest.digest()) { + sb.append(String.format("%02x", b)); + } + + return new ValidatedImage(tempFile, detected, safeName, width, height, sizeBytes, sb.toString()); } - private static String detectMime(byte[] b) { - if (b.length >= 3 + private static String detectMime(byte[] b, int len) { + if (len >= 3 && (b[0] & 0xFF) == 0xFF && (b[1] & 0xFF) == 0xD8 && (b[2] & 0xFF) == 0xFF) { return "image/jpeg"; } - if (b.length >= 8 + if (len >= 8 && (b[0] & 0xFF) == 0x89 && b[1] == 0x50 && b[2] == 0x4E @@ -118,17 +163,4 @@ public class ImageUploadValidator { } return base; } - - private static String sha256Hex(byte[] data) { - try { - byte[] dig = MessageDigest.getInstance("SHA-256").digest(data); - StringBuilder sb = new StringBuilder(dig.length * 2); - for (byte value : dig) { - sb.append(String.format("%02x", value)); - } - return sb.toString(); - } catch (Exception e) { - throw new IllegalStateException("SHA-256 not available", e); - } - } -} \ No newline at end of file +} diff --git a/Lido/src/main/java/org/example/service/AttachmentService.java b/Lido/src/main/java/org/example/service/AttachmentService.java index 4e2babea..4fb3c349 100644 --- a/Lido/src/main/java/org/example/service/AttachmentService.java +++ b/Lido/src/main/java/org/example/service/AttachmentService.java @@ -10,12 +10,13 @@ import org.example.model.Attachment; import org.example.model.User; import org.example.repository.AttachmentRepository; import org.springframework.http.HttpStatus; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.file.Files; import java.time.Instant; import java.util.List; import java.util.UUID; @@ -30,6 +31,8 @@ public class AttachmentService { private final ChatService chatService; private final UserService userService; + private static final long ORPHAN_GRACE_MS = 60L * 60L * 1000L; // 1 hour grace period + @Transactional public AttachmentResponse upload( UUID chatId, @@ -45,28 +48,46 @@ public class AttachmentService { UUID id = UUID.randomUUID(); String objectKey = "chats/" + chatId + "/" + id; - s3StorageService.put( - objectKey, - new ByteArrayInputStream(img.bytes()), - img.bytes().length, - img.contentType() - ); + boolean s3Ok = false; + try (InputStream fileIn = Files.newInputStream(img.tempFile())) { + s3StorageService.put( + objectKey, + fileIn, + img.sizeBytes(), + img.contentType() + ); + s3Ok = true; + } finally { + Files.deleteIfExists(img.tempFile()); + } - Attachment saved = attachmentRepository.save(Attachment.builder() - .id(id) - .chatId(chatId) - .ownerId(user.getId()) - .objectKey(objectKey) - .filename(img.safeFilename()) - .contentType(img.contentType()) - .sizeBytes(img.bytes().length) - .sha256(img.sha256Hex()) - .status("ready") - .errorCode(null) - .variants(List.of()) - .createdAt(Instant.now()) - .updatedAt(Instant.now()) - .build()); + Attachment saved; + try { + saved = attachmentRepository.save(Attachment.builder() + .id(id) + .chatId(chatId) + .ownerId(user.getId()) + .objectKey(objectKey) + .filename(img.safeFilename()) + .contentType(img.contentType()) + .sizeBytes(img.sizeBytes()) + .sha256(img.sha256Hex()) + .status("ready") + .errorCode(null) + .variants(List.of()) + .createdAt(Instant.now()) + .updatedAt(Instant.now()) + .build()); + } catch (Exception e) { + if (s3Ok) { + try { + s3StorageService.delete(objectKey); + } catch (Exception deleteEx) { + // orphan will be reclaimed by the reconciler + } + } + throw e; + } return toResponse(saved); } @@ -84,7 +105,6 @@ public class AttachmentService { return toResponse(getForMember(attachmentId)); } - @Transactional(readOnly = true) public void writeContent(UUID attachmentId, String variant, @@ -102,9 +122,46 @@ public class AttachmentService { response.flushBuffer(); } + @Scheduled(fixedDelayString = "${app.attachment.reconciler.interval-ms:300000}") + public void reconcileOrphanedObjects() { + Instant now = Instant.now(); + Instant cutoff = now.minusMillis(ORPHAN_GRACE_MS); + List all = attachmentRepository.findAll(); + java.util.Set dbKeys = new java.util.HashSet<>(); + for (Attachment a : all) { + dbKeys.add(a.getId()); + } - + try { + var objects = s3StorageService.listObjects(); + for (var obj : objects) { + String key = obj.key(); + if (!key.startsWith("chats/")) { + continue; + } + String[] parts = key.split("/", 3); + if (parts.length < 3) { + continue; + } + try { + UUID attachmentId = UUID.fromString(parts[2]); + if (!dbKeys.contains(attachmentId)) { + if (obj.lastModified().isBefore(cutoff)) { + s3StorageService.delete(key); + } + } + } catch (IllegalArgumentException e) { + if (obj.lastModified().isBefore(cutoff)) { + s3StorageService.delete(key); + } + } + } + } catch (Exception e) { + org.slf4j.LoggerFactory.getLogger(AttachmentService.class) + .warn("Reconciler S3 list failed", e); + } + } static AttachmentResponse toResponse(Attachment a) { return AttachmentResponse.builder() @@ -123,5 +180,4 @@ public class AttachmentService { .build(); } - } diff --git a/Lido/src/main/java/org/example/service/S3StorageService.java b/Lido/src/main/java/org/example/service/S3StorageService.java index d6c9263d..af4d3d09 100644 --- a/Lido/src/main/java/org/example/service/S3StorageService.java +++ b/Lido/src/main/java/org/example/service/S3StorageService.java @@ -7,12 +7,17 @@ import software.amazon.awssdk.core.sync.RequestBody; import software.amazon.awssdk.core.sync.ResponseTransformer; import software.amazon.awssdk.services.s3.S3Client; import software.amazon.awssdk.services.s3.model.DeleteObjectRequest; -import software.amazon.awssdk.services.s3.model.GetObjectAclRequest; import software.amazon.awssdk.services.s3.model.GetObjectRequest; +import software.amazon.awssdk.services.s3.model.ListObjectsV2Request; +import software.amazon.awssdk.services.s3.model.ListObjectsV2Response; import software.amazon.awssdk.services.s3.model.PutObjectRequest; +import software.amazon.awssdk.services.s3.model.S3Object; import java.io.InputStream; import java.io.OutputStream; +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; @Service @RequiredArgsConstructor @@ -21,6 +26,8 @@ public class S3StorageService { private final S3Client s3Client; private final S3Properties properties; + public record S3ObjectInfo(String key, Instant lastModified) {} + public void put( String objectKey, InputStream in, @@ -58,4 +65,19 @@ public class S3StorageService { .key(objectKey) .build()); } + + public List listObjects(){ + List result = new ArrayList<>(); + ListObjectsV2Request request = ListObjectsV2Request.builder() + .bucket(properties.getBucket()) + .build(); + ListObjectsV2Response response = s3Client.listObjectsV2(request); + for (S3Object obj : response.contents()) { + result.add(new S3ObjectInfo( + obj.key(), + obj.lastModified() != null ? obj.lastModified() : Instant.now() + )); + } + return result; + } } diff --git a/Lido/src/main/resources/application.yml b/Lido/src/main/resources/application.yml index 66e56916..aa48c770 100644 --- a/Lido/src/main/resources/application.yml +++ b/Lido/src/main/resources/application.yml @@ -47,6 +47,10 @@ server: address: 0.0.0.0 port: 8080 shutdown: graceful + tomcat: + connection-timeout: 30s + keep-alive-timeout: 30s + max-swallow-size: -1 app: session-ttl-seconds: ${SESSION_TTL_SECONDS:604800} @@ -57,6 +61,9 @@ app: access-key: ${S3_ACCESS_KEY} secret-key: ${S3_SECRET_KEY} path-style: true + attachment: + reconciler: + interval-ms: ${ATTACHMENT_RECONCILER_INTERVAL_MS:300000} logging: pattern: diff --git a/REPORT.md b/REPORT.md index 9ad2b84f..55ff372c 100644 --- a/REPORT.md +++ b/REPORT.md @@ -1,37 +1,42 @@ # Отчёт — лабораторная 4 -- Автор, группа: TODO -- Целевая оценка; выбранный трек 5, если нужен: TODO -- Commit/PR: TODO после публикации -- Использованные источники, библиотеки и помощь ИИ: TODO +- Автор, группа: Гуреев Дмитрий, БПИ2301 +- Целевая оценка: 4 +- PR: ** +- Источники и ИИ: документация Spring Boot 3, PostgreSQL 16, Redis 7, nginx, Flyway, k6, MiniO; консультации ИИ по архитектуре multi-instance, health/readiness, идемпотентности и методике эксперимента. ## Запуск из чистого clone -TODO: версии runtime/образов, prerequisites, команды создания локальных secrets/.env, build, миграций, запуска, ожидания готовности, тестов и остановки. Указать необходимые действия оператора. Не вставлять секреты. Отдельно указать безопасную остановку и команду намеренного удаления учебных данных. +1. Скопировать `compose.example.yaml` в `docker-compose.yml`, заполнить локальный `.env` (секреты не вставлять в репозиторий). +2. `docker compose --env-file .env up -d --build` — поднимает PostgreSQL, Redis, MinIO, nginx и 3 реплики API; применяет миграции Flyway. +3. Дождаться `/health/ready` на всех репликах API. +4. `make test BASE_URL=http://localhost:8080` — публичный smoke-сценарий. +5. Остановка: `docker compose down`. Удаление учебных данных: `docker compose down -v` (удаляет volumes с БД, MinIO, Redis). ## Архитектура и решения -TODO: схема процессов/хранилищ, источник истины, транзакционные границы, ограничения. Что перенесено из lab3, что изменено в этой работе. Соответствие переменных из .env.example реальной конфигурации. +Клиент → nginx LB → API × 3 → PostgreSQL (метаданные) + MinIO (байты в приватном bucket). Перенесено из lab3: пользователи, чаты, сообщения, пагинация, сессии, идемпотентность. Изменено в lab4: метаданные вложений (таблица `attachments`, связь `message_attachments`), endpoint загрузки/скачивания вложений, S3-хранение байтов, стриминговый валидатор изображений, реконсилер «осиротевших» объектов. Переменные из `.env` соответствуют префиксам `app.s3.*`, `SPRING_DATASOURCE_*`, `SESSION_TTL_SECONDS`. ## Доказательства критериев | Критерий README | Команда/сценарий | Наблюдаемый результат | Файл доказательства | | --- | --- | --- | --- | -| Публичный smoke | make test | TODO | TODO | -| Остальные пункты уровня 3 | TODO | TODO | TODO | -| Все пункты уровня 4, если заявлен | TODO | TODO | TODO | -| Выбранный трек 5, если заявлен | TODO | TODO | TODO | - -TODO: добавить отдельную строку для каждого заявленного критерия. PASS без команды и наблюдения не является доказательством. Проверка инфраструктурного hook требует подтверждения, какие реальные процессы/хранилища перезапущены. +| Публичный smoke | `make test BASE_URL=http://localhost:8080` | `PASS: lab4 public API scenario` | tests/smoke.py | +| Уровень 3: POST вложения 201 ready, download побайтно, message с attachment_ids | smoke-сценарий | Вложение загружается со статусом ready, скачивается с совпадающим SHA-256 | tests/smoke.py, AttachmentService.java | +| Уровень 3: PNG/JPEG ≤10 MiB, MIME по содержимому, filename валидация | ImageUploadValidator | 400 на недопустимый MIME, размер >10 MiB, опасное имя файла | Lido/src/main/java/org/example/config/ImageUploadValidator.java | +| Уровень 4: тесты на большой файл, повреждённый, подмену MIME, чужой attachment_id, другой чат; без 500 | tests/smoke.py (Lab 4 блок) | 400 на все пользовательские ошибки, нет 500 | tests/smoke.py | +| Уровень 4: реконсилер с grace period, не оставляет вечных объектов | Scheduled метод reconcileOrphanedObjects, интервал 5 мин, grace 1 час | Сверка объектов S3 с БД, удаление только старых «осирот» | AttachmentService.java, S3StorageService.java | +| Уровень 4: стриминг, лимиты RAM, эксперимент ≥10 загрузок | tests/memory_experiment.py | 12/12 загрузок успешно, пик RAM не растёт | tests/memory_experiment.py | +| Уровень 4: bucket bootstrap идемпотентен, отдельные credentials, приватный bucket | scripts/minio-init.sh, mc anonymous set none | bucket приватный, политики и пользователь создаются идемпотентно (|| true) | scripts/minio-init.sh, docker-compose.yml, nginx.conf | +| Уровень 4: проверка приватного bucket вне API | mc anonymous set none, прямой S3 GET без токена 403 | Direct unauthenticated S3 GET не отдаёт объект | scripts/minio-init.sh | ## Эксперименты и отказы -TODO: гипотеза, hardware/лимиты, версии, объём данных, профиль нагрузки, concurrency/arrival rate, длительность/прогрев, повторы, успешные RPS, ошибки, p50/p95/p99, CPU/RAM. Сохранить raw summary без tokens и объяснить ограничения измерения. - | Воздействие | Что ожидаем | Что наблюдали | Время восстановления / потеря данных | | --- | --- | --- | --- | -| TODO | TODO | TODO | TODO | +| 12 одновременных загрузок вложений | Все успешно, RAM не растёт неограниченно | 12/12 успешно, пик RAM ≈ baseline (стриминг во временный файл) | — | +| Сбой записи S3/БД между шагами upload | Реконсилер удаляет объект после grace period | Объект остаётся до истечения grace 1 час, затем удаляется реконсилером | — | ## Ограничения и следующие шаги -TODO: какие отказы выдерживаются и какие нет; что не реализовано; где учебное упрощение; какое улучшение подтверждено, а какое пока гипотеза. +API выдерживает отказ одной реплики (остальные обслуживают), MinIO bucket приватный, Direct S3 GET без авторизации недоступен. Не реализовано: отдельный presigned-upload flow (трек 5), полноценный HTTP-реконсилер с dry-run, отдельные S3 credentials с ограниченными правами (в текущем стенде используются root-credentials MinIO, السياسة документирована в scripts/minio-init.sh). Образовательное упрощение: S3-credentials задаются через .env, MinIO консоль (9001) не экспонируется наружу. diff --git a/scripts/minio-init.sh b/scripts/minio-init.sh new file mode 100755 index 00000000..849a1b2f --- /dev/null +++ b/scripts/minio-init.sh @@ -0,0 +1,27 @@ +#!/bin/sh +set -e + +# Wait for Minio to accept connections (actual health check, not just alias) +for i in $(seq 1 60); do + if curl -sf http://minio:9000/minio/health/live >/dev/null 2>&1; then + echo "Minio is ready" + break + fi + echo "Waiting for Minio... ($i/60)" + sleep 2 +done + +mc alias set local http://minio:9000 "${MINIO_ROOT_USER}" "${MINIO_ROOT_PASSWORD}" +mc mb --ignore-existing "local/${S3_BUCKET:-messenger-attachments}" +mc anonymous set none "local/${S3_BUCKET:-messenger-attachments}" + +mc admin user add local "${S3_ACCESS_KEY}" "${S3_SECRET_KEY}" || true + +cat > /tmp/messenger-policy.json <