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

Enables 'basic auth force' -feature globally

Browse source
This commit is contained in:
Iiro Uusitalo 2014-10-07 12:41:13 +03:00
parent a9712bb0fb
commit 403f4881ee
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -229,6 +229,7 @@ import sys
import socket import socket
import platform import platform
import tempfile import tempfile
import base64
# This is a dummy cacert provided for Mac OS since you need at least 1 # This is a dummy cacert provided for Mac OS since you need at least 1
@ -523,6 +524,7 @@ class SSLValidationHandler(urllib2.BaseHandler):
def open_url(url, data=None, headers=None, method=None, use_proxy=True, def open_url(url, data=None, headers=None, method=None, use_proxy=True,
force=False, last_mod_time=None, timeout=10, validate_certs=True, force=False, last_mod_time=None, timeout=10, validate_certs=True,
url_username=None, url_password=None, http_agent=None): url_username=None, url_password=None, http_agent=None):
force_basic_auth = dict(required=False, type='bool')
''' '''
Fetches a file from an HTTP/FTP server using urllib2 Fetches a file from an HTTP/FTP server using urllib2
''' '''
@ -554,6 +556,7 @@ def open_url(url, data=None, headers=None, method=None, use_proxy=True,
if parsed[0] != 'ftp': if parsed[0] != 'ftp':
username = url_username username = url_username
force_basic_auth = module.params.get('force_basic_auth', False)
if username: if username:
password = url_password password = url_password
@ -572,7 +575,7 @@ def open_url(url, data=None, headers=None, method=None, use_proxy=True,
# reconstruct url without credentials # reconstruct url without credentials
url = urlparse.urlunparse(parsed) url = urlparse.urlunparse(parsed)
if username: if username and not force_basic_auth:
passman = urllib2.HTTPPasswordMgrWithDefaultRealm() passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
# this creates a password manager # this creates a password manager
@ -586,6 +589,12 @@ def open_url(url, data=None, headers=None, method=None, use_proxy=True,
# create the AuthHandler # create the AuthHandler
handlers.append(authhandler) handlers.append(authhandler)
elif username and force_basic_auth:
if headers is None:
headers = {}
headers["Authorization"] = "Basic {0}".format(base64.b64encode("{0}:{1}".format(username, password)))
if not use_proxy: if not use_proxy:
proxyhandler = urllib2.ProxyHandler({}) proxyhandler = urllib2.ProxyHandler({})
handlers.append(proxyhandler) handlers.append(proxyhandler)