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
10 changes: 8 additions & 2 deletions maldump/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ def main() -> None:
'Working in directory "%s", files would be stored into "%s"', os.getcwd(), dest
)

# Get a list of all installed avs
avs = AVManager.detect()
# Get a list of all supported or all installed avs
avs = AVManager.detect() if args.detect_avs else AVManager.retrieve()

logger.debug("Detected AVs: %s", [av.name for av in avs])

Expand Down Expand Up @@ -169,6 +169,12 @@ def parse_cli() -> argparse.Namespace:
parser.add_argument(
"-a", "--all", action="store_true", help="equivalent of running both -q and -m"
)
parser.add_argument(
"-c",
"--detect-avs",
action="store_false",
help="try only avs which were detected in the system",
)
parser.add_argument(
"-t",
"--log-level",
Expand Down
5 changes: 5 additions & 0 deletions maldump/av_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,8 @@ class AVManager:
def detect(cls) -> list[Quarantine]:
"""Returns a list of avs installed on the system"""
return [av for av in cls.avs if av.location.exists()]

@classmethod
def retrieve(cls) -> list[Quarantine]:
"""Returns a list of all supported avs"""
return cls.avs
19 changes: 16 additions & 3 deletions maldump/parsers/avast_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,21 @@ def __init__(self):
@log.log(lgr=logger)
def __del__(self):
if hasattr(self, "db"):
self.db.close()
unlink(self.tmpfile)
logger.debug(
"Deleting parser object, closing database file, unlinking tmp file"
)

if self.db is not None:
self.db.close()

try:
logger.debug('Trying to delete temporary file "%s"', self.tmpfile)
if self.tmpfile is not None:
unlink(self.tmpfile)
except OSError as e:
logger.exception(
'Cannot unlink temporary file "%s"', self.tmpfile, exc_info=e
)

@log.log(lgr=logger)
def _initDB(self) -> bool:
Expand All @@ -40,7 +53,7 @@ def _initDB(self) -> bool:
'Trying to parse index.xml file "%s"', self.location / "index.xml"
)
self.root = ET.parse(self.location / "index.xml").getroot()
except ParseError as e:
except (ParseError, OSError) as e:
logger.exception("Cannot open and parse index.xml", exc_info=e)
return False

Expand Down
19 changes: 16 additions & 3 deletions maldump/parsers/avg_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,21 @@ def __init__(self):
@log.log(lgr=logger)
def __del__(self):
if hasattr(self, "db"):
self.db.close()
unlink(self.tmpfile)
logger.debug(
"Deleting parser object, closing database file, unlinking tmp file"
)

if self.db is not None:
self.db.close()

try:
logger.debug('Trying to delete temporary file "%s"', self.tmpfile)
if self.tmpfile is not None:
unlink(self.tmpfile)
except OSError as e:
logger.exception(
'Cannot unlink temporary file "%s"', self.tmpfile, exc_info=e
)

@log.log(lgr=logger)
def _initDB(self) -> bool:
Expand All @@ -40,7 +53,7 @@ def _initDB(self) -> bool:
'Trying to parse index.xml file "%s"', self.location / "index.xml"
)
self.root = ET.parse(self.location / "index.xml").getroot()
except ParseError as e:
except (ParseError, OSError) as e:
logger.exception("Cannot open and parse index.xml", exc_info=e)
return False

Expand Down