Wrap SSL sockets after connecting #1754
Merged
Conversation
This file contains 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
jeffwidman
approved these changes
Mar 21, 2019
jeffwidman
reviewed
Mar 21, 2019
| @@ -486,9 +481,6 @@ def _try_handshake(self): | |||
| # old ssl in python2.6 will swallow all SSLErrors here... | |||
| except (SSLWantReadError, SSLWantWriteError): | |||
There was a problem hiding this comment.
Should this also check whether python < 2.7 before pass'ing? Just in the off-chance these exceptions get-used later?
There was a problem hiding this comment.
no, see the import hackery above. this is an old problem. we could try to check exception error codes etc, but unless there's a real user asking for help w/ old python installs I'm not that interested in adding more compatibility layers here.
Plus python 2.7 is EOL very soon...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix for #1741 . Previously we have been wrapping sockets with an SSLContext before connection, and calling
connect_exto do a non-blocking connect, then callingdo_handshake. But the TCP connect itself does not require the SSLContext, and it appears that in general, and definitely on python3.7, non-blocking connect_ex w/ ssl sockets is not fully supported.So this PR defers wrap_ssl until after the TCP socket is connected, which should side-step all of the ValueError / OSError issues raised by python3.7 due to poor support for connect_ex. Also it is simpler, which I like.
This change is