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

Agent: Refactor build_victim_host() to improve readability

This commit is contained in:
Mike Salvatore 2021-12-16 14:04:41 -05:00
parent b6f2bab15b
commit b3bc9b2ffa
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
monkey/infection_monkey/model/victim_host_factory.py
View File

@ -28,19 +28,20 @@ class VictimHostFactory:
if self.tunnel: if self.tunnel:
victim_host.default_tunnel = self.tunnel.get_tunnel_for_ip(victim_host.ip_addr) victim_host.default_tunnel = self.tunnel.get_tunnel_for_ip(victim_host.ip_addr)
if self.default_server: if self.default_server:
if self.on_island: victim_host.set_default_server(self._get_formatted_default_server(victim_host.ip_addr))
victim_host.set_default_server(
get_interface_to_target(victim_host.ip_addr) logger.debug(f"Default tunnel for {victim_host} set to {victim_host.default_tunnel}")
+ (":" + self.default_port if self.default_port else "") logger.debug(f"Default server for {victim_host} set to {victim_host.default_server}")
)
else:
victim_host.set_default_server(self.default_server)
logger.debug(
f"Default server for machine: {victim_host} set to {victim_host.default_server}"
)
logger.debug(
f"Default tunnel for machine: {victim_host} set to {victim_host.default_tunnel}"
)
return victim_host return victim_host
def _get_formatted_default_server(self, ip: str):
if self.on_island:
default_server_port = f":{self.default_port}" if self.default_port else ""
interface = get_interface_to_target(ip)
return f"{interface}{default_server_port}"
else:
return self.default_server