diff --git a/java/src/main/java/com/vnp/demo/config/JacksonConfig.java b/java/src/main/java/com/vnp/demo/config/JacksonConfig.java new file mode 100644 index 0000000..5392014 --- /dev/null +++ b/java/src/main/java/com/vnp/demo/config/JacksonConfig.java @@ -0,0 +1,22 @@ +package main.java.com.vnp.demo.config; + +import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.fasterxml.jackson.databind.cfg.CoercionAction; +import com.fasterxml.jackson.databind.cfg.CoercionInputShape; +import com.fasterxml.jackson.databind.type.LogicalType; + +@Configuration +public class JacksonConfig { + @Bean + public Jackson2ObjectMapperBuilderCustomizer strictTextValues() { + return builder -> builder.postConfigurer(mapper -> + mapper.coercionConfigFor(LogicalType.Textual) + .setCoercion(CoercionInputShape.Integer, CoercionAction.Fail) + .setCoercion(CoercionInputShape.Float, CoercionAction.Fail) + .setCoercion(CoercionInputShape.Boolean, CoercionAction.Fail)); + } +} + diff --git a/java/src/main/java/com/vnp/demo/controllers/AuthController.java b/java/src/main/java/com/vnp/demo/controllers/AuthController.java index 75d5f0d..1338291 100644 --- a/java/src/main/java/com/vnp/demo/controllers/AuthController.java +++ b/java/src/main/java/com/vnp/demo/controllers/AuthController.java @@ -1,5 +1,6 @@ package com.vnp.demo.controllers; +import java.io.IOException; import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; import java.nio.charset.StandardCharsets; @@ -18,6 +19,8 @@ import com.vnp.demo.BusinessException; import com.vnp.demo.dto.SessionResponse; import com.vnp.demo.service.AuthService; +import jakarta.servlet.http.HttpServletRequest; + @RestController @RequestMapping("/api/v1/auth/sessions") public class AuthController { @@ -32,8 +35,12 @@ public class AuthController { @ResponseStatus(HttpStatus.CREATED) public SessionResponse login( @RequestHeader(value = HttpHeaders.AUTHORIZATION, required = false) - String authorization - ) { + String authorization, + HttpServletRequest request + ) throws IOException { + if (request.getInputStream().read() != -1) { + throw BusinessException.invalid("Тело запроса создания сессии должно быть пустым"); + } if (authorization == null || !authorization.startsWith("Basic ")) { throw BusinessException.unauthorized(); diff --git a/java/src/main/java/com/vnp/demo/service/ChatService.java b/java/src/main/java/com/vnp/demo/service/ChatService.java index 79dc567..1b4ce67 100644 --- a/java/src/main/java/com/vnp/demo/service/ChatService.java +++ b/java/src/main/java/com/vnp/demo/service/ChatService.java @@ -74,7 +74,7 @@ public class ChatService { List users = userRepository.findAllById(memberIds); if (users.size() != memberIds.size()) { - throw BusinessException.notFound(); + throw BusinessException.invalid("Один или несколько участников не найдены"); } // Создаём чат через конструктор существующей модели. diff --git a/java/src/main/resources/application.yml b/java/src/main/resources/application.yml index 513e1ce..da6475e 100644 --- a/java/src/main/resources/application.yml +++ b/java/src/main/resources/application.yml @@ -13,6 +13,9 @@ spring: default-property-inclusion: always deserialization: fail-on-unknown-properties: true + fail-on-trailing-tokens: true + mapper: + allow-coercion-of-scalars: false datasource: url: ${DB_URL:jdbc:postgresql://localhost:5432/messenger} username: ${DB_USERNAME:messenger} diff --git a/scripts/stop-one.sh b/scripts/stop-one.sh index 073164d..d8c94e9 100644 --- a/scripts/stop-one.sh +++ b/scripts/stop-one.sh @@ -1,14 +1,12 @@ #!/bin/sh set -eu -# Переходим в корень проекта. cd "$(dirname "$0")/.." -# Переменную передаёт тест failover. : "${TARGET_INSTANCE_ID:?Не задан TARGET_INSTANCE_ID}" compose() { - docker compose --env-file .env -f compose.yaml "$@" + docker compose --env-file .env -f compose.yml "$@" } containers=$(compose ps --status running -q api) @@ -45,4 +43,4 @@ fi docker kill --signal=KILL "$target" >/dev/null -printf '%s\n' "Остановлена API-реплика: $TARGET_INSTANCE_ID" \ No newline at end of file +printf '%s\n' "Остановлена API-реплика: $TARGET_INSTANCE_ID"