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

Agent: Always join threads in main loop before exit

This commit is contained in:
Mike Salvatore 2021-07-30 05:07:50 -04:00
parent e7d694380d
commit e97943a905
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
monkey/infection_monkey/monkey.py
View File

@ -63,6 +63,7 @@ class InfectionMonkey(object):
self._opts = None self._opts = None
self._upgrading_to_64 = False self._upgrading_to_64 = False
self._monkey_tunnel = None self._monkey_tunnel = None
self._post_breach_phase = None
def initialize(self): def initialize(self):
LOG.info("Monkey is initializing...") LOG.info("Monkey is initializing...")
@ -144,8 +145,8 @@ class InfectionMonkey(object):
TunnelTelem().send() TunnelTelem().send()
LOG.debug("Starting the post-breach phase asynchronously.") LOG.debug("Starting the post-breach phase asynchronously.")
post_breach_phase = Thread(target=self.start_post_breach_phase) self._post_breach_phase = Thread(target=self.start_post_breach_phase)
post_breach_phase.start() self._post_breach_phase.start()
if not InfectionMonkey.max_propagation_depth_reached(): if not InfectionMonkey.max_propagation_depth_reached():
LOG.info("Starting the propagation phase.") LOG.info("Starting the propagation phase.")
@ -167,12 +168,6 @@ class InfectionMonkey(object):
) )
time.sleep(time_to_sleep) time.sleep(time_to_sleep)
if self._monkey_tunnel:
self._monkey_tunnel.stop()
self._monkey_tunnel.join()
post_breach_phase.join()
except PlannedShutdownException: except PlannedShutdownException:
LOG.info( LOG.info(
"A planned shutdown of the Monkey occurred. Logging the reason and finishing " "A planned shutdown of the Monkey occurred. Logging the reason and finishing "
@ -180,6 +175,14 @@ class InfectionMonkey(object):
) )
LOG.exception("Planned shutdown, reason:") LOG.exception("Planned shutdown, reason:")
finally:
if self._monkey_tunnel:
self._monkey_tunnel.stop()
self._monkey_tunnel.join()
if self._post_breach_phase:
self._post_breach_phase.join()
def start_post_breach_phase(self): def start_post_breach_phase(self):
self.collect_system_info_if_configured() self.collect_system_info_if_configured()
PostBreach().execute_all_configured() PostBreach().execute_all_configured()