Skip to content

Updating SSL protocol selection with fallback #7

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

Updating SSL protocol selection with fallback #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb247b8
Updating SSL protocol selection with fallback
jrepp Jan 10, 2017
1f3efe4
Updating docstring for TLS adapter
jrepp Jan 10, 2017
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
18 changes: 14 additions & 4 deletions etcd/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,24 @@
'') or None


class _Ssl3HttpAdapter(HTTPAdapter):
""""Transport adapter" that allows us to use SSLv3."""
class _SslHttpAdapter(HTTPAdapter):
""""Transport adapter" for requests module that creates TLS connections."""

def init_poolmanager(self, connections, maxsize, block=False):
self.poolmanager = PoolManager(num_pools=connections,
maxsize=maxsize,
block=block,
ssl_version=ssl.PROTOCOL_SSLv3)
ssl_version=self.best_ssl_version())

def best_ssl_version(self):
# Use recommended settings from ssl module docs with fallbacks to
# earlier module definitions
# https://docs.python.org/2/library/ssl.html#ssl.PROTOCOL_TLS
versions = ['PROTOCOL_TLS', 'PROTOCOL_SSLv3', 'PROTOCOL_SSLv23']
for v in versions:
if v in ssl.__dict__:
return ssl.__dict__[v]
raise ValueError('Supported SSL protocol not found')


class _Modules(object):
Expand Down Expand Up @@ -159,7 +169,7 @@ def __init__(self, host='127.0.0.1', port=4001,
self.__session = requests.Session()

# Define an adapter for when SSL is requested.
self.__session.mount('https://', _Ssl3HttpAdapter())
self.__session.mount('https://', _SslHttpAdapter())

# TODO: Remove the version check after debugging.
# TODO: Can we implicitly read the version from the response/headers?
Expand Down