Fix stale sockets after WinError

This commit is contained in:
Flowseal
2026-11-18 00:02:45 +03:00
parent 6690b78843
commit 768d83d10c
3 changed files with 73 additions and 2 deletions
+31
View File
@@ -4,11 +4,42 @@ import signal
import socket
import sys
import threading
from contextlib import suppress
log = logging.getLogger('tg-mtproto-proxy')
def _close_proactor_socket(transport, exc):
sock = transport._sock
if sock is None:
return
try:
transport._protocol.connection_lost(exc)
finally:
try:
if sock.fileno() != -1:
with suppress(ConnectionResetError):
sock.shutdown(socket.SHUT_RDWR)
finally:
sock.close()
transport._sock = None
transport._called_connection_lost = True
server, transport._server = transport._server, None
if server is not None:
if sys.version_info >= (3, 13):
server._detach(transport)
else:
server._detach()
def install_proactor_socket_guard(loop):
# https://github.com/Flowseal/tg-ws-proxy/issues/1614
if sys.platform == 'win32' and isinstance(loop, asyncio.ProactorEventLoop):
from asyncio.proactor_events import _ProactorSocketTransport
_ProactorSocketTransport._call_connection_lost = _close_proactor_socket
def _replace_self_pipe(loop):
reader, writer = socket.socketpair()
try:
+4 -2
View File
@@ -34,7 +34,7 @@ from .balancer import balancer
from .pool import ws_pool, cf_worker_pool
from .cf_h2 import CfH2Pool
from .network_debug import log_ws_flow
from .event_loop import install_self_pipe_guard
from .event_loop import install_proactor_socket_guard, install_self_pipe_guard
from ._aes import Cipher, algorithms, modes
@@ -385,7 +385,9 @@ _client_tasks: Set[asyncio.Task] = set()
async def _run(stop_event: Optional[asyncio.Event] = None):
global _server_instance, _server_stop_event, cf_h2_pool
install_self_pipe_guard(asyncio.get_running_loop())
loop = asyncio.get_running_loop()
install_proactor_socket_guard(loop)
install_self_pipe_guard(loop)
_server_stop_event = stop_event
reset_tcp_backoff()
+38
View File
@@ -274,5 +274,43 @@ class ProxySelfPipeTest(unittest.IsolatedAsyncioTestCase):
await asyncio.gather(task, return_exceptions=True)
@unittest.skipUnless(sys.platform == 'win32', 'Windows proactor TCP transports')
class WindowsSocketCloseTest(unittest.IsolatedAsyncioTestCase):
async def test_shutdown_reset_still_closes_client_and_accepted_socket(self):
from asyncio.proactor_events import _ProactorSocketTransport
self.addCleanup(setattr, _ProactorSocketTransport, '_call_connection_lost',
_ProactorSocketTransport._call_connection_lost)
loop = asyncio.get_running_loop()
event_loop.install_proactor_socket_guard(loop)
accepted = loop.create_future()
server = await asyncio.start_server(
lambda _, writer: accepted.set_result(writer), '127.0.0.1', 0)
self.addCleanup(server.close)
port = server.sockets[0].getsockname()[1]
_, client = await asyncio.open_connection('127.0.0.1', port)
peer = await asyncio.wait_for(accepted, 1)
sockets = (client.transport._sock, peer.transport._sock)
shutdown = socket.socket.shutdown
def reset_on_shutdown(sock, how):
if sock in sockets:
raise ConnectionResetError(0, 'connection reset', None, 10054)
shutdown(sock, how)
for sock in sockets:
self.addCleanup(sock.close)
with patch.object(socket.socket, 'shutdown', reset_on_shutdown), \
patch.object(loop, 'call_exception_handler') as report:
client.close()
peer.close()
await asyncio.wait_for(asyncio.gather(client.wait_closed(), peer.wait_closed()), 1)
self.assertEqual([sock.fileno() for sock in sockets], [-1, -1])
report.assert_not_called()
server.close()
await asyncio.wait_for(server.wait_closed(), 1)
if __name__ == '__main__':
unittest.main()