Add ForUrl test

GDATASoftwareAG · Mar 12, 2024 · a3644cd · a3644cd
1 parent 1f536c6
commit a3644cd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/dotnet/Vaas/src/Vaas/Messages/Detection.cs b/dotnet/Vaas/src/Vaas/Messages/Detection.cs
@@ -5,7 +5,7 @@ namespace Vaas.Messages;
 public class Detection
 {
     [JsonPropertyName("engine")]
-    public int Engine { get; init; }
+    public int? Engine { get; init; }
 
     [JsonPropertyName("fileName")]
     public string FileName { get; init; }

diff --git a/dotnet/Vaas/src/Vaas/Messages/VerdictResponse.cs b/dotnet/Vaas/src/Vaas/Messages/VerdictResponse.cs
@@ -35,10 +35,10 @@ public VerdictResponse(string sha256, Verdict verdict)
     public string? UploadToken { get; init; }
 
     [JsonPropertyName("detections")]
-    public List<Detection> Detections { get; init; }
+    public List<Detection>? Detections { get; init; }
 
     [JsonPropertyName("libMagic")]
-    public LibMagic LibMagic { get; init; }
+    public LibMagic? LibMagic { get; init; }
 
     [MemberNotNullWhen(true, nameof(Sha256), nameof(Guid))]
     public bool IsValid => !string.IsNullOrWhiteSpace(Sha256)

diff --git a/dotnet/Vaas/src/Vaas/VaasVerdict.cs b/dotnet/Vaas/src/Vaas/VaasVerdict.cs
@@ -14,6 +14,6 @@ public VaasVerdict(VerdictResponse verdictResponse)
 
     public string Sha256 { get; init; }
     public Verdict Verdict { get; init; }
-    public List<Detection> Detections { get; init; }
-    public LibMagic LibMagic { get; init; }
+    public List<Detection>? Detections { get; init; }
+    public LibMagic? LibMagic { get; init; }
 }
diff --git a/dotnet/Vaas/test/Vaas.Test/IntegrationTests.cs b/dotnet/Vaas/test/Vaas.Test/IntegrationTests.cs
@@ -256,6 +256,7 @@ private async Task<Vaas> AuthenticateWithCredentials()
             { "VerdictAsAService:Credentials:GrantType", "ClientCredentials" },
             { "VerdictAsAService:Credentials:ClientId", AuthenticationEnvironment.ClientId },
             { "VerdictAsAService:Credentials:ClientSecret", AuthenticationEnvironment.ClientSecret },
+            { "VerdictAsAService:UseCache", "false" }
         });
         ServiceCollectionTools.Output(_output, services);
         var provider = services.BuildServiceProvider();
@@ -316,6 +317,23 @@ public async Task ForStream_WithEicarUrl_ReturnsMaliciousWithDetectionsAndMimeTy
         var verdict = await vaas.ForStreamAsync(targetStream, CancellationToken.None);
 
         Assert.Equal(Verdict.Malicious, verdict.Verdict);
+        Assert.NotNull(verdict.LibMagic);
+        Assert.NotNull(verdict.Detections);
+        Assert.Equal("text/plain", verdict.LibMagic.MimeType);
+        Assert.Contains(verdict.Detections, detection => detection.Virus == "EICAR_TEST_FILE");
+    }
+
+    [Fact]
+    public async Task ForUrl_WithEicarUrl_ReturnsMaliciousWithDetectionAndMimeType()
+    {
+        var vaas = await AuthenticateWithCredentials();
+        var uri = new Uri("https://secure.eicar.org/eicar.com");
+
+        var verdict = await vaas.ForUrlAsync(uri, CancellationToken.None);
+
+        Assert.Equal(Verdict.Malicious, verdict.Verdict);
+        Assert.NotNull(verdict.LibMagic);
+        Assert.NotNull(verdict.Detections);
         Assert.Equal("text/plain", verdict.LibMagic.MimeType);
         Assert.Contains(verdict.Detections, detection => detection.Virus == "EICAR_TEST_FILE");
     }