update

Author: manuel-sommer

dojo/tools/n0s1/parser.py

@@ -1,6 +1,8 @@
+
 import json
 
 from dojo.models import Finding
+from dojo.tools.parser_test import ParserTest
 
 
 class N0s1Parser:
@@ -13,27 +15,45 @@ 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_findings(self, filename, test):
-        dupes = {}
-        tree = filename.read()
-        try:
-            data = json.loads(str(tree, "utf-8"))
-        except Exception:
-            data = json.loads(tree)
+    def get_tests(self, scan_type, handle):
+        data = json.load(handle)
+        tests = []
+
+        # Determine sub-scanner type based on platform or regex_config
+        subscanner = "n0s1"
+        findings = data.get("findings", {})
+        platforms = {f.get("details", {}).get("platform", "") for f in findings.values()}
+        if "Confluence" in platforms:
+            subscanner = "n0s1 Confluence"
+        elif "GitHub" in platforms:
+            subscanner = "n0s1 GitHub"
+        elif "GitLab" in platforms:
+            subscanner = "n0s1 GitLab"
+        # Add more platform checks as needed
+
+        test = ParserTest(
+            name=subscanner,
+            parser_type=subscanner,
+            version=data.get("tool", {}).get("version", ""),
+            description=f"Scan from {subscanner}",
+        )
 
-        # Load global regex rules
+        test.findings = self.get_findings_from_data(data, test)
+        tests.append(test)
+        return tests
+
+    def get_findings_from_data(self, data, test):
+        dupes = {}
         regex_configs = {}
         if "regex_config" in data and "rules" in data["regex_config"]:
             for rule in data["regex_config"]["rules"]:
                 regex_configs[rule["id"]] = rule
 
-        # Iterate over findings
         for finding_id, finding_data in data.get("findings", {}).items():
             details = finding_data.get("details", {})
             regex_ref = details.get("matched_regex_config", {})
             regex_id = regex_ref.get("id")
 
-            # Merge global config with local override
             regex_info = regex_configs.get(regex_id, {})
             merged_regex = {
                 "id": regex_id,
@@ -42,7 +62,6 @@ def get_findings(self, filename, test):
                 "keywords": regex_info.get("keywords", []),
                 "tags": regex_info.get("tags", []),
             }
-
             title = merged_regex["id"] or "n0s1 Finding"
             description = f"**URL:** {finding_data.get('url', 'N/A')}\n"
             description += f"**Secret:** {finding_data.get('secret', 'N/A')}\n"
@@ -62,7 +81,7 @@ def get_findings(self, filename, test):
                 title=title,
                 test=test,
                 description=description,
-                severity="High",  # Adjust if needed
+                severity="High",
                 dynamic_finding=True,
                 static_finding=False,
                 unique_id_from_tool=dupe_key,

unittests/tools/test_n0s1_parser.py

@@ -15,3 +15,15 @@ def test_n0s1_parser_with_multiple_findings(self):
             self.assertEqual(finding.title, "AWS")
             self.assertIsNotNone(finding.description)
             self.assertTrue(finding.dynamic_finding)
+
+    def test_n0s1_get_tests_returns_correct_subscanner(self):
+        with (get_unit_tests_scans_path("n0s1") / "many_findings.json").open(encoding="utf-8") as testfile:
+            parser = N0s1Parser()
+            tests = parser.get_tests("n0s1 Scanner", testfile)
+            self.assertEqual(1, len(tests))
+            test = tests[0]
+            self.assertEqual("n0s1 Confluence", test.name)
+            self.assertEqual("n0s1 Confluence", test.parser_type)
+            self.assertEqual("Scan from n0s1 Confluence", test.description)
+            self.assertEqual(17, len(test.findings))
+            self.assertTrue(all(f.dynamic_finding for f in test.findings))