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

Agent: Add function to disconnect from relay

This commit is contained in:
Kekoa Kaaikala 2022-09-02 15:02:45 +00:00 committed by Mike Salvatore
parent 5366bba389
commit baeb0c9460
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
import logging import logging
import socket import socket
from ipaddress import IPv4Address
from typing import Iterable, Optional from typing import Iterable, Optional
import requests import requests
@ -49,14 +50,21 @@ def send_remove_from_waitlist_control_message_to_relays(servers: Iterable[str]):
def _send_remove_from_waitlist_control_message_to_relay(server: str): def _send_remove_from_waitlist_control_message_to_relay(server: str):
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as d_socket:
d_socket.settimeout(MEDIUM_REQUEST_TIMEOUT)
ip, port = address_to_ip_port(server) ip, port = address_to_ip_port(server)
logger.info(f"Control message was sent to the server/relay {server}") notify_disconnect(IPv4Address(ip), int(port))
def notify_disconnect(server_ip: IPv4Address, server_port: int):
"""
Tell upstream relay that we no longer need the relay.
:param server_ip: The IP address of the server to notify.
:param server_port: The port of the server to notify.
"""
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as d_socket:
try: try:
d_socket.connect((ip, int(port))) d_socket.connect((server_ip, server_port))
d_socket.send(RELAY_CONTROL_MESSAGE_REMOVE_FROM_WAITLIST) d_socket.sendall(RELAY_CONTROL_MESSAGE_REMOVE_FROM_WAITLIST)
logger.info(f"Control message was sent to the server/relay {server_ip}:{server_port}")
except OSError as err: except OSError as err:
logger.error(f"Error connecting to socket {server}: {err}") logger.error(f"Error connecting to socket {server_ip}:{server_port}: {err}")