finalize return statement

Author: Valentijn Scholten

dojo/finding/deduplication.py

@@ -529,19 +529,22 @@ def _dedupe_batch_legacy(findings):
 
 def dedupe_batch_of_findings(findings, *args, **kwargs):
     """Batch deduplicate a list of findings. The findings are assumed to be in the same test."""
+
+    # Pro has customer implementation which will call the Pro dedupe methods, but also the normal OS dedupe methods.
+    from dojo.utils import get_custom_method  # noqa: PLC0415 -- circular import
+    if batch_dedupe_method := get_custom_method("FINDING_DEDUPE_BATCH_METHOD"):
+        deduplicationLogger.debug(f"Using custom deduplication method: {batch_dedupe_method.__name__}")
+        return batch_dedupe_method(findings, *args, **kwargs)
+
     if not findings:
-        return
+        return None
 
     enabled = System_Settings.objects.get().enable_deduplication
 
     if enabled:
         # sort findings by id to ensure deduplication is deterministic/reproducible
         findings = sorted(findings, key=attrgetter("id"))
 
-        from dojo.utils import get_custom_method  # noqa: PLC0415 -- circular import
-        if batch_dedupe_method := get_custom_method("FINDING_DEDUPE_BATCH_METHOD"):
-            batch_dedupe_method(findings, *args, **kwargs)
-
         test = findings[0].test
         dedup_alg = test.deduplication_algorithm
 
@@ -559,3 +562,4 @@ def dedupe_batch_of_findings(findings, *args, **kwargs):
             _dedupe_batch_legacy(findings)
     else:
         deduplicationLogger.debug("dedupe: skipping dedupe because it's disabled in system settings get()")
+    return None

dojo/models.py

@@ -2234,6 +2234,7 @@ def deduplication_algorithm(self):
 
     @property
     def hash_code_fields(self):
+        """Retrieve OS HASH_CODE_FIELDS_PER_SCANNER settings. Be aware when calling this to make sure Pro doesn't use these OS seetings"""
         hashCodeFields = None
 
         if hasattr(settings, "HASHCODE_FIELDS_PER_SCANNER"):
@@ -2916,7 +2917,7 @@ def compute_hash_code(self):
         # Allow Pro to overwrite compute hash_code which gets dedupe settings from a database instead of django.settings
         from dojo.utils import get_custom_method  # noqa: PLC0415 circular import
         if compute_hash_code_method := get_custom_method("FINDING_COMPUTE_HASH_METHOD"):
-            deduplicationLogger.debug("using custom compute_hash_code method")
+            deduplicationLogger.debug("using custom FINDING_COMPUTE_HASH_METHOD method")
             return compute_hash_code_method(self)
 
         # Check if all needed settings are defined