Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ def _close_conn_endpoints(self, conn_id: str) -> None:
if endpoints is None:
return
for endpoint in endpoints:
try:
endpoint.shutdown(socket.SHUT_RDWR)
except (OSError, ValueError, AttributeError):
pass
try:
endpoint.close()
except OSError:
Expand Down Expand Up @@ -724,6 +728,10 @@ def _relay(self, src: socket.socket, dst: socket.socket, conn_id: str, direction
pass
finally:
for endpoint in (src, dst):
try:
endpoint.shutdown(socket.SHUT_RDWR)
except (OSError, ValueError, AttributeError):
pass
try:
endpoint.close()
except OSError:
Expand Down Expand Up @@ -807,6 +815,10 @@ def _handle_client(self, tls_conn: socket.socket | ssl.SSLSocket, addr: tuple[st
for endpoint in (tls_conn, backend):
if endpoint is None:
continue
try:
endpoint.shutdown(socket.SHUT_RDWR)
except (OSError, ValueError, AttributeError):
pass
try:
endpoint.close()
except OSError:
Expand Down
37 changes: 37 additions & 0 deletions tests/test_mqtt_tls_proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ def __init__(self, *chunks: bytes) -> None:
self._chunks = list(chunks)
self.sent: list[bytes] = []
self.closed = False
self.shutdown_calls: list[int] = []
self.recv_calls = 0

def recv(self, _size: int) -> bytes:
Expand All @@ -34,6 +35,9 @@ def recv(self, _size: int) -> bytes:
def sendall(self, chunk: bytes) -> None:
self.sent.append(chunk)

def shutdown(self, how: int) -> None:
self.shutdown_calls.append(how)

def close(self) -> None:
self.closed = True

Expand All @@ -43,11 +47,15 @@ def __init__(self) -> None:
self.sent: list[bytes] = []
self.send_event = threading.Event()
self.closed = False
self.shutdown_calls: list[int] = []

def sendall(self, chunk: bytes) -> None:
self.sent.append(chunk)
self.send_event.set()

def shutdown(self, how: int) -> None:
self.shutdown_calls.append(how)

def close(self) -> None:
self.closed = True

Expand Down Expand Up @@ -210,6 +218,8 @@ def slow_trace_packet(conn_id: str, direction: str, packet: bytes) -> None:
assert trace_finished.wait(1.0)
assert src.closed is True
assert dst.closed is True
assert src.shutdown_calls == [socket.SHUT_RDWR]
assert dst.shutdown_calls == [socket.SHUT_RDWR]

proxy.stop()

Expand Down Expand Up @@ -1195,3 +1205,30 @@ def test_stalled_tls_handshake_is_closed_after_timeout(start_tls_proxy) -> None:
proxy = start_tls_proxy(handshake_timeout_seconds=0.5)
with socket.create_connection(("127.0.0.1", proxy.listen_port), timeout=5) as stalled:
assert stalled.recv(1) == b""


def test_close_conn_endpoints_shuts_down_sockets(tmp_path) -> None:
cloud_snapshot_path = tmp_path / "cloud_snapshot.json"
_seed_cloud_snapshot(cloud_snapshot_path)
proxy = MqttTlsProxy(
cert_file=tmp_path / "fullchain.pem",
key_file=tmp_path / "privkey.pem",
listen_host="127.0.0.1",
listen_port=8883,
backend_host="127.0.0.1",
backend_port=1883,
localkey="test-local-key",
logger=logging.getLogger("test.mqtt_tls_proxy"),
decoded_jsonl=tmp_path / "decoded.jsonl",
cloud_snapshot_path=cloud_snapshot_path,
)
s1 = _FakeSourceSocket()
s2 = _FakeDestinationSocket()
proxy._register_conn_endpoints("test-conn", s1, s2)
proxy._close_conn_endpoints("test-conn")

assert s1.closed is True
assert s2.closed is True
assert s1.shutdown_calls == [socket.SHUT_RDWR]
assert s2.shutdown_calls == [socket.SHUT_RDWR]

Loading