Skip to content
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

Jump to bottom

Only use SSL socket if kwargs are not all defaults #1639

Closed
wants to merge 1 commit into from
Closed

Only use SSL socket if kwargs are not all defaults #1639

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 14 additions & 9 deletions src/flask_socketio/__init__.py
View file
Open in desktop
Expand Up @@ -607,15 +607,20 @@ def run_server():
eventlet_socket = eventlet.listen(addresses[0][4],
addresses[0][0])

# If provided an SSL argument, use an SSL socket
ssl_args = ['keyfile', 'certfile', 'server_side', 'cert_reqs',
'ssl_version', 'ca_certs',
'do_handshake_on_connect', 'suppress_ragged_eofs',
'ciphers']
ssl_params = {k: kwargs[k] for k in kwargs if k in ssl_args}
if len(ssl_params) > 0:
for k in ssl_params:
kwargs.pop(k)
# If provided a non-default SSL argument, use an SSL socket
ssl_args = {'keyfile': None, 'certfile': None,
'server_side': False, 'cert_reqs': None,
'ssl_version': None, 'ca_certs': None,
'do_handshake_on_connect': True,
'suppress_ragged_eofs': True, 'ciphers': None}
ssl_params = {k: kwargs[k] for k in kwargs
if k in ssl_args.keys()}
non_default_ssl_params = {k: kwargs[k] for k in kwargs
if k in ssl_args.keys() and
kwargs[k] != ssl_args[k]}
for k in ssl_params:
kwargs.pop(k)
if len(non_default_ssl_params) > 0:
ssl_params['server_side'] = True # Listening requires true
eventlet_socket = eventlet.wrap_ssl(eventlet_socket,
**ssl_params)
Expand Down