ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Make sure that we're comparing text all the way through.

Browse source 
On Darwin, sys.platform returns byte strings on both python2 and
python3.  Turn it into a text string everywhere in order to remedy that.

Fixes #19845
This commit is contained in:
Toshio Kuratomi 2017-02-03 20:39:12 -08:00
parent 5c56e79a8f
commit bfffd1952f
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/module_utils/urls.py
View file

@ -115,7 +115,7 @@ import ansible.module_utils.six.moves.urllib.request as urllib_request
import ansible.module_utils.six.moves.urllib.error as urllib_error import ansible.module_utils.six.moves.urllib.error as urllib_error
from ansible.module_utils.basic import get_distribution, get_exception from ansible.module_utils.basic import get_distribution, get_exception
from ansible.module_utils.six import b from ansible.module_utils.six import b
from ansible.module_utils._text import to_bytes, to_native from ansible.module_utils._text import to_bytes, to_native, to_text
try: try:
# python3 # python3
@ -579,21 +579,21 @@ class SSLValidationHandler(urllib_request.BaseHandler):
ca_certs = [] ca_certs = []
paths_checked = [] paths_checked = []
system = platform.system() system = to_text(platform.system(), errors='surrogate_or_strict')
# build a list of paths to check for .crt/.pem files # build a list of paths to check for .crt/.pem files
# based on the platform type # based on the platform type
paths_checked.append('/etc/ssl/certs') paths_checked.append('/etc/ssl/certs')
if system == 'Linux': if system == u'Linux':
paths_checked.append('/etc/pki/ca-trust/extracted/pem') paths_checked.append('/etc/pki/ca-trust/extracted/pem')
paths_checked.append('/etc/pki/tls/certs') paths_checked.append('/etc/pki/tls/certs')
paths_checked.append('/usr/share/ca-certificates/cacert.org') paths_checked.append('/usr/share/ca-certificates/cacert.org')
elif system == 'FreeBSD': elif system == u'FreeBSD':
paths_checked.append('/usr/local/share/certs') paths_checked.append('/usr/local/share/certs')
elif system == 'OpenBSD': elif system == u'OpenBSD':
paths_checked.append('/etc/ssl') paths_checked.append('/etc/ssl')
elif system == 'NetBSD': elif system == u'NetBSD':
ca_certs.append('/etc/openssl/certs') ca_certs.append('/etc/openssl/certs')
elif system == 'SunOS': elif system == u'SunOS':
paths_checked.append('/opt/local/etc/openssl/certs') paths_checked.append('/opt/local/etc/openssl/certs')
# fall back to a user-deployed cert in a standard # fall back to a user-deployed cert in a standard
@ -605,7 +605,7 @@ class SSLValidationHandler(urllib_request.BaseHandler):
to_add = False to_add = False
# Write the dummy ca cert if we are running on Mac OS X # Write the dummy ca cert if we are running on Mac OS X
if system == 'Darwin': if system == u'Darwin':
os.write(tmp_fd, b_DUMMY_CA_CERT) os.write(tmp_fd, b_DUMMY_CA_CERT)
# Default Homebrew path for OpenSSL certs # Default Homebrew path for OpenSSL certs
paths_checked.append('/usr/local/etc/openssl') paths_checked.append('/usr/local/etc/openssl')