update

Author: manuel-sommer

dojo/tools/n0s1/parser.py

@@ -2,6 +2,7 @@
 import json
 
 from dojo.models import Finding
+from dojo.tools.parser_test import ParserTest
 
 
 class N0s1Parser:
@@ -14,6 +15,22 @@ def get_label_for_scan_types(self, scan_type):
     def get_description_for_scan_types(self, scan_type):
         return "JSON output from the n0s1 scanner."
 
+    def get_tests(self, scan_type, handle):
+        data = json.load(handle)
+        subscanner = self.detect_subscanner(data)
+        test = ParserTest(
+            name=subscanner,
+            parser_type=subscanner,
+            version=data.get("tool", {}).get("version", ""),
+            description=f"Scan from {subscanner}",
+        )
+        test.findings = self.get_findings_from_data(data)
+        return [test]
+
+    def get_findings(self, scan_file, test):
+        data = json.load(scan_file)
+        return self.get_findings_from_data(data)
+
     def detect_subscanner(self, data):
         platforms = {f.get("details", {}).get("platform", "") for f in data.get("findings", {}).values()}
         if "Confluence" in platforms:
@@ -24,14 +41,6 @@ def detect_subscanner(self, data):
             return "n0s1 GitLab"
         return "n0s1"
 
-    def get_findings(self, scan_file, test):
-        data = json.load(scan_file)
-        subscanner = self.detect_subscanner(data)
-        if hasattr(test, "test_type") and test.test_type:
-            test.test_type.name = subscanner
-        test.description = f"Scan from {subscanner}"
-        return self.get_findings_from_data(data)
-
     def get_findings_from_data(self, data):
         dupes = {}
         regex_configs = {}

unittests/tools/test_n0s1_parser.py

@@ -1,5 +1,4 @@
 
-import json
 
 from dojo.models import Test, Test_Type
 from dojo.tools.n0s1.parser import N0s1Parser
@@ -19,12 +18,14 @@ def test_n0s1_parser_with_multiple_findings(self):
             self.assertEqual(finding.title, "AWS")
             self.assertIsNotNone(finding.description)
             self.assertTrue(finding.dynamic_finding)
-            self.assertEqual(test.test_type.name, "n0s1 Confluence")
-            self.assertEqual(test.description, "Scan from n0s1 Confluence")
+            self.assertEqual(test.test_type.name, "n0s1 Scanner")
 
     def test_detect_subscanner_returns_correct_type(self):
         with (get_unit_tests_scans_path("n0s1") / "many_findings.json").open(encoding="utf-8") as testfile:
             parser = N0s1Parser()
-            data = json.load(testfile)
-            subscanner = parser.detect_subscanner(data)
-            self.assertEqual("n0s1 Confluence", subscanner)
+            tests = parser.get_tests("n0s1 Scanner", testfile)
+            self.assertEqual(1, len(tests))
+            test = tests[0]
+            self.assertEqual("n0s1 Confluence", test.name)
+            self.assertEqual("Scan from n0s1 Confluence", test.description)
+            self.assertEqual(17, len(test.findings))