Uh oh!
There was an error while loading. Please reload this page.
GH-113214: Fix SSLProto exception handling in SSL-over-SSL scenarios - #113334
Merged
Conversation
mjpieters
requested review from
1st1, asvetlov, gvanrossum, kumaraditya303 and willingc
as code ownersDecember 20, 2023 21:16
mjpietersforce-pushed
the
asyncio_fix_ssl_abort
branch
from
December 20, 2023 21:20
c9d76d4 to
d4bbdffCompare
gvanrossum
left a comment
Member
There was a problem hiding this comment.
This looks great except a comment nit. Once you fix that I'll merge, and full speed ahead on the 3.12 and 3.11 backports.
Uh oh!
There was an error while loading. Please reload this page.
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).
mjpietersforce-pushed
the
asyncio_fix_ssl_abort
branch
from
December 20, 2023 22:12
d4bbdff to
998504dComparegvanrossum
approved these changes
Dec 20, 2023
gvanrossum
left a comment
Member
There was a problem hiding this comment.
Thanks! Merging now, hopefully the backports will be uneventful (but boy do they generate a lot of notification email :-).
PS. Next time please do not force-push -- it makes the review harder. We squash-merge into main anyway.
Thanks @mjpieters for the PR, and @gvanrossum for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12. |
miss-islington pushed a commit
to miss-islington/cpython
that referenced
this pull request
Dec 20, 2023
…arios (pythonGH-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). (cherry picked from commit 1ff0238) Co-authored-by: Martijn Pieters <mj@zopatista.com>
GH-113339 is a backport of this pull request to the 3.12 branch. |
GH-113340 is a backport of this pull request to the 3.11 branch. |
miss-islington pushed a commit
to miss-islington/cpython
that referenced
this pull request
Dec 20, 2023
…arios (pythonGH-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). (cherry picked from commit 1ff0238) Co-authored-by: Martijn Pieters <mj@zopatista.com>
gvanrossum pushed a commit
that referenced
this pull request
Dec 21, 2023
…narios (GH-113334) (#113339) 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). (cherry picked from commit 1ff0238) Co-authored-by: Martijn Pieters <mj@zopatista.com>
gvanrossum pushed a commit
that referenced
this pull request
Dec 21, 2023
…narios (GH-113334) (#113340) 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). (cherry picked from commit 1ff0238) Co-authored-by: Martijn Pieters <mj@zopatista.com>
ryan-duve pushed a commit
to ryan-duve/cpython
that referenced
this pull request
Dec 26, 2023
…arios (python#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).
kulikjak pushed a commit
to kulikjak/cpython
that referenced
this pull request
Jan 22, 2024
…arios (python#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).
aisk pushed a commit
to aisk/cpython
that referenced
this pull request
Feb 11, 2024
…arios (python#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).
Glyphack pushed a commit
to Glyphack/cpython
that referenced
this pull request
Sep 2, 2024
…arios (python#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).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 theSSLProtocol._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).