From 31c193e5d625f813cc0ed286fdc10b5b7947e985 Mon Sep 17 00:00:00 2001 From: "adel.ka" Date: Tue, 6 May 2025 15:12:04 +0300 Subject: [PATCH 1/4] SUPPORT-9156: fixes --- src/main/java/ru/micord/ervu/av/service/FileUploadService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java index 9db19bf..474a41a 100644 --- a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java +++ b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java @@ -83,7 +83,7 @@ public class FileUploadService { String downloadUrl = fileUrl.fileUrl(); fIleManager.downloadFile(downloadUrl, filePath); boolean isAvError = false; - int exitCode = 0; + int exitCode = INFECTED_CODE; if (avCheckEnabled) { try { From 197991546462f49049ff1bb100eb5ed6eca301b5 Mon Sep 17 00:00:00 2001 From: "adel.ka" Date: Tue, 6 May 2025 16:29:35 +0300 Subject: [PATCH 2/4] SUPPORT-9156: add new exitCode --- .../java/ru/micord/ervu/av/kafka/dto/FileStatus.java | 2 +- .../ru/micord/ervu/av/service/FileUploadService.java | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/ru/micord/ervu/av/kafka/dto/FileStatus.java b/src/main/java/ru/micord/ervu/av/kafka/dto/FileStatus.java index 020c879..ac509e5 100644 --- a/src/main/java/ru/micord/ervu/av/kafka/dto/FileStatus.java +++ b/src/main/java/ru/micord/ervu/av/kafka/dto/FileStatus.java @@ -17,6 +17,6 @@ public record FileStatus(String code, String status, String description) { "Файл был принят в обработку" ); public static final FileStatus FILE_STATUS_11 = new FileStatus("11", "Невозможно проверить файл ЛК РП", - "Невозможно проверить файл по причине недоступности или ошибки в работе антивируса" + "Невозможно проверить файл по причине недоступности или ошибки в работе антивируса, или из-за того, что файл защищён паролем." ); } diff --git a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java index 474a41a..d966c05 100644 --- a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java +++ b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java @@ -37,6 +37,7 @@ import ru.micord.ervu.av.s3.S3Service; @Service public class FileUploadService { private static final int INFECTED_CODE = 72; + private static final int PROTECTED_CODE = 73; private static final Logger LOGGER = LoggerFactory.getLogger(FileUploadService.class); @Value("${av.check.enabled}") private boolean avCheckEnabled; @@ -95,12 +96,14 @@ public class FileUploadService { } } - if (isAvError || exitCode == INFECTED_CODE) { + if (isAvError || exitCode == INFECTED_CODE || exitCode == PROTECTED_CODE) { downloadRequest.fileInfo().setFileUrl(null); - FileStatus fileStatus = isAvError ? FileStatus.FILE_STATUS_11 : FileStatus.FILE_STATUS_02; + FileStatus fileStatus = (exitCode == PROTECTED_CODE || isAvError) + ? FileStatus.FILE_STATUS_11 + : FileStatus.FILE_STATUS_02; downloadRequest.fileInfo().setFileStatus(fileStatus); - if (!isAvError) { + if (!isAvError && exitCode == INFECTED_CODE) { sendMessage(outErrorTopic.name(), downloadRequest, messageId, kafkaTemplate); } } From 57e77fc9125beb00ffe6ae280cf337cf60c08ca3 Mon Sep 17 00:00:00 2001 From: "adel.ka" Date: Tue, 6 May 2025 17:09:20 +0300 Subject: [PATCH 3/4] SUPPORT-9156: fix --- .../java/ru/micord/ervu/av/service/FileUploadService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java index d966c05..7a6c790 100644 --- a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java +++ b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java @@ -37,7 +37,7 @@ import ru.micord.ervu.av.s3.S3Service; @Service public class FileUploadService { private static final int INFECTED_CODE = 72; - private static final int PROTECTED_CODE = 73; + private static final int PASS_PROTECTED_CODE = 73; private static final Logger LOGGER = LoggerFactory.getLogger(FileUploadService.class); @Value("${av.check.enabled}") private boolean avCheckEnabled; @@ -96,9 +96,9 @@ public class FileUploadService { } } - if (isAvError || exitCode == INFECTED_CODE || exitCode == PROTECTED_CODE) { + if (isAvError || exitCode == INFECTED_CODE || exitCode == PASS_PROTECTED_CODE) { downloadRequest.fileInfo().setFileUrl(null); - FileStatus fileStatus = (exitCode == PROTECTED_CODE || isAvError) + FileStatus fileStatus = (exitCode == PASS_PROTECTED_CODE || isAvError) ? FileStatus.FILE_STATUS_11 : FileStatus.FILE_STATUS_02; downloadRequest.fileInfo().setFileStatus(fileStatus); From 9924818d24d270d2194556e8169a9a9719a7aae6 Mon Sep 17 00:00:00 2001 From: "adel.ka" Date: Tue, 6 May 2025 17:12:21 +0300 Subject: [PATCH 4/4] SUPPORT-9156: fix --- src/main/java/ru/micord/ervu/av/service/FileUploadService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java index 7a6c790..897f56c 100644 --- a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java +++ b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java @@ -84,7 +84,7 @@ public class FileUploadService { String downloadUrl = fileUrl.fileUrl(); fIleManager.downloadFile(downloadUrl, filePath); boolean isAvError = false; - int exitCode = INFECTED_CODE; + int exitCode = 0; if (avCheckEnabled) { try {