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
2 changes: 2 additions & 0 deletions Lib/asyncio/base_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -1237,6 +1237,7 @@ async def _create_connection_transport(
await waiter
except:
transport.close()
waiter = None
raise

return transport, protocol
Expand Down Expand Up @@ -1371,6 +1372,7 @@ async def start_tls(self, transport, protocol, sslcontext, *,
transport.close()
conmade_cb.cancel()
resume_cb.cancel()
waiter = None
raise

return ssl_protocol._app_transport
Expand Down
1 change: 1 addition & 0 deletions Lib/asyncio/selector_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -1206,6 +1206,7 @@ def _call_connection_lost(self, exc):
super()._call_connection_lost(exc)
finally:
self._write_ready = None
self._read_ready_cb = None
if self._empty_waiter is not None:
self._empty_waiter.set_exception(
ConnectionError("Connection is closed by peer"))
Expand Down
62 changes: 62 additions & 0 deletions Lib/test/test_asyncio/test_sslproto.py
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,68 @@ async def client(addr):
with self.assertRaises(ssl.SSLCertVerificationError):
self.loop.run_until_complete(client(srv.addr))

def test_create_connection_ssl_failed_certificate_no_cycles(self):
# gh-159049
sslctx = test_utils.simple_server_sslcontext()
client_sslctx = test_utils.simple_client_sslcontext(
disable_verify=False)
transports = []

def server(sock):
try:
sock.start_tls(sslctx, server_side=True)
except OSError:
pass

connection_made = sslproto.SSLProtocol.connection_made

def remember_transport(proto, tr):
transports.append(weakref.ref(tr))
connection_made(proto, tr)

async def conn(addr):
try:
await self.loop.create_connection(
asyncio.Protocol, *addr,
ssl=client_sslctx, server_hostname='')
except ssl.SSLCertVerificationError:
pass

support.gc_collect()
with (self.tcp_server(server) as srv, support.disable_gc(),
mock.patch.object(sslproto.SSLProtocol, 'connection_made',
remember_transport)):
self.loop.run_until_complete(conn(srv.addr))
self.assertEqual([tr() for tr in transports], [None])

def test_start_tls_failed_certificate_no_cycles(self):
# gh-159049
sslctx = test_utils.simple_server_sslcontext()
client_sslctx = test_utils.simple_client_sslcontext(
disable_verify=False)
transports = []

def server(sock):
try:
sock.start_tls(sslctx, server_side=True)
except OSError:
pass

async def client(addr):
tr, proto = await self.loop.create_connection(
asyncio.Protocol, *addr)
transports.append(weakref.ref(tr))
try:
await self.loop.start_tls(
tr, proto, client_sslctx, server_hostname='')
except ssl.SSLCertVerificationError:
pass

support.gc_collect()
with self.tcp_server(server) as srv, support.disable_gc():
self.loop.run_until_complete(client(srv.addr))
self.assertEqual([tr() for tr in transports], [None])

def test_start_tls_client_corrupted_ssl(self):
self.loop.set_exception_handler(lambda loop, ctx: None)

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix reference cycles in :meth:`asyncio.loop.create_connection` and
:meth:`asyncio.loop.start_tls` after a failed TLS handshake.
Patch by Timofei Ivankov.
Loading