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

Apply cafile defaults before checking for emptiness

Browse Source 
Fixes #669
This commit is contained in:
Honza Král
2017-11-14 19:20:15 +01:00
parent d9fa510fa6
commit f639f9b28e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
elasticsearch/connection/http_urllib3.py
+3 -3
View File
@@ -85,7 +85,8 @@ class Urllib3HttpConnection(Connection):
# 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:
if not ca_certs and not ssl_context and verify_certs: cafile = CA_CERTS if ca_certs is None else ca_certs
if not cafile 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 "
@@ -97,7 +98,6 @@ class Urllib3HttpConnection(Connection):
if not ssl_context: if not ssl_context:
# if SSLContext hasn't been passed in, create one. # if SSLContext hasn't been passed in, create one.
cafile = CA_CERTS if ca_certs is None else ca_certs
# 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=cafile)
@@ -116,7 +116,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': ca_certs, 'ca_certs': cafile,
'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)