Migrate ssl.wrap_socket to SSLContext.wrap_socket#39
Open
zaurask wants to merge 2 commits intoGoogleChromeLabs:masterfrom
Open
Migrate ssl.wrap_socket to SSLContext.wrap_socket#39zaurask wants to merge 2 commits intoGoogleChromeLabs:masterfrom
zaurask wants to merge 2 commits intoGoogleChromeLabs:masterfrom
Conversation
ricea
reviewed
Mar 29, 2024
| ca_certs=server_options.tls_client_ca, | ||
| cert_reqs=client_cert_) | ||
|
|
||
| ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS) |
Collaborator
There was a problem hiding this comment.
Looks like we should use ssl.PROTOCOL_TLS_SERVER if we are on Python >= 3.6.
Author
There was a problem hiding this comment.
So far the defaults were used since they were not set when calling ssl.wrap_socket(): server_side=False and ssl_version=PROTOCOL_TLS. Since I am not sure about the implications I used those defaults. For PROTOCOL_TLS it looks like it is deprecated since version 3.10, so going for PROTOCOL_TLS_SERVER seems to be the right choice.
| ssl_context.load_verify_locations( | ||
| server_options.tls_client_ca) | ||
| ssl_context.verify_mode = client_cert_ | ||
| socket_ = ssl_context.wrap_socket(socket_) |
Collaborator
There was a problem hiding this comment.
Don't we need server_side=True?
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 free
to 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.
The ssl.wrap_socket function was removed in 3.12. This PR migrates ssl.wrap_socket to SSLContext.wrap_socket by recreating the logic already used internally by ssl.wrap_socket when called from pywebsocket3.
Tested by successfully running WPT locally.
Fixes #38.