Skip to content
Open
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
14 changes: 9 additions & 5 deletions maldump/parsers/eset_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,12 @@ def _decrypt(self, data: bytes) -> bytes:

@log.log(lgr=logger)
def _get_malfile(self, username: str, sha1: str) -> bytes:
quarfile = self.quarpath.format(username=username)
quarfile = Path(quarfile) / (sha1.upper() + ".NQF")

if username == "ProgramData":
quarfile = Path("ProgramData/ESET/ESET Security/Quarantine/") / (sha1.upper() + ".NQF")
else:
quarfile = self.quarpath.format(username=username)
quarfile = Path(quarfile) / (sha1.upper() + ".NQF")

data = read.contents(quarfile, filetype="malware")
if data is None:
return b""
Expand Down Expand Up @@ -183,7 +186,8 @@ def parse_from_fs(

actual_path = Path("Users/")
for idx, entry in enumerate(
actual_path.glob("*/AppData/Local/ESET/ESET Security/Quarantine/*.NQF")
list(actual_path.glob("*/AppData/Local/ESET/ESET Security/Quarantine/*.NQF")) +
list(Path("ProgramData/").glob("ESET/ESET Security/Quarantine/*.NQF"))
):
logger.debug('Parsing entry, idx %s, path "%s"', idx, entry)
res_path = re.match(self.regex_entry, entry.name)
Expand All @@ -195,7 +199,7 @@ def parse_from_fs(
)
continue

user = res_user.group(1)
user = res_user.group(1) if res_user else "ProgramData"
objhash = res_path.group(1)

if (objhash.lower(), user) in data:
Expand Down
Loading