p34709852
/
monkey
forked from p15670423/monkey
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Optimised monkey_to_net_node

This commit is contained in:
Shay Nehmad 2019-10-02 11:01:47 +03:00
parent 122919d73c
commit 264e7407fb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
monkey/monkey_island/cc/services/node.py
View File

@ -145,15 +145,18 @@ class NodeService:
@staticmethod @staticmethod
def monkey_to_net_node(monkey, for_report=False): def monkey_to_net_node(monkey, for_report=False):
label = monkey['hostname'] if for_report else NodeService.get_monkey_label(monkey) monkey_id = monkey["_id"]
is_monkey_dead = Monkey.get_single_monkey_by_id(monkey["_id"]).is_dead() label = Monkey.get_hostname_by_id(monkey_id) if for_report else Monkey.get_label_by_id(monkey_id)
monkey_group = NodeService.get_monkey_group(monkey)
return \ return \
{ {
"id": monkey["_id"], "id": monkey_id,
"label": label, "label": label,
"group": NodeService.get_monkey_group(monkey), "group": monkey_group,
"os": NodeService.get_monkey_os(monkey), "os": NodeService.get_monkey_os(monkey),
"dead": is_monkey_dead, # The monkey is running IFF the group contains "_running". Therefore it's dead IFF the group does NOT
# contain "_running". This is a small optimisation, to not call "is_dead" twice.
"dead": "_running" not in monkey_group,
"domain_name": "", "domain_name": "",
"pba_results": monkey["pba_results"] if "pba_results" in monkey else [] "pba_results": monkey["pba_results"] if "pba_results" in monkey else []
} }