forked from p15670423/monkey
Agent: Add human-readable thread names to AutomatedMaster
This commit is contained in:
parent
847c7fbf9b
commit
66d9549507
|
@ -55,8 +55,12 @@ class AutomatedMaster(IMaster):
|
||||||
)
|
)
|
||||||
|
|
||||||
self._stop = threading.Event()
|
self._stop = threading.Event()
|
||||||
self._master_thread = create_daemon_thread(target=self._run_master_thread)
|
self._master_thread = create_daemon_thread(
|
||||||
self._simulation_thread = create_daemon_thread(target=self._run_simulation)
|
target=self._run_master_thread, name="AutomatedMasterThread"
|
||||||
|
)
|
||||||
|
self._simulation_thread = create_daemon_thread(
|
||||||
|
target=self._run_simulation, name="SimulationThread"
|
||||||
|
)
|
||||||
|
|
||||||
def start(self):
|
def start(self):
|
||||||
logger.info("Starting automated breach and attack simulation")
|
logger.info("Starting automated breach and attack simulation")
|
||||||
|
@ -144,6 +148,7 @@ class AutomatedMaster(IMaster):
|
||||||
|
|
||||||
credential_collector_thread = create_daemon_thread(
|
credential_collector_thread = create_daemon_thread(
|
||||||
target=self._run_plugins,
|
target=self._run_plugins,
|
||||||
|
name="CredentialCollectorThread",
|
||||||
args=(
|
args=(
|
||||||
config["credential_collector_classes"],
|
config["credential_collector_classes"],
|
||||||
"credential collector",
|
"credential collector",
|
||||||
|
@ -152,6 +157,7 @@ class AutomatedMaster(IMaster):
|
||||||
)
|
)
|
||||||
pba_thread = create_daemon_thread(
|
pba_thread = create_daemon_thread(
|
||||||
target=self._run_plugins,
|
target=self._run_plugins,
|
||||||
|
name="PBAThread",
|
||||||
args=(config["post_breach_actions"].items(), "post-breach action", self._run_pba),
|
args=(config["post_breach_actions"].items(), "post-breach action", self._run_pba),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -172,6 +178,7 @@ class AutomatedMaster(IMaster):
|
||||||
|
|
||||||
payload_thread = create_daemon_thread(
|
payload_thread = create_daemon_thread(
|
||||||
target=self._run_plugins,
|
target=self._run_plugins,
|
||||||
|
name="PayloadThread",
|
||||||
args=(config["payloads"].items(), "payload", self._run_payload),
|
args=(config["payloads"].items(), "payload", self._run_payload),
|
||||||
)
|
)
|
||||||
payload_thread.start()
|
payload_thread.start()
|
||||||
|
|
|
@ -54,7 +54,10 @@ class Exploiter:
|
||||||
stop,
|
stop,
|
||||||
)
|
)
|
||||||
run_worker_threads(
|
run_worker_threads(
|
||||||
target=self._exploit_hosts_on_queue, args=exploit_args, num_workers=self._num_workers
|
target=self._exploit_hosts_on_queue,
|
||||||
|
name_prefix="ExploiterThread",
|
||||||
|
args=exploit_args,
|
||||||
|
num_workers=self._num_workers,
|
||||||
)
|
)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
|
|
@ -42,7 +42,10 @@ class IPScanner:
|
||||||
|
|
||||||
scan_ips_args = (addresses, options, results_callback, stop)
|
scan_ips_args = (addresses, options, results_callback, stop)
|
||||||
run_worker_threads(
|
run_worker_threads(
|
||||||
target=self._scan_addresses, args=scan_ips_args, num_workers=self._num_workers
|
target=self._scan_addresses,
|
||||||
|
name_prefix="ScanThread",
|
||||||
|
args=scan_ips_args,
|
||||||
|
num_workers=self._num_workers,
|
||||||
)
|
)
|
||||||
|
|
||||||
def _scan_addresses(
|
def _scan_addresses(
|
||||||
|
|
|
@ -46,10 +46,11 @@ class Propagator:
|
||||||
self._hosts_to_exploit = Queue()
|
self._hosts_to_exploit = Queue()
|
||||||
|
|
||||||
scan_thread = create_daemon_thread(
|
scan_thread = create_daemon_thread(
|
||||||
target=self._scan_network, args=(propagation_config, stop)
|
target=self._scan_network, name="PropagatorScanThread", args=(propagation_config, stop)
|
||||||
)
|
)
|
||||||
exploit_thread = create_daemon_thread(
|
exploit_thread = create_daemon_thread(
|
||||||
target=self._exploit_hosts,
|
target=self._exploit_hosts,
|
||||||
|
name="PropagatorExploitThread",
|
||||||
args=(propagation_config, current_depth, network_scan_completed, stop),
|
args=(propagation_config, current_depth, network_scan_completed, stop),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue