Update tests

Author: AlexHladin

lib/Model.js

@@ -44,38 +44,20 @@ class Model {
       return;
     }
 
-    // only for npm ver. 6
-    if (advisory.findings) {
-      advisory.findings.forEach((finding) =>
-        finding.paths.forEach((path) => {
-          if (this.allowlist.paths.includes(`${advisory.id}|${path}`)) {
-            this.allowlistedPathsFound.push(`${advisory.id}|${path}`);
-          }
-        })
-      );
+    this.allowlistedPathsFound.push(
+      ...advisory.findings
+        .flatMap((finding) => `${advisory.id}|${finding.paths}`)
+        .filter((path) => this.allowlist.paths.includes(path))
+    );
 
-      if (
-        advisory.findings.every((finding) =>
-          finding.paths.every((path) =>
-            this.allowlist.paths.includes(`${advisory.id}|${path}`)
-          )
-        )
-      ) {
-        return;
-      }
-    }
+    const isAllowListed = advisory.findings.every((finding) =>
+      finding.paths.every((path) =>
+        this.allowlist.paths.includes(`${advisory.id}|${path}`)
+      )
+    );
 
-    // only for npm ver. 7
-    if (advisory.nodes) {
-      const nodes = advisory.nodes
-        .map((node) => node.split(/\//)[1])
-        .filter((node) =>
-          this.allowlist.paths.find((path) => path.includes(node))
-        );
-
-      nodes.forEach((path) => {
-        this.allowlistedPathsFound.push(`${advisory.id}|${path}`);
-      });
+    if (isAllowListed) {
+      return;
     }
 
     this.advisoriesFound.push(advisory);
@@ -89,13 +71,25 @@ class Model {
     }
 
     // only for npm ver. 7
-    Object.values(parsedOutput.vulnerabilities)
-      .map((a) => ({
-        id: a.via[0].source ? a.via[0].source : a.via[0],
-        module_name: a.name,
-        severity: a.severity,
-        nodes: a.nodes,
-      }))
+    Object.keys(parsedOutput.vulnerabilities)
+      .map((key, index) => {
+        const vulnerability = parsedOutput.vulnerabilities[key];
+        let { via } = vulnerability;
+
+        if (typeof via[0] === "string") {
+          via = parsedOutput.vulnerabilities[via[0]].via;
+          (via[index] || via[0]).paths = `${vulnerability.name}>${
+            (via[index] || via[0]).name
+          }`;
+        }
+        return {
+          id: (via[index] || via[0]).source,
+          module_name: vulnerability.name,
+          severity: vulnerability.severity,
+          nodes: vulnerability.nodes,
+          findings: via.map((v) => ({ paths: [v.paths || v.name] })),
+        };
+      })
       .forEach((a) => this.process(a));
     return this.getSummary();
   }