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

Agent: Use addres_to_ip_port in connect()

This commit is contained in:
Kekoa Kaaikala 2022-09-07 13:58:31 +00:00 committed by Mike Salvatore
parent f212425842
commit aac0bfe90b
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
monkey/common/network/network_utils.py
View File

@ -2,6 +2,13 @@ from typing import Optional, Tuple
def address_to_ip_port(address: str) -> Tuple[str, Optional[str]]: def address_to_ip_port(address: str) -> Tuple[str, Optional[str]]:
"""
Split a string containing an IP address (and optionally a port) into IP and Port components.
Currently only works for IPv4 addresses.
:param address: The address string.
:return: Tuple of IP and port strings. The port may be None if no port was in the address.
"""
if ":" in address: if ":" in address:
ip, port = address.split(":") ip, port = address.split(":")
return ip, port or None return ip, port or None

8
monkey/infection_monkey/network/tools.py
View File

@ -6,6 +6,7 @@ import sys
from typing import List, Tuple, Union from typing import List, Tuple, Union
from common.common_consts.timeouts import CONNECTION_TIMEOUT from common.common_consts.timeouts import CONNECTION_TIMEOUT
from common.network.network_utils import address_to_ip_port
from infection_monkey.network.info import get_routes from infection_monkey.network.info import get_routes
DEFAULT_TIMEOUT = CONNECTION_TIMEOUT DEFAULT_TIMEOUT = CONNECTION_TIMEOUT
@ -103,13 +104,14 @@ def connect(connections: List[str]) -> Tuple[socket.socket, str, int]:
:raises: ValueError if an improper connection is provided. :raises: ValueError if an improper connection is provided.
""" """
for connection in connections: for connection in connections:
ip, _, port = connection.rpartition(":") ip, port = address_to_ip_port(connection)
ip = ip.strip("[]") if port is None:
raise ValueError("Connection does not contain a port")
sock = try_connect(ip, int(port)) sock = try_connect(ip, int(port))
if sock: if sock:
return sock, ip, int(port) return sock, ip, int(port)
raise ConnectionError raise ConnectionError("Could not connect to a server in the server list")
def try_connect(ip: str, port: int) -> Union[socket.socket, None]: def try_connect(ip: str, port: int) -> Union[socket.socket, None]: