p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Agent: improve the readability of InfectionMonkey constructor by decoupling cmd argument parsing from object parameter setting

This commit is contained in:
VakarisZ 2021-12-01 17:08:32 +02:00
parent 793bb33c8c
commit 81e61dcea5
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
monkey/infection_monkey/monkey.py
View File

@ -42,8 +42,7 @@ class InfectionMonkey:
logger.info("Monkey is initializing...") logger.info("Monkey is initializing...")
self._master = MockMaster(MockPuppet(), LegacyTelemetryMessengerAdapter()) self._master = MockMaster(MockPuppet(), LegacyTelemetryMessengerAdapter())
self._singleton = SystemSingleton() self._singleton = SystemSingleton()
self._opts = None self._opts = self._get_arguments(args)
self._set_arguments(args)
self._parent = self._opts.parent self._parent = self._opts.parent
self._default_tunnel = self._opts.tunnel self._default_tunnel = self._opts.tunnel
self._default_server = self._opts.server self._default_server = self._opts.server
@ -52,18 +51,21 @@ class InfectionMonkey:
self._add_default_server_to_config() self._add_default_server_to_config()
self._monkey_tunnel = None self._monkey_tunnel = None
def _set_arguments(self, args): @staticmethod
def _get_arguments(args):
arg_parser = argparse.ArgumentParser() arg_parser = argparse.ArgumentParser()
arg_parser.add_argument("-p", "--parent") arg_parser.add_argument("-p", "--parent")
arg_parser.add_argument("-t", "--tunnel") arg_parser.add_argument("-t", "--tunnel")
arg_parser.add_argument("-s", "--server") arg_parser.add_argument("-s", "--server")
arg_parser.add_argument("-d", "--depth", type=int) arg_parser.add_argument("-d", "--depth", type=int)
arg_parser.add_argument("-vp", "--vulnerable-port") arg_parser.add_argument("-vp", "--vulnerable-port")
self._opts, _ = arg_parser.parse_known_args(args) opts, _ = arg_parser.parse_known_args(args)
self._log_arguments() InfectionMonkey._log_arguments(opts)
return opts
def _log_arguments(self): @staticmethod
arg_string = " ".join([f"{key}: {value}" for key, value in vars(self._opts).items()]) def _log_arguments(args):
arg_string = " ".join([f"{key}: {value}" for key, value in vars(args).items()])
logger.info(f"Monkey started with arguments: {arg_string}") logger.info(f"Monkey started with arguments: {arg_string}")
def _set_propagation_depth(self): def _set_propagation_depth(self):