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

Prefer the stdlib SSLContext over urllib3 context #32053

Merged
merged 1 commit into from
Oct 24, 2017
Merged

Prefer the stdlib SSLContext over urllib3 context #32053

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
12 changes: 9 additions & 3 deletions lib/ansible/module_utils/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,10 +700,13 @@ def detect_no_proxy(self, url):
return True

def _make_context(self, to_add_ca_cert_path):
if HAS_URLLIB3_PYOPENSSLCONTEXT:
if HAS_SSLCONTEXT:
context = create_default_context()
elif HAS_URLLIB3_PYOPENSSLCONTEXT:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this. It should have been done this way to start with.

context = PyOpenSSLContext(PROTOCOL)
else:
context = create_default_context()
raise NotImplementedError('Host libraries are too old to support creating an sslcontext')

if to_add_ca_cert_path:
context.load_verify_locations(to_add_ca_cert_path)
return context
Expand All @@ -712,8 +715,11 @@ def http_request(self, req):
tmp_ca_cert_path, to_add_ca_cert_path, paths_checked = self.get_ca_certs()
https_proxy = os.environ.get('https_proxy')
context = None
if HAS_SSLCONTEXT or HAS_URLLIB3_PYOPENSSLCONTEXT:
try:
context = self._make_context(to_add_ca_cert_path)
except Exception:
# We'll make do with no context below
pass

# Detect if 'no_proxy' environment variable is set and if our URL is included
use_proxy = self.detect_no_proxy(req.get_full_url())
Expand Down