actions/opensearch-pyd
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #689 from elastic/nick/ssl_bugs

Browse Source 
Updates to SSL Context changes
This commit is contained in:
Nick Lang
2017-12-27 20:49:39 -07:00
committed by GitHub
parent 966f689545 bf1d64e88d
commit 190e4fdc9a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
elasticsearch/connection/http_urllib3.py
+7 -6
View File
@@ -80,13 +80,14 @@ class Urllib3HttpConnection(Connection):
kw = {} kw = {}
# if providing an SSL context, raise error if any other SSL related flag is used # if providing an SSL context, raise error if any other SSL related flag is used
if ssl_context and (ca_certs or ssl_version or use_ssl): if ssl_context and (ca_certs or ssl_version):
raise ImproperlyConfigured("When using `ssl_context`, `use_ssl`, `ca_certs` and `ssl_version` are not permitted") raise ImproperlyConfigured("When using `ssl_context`, `use_ssl`, `verify_certs`, `ca_certs` and `ssl_version` are not permitted")
# if ssl_context provided use SSL by default # if ssl_context provided use SSL by default
if use_ssl or ssl_context: if use_ssl or ssl_context:
cafile = CA_CERTS if ca_certs is None else ca_certs ca_certs = CA_CERTS if ca_certs is None else ca_certs
if not cafile and not ssl_context and verify_certs:
if not ca_certs and not ssl_context and verify_certs:
# If no ca_certs and no sslcontext passed and asking to verify certs # If no ca_certs and no sslcontext passed and asking to verify certs
# raise error # raise error
raise ImproperlyConfigured("Root certificates are missing for certificate " raise ImproperlyConfigured("Root certificates are missing for certificate "
@@ -100,7 +101,7 @@ class Urllib3HttpConnection(Connection):
# if SSLContext hasn't been passed in, create one. # if SSLContext hasn't been passed in, create one.
# need to skip if sslContext isn't avail # need to skip if sslContext isn't avail
try: try:
ssl_context = create_ssl_context(cafile=cafile) ssl_context = create_ssl_context(cafile=ca_certs)
except AttributeError: except AttributeError:
ssl_context = None ssl_context = None
@@ -116,7 +117,7 @@ class Urllib3HttpConnection(Connection):
'assert_fingerprint': ssl_assert_fingerprint, 'assert_fingerprint': ssl_assert_fingerprint,
'ssl_context': ssl_context, 'ssl_context': ssl_context,
'cert_file': client_cert, 'cert_file': client_cert,
'ca_certs': cafile, 'ca_certs': ca_certs,
'key_file': client_key, 'key_file': client_key,
}) })
self.pool = pool_class(host, port=port, timeout=self.timeout, maxsize=maxsize, **kw) self.pool = pool_class(host, port=port, timeout=self.timeout, maxsize=maxsize, **kw)
test_elasticsearch/test_connection.py
-1
View File
@@ -67,7 +67,6 @@ class TestUrllib3Connection(TestCase):
ctx = create_ssl_context() ctx = create_ssl_context()
except AttributeError: except AttributeError:
raise SkipTest("SSL Context not supported in this version of python") raise SkipTest("SSL Context not supported in this version of python")
self.assertRaises(ImproperlyConfigured, Urllib3HttpConnection, ssl_context=ctx, use_ssl=True)
self.assertRaises(ImproperlyConfigured, Urllib3HttpConnection, ssl_context=ctx, ca_certs="/some/path/to/cert.crt") self.assertRaises(ImproperlyConfigured, Urllib3HttpConnection, ssl_context=ctx, ca_certs="/some/path/to/cert.crt")
self.assertRaises(ImproperlyConfigured, Urllib3HttpConnection, ssl_context=ctx, ssl_version=ssl.PROTOCOL_SSLv23) self.assertRaises(ImproperlyConfigured, Urllib3HttpConnection, ssl_context=ctx, ssl_version=ssl.PROTOCOL_SSLv23)