Skip to content

Migrate ssl.wrap_socket to SSLContext.wrap_socket #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Migrate ssl.wrap_socket to SSLContext.wrap_socket #39

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc50ae9
use ssl.SSLContext.wrap_socket rather than the deprecated ssl.wrap_so…
zaurask Mar 28, 2024
7fe6294
reformat with yapf
zaurask Mar 28, 2024
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
17 changes: 11 additions & 6 deletions pywebsocket3/websocket_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,17 @@ def _create_sockets(self):
client_cert_ = ssl.CERT_REQUIRED
else:
client_cert_ = ssl.CERT_NONE
socket_ = ssl.wrap_socket(
socket_,
keyfile=server_options.private_key,
certfile=server_options.certificate,
ca_certs=server_options.tls_client_ca,
cert_reqs=client_cert_)

ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we should use ssl.PROTOCOL_TLS_SERVER if we are on Python >= 3.6.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

if server_options.certificate:
ssl_context.load_cert_chain(
certfile=server_options.certificate,
keyfile=server_options.private_key)
if server_options.tls_client_ca:
ssl_context.load_verify_locations(
server_options.tls_client_ca)
ssl_context.verify_mode = client_cert_
socket_ = ssl_context.wrap_socket(socket_)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we need server_side=True?

self._sockets.append((socket_, addrinfo))

def server_bind(self):
Expand Down