Merge pull request #12864 from DefectDojo/release/2.48.5

Release: Merge release into master from: release/2.48.5

Author: rossops

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "2.48.4",
+  "version": "2.48.5",
   "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.48.4"
+__version__ = "2.48.5"
 __url__ = "https://github.com/DefectDojo/django-DefectDojo"
 __docs__ = "https://documentation.defectdojo.com"

dojo/settings/settings.dist.py

@@ -1846,6 +1846,7 @@ def saml2_attrib_map_format(din):
     "LEN-": "https://support.lenovo.com/cl/de/product_security/",  # e.g. https://support.lenovo.com/cl/de/product_security/LEN-94953
     "MGAA-": "https://advisories.mageia.org/&&.html",  # e.g. https://advisories.mageia.org/MGAA-2013-0054.html
     "MGASA-": "https://advisories.mageia.org/&&.html",  # e.g. https://advisories.mageia.org/MGASA-2025-0023.html
+    "NCSC-": "https://advisories.ncsc.nl/advisory?id=",  # e.g. https://advisories.ncsc.nl/advisory?id=NCSC-2025-0191
     "NTAP-": "https://security.netapp.com/advisory/",  # e.g. https://security.netapp.com/advisory/ntap-20250328-0007
     "OPENSUSE-SU-": "https://osv.dev/vulnerability/",  # e.g. https://osv.dev/vulnerability/openSUSE-SU-2025:14898-1
     "OSV-": "https://osv.dev/vulnerability/",  # e.g. https://osv.dev/vulnerability/OSV-2024-1330

dojo/tools/blackduck_component_risk/importer.py

@@ -62,14 +62,13 @@ def _process_zipfile(self, report: Path) -> (dict, dict, dict):
                     elif "source" in file_name:
                         with io.TextIOWrapper(zipf.open(full_file_name), encoding="utf-8") as f:
                             source = self.__get_source(f)
-                # Raise exception to error-out if the zip is missing either of
-                # these files.
-                if not (c_file and s_file):
-                    msg = "Zip file missing needed files!"
-                    raise Exception(msg)
-
         except Exception:
             logger.exception("Could not process zip file")
+            # Raise exception to error-out if the zip is missing either of
+            # these files.
+            if not (c_file and s_file):
+                msg = "Zip file missing needed files!"
+                raise Exception(msg)
 
         return components, security_issues, source
 

helm/defectdojo/Chart.yaml

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

unittests/dojo_test_case.py

@@ -536,7 +536,7 @@ def get_results_by_id(self, results: list, object_id: int) -> dict | None:
         return None
 
     def import_scan_with_params(self, filename, scan_type="ZAP Scan", engagement=1, minimum_severity="Low", *, active=True, verified=False,
-                                push_to_jira=None, endpoint_to_add=None, tags=None, close_old_findings=False, group_by=None, engagement_name=None,
+                                push_to_jira=None, endpoint_to_add=None, tags=None, close_old_findings=None, group_by=None, engagement_name=None,
                                 product_name=None, product_type_name=None, auto_create_context=None, expected_http_status_code=201, test_title=None,
                                 scan_date=None, service=None, force_active=True, force_verified=True):
 
@@ -546,9 +546,11 @@ def import_scan_with_params(self, filename, scan_type="ZAP Scan", engagement=1,
                     "scan_type": scan_type,
                     "file": testfile,
                     "version": "1.0.1",
-                    "close_old_findings": close_old_findings,
             }
 
+            if close_old_findings is not None:
+                payload["close_old_findings"] = close_old_findings
+
             if active is not None:
                 payload["active"] = active
 
@@ -594,7 +596,7 @@ def import_scan_with_params(self, filename, scan_type="ZAP Scan", engagement=1,
             return self.import_scan(payload, expected_http_status_code)
 
     def reimport_scan_with_params(self, test_id, filename, scan_type="ZAP Scan", engagement=1, minimum_severity="Low", *, active=True, verified=False, push_to_jira=None,
-                                  tags=None, close_old_findings=True, group_by=None, engagement_name=None, scan_date=None, service=None,
+                                  tags=None, close_old_findings=None, group_by=None, engagement_name=None, scan_date=None, service=None,
                                   product_name=None, product_type_name=None, auto_create_context=None, expected_http_status_code=201, test_title=None):
         with Path(filename).open(encoding="utf-8") as testfile:
             payload = {
@@ -604,9 +606,11 @@ def reimport_scan_with_params(self, test_id, filename, scan_type="ZAP Scan", eng
                     "scan_type": scan_type,
                     "file": testfile,
                     "version": "1.0.1",
-                    "close_old_findings": close_old_findings,
             }
 
+            if close_old_findings is not None:
+                payload["close_old_findings"] = close_old_findings
+
             if test_id is not None:
                 payload["test"] = test_id