diff options
| author | Martijn Pieters <mj@zopatista.com> | 2023-12-20 23:09:01 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-20 23:09:01 (GMT) |
| commit | 1ff02385944924db7e683a607da2882462594764 (patch) | |
| tree | 05a658fb019bc290359c9c3aee69116decdd8f91 /Lib/asyncio/sslproto.py | |
| parent | a3e8afe0a3b5868440501edf579d1d4711c0fb18 (diff) | |
| download | cpython-1ff02385944924db7e683a607da2882462594764.zip cpython-1ff02385944924db7e683a607da2882462594764.tar.gz cpython-1ff02385944924db7e683a607da2882462594764.tar.bz2 | |
GH-113214: Fix SSLProto exception handling in SSL-over-SSL scenarios (#113334)
When wrapped, `_SSLProtocolTransport._force_close(exc)` is called just like in the unwrapped scenario `_SelectorTransport._force_close(exc)` or `_ProactorBasePipeTransport._force_close(exc)` would be called, except here the exception needs to be passed through the `SSLProtocol._abort()` method, which didn't accept an exception object.
This commit ensures that this path works, in the same way that the uvloop implementation of SSLProto passes on the exception (on which the current implementation of SSLProto is based).
Diffstat (limited to 'Lib/asyncio/sslproto.py')
| -rw-r--r-- | Lib/asyncio/sslproto.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Lib/asyncio/sslproto.py b/Lib/asyncio/sslproto.py index 3eb65a8..cbb6527 100644 --- a/Lib/asyncio/sslproto.py +++ b/Lib/asyncio/sslproto.py @@ -243,13 +243,12 @@ class _SSLProtocolTransport(transports._FlowControlMixin, The protocol's connection_lost() method will (eventually) be called with None as its argument. """ - self._closed = True - if self._ssl_protocol is not None: - self._ssl_protocol._abort() + self._force_close(None) def _force_close(self, exc): self._closed = True - self._ssl_protocol._abort(exc) + if self._ssl_protocol is not None: + self._ssl_protocol._abort(exc) def _test__append_write_backlog(self, data): # for test only @@ -614,7 +613,7 @@ class SSLProtocol(protocols.BufferedProtocol): if self._app_transport is not None: self._app_transport._closed = True if self._state == SSLProtocolState.DO_HANDSHAKE: - self._abort() + self._abort(None) else: self._set_state(SSLProtocolState.FLUSHING) self._shutdown_timeout_handle = self._loop.call_later( @@ -661,10 +660,10 @@ class SSLProtocol(protocols.BufferedProtocol): else: self._loop.call_soon(self._transport.close) - def _abort(self): + def _abort(self, exc): self._set_state(SSLProtocolState.UNWRAPPED) if self._transport is not None: - self._transport.abort() + self._transport._force_close(exc) # Outgoing flow |