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

Agent: Log uncaught errors in tcp_connection_handler.py thread 

If there's an uncaught error in the thread, the error won't propagate to the caller and we wouldn't know what went wrong from the logs. This fixes things and all uncaught errors get logged
This commit is contained in:
vakarisz 2022-09-12 12:15:07 +03:00 committed by Kekoa Kaaikala
parent 9ff92d2128
commit 7ff61423dc
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
monkey/infection_monkey/network/relay/tcp_connection_handler.py
View File

@ -1,3 +1,4 @@
import logging
import socket
from threading import Thread
from typing import Callable, List
@ -6,6 +7,8 @@ from infection_monkey.utils.threading import InterruptableThreadMixin
PROXY_TIMEOUT = 2.5
logger = logging.getLogger(__name__)
class TCPConnectionHandler(Thread, InterruptableThreadMixin):
"""Accepts connections on a TCP socket."""
@ -24,18 +27,21 @@ class TCPConnectionHandler(Thread, InterruptableThreadMixin):
InterruptableThreadMixin.__init__(self)
def run(self):
l_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
l_socket.bind((self.bind_host, self.bind_port))
l_socket.settimeout(PROXY_TIMEOUT)
l_socket.listen(5)
try:
l_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
l_socket.bind((self.bind_host, self.bind_port))
l_socket.settimeout(PROXY_TIMEOUT)
l_socket.listen(5)
while not self._interrupted.is_set():
try:
source, _ = l_socket.accept()
except socket.timeout:
continue
while not self._interrupted.is_set():
try:
source, _ = l_socket.accept()
except socket.timeout:
continue
for notify_client_connected in self._client_connected:
notify_client_connected(source)
l_socket.close()
for notify_client_connected in self._client_connected:
notify_client_connected(source)
except:
logging.exception("Uncaught error in TCPConnectionHandler thread")
finally:
l_socket.close()