ssl_show_warn option added (#913)
* ssl_show_warn option added * Typo fixed
This commit is contained in:
committed by
Nick Lang
parent
2c6e60380a
commit
51ad5d3617
@@ -18,6 +18,7 @@ class RequestsHttpConnection(Connection):
|
||||
string or a tuple. Any value will be passed into requests as `auth`.
|
||||
:arg use_ssl: use ssl for the connection if `True`
|
||||
:arg verify_certs: whether to verify SSL certificates
|
||||
:arg ssl_show_warn: show warning when verify certs is disabled
|
||||
:arg ca_certs: optional path to CA bundle. By default standard requests'
|
||||
bundle will be used.
|
||||
:arg client_cert: path to the file containing the private key and the
|
||||
@@ -27,7 +28,7 @@ class RequestsHttpConnection(Connection):
|
||||
:arg headers: any custom http headers to be add to requests
|
||||
"""
|
||||
def __init__(self, host='localhost', port=9200, http_auth=None,
|
||||
use_ssl=False, verify_certs=True, ca_certs=None, client_cert=None,
|
||||
use_ssl=False, verify_certs=True, ssl_show_warn=True, ca_certs=None, client_cert=None,
|
||||
client_key=None, headers=None, **kwargs):
|
||||
if not REQUESTS_AVAILABLE:
|
||||
raise ImproperlyConfigured("Please install requests to use RequestsHttpConnection.")
|
||||
@@ -57,7 +58,7 @@ class RequestsHttpConnection(Connection):
|
||||
raise ImproperlyConfigured("You cannot pass CA certificates when verify SSL is off.")
|
||||
self.session.verify = ca_certs
|
||||
|
||||
if self.use_ssl and not verify_certs:
|
||||
if self.use_ssl and not verify_certs and ssl_show_warn:
|
||||
warnings.warn(
|
||||
'Connecting to %s using SSL with verify_certs=False is insecure.' % self.base_url)
|
||||
|
||||
|
||||
@@ -48,6 +48,7 @@ class Urllib3HttpConnection(Connection):
|
||||
string or a tuple
|
||||
:arg use_ssl: use ssl for the connection if `True`
|
||||
:arg verify_certs: whether to verify SSL certificates
|
||||
:arg ssl_show_warn: show warning when verify certs is disabled
|
||||
:arg ca_certs: optional path to CA bundle.
|
||||
See https://urllib3.readthedocs.io/en/latest/security.html#using-certifi-with-urllib3
|
||||
for instructions how to get default set
|
||||
@@ -67,7 +68,7 @@ class Urllib3HttpConnection(Connection):
|
||||
:arg http_compress: Use gzip compression
|
||||
"""
|
||||
def __init__(self, host='localhost', port=9200, http_auth=None,
|
||||
use_ssl=False, verify_certs=VERIFY_CERTS_DEFAULT, ca_certs=None, client_cert=None,
|
||||
use_ssl=False, verify_certs=VERIFY_CERTS_DEFAULT, ssl_show_warn=True, ca_certs=None, client_cert=None,
|
||||
client_key=None, ssl_version=None, ssl_assert_hostname=None,
|
||||
ssl_assert_fingerprint=None, maxsize=10, headers=None, ssl_context=None, http_compress=False, **kwargs):
|
||||
|
||||
@@ -131,8 +132,9 @@ class Urllib3HttpConnection(Connection):
|
||||
'key_file': client_key,
|
||||
})
|
||||
else:
|
||||
warnings.warn(
|
||||
'Connecting to %s using SSL with verify_certs=False is insecure.' % host)
|
||||
if ssl_show_warn:
|
||||
warnings.warn(
|
||||
'Connecting to %s using SSL with verify_certs=False is insecure.' % host)
|
||||
|
||||
self.pool = pool_class(host, port=port, timeout=self.timeout, maxsize=maxsize, **kw)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user