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

Merge remote-tracking branch 'upstream/develop' into attack_module_load

This commit is contained in:
VakarisZ 2019-07-08 17:55:38 +03:00
parent f5336dfff8 31a20254fa
commit 13b9eab3a4
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
monkey/infection_monkey/monkey.py
View File

@ -179,8 +179,11 @@ class InfectionMonkey(object):
if monkey_tunnel: if monkey_tunnel:
monkey_tunnel.set_tunnel_for_host(machine) monkey_tunnel.set_tunnel_for_host(machine)
if self._default_server: if self._default_server:
machine.set_default_server(get_interface_to_target(machine.ip_addr) + if self._network.on_island(self._default_server):
(':'+self._default_server_port if self._default_server_port else '')) machine.set_default_server(get_interface_to_target(machine.ip_addr) +
(':'+self._default_server_port if self._default_server_port else ''))
else:
machine.set_default_server(self._default_server)
LOG.debug("Default server: %s set to machine: %r" % (self._default_server, machine)) LOG.debug("Default server: %s set to machine: %r" % (self._default_server, machine))
# Order exploits according to their type # Order exploits according to their type

3
monkey/infection_monkey/network/network_scanner.py
View File

@ -118,3 +118,6 @@ class NetworkScanner(object):
if NetworkRange.get_range_obj(subnet_str).is_in_range(ip_address): if NetworkRange.get_range_obj(subnet_str).is_in_range(ip_address):
return True return True
return False return False
def on_island(self, server):
return bool([x for x in self._ip_addresses if x in server])