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

fix: Do not try to load archived captures in sorted_capture_cache

pull/497/head
Raphaël Vinot 2022-08-01 17:49:54 +02:00
parent c589933a40
commit 0c81f6b218
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lookyloo/lookyloo.py
View File

@ -317,8 +317,9 @@ class Lookyloo():
def update_tree_cache_info(self, process_id: int, classname: str) -> None:
self.redis.hset('tree_cache', f'{process_id}|{classname}', str(self._captures_index.lru_cache_status()))
def sorted_capture_cache(self, capture_uuids: Optional[Iterable[str]]=None) -> List[CaptureCache]:
'''Get all the captures in the cache, sorted by timestamp (new -> old).'''
def sorted_capture_cache(self, capture_uuids: Optional[Iterable[str]]=None, cached_captures_only: bool=True) -> List[CaptureCache]:
'''Get all the captures in the cache, sorted by timestamp (new -> old).
By default, this method will only return the captures that are currently cached.'''
if capture_uuids is None:
# Sort all recent captures
capture_uuids = self.redis.hkeys('lookup_dirs')
@ -326,6 +327,10 @@ class Lookyloo():
# No captures at all on the instance
return []
if cached_captures_only:
# Do not try to build pickles
capture_uuids = set(capture_uuids) & self._captures_index.cached_captures
all_cache: List[CaptureCache] = [self._captures_index[uuid] for uuid in capture_uuids if self.capture_cache(uuid)]
all_cache.sort(key=operator.attrgetter('timestamp'), reverse=True)
return all_cache