CIRCL
/
lookyloo
mirror of https://github.com/CIRCL/lookyloo
2
0
Fork 0
Code Issues Releases Wiki Activity

fix: Avoid exception when attempting to move a capture

pull/783/head
Raphaël Vinot 2023-09-18 00:32:36 +02:00
parent 84175a944c
commit 532b68dd07
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/background_indexer.py
View File

@ -67,7 +67,10 @@ class BackgroundIndexer(AbstractManager):
if cached_path.exists(): if cached_path.exists():
# Both paths exist, move the one that isn't in lookup_dirs # Both paths exist, move the one that isn't in lookup_dirs
self.logger.critical(f'Duplicate UUID for {uuid} in {cached_path} and {uuid_path.parent}, discarding the latest') self.logger.critical(f'Duplicate UUID for {uuid} in {cached_path} and {uuid_path.parent}, discarding the latest')
try:
shutil.move(str(uuid_path.parent), str(self.discarded_captures_dir / uuid_path.parent.name)) shutil.move(str(uuid_path.parent), str(self.discarded_captures_dir / uuid_path.parent.name))
except FileNotFoundError as e:
self.logger.warning(f'Unable to move capture: {e}')
continue continue
else: else:
# The path in lookup_dirs for that UUID doesn't exists, just update it. # The path in lookup_dirs for that UUID doesn't exists, just update it.
@ -89,8 +92,12 @@ class BackgroundIndexer(AbstractManager):
except Exception: except Exception:
self.logger.exception(f'Unable to build pickle for {uuid}: {uuid_path.parent.name}') self.logger.exception(f'Unable to build pickle for {uuid}: {uuid_path.parent.name}')
# The capture is not working, moving it away. # The capture is not working, moving it away.
self.lookyloo.redis.hdel('lookup_dirs', uuid) try:
shutil.move(str(uuid_path.parent), str(self.discarded_captures_dir / uuid_path.parent.name)) shutil.move(str(uuid_path.parent), str(self.discarded_captures_dir / uuid_path.parent.name))
self.lookyloo.redis.hdel('lookup_dirs', uuid)
except FileNotFoundError as e:
self.logger.warning(f'Unable to move capture: {e}')
continue
if max_captures <= 0: if max_captures <= 0:
self.logger.info('Too many captures in the backlog, start from the beginning.') self.logger.info('Too many captures in the backlog, start from the beginning.')
return False return False