Merge pull request #438 from GDATASoftwareAG/typescript/fix-detection…

…-and-file-mime-type fix detection and mime file type
GDATASoftwareAG · Apr 29, 2024 · 477de7f · 477de7f
2 parents 8aa7a11 + 65e5eba
commit 477de7f
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 48 deletions.
diff --git a/typescript/src/Vaas.ts b/typescript/src/Vaas.ts
@@ -188,7 +188,7 @@ export class Vaas {
 
           this.verdictPromises.delete(guid);
           resolve(
-            new VaasVerdict(verdictResponse.sha256, verdictResponse.verdict, verdictResponse.detections, verdictResponse.lib_magic),
+            new VaasVerdict(verdictResponse.sha256, verdictResponse.verdict, verdictResponse.detection, verdictResponse.file_type, verdictResponse.mime_type),
           );
         },
         reject: (reason) => reject(reason),
@@ -216,7 +216,7 @@ export class Vaas {
         resolve: async (verdictResponse: VerdictResponse) => {
           this.verdictPromises.delete(guid);
           resolve(
-            new VaasVerdict(verdictResponse.sha256, verdictResponse.verdict, verdictResponse.detections, verdictResponse.lib_magic),
+            new VaasVerdict(verdictResponse.sha256, verdictResponse.verdict, verdictResponse.detection, verdictResponse.file_type, verdictResponse.mime_type),
           );
         },
         reject: (reason) => reject(reason),
@@ -263,8 +263,8 @@ export class Vaas {
             resolve: async (verdictResponse: VerdictResponse) => {
               this.verdictPromises.delete(guid);
               resolve(
-                new VaasVerdict(verdictResponse.sha256, verdictResponse.verdict, verdictResponse.detections, verdictResponse.lib_magic),
-              );
+                new VaasVerdict(verdictResponse.sha256, verdictResponse.verdict, verdictResponse.detection, verdictResponse.file_type, verdictResponse.mime_type),
+                );
             },
             reject: (reason) => reject(reason),
           });

diff --git a/typescript/src/messages/detection.ts b/typescript/src/messages/detection.ts
diff --git a/typescript/src/messages/lib_magic.ts b/typescript/src/messages/lib_magic.ts
diff --git a/typescript/src/messages/vaas_verdict.ts b/typescript/src/messages/vaas_verdict.ts
@@ -1,14 +1,13 @@
 import { JsonProperty, JsonObject } from "typescript-json-serializer";
 import { Verdict } from "../Verdict";
-import { Detection } from "./detection";
-import { LibMagic } from "./lib_magic";
 
 @JsonObject()
 export class VaasVerdict {
   public constructor(
     @JsonProperty() public sha256: string,
     @JsonProperty() public verdict: Verdict,
-    @JsonProperty() public detections: Detection[] | undefined,
-    @JsonProperty() public libMagic: LibMagic | undefined,        
+    @JsonProperty() public detection: string | undefined,
+    @JsonProperty() public file_type: string | undefined,
+    @JsonProperty() public mime_type: string | undefined,      
   ) {}
 }
diff --git a/typescript/src/messages/verdict_response.ts b/typescript/src/messages/verdict_response.ts
@@ -1,8 +1,6 @@
 import { JsonProperty, JsonObject } from "typescript-json-serializer";
 import { Kind, Message } from "./message";
 import { Verdict } from "../Verdict";
-import { Detection } from "./detection";
-import { LibMagic } from "./lib_magic";
 
 @JsonObject()
 export class VerdictResponse extends Message {
@@ -12,8 +10,9 @@ export class VerdictResponse extends Message {
     @JsonProperty() public verdict: Verdict,
     @JsonProperty() public upload_token: string | undefined,
     @JsonProperty() public url: string | undefined,
-    @JsonProperty() public detections: Detection[] | undefined,
-    @JsonProperty() public lib_magic: LibMagic | undefined,
+    @JsonProperty() public detection: string | undefined,
+    @JsonProperty() public file_type: string | undefined,
+    @JsonProperty() public mime_type: string | undefined,
   ) {
     super(Kind.VerdictResponse);
   }

diff --git a/typescript/tests/test.ts b/typescript/tests/test.ts
@@ -232,14 +232,14 @@ describe("Test verdict requests", function () {
     expect(verdict.sha256.toUpperCase()).to.equal(sha256);
   }).timeout(45000);
 
-  // it("returns Pup for AMTSO pup sample", async () => {
-  //   const vaas = await createVaasWithClientCredentialsGrantAuthenticator();
-  //   const sha256 =
-  //     "d6f6c6b9fde37694e12b12009ad11ab9ec8dd0f193e7319c523933bdad8a50ad";
-  //   let verdict = await vaas.forSha256(sha256);
-  //   expect(verdict.verdict).to.equal("Pup");
-  //   expect(verdict.sha256).to.equal(sha256);
-  // });
+  it("returns Pup for AMTSO pup sample", async () => {
+    const vaas = await createVaasWithClientCredentialsGrantAuthenticator();
+    const sha256 =
+      "d6f6c6b9fde37694e12b12009ad11ab9ec8dd0f193e7319c523933bdad8a50ad";
+    let verdict = await vaas.forSha256(sha256);
+    expect(verdict.verdict).to.equal("Pup");
+    expect(verdict.sha256).to.equal(sha256);
+  });
 
   it('if a clean url is submitted, a verdict "clean" is expected', async () => {
     const vaas = await createVaasWithClientCredentialsGrantAuthenticator();
@@ -264,9 +264,9 @@ describe("Test verdict requests", function () {
     stream.push(null);
     const verdict = await vaas.forStream(stream);
     expect(verdict.verdict).to.equal("Clean");
-    expect(verdict.detections).to.be.empty;
-    expect(verdict.libMagic?.file_type).to.equal("ASCII text, with no line terminators");
-    expect(verdict.libMagic?.mime_type).to.equal("text/plain");
+    expect(verdict.detection).to.be.undefined;
+    expect(verdict.file_type).to.equal("ASCII text, with no line terminators");
+    expect(verdict.mime_type).to.equal("text/plain");
   });
 
   it('if a EICAR stream is submitted, a verdict "malicious" is expected', async () => {
@@ -279,9 +279,9 @@ describe("Test verdict requests", function () {
     stream.push(null);
     const verdict = await vaas.forStream(stream);
     expect(verdict.verdict).to.equal("Malicious");
-    expect(verdict.detections).to.be.not.empty;
-    expect(verdict.libMagic?.file_type).to.equal("EICAR virus test files");
-    expect(verdict.libMagic?.mime_type).to.equal("text/plain");
+    expect(verdict.detection).to.be.not.empty;
+    expect(verdict.file_type).to.equal("EICAR virus test files");
+    expect(verdict.mime_type).to.equal("text/plain");
   });
 
   it('if a EICAR stream from an url is submitted, a response with verdict, libmagic & detections is expected', async () => {
@@ -292,9 +292,9 @@ describe("Test verdict requests", function () {
     );
     const verdict = await vaas.forStream(response.data);
     expect(verdict.verdict).to.equal("Malicious");
-    expect(verdict.detections).to.be.not.empty;
-    expect(verdict.libMagic?.file_type).to.equal("EICAR virus test files");
-    expect(verdict.libMagic?.mime_type).to.equal("text/plain");
+    expect(verdict.detection).to.be.not.empty;
+    expect(verdict.file_type).to.equal("EICAR virus test files");
+    expect(verdict.mime_type).to.equal("text/plain");
   });
 });