diff --git a/src/main/java/ru/micord/av/service/service/FileScanService.java b/src/main/java/ru/micord/av/service/service/FileScanService.java index 73d3d82..6389203 100644 --- a/src/main/java/ru/micord/av/service/service/FileScanService.java +++ b/src/main/java/ru/micord/av/service/service/FileScanService.java @@ -68,6 +68,7 @@ public class FileScanService { try (InputStream inputStream = process.getInputStream()) { String result = new String(inputStream.readAllBytes()); + LOGGER.info("File {} scanned with result: {}", originalFileName, result); checkScanResult(result, originalFileName); int exitCode = process.waitFor(); @@ -100,14 +101,20 @@ public class FileScanService { } private void checkScanResult(String result, String originalFileName) { - for (String line : result.split("\n")) { - String[] lineParts = line.split(":"); - if (lineParts.length > 1) { - if (lineParts[0].startsWith(passwordProtectedResultName) - && Integer.parseInt(lineParts[1].trim()) > 0) { - throw new AvException("Detected password-protected file: " + originalFileName); - } + if (!result.contains(passwordProtectedResultName)) { + LOGGER.warn("File scan result doesn't contains \"{}\", " + + "please check property \"password.protected.result.name\" is correct", + passwordProtectedResultName); + } + + for (String line : result.split("\n")) { + String[] lineParts = line.split(":"); + if (lineParts.length > 1) { + if (lineParts[0].startsWith(passwordProtectedResultName) + && Integer.parseInt(lineParts[1].trim()) > 0) { + throw new AvException("Detected password-protected file: " + originalFileName); } } + } } } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 890d946..be42268 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -5,4 +5,4 @@ file: password: protected: result: - name: '???????, ?????????? ???????' \ No newline at end of file + name: 'Объекты, защищенные паролем' \ No newline at end of file