Skip to content
Merged
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
8 changes: 6 additions & 2 deletions dojo/tools/ms_defender/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,20 @@ def get_findings(self, file, test):
input_zip = zipfile.ZipFile(file.name, "r")
else:
input_zip = zipfile.ZipFile(file, "r")

zipdata = {name: input_zip.read(name) for name in input_zip.namelist()}
if zipdata.get("vulnerabilities/") is None:
return []
vulnerabilityfiles = []
machinefiles = []
for content in list(zipdata):
if "vulnerabilities/" in content and content != "vulnerabilities/":
vulnerabilityfiles.append(content)
if "machines/" in content and content != "machines/":
machinefiles.append(content)

if len(vulnerabilityfiles) == 0:
logger.debug("No vulnerabilities.json files found in the vulnerabilities/ folder")
return []

vulnerabilities = []
machines = {}
for vulnerabilityfile in vulnerabilityfiles:
Expand Down