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

chg: always return something in merge_hashlookup_tree

pull/298/head
Raphaël Vinot 2021-11-30 15:51:48 +01:00
parent fc4c342316
commit b75540cd7d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lookyloo/lookyloo.py
View File

@ -736,7 +736,7 @@ class Lookyloo():
return {h: [node.name for node in nodes] for h, nodes in hashes.items()} return {h: [node.name for node in nodes] for h, nodes in hashes.items()}
return hashes return hashes
def merge_hashlookup_tree(self, tree_uuid: str, /): def merge_hashlookup_tree(self, tree_uuid: str, /) -> Tuple[Dict[str, Dict[str, Any]], int]:
if not self.hashlookup.available: if not self.hashlookup.available:
raise LookylooException('Hashlookup module not enabled.') raise LookylooException('Hashlookup module not enabled.')
hashes_tree = self.get_hashes_with_context(tree_uuid, algorithm='sha1') hashes_tree = self.get_hashes_with_context(tree_uuid, algorithm='sha1')
@ -748,7 +748,7 @@ class Lookyloo():
if not hashlookup_file.exists(): if not hashlookup_file.exists():
# no hits on hashlookup # no hits on hashlookup
return return {}, len(hashes_tree)
with hashlookup_file.open() as f: with hashlookup_file.open() as f:
hashlookup_entries = json.load(f) hashlookup_entries = json.load(f)