valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix git https auth for password of None

Browse Source
This commit is contained in:
Colton Myers 2015-08-21 11:06:14 -06:00
parent ff2d6c6045
commit 70884e1cb3
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
salt/modules/git.py
View File

@ -39,13 +39,21 @@ def _add_http_basic_auth(url, https_user=None, https_pass=None):
else:
urltuple = _urlparse(url)
if urltuple.scheme == 'https':
netloc = '{0}:{1}@{2}'.format(
https_user,
https_pass,
urltuple.netloc
)
urltuple = urltuple._replace(netloc=netloc)
return _urlunparse(urltuple)
if https_pass is None:
netloc = '{0}@{2}'.format(
https_user,
urltuple.netloc
)
urltuple = urltuple._replace(netloc=netloc)
return _urlunparse(urltuple)
else:
netloc = '{0}:{1}@{2}'.format(
https_user,
https_pass,
urltuple.netloc
)
urltuple = urltuple._replace(netloc=netloc)
return _urlunparse(urltuple)
else:
raise SaltInvocationError('Basic Auth only supported for HTTPS')