Merge pull request #814 from GDATASoftwareAG/java/for_stream_0_bytes

Java/for stream 0 bytes

Author: doxthree

java/src/main/java/de/gdata/vaas/Vaas.java

@@ -118,7 +118,7 @@ private static void throwInnerException(Exception e) throws VaasAuthenticationEx
     }
 
     private CompletableFuture<VaasVerdict> sendUrlWithRetry(HttpClient httpClient, URI uri, String vaasRequestId) {
-        return CreateHttpRequestBuilderWithHeaders(uri, vaasRequestId).thenCompose(request ->
+        return createHttpRequestBuilderWithHeaders(uri, vaasRequestId).thenCompose(request ->
                 httpClient.sendAsync(request.build(), HttpResponse.BodyHandlers.ofString())
                         .thenCompose(handleException(response -> switch (response.statusCode()) {
                             case 200 -> {
@@ -135,7 +135,7 @@ private CompletableFuture<VaasVerdict> sendUrlWithRetry(HttpClient httpClient, U
     }
 
     private CompletableFuture<VaasVerdict> sendFileWithRetry(HttpClient httpClient, URI uri, String vaasRequestId) {
-        return CreateHttpRequestBuilderWithHeaders(uri, vaasRequestId).thenCompose(request ->
+        return createHttpRequestBuilderWithHeaders(uri, vaasRequestId).thenCompose(request ->
                 httpClient.sendAsync(request.build(), HttpResponse.BodyHandlers.ofString())
                         .thenCompose(handleException(response -> switch (response.statusCode()) {
                             case 200 -> {
@@ -150,7 +150,7 @@ private CompletableFuture<VaasVerdict> sendFileWithRetry(HttpClient httpClient,
                         })));
     }
 
-    private CompletableFuture<HttpRequest.Builder> CreateHttpRequestBuilderWithHeaders(URI uri, String requestId) {
+    private CompletableFuture<HttpRequest.Builder> createHttpRequestBuilderWithHeaders(URI uri, String requestId) {
         return this.authenticator.getToken().thenApply(token -> {
             var httpRequestBuilder = HttpRequest.newBuilder()
                     .uri(uri)
@@ -274,9 +274,10 @@ public CompletableFuture<VaasVerdict> forStreamAsync(InputStream inputStream, lo
                                                          ForStreamOptions options) {
         var params = Map.of("useHashLookup", String.valueOf(options.isUseHashLookup()));
         var filesUri = this.config.getUrl() + "/files?" + encodeParams(params);
-        var bodyPublisher = BodyPublishers.fromPublisher(BodyPublishers.ofInputStream(() -> inputStream),
-                contentLength);
-        return CreateHttpRequestBuilderWithHeaders(URI.create(filesUri), options.getVaasRequestId()).thenCompose(
+        var bodyPublisher = contentLength > 0
+            ? BodyPublishers.fromPublisher(BodyPublishers.ofInputStream(() -> inputStream), contentLength)
+            : BodyPublishers.noBody();
+        return createHttpRequestBuilderWithHeaders(URI.create(filesUri), options.getVaasRequestId()).thenCompose(
                 requestBuilder -> {
                     var postRequest = requestBuilder
                             .POST(bodyPublisher)
@@ -329,7 +330,7 @@ public CompletableFuture<VaasVerdict> forUrlAsync(URL url, ForUrlOptions options
         var params = Map.of("useHashLookup", String.valueOf(options.isUseHashLookup()));
         var urlsUri = this.config.getUrl() + "/urls";
         var urlAnalysisRequest = new UrlAnalysisRequest(url.toString(), options.isUseHashLookup());
-        return CreateHttpRequestBuilderWithHeaders(URI.create(urlsUri), options.getVaasRequestId()).thenCompose(requestBuilder -> {
+        return createHttpRequestBuilderWithHeaders(URI.create(urlsUri), options.getVaasRequestId()).thenCompose(requestBuilder -> {
             var postRequest = requestBuilder
                     .POST(HttpRequest.BodyPublishers.ofString(UrlAnalysisRequest.ToJson(urlAnalysisRequest)))
                     .header("Content-Type", "application/json")

java/src/test/java/de/gdata/test/integration/RealApiIntegrationTests.java

@@ -23,13 +23,16 @@
 import org.junit.jupiter.params.provider.CsvSource;
 import org.mockito.ArgumentCaptor;
 
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
@@ -732,6 +735,18 @@ public void forFile_BigFileWithSmallTimeout_ThrowsTimeoutException()
         assertInstanceOf(TimeoutException.class, exception.getCause());
     }
 
+    @Test
+    public void forFile_EmptyFile_ReturnsVerdict() throws Exception {
+        var file = new File(System.getProperty("java.io.tmpdir"), "empty.txt");
+        file.createNewFile();
+
+        vaas = getVaasWithCredentials();
+        var vaasVerdict = vaas.forFileAsync(file.toPath()).join();
+
+        assertEquals("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", vaasVerdict.getSha256());
+        assertEquals(Verdict.CLEAN, vaasVerdict.getVerdict());
+    }
+
     @Test
     public void forStream_ReturnsVerdict() throws Exception {
         var url = URI.create(EICAR_URL).toURL();
@@ -1111,6 +1126,17 @@ public void forStream_BigFileWithSmallTimeout_ThrowsTimeoutException()
         assertInstanceOf(TimeoutException.class, exception.getCause());
     }
 
+    @Test
+    public void forStream_EmptyFile_ReturnsVerdict() throws Exception {
+        var stream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8));
+
+        vaas = getVaasWithCredentials();
+        var vaasVerdict = vaas.forStreamAsync(stream, 0).join();
+
+        assertEquals("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", vaasVerdict.getSha256());
+        assertEquals(Verdict.CLEAN, vaasVerdict.getVerdict());
+    }
+
     @Test
     public void forUrl_ReturnsVerdict() throws Exception {
         var url = URI.create(EICAR_URL).toURL();