Checkmarx: Add safeguards for "null" values in result types (DefectDojo#8221)

Maffooch · web-flow · commit 98f64d42827a · 2023-06-08T15:13:49.000-05:00
diff --git a/dojo/tools/checkmarx/parser.py b/dojo/tools/checkmarx/parser.py
@@ -402,7 +402,7 @@ def _get_findings_json(self, file, test):
         results = data.get("scanResults", [])
         for result_type in results:
             # manage sca part
-            if result_type == "sast":
+            if result_type == "sast" and results.get(result_type) is not None:
                 for language in results[result_type].get("languages", []):
                     for query in language.get("queries", []):
                         descriptiondetails = query.get("description", "")
@@ -443,7 +443,7 @@ def _get_findings_json(self, file, test):
                                 finding.line = last_node.get("line")
                             finding.unsaved_tags = [result_type]
                             findings.append(finding)
-            if result_type == "sca":
+            if result_type == "sca" and results.get(result_type) is not None:
                 for package in results[result_type].get("packages", []):
                     component_name = package.get("name").split("-")[-2]
                     component_version = package.get("name").split("-")[-1]
@@ -483,7 +483,7 @@ def _get_findings_json(self, file, test):
                             )
                         finding.unsaved_tags = [result_type]
                         findings.append(finding)
-            if result_type == "kics":
+            if result_type == "kics" and results.get(result_type) is not None:
                 for kics_type in results[result_type].get("results", []):
                     name = kics_type.get("name")
                     for vulnerability in kics_type.get("vulnerabilities", []):
diff --git a/unittests/scans/checkmarx/multiple_findings.json b/unittests/scans/checkmarx/multiple_findings.json
@@ -570,6 +570,8 @@
     "low": 5,
     "info": 0
    }
-  }
+  },
+  "sca": null,
+  "kics": null
  }
 }

Original file line number	Diff line number	Diff line change
`@@ -570,6 +570,8 @@`
`570`	`570`	`"low": 5,`
`571`	`571`	`"info": 0`
`572`	`572`	`}`
`573`		`- }`
	`573`	`+ },`
	`574`	`+ "sca": null,`
	`575`	`+ "kics": null`
`574`	`576`	`}`
`575`	`577`	`}`