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

Agent: Rename send_relay_control_message -> send_remove_from_waitlist_control_message_to_relays

This commit is contained in:
Shreya Malviya 2022-09-08 13:30:56 +05:30 committed by Mike Salvatore
parent f436bf7b8c
commit 78d32053a2
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
monkey/infection_monkey/monkey.py
View File

@ -42,7 +42,10 @@ from infection_monkey.master.control_channel import ControlChannel
from infection_monkey.model import VictimHostFactory from infection_monkey.model import VictimHostFactory
from infection_monkey.network.firewall import app as firewall from infection_monkey.network.firewall import app as firewall
from infection_monkey.network.info import get_network_interfaces from infection_monkey.network.info import get_network_interfaces
from infection_monkey.network.relay.utils import find_server, send_relay_control_message from infection_monkey.network.relay.utils import (
find_server,
send_remove_from_waitlist_control_message_to_relays,
)
from infection_monkey.network_scanning.elasticsearch_fingerprinter import ElasticSearchFingerprinter from infection_monkey.network_scanning.elasticsearch_fingerprinter import ElasticSearchFingerprinter
from infection_monkey.network_scanning.http_fingerprinter import HTTPFingerprinter from infection_monkey.network_scanning.http_fingerprinter import HTTPFingerprinter
from infection_monkey.network_scanning.mssql_fingerprinter import MSSQLFingerprinter from infection_monkey.network_scanning.mssql_fingerprinter import MSSQLFingerprinter
@ -131,7 +134,7 @@ class InfectionMonkey:
raise Exception( raise Exception(
f"Failed to connect to the island via any known servers: {self._opts.servers}" f"Failed to connect to the island via any known servers: {self._opts.servers}"
) )
send_relay_control_message(servers_iterator) send_remove_from_waitlist_control_message_to_relays(servers_iterator)
return server return server

2
monkey/infection_monkey/network/relay/utils.py
View File

@ -38,7 +38,7 @@ def find_server(servers: Iterable[str]) -> Optional[str]:
return None return None
def send_relay_control_message(servers: Iterable[str]): def send_remove_from_waitlist_control_message_to_relays(servers: Iterable[str]):
for server in servers: for server in servers:
t = create_daemon_thread( t = create_daemon_thread(
target=_open_socket_to_server, target=_open_socket_to_server,