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

Merge pull request #2211 from guardicore/fix-batching-telemetry-thread-shutdown 

Fix batching telemetry thread shutdown
This commit is contained in:
Mike Salvatore 2022-08-25 10:13:16 -04:00 committed by GitHub
parent 15bd9a31c6 2f50e30a92
commit 478f3bea29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
monkey/infection_monkey/monkey.py
View File

@ -66,9 +66,6 @@ from infection_monkey.puppet.puppet import Puppet
from infection_monkey.system_singleton import SystemSingleton from infection_monkey.system_singleton import SystemSingleton
from infection_monkey.telemetry.attack.t1106_telem import T1106Telem from infection_monkey.telemetry.attack.t1106_telem import T1106Telem
from infection_monkey.telemetry.attack.t1107_telem import T1107Telem from infection_monkey.telemetry.attack.t1107_telem import T1107Telem
from infection_monkey.telemetry.messengers.batching_telemetry_messenger import (
BatchingTelemetryMessenger,
)
from infection_monkey.telemetry.messengers.exploit_intercepting_telemetry_messenger import ( from infection_monkey.telemetry.messengers.exploit_intercepting_telemetry_messenger import (
ExploitInterceptingTelemetryMessenger, ExploitInterceptingTelemetryMessenger,
) )
@ -359,7 +356,7 @@ class InfectionMonkey:
puppet.load_plugin( puppet.load_plugin(
"ransomware", "ransomware",
RansomwarePayload(BatchingTelemetryMessenger(self._telemetry_messenger)), RansomwarePayload(self._telemetry_messenger),
PluginType.PAYLOAD, PluginType.PAYLOAD,
) )

5
monkey/infection_monkey/payload/ransomware/ransomware_builder.py
View File

@ -1,6 +1,9 @@
import logging import logging
from pprint import pformat from pprint import pformat
from infection_monkey.telemetry.messengers.batching_telemetry_messenger import (
BatchingTelemetryMessenger,
)
from infection_monkey.telemetry.messengers.i_telemetry_messenger import ITelemetryMessenger from infection_monkey.telemetry.messengers.i_telemetry_messenger import ITelemetryMessenger
from infection_monkey.utils.bit_manipulators import flip_bits from infection_monkey.utils.bit_manipulators import flip_bits
@ -29,7 +32,7 @@ def build_ransomware(options: dict, telemetry_messenger: ITelemetryMessenger):
file_encryptor, file_encryptor,
file_selector, file_selector,
leave_readme, leave_readme,
telemetry_messenger, BatchingTelemetryMessenger(telemetry_messenger),
) )

2
monkey/infection_monkey/telemetry/messengers/batching_telemetry_messenger.py
View File

@ -47,7 +47,7 @@ class BatchingTelemetryMessenger(ITelemetryMessenger):
def start(self): def start(self):
self._should_run_batch_thread = True self._should_run_batch_thread = True
self._manage_telemetry_batches_thread = threading.Thread( self._manage_telemetry_batches_thread = threading.Thread(
target=self._manage_telemetry_batches name="BatchingTelemetryMessengerThread", target=self._manage_telemetry_batches
) )
self._manage_telemetry_batches_thread.start() self._manage_telemetry_batches_thread.start()