saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Rename arguments in salt.utils.url.add_http_basic_auth

Browse source
This commit is contained in:
Erik Johnson 2015-08-28 10:54:14 -05:00
parent b45f37a467
commit d2eb1f4340
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
salt/utils/url.py
View file

@ -150,29 +150,29 @@ def strip_proto(url):
def add_http_basic_auth(url,
https_user=None,
https_pass=None,
user=None,
password=None,
https_only=False):
'''
Return a string with http basic auth incorporated into it
'''
if https_user is None and https_pass is None:
if user is None and password is None:
return url
else:
urltuple = urlparse(url)
if https_only and urltuple.scheme != 'https':
raise ValueError('Basic Auth only supported for HTTPS')
if https_pass is None:
if password is None:
netloc = '{0}@{1}'.format(
https_user,
user,
urltuple.netloc
)
urltuple = urltuple._replace(netloc=netloc)
return urlunparse(urltuple)
else:
netloc = '{0}:{1}@{2}'.format(
https_user,
https_pass,
user,
password,
urltuple.netloc
)
urltuple = urltuple._replace(netloc=netloc)