fixed lint and bugs

Author: jostaub

dojo/tools/factory.py

@@ -122,7 +122,7 @@ def requires_tool_type(scan_type):
                     # Allow parser class names with optional v[number] suffix (e.g., OpenVASParser, OpenVASParserV2)
                     expected_base = module_name.replace("_", "") + "parser"
                     if isclass(attribute) and (
-                        attribute_name.lower() == expected_base or 
+                        attribute_name.lower() == expected_base or
                         re.match(rf"^{re.escape(expected_base)}v\d+$", attribute_name.lower())
                     ):
                         register(attribute)

dojo/tools/openvas/parser_v1/csv_parser.py

@@ -79,7 +79,7 @@ def __init__(self):
         super().__init__()
 
     def map_column_value(self, finding, column_value):
-        if column_value != "":
+        if column_value:
             if "," in column_value:
                 finding.description += "\n**All CVEs:** " + str(column_value)
                 for value in column_value.split(","):
@@ -234,6 +234,7 @@ def __init__(self):
     def map_column_value(self, finding, column_value):
         finding.duplicate = self.evaluate_bool_value(column_value)
 
+
 class OpenVASCSVParser:
     def create_chain(self):
         date_column_strategy = DateColumnMappingStrategy()

dojo/tools/openvas/parser_v2/common.py

@@ -65,16 +65,17 @@ def deduplicate(dupes: dict[str, Finding], finding: Finding):
             org.unsaved_endpoints += finding.unsaved_endpoints
 
 
-def id_from_tool_finding_hash(finding: Finding):
-    """Generate a hash that complements final hash generating outside of this parser"""
+def dedup_finding_hash(finding: Finding):
+    """Generate a hash for a finding that is used for deduplication of findings inside the current report"""
     endpoint = finding.unsaved_endpoints[0]
-
-    if "endpoints" in HASHCODE_FIELDS_PER_SCANNER["OpenVAS Parser v2"]:
-        pass
-
     hash_data = [
         str(endpoint.protocol),
-        str(endpoint.port),  # keep findings on different port seperate as it may be different applications
-        finding.severity,  # allows changing severity of finding after import
+        str(endpoint.userinfo),
+        str(endpoint.port),
+        str(endpoint.path),
+        str(endpoint.fragment),
+        finding.title,
+        finding.vuln_id_from_tool,
+        finding.severity,
     ]
     return hashlib.sha256("|".join(hash_data).encode("utf-8")).hexdigest()