Wizcli improvements

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "2.48.0-dev",
+  "version": "2.47.1",
   "license" : "BSD-3-Clause",
   "private": true,
   "dependencies": {

dojo/__init__.py

@@ -4,6 +4,6 @@
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app  # noqa: F401
 
-__version__ = "2.47.0"
+__version__ = "2.47.1"
 __url__ = "https://github.com/DefectDojo/django-DefectDojo"
 __docs__ = "https://documentation.defectdojo.com"

dojo/settings/settings.dist.py

@@ -1345,6 +1345,9 @@ def saml2_attrib_map_format(din):
     "Red Hat Satellite": ["description", "severity"],
     "Qualys Hacker Guardian Scan": ["title", "severity", "description"],
     "Cyberwatch scan (Galeax)": ["title", "description", "severity"],
+    "Wizcli Img Scan": ["title", "description", "file_path", "line", "component_name", "component_version"],
+    "Wizcli Dir Scan": ["title", "description", "file_path", "line", "component_name", "component_version"],
+    "Wizcli IAC Scan": ["title", "description", "file_path", "line", "component_name"],
 }
 
 # Override the hardcoded settings here via the env var
@@ -1590,6 +1593,9 @@ def saml2_attrib_map_format(din):
     "Kubescape JSON Importer": DEDUPE_ALGO_HASH_CODE,
     "Kiuwan SCA Scan": DEDUPE_ALGO_HASH_CODE,
     "Rapplex Scan": DEDUPE_ALGO_HASH_CODE,
+    "Wizcli Img Scan": DEDUPE_ALGO_HASH_CODE,
+    "Wizcli Dir Scan": DEDUPE_ALGO_HASH_CODE,
+    "Wizcli IAC Scan": DEDUPE_ALGO_HASH_CODE,
     "AppCheck Web Application Scanner": DEDUPE_ALGO_HASH_CODE,
     "AWS Inspector2 Scan": DEDUPE_ALGO_UNIQUE_ID_FROM_TOOL_OR_HASH_CODE,
     "Legitify Scan": DEDUPE_ALGO_HASH_CODE,

dojo/tools/wizcli_dir/parser.py

@@ -1,36 +1,66 @@
 import json
+import logging
 
 from dojo.tools.wizcli_common_parsers.parsers import WizcliParsers
 
+logger = logging.getLogger(__name__)
+
 
 class WizcliDirParser:
 
-    """Wizcli Dir Scan results in JSON file format."""
+    """Wiz CLI Directory/IaC Scan results in JSON file format."""
 
     def get_scan_types(self):
         return ["Wizcli Dir Scan"]
 
     def get_label_for_scan_types(self, scan_type):
-        return "Wizcli Dir Scan"
+        return "Wiz CLI Scan (Directory)"
 
     def get_description_for_scan_types(self, scan_type):
-        return "Wizcli Dir Scan results in JSON file format."
+        return "Parses Wiz CLI Directory/IaC scan results in JSON format, creating granular findings for vulnerabilities and secrets."
 
-    def get_findings(self, filename, test):
-        scan_data = filename.read()
+    def get_findings(self, file, test):
+        """Processes the JSON report and returns a list of DefectDojo Finding objects."""
         try:
-            data = json.loads(scan_data.decode("utf-8"))
-        except Exception:
+            scan_data = file.read()
+            if isinstance(scan_data, bytes):
+                # Try decoding common encodings
+                try:
+                    scan_data = scan_data.decode("utf-8-sig")  # Handles BOM
+                except UnicodeDecodeError:
+                    scan_data = scan_data.decode("utf-8")  # Fallback
             data = json.loads(scan_data)
+        except json.JSONDecodeError as e:
+            msg = f"Invalid JSON format: {e}"
+            logger.error(msg)
+            raise ValueError(msg) from e
+        except Exception as e:
+            msg = f"Error processing report file: {e}"
+            logger.error(msg)
+            raise ValueError(msg) from e
+
         findings = []
-        results = data.get("result", {})
+        results_data = data.get("result", {})
+
+        if not results_data:
+            logger.warning("No 'result' key found in the Wiz report. Unable to parse findings.")
+            return findings
 
-        libraries = results.get("libraries", None)
+        # Parse Libraries (Vulnerabilities)
+        libraries = results_data.get("libraries")
         if libraries:
+            logger.debug(f"Parsing {len(libraries)} library entries.")
             findings.extend(WizcliParsers.parse_libraries(libraries, test))
+        else:
+            logger.debug("No 'libraries' data found in results.")
 
-        secrets = results.get("secrets", None)
+        # Parse Secrets
+        secrets = results_data.get("secrets")
         if secrets:
+            logger.debug(f"Parsing {len(secrets)} secret entries.")
             findings.extend(WizcliParsers.parse_secrets(secrets, test))
+        else:
+            logger.debug("No 'secrets' data found in results.")
 
+        logger.info(f"WizcliDirParser processed {len(findings)} findings.")
         return findings

dojo/tools/wizcli_iac/parser.py

@@ -1,36 +1,64 @@
 import json
+import logging
 
-from dojo.tools.wizcli_common_parsers.parsers import WizcliParsers
+from dojo.tools.wizcli_common_parsers.parsers import WizcliParsers  # Adjust import path
 
+logger = logging.getLogger(__name__)
 
-class WizcliIaCParser:
 
-    """Wizcli IaC Scan results in JSON file format."""
+class WizcliIacParser:
+
+    """Wiz CLI IaC Scan results in JSON file format."""
 
     def get_scan_types(self):
         return ["Wizcli IaC Scan"]
 
     def get_label_for_scan_types(self, scan_type):
-        return "Wizcli IaC Scan"
+        return "Wiz CLI Scan (IaC)"
 
     def get_description_for_scan_types(self, scan_type):
-        return "Wizcli IaC Scan results in JSON file format."
+        return "Parses Wiz CLI Infrastructure as Code (IaC) scan results in JSON format."
 
-    def get_findings(self, filename, test):
-        scan_data = filename.read()
+    def get_findings(self, file, test):
         try:
-            data = json.loads(scan_data.decode("utf-8"))
-        except Exception:
+            scan_data = file.read()
+            if isinstance(scan_data, bytes):
+                try:
+                    scan_data = scan_data.decode("utf-8-sig")
+                except UnicodeDecodeError:
+                    scan_data = scan_data.decode("utf-8")
             data = json.loads(scan_data)
+        except json.JSONDecodeError as e:
+            msg = f"Invalid JSON format: {e}"
+            logger.error(msg)
+            raise ValueError(msg) from e
+        except Exception as e:
+            msg = f"Error processing report file: {e}"
+            logger.error(msg)
+            raise ValueError(msg) from e
+
         findings = []
-        results = data.get("result", {})
+        results_data = data.get("result", {})
+
+        if not results_data:
+            logger.warning("No 'result' key found in the Wiz report.")
+            return findings
 
-        rule_matches = results.get("ruleMatches", None)
+        # Parse Rule Matches (IaC findings)
+        rule_matches = results_data.get("ruleMatches")
         if rule_matches:
+            logger.debug(f"Parsing {len(rule_matches)} rule match entries.")
             findings.extend(WizcliParsers.parse_rule_matches(rule_matches, test))
+        else:
+            logger.debug("No 'ruleMatches' data found in results.")
 
-        secrets = results.get("secrets", None)
+        # Parse Secrets (if present in IaC scans)
+        secrets = results_data.get("secrets")
         if secrets:
+            logger.debug(f"Parsing {len(secrets)} secret entries.")
             findings.extend(WizcliParsers.parse_secrets(secrets, test))
+        else:
+            logger.debug("No 'secrets' data found in results.")
 
+        logger.info(f"WizcliIacParser processed {len(findings)} findings.")
         return findings

dojo/tools/wizcli_img/parser.py

@@ -1,40 +1,73 @@
 import json
+import logging
 
-from dojo.tools.wizcli_common_parsers.parsers import WizcliParsers
+from dojo.tools.wizcli_common_parsers.parsers import WizcliParsers  # Adjust import path
+
+logger = logging.getLogger(__name__)
 
 
 class WizcliImgParser:
 
-    """Wizcli Image Scan results in JSON file format."""
+    """Wiz CLI Container Image Scan results in JSON file format."""
 
     def get_scan_types(self):
+        # Use a distinct name for image scans
         return ["Wizcli Img Scan"]
 
     def get_label_for_scan_types(self, scan_type):
-        return "Wizcli Img Scan"
+        return "Wiz CLI Scan (Image)"
 
     def get_description_for_scan_types(self, scan_type):
-        return "Wizcli Img report file can be imported in JSON format."
+        return "Parses Wiz CLI Container Image scan results in JSON format."
 
-    def get_findings(self, filename, test):
-        scan_data = filename.read()
+    def get_findings(self, file, test):
         try:
-            data = json.loads(scan_data.decode("utf-8"))
-        except Exception:
+            scan_data = file.read()
+            if isinstance(scan_data, bytes):
+                try:
+                    scan_data = scan_data.decode("utf-8-sig")
+                except UnicodeDecodeError:
+                    scan_data = scan_data.decode("utf-8")
             data = json.loads(scan_data)
+        except json.JSONDecodeError as e:
+            msg = f"Invalid JSON format: {e}"
+            logger.error(msg)
+            raise ValueError(msg) from e
+        except Exception as e:
+            msg = f"Error processing report file: {e}"
+            logger.error(msg)
+            raise ValueError(msg) from e
+
         findings = []
-        results = data.get("result", {})
+        results_data = data.get("result", {})
+
+        if not results_data:
+            logger.warning("No 'result' key found in the Wiz report.")
+            return findings
 
-        osPackages = results.get("osPackages", None)
-        if osPackages:
-            findings.extend(WizcliParsers.parse_os_packages(osPackages, test))
+        # Parse OS Packages - Key difference for image scans
+        os_packages = results_data.get("osPackages")
+        if os_packages:
+            logger.debug(f"Parsing {len(os_packages)} OS package entries.")
+            findings.extend(WizcliParsers.parse_os_packages(os_packages, test))
+        else:
+            logger.debug("No 'osPackages' data found in results.")
 
-        libraries = results.get("libraries", None)
+        # Parse Libraries (if present in image scans)
+        libraries = results_data.get("libraries")
         if libraries:
+            logger.debug(f"Parsing {len(libraries)} library entries.")
             findings.extend(WizcliParsers.parse_libraries(libraries, test))
+        else:
+            logger.debug("No 'libraries' data found in results.")
 
-        secrets = results.get("secrets", None)
+        # Parse Secrets (if present in image scans)
+        secrets = results_data.get("secrets")
         if secrets:
+            logger.debug(f"Parsing {len(secrets)} secret entries.")
             findings.extend(WizcliParsers.parse_secrets(secrets, test))
+        else:
+            logger.debug("No 'secrets' data found in results.")
 
+        logger.info(f"WizcliImgParser processed {len(findings)} findings.")
         return findings

helm/defectdojo/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "2.48.0-dev"
+appVersion: "2.47.1"
 description: A Helm chart for Kubernetes to install DefectDojo
 name: defectdojo
-version: 1.6.191-dev
+version: 1.6.191
 icon: https://www.defectdojo.org/img/favicon.ico
 maintainers:
   - name: madchap