Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions dojo/tools/dependency_check/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def add_finding(self, finding, dupes):
def get_filename_and_path_from_dependency(
self, dependency, related_dependency, namespace,
):
if not related_dependency:
if related_dependency is None:
return dependency.findtext(
f"{namespace}fileName",
), dependency.findtext(f"{namespace}filePath")
Expand All @@ -105,10 +105,10 @@ def get_component_name_and_version_from_dependency(
self, dependency, related_dependency, namespace,
):
identifiers_node = dependency.find(namespace + "identifiers")
if identifiers_node:
if identifiers_node is not None:
# analyzing identifier from the more generic to
package_node = identifiers_node.find(".//" + namespace + "package")
if package_node:
if package_node is not None:
pck_id = package_node.findtext(f"{namespace}id")
purl = PackageURL.from_string(pck_id)
purl_parts = purl.to_dict()
Expand Down Expand Up @@ -166,7 +166,7 @@ def get_component_name_and_version_from_dependency(
maven_node = identifiers_node.find(
".//" + namespace + 'identifier[@type="maven"]',
)
if maven_node:
if maven_node is not None:
maven_parts = maven_node.findtext(f"{namespace}name").split(
":",
)
Expand All @@ -181,7 +181,7 @@ def get_component_name_and_version_from_dependency(
evidence_collected_node = dependency.find(
namespace + "evidenceCollected",
)
if evidence_collected_node:
if evidence_collected_node is not None:
# <evidenceCollected>
# <evidence type="product" confidence="HIGH">
# <source>file</source>
Expand All @@ -199,12 +199,12 @@ def get_component_name_and_version_from_dependency(
product_node = evidence_collected_node.find(
".//" + namespace + 'evidence[@type="product"]',
)
if product_node:
if product_node is not None:
component_name = product_node.findtext(f"{namespace}value")
version_node = evidence_collected_node.find(
".//" + namespace + 'evidence[@type="version"]',
)
if version_node:
if version_node is not None:
component_version = version_node.findtext(
f"{namespace}value",
)
Expand Down Expand Up @@ -280,7 +280,7 @@ def get_finding_from_vulnerability(
mitigated = None
is_Mitigated = False
name = vulnerability.findtext(f"{namespace}name")
if vulnerability.find(f"{namespace}cwes"):
if vulnerability.find(f"{namespace}cwes") is not None:
cwe_field = vulnerability.find(f"{namespace}cwes").findtext(
f"{namespace}cwe",
)
Expand Down Expand Up @@ -425,14 +425,14 @@ def get_findings(self, filename, test):

dependencies = scan.find(namespace + "dependencies")
scan_date = None
if scan.find(f"{namespace}projectInfo"):
if scan.find(f"{namespace}projectInfo") is not None:
projectInfo_node = scan.find(f"{namespace}projectInfo")
if projectInfo_node.findtext(f"{namespace}reportDate"):
scan_date = dateutil.parser.parse(
projectInfo_node.findtext(f"{namespace}reportDate"),
)

if dependencies:
if dependencies is not None:
for dependency in dependencies.findall(namespace + "dependency"):
vulnerabilities = dependency.find(
namespace + "vulnerabilities",
Expand All @@ -441,7 +441,7 @@ def get_findings(self, filename, test):
for vulnerability in vulnerabilities.findall(
namespace + "vulnerability",
):
if vulnerability:
if vulnerability is not None:
finding = self.get_finding_from_vulnerability(
dependency,
None,
Expand All @@ -456,7 +456,7 @@ def get_findings(self, filename, test):
relatedDependencies = dependency.find(
namespace + "relatedDependencies",
)
if relatedDependencies:
if relatedDependencies is not None:
for (
relatedDependency
) in relatedDependencies.findall(
Expand All @@ -479,7 +479,7 @@ def get_findings(self, filename, test):
for suppressedVulnerability in vulnerabilities.findall(
namespace + "suppressedVulnerability",
):
if suppressedVulnerability:
if suppressedVulnerability is not None:
finding = self.get_finding_from_vulnerability(
dependency,
None,
Expand Down
6 changes: 3 additions & 3 deletions dojo/tools/fortify/xml_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def xml_structure_before_24_2(self, root, test):
for group in ReportSection.iter("GroupingSection"):
title = group.findtext("groupTitle")
maj_attr_summary = group.find("MajorAttributeSummary")
if maj_attr_summary:
if maj_attr_summary is not None:
meta_info = maj_attr_summary.findall("MetaInfo")
meta_pair[place][title] = {
x.findtext("Name"): x.findtext("Value")
Expand Down Expand Up @@ -115,11 +115,11 @@ def xml_structure_before_24_2(self, root, test):
"FilePath": issue.find("Primary").find("FilePath").text,
"LineStart": issue.find("Primary").find("LineStart").text,
}
if issue.find("Primary").find("Snippet"):
if issue.find("Primary").find("Snippet") is not None:
details["Snippet"] = issue.find("Primary").find("Snippet").text
else:
details["Snippet"] = "n/a"
if issue.find("Source"):
if issue.find("Source") is not None:
source = {
"FileName": issue.find("Source").find("FileName").text,
"FilePath": issue.find("Source").find("FilePath").text,
Expand Down
3 changes: 2 additions & 1 deletion dojo/tools/nmap/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ def get_findings(self, file, test):
)
description += service_info
script_id = None
if script := port_element.find("script"):
script = port_element.find("script")
if script is not None:
if script_id := script.attrib.get("id"):
description += f"**Script ID:** {script_id}\n"
if script_output := script.attrib.get("output"):
Expand Down
Loading