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

check for ValueError when adding http basic auth

Browse source
This commit is contained in:
Erik Johnson 2015-08-28 15:45:34 -05:00
parent d2eb1f4340
commit 776dc38d73
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
salt/modules/git.py
View file

@ -219,7 +219,13 @@ def clone(cwd, repository, opts=None, user=None, identity=None,
'''
_check_git()
repository = _add_http_basic_auth(repository, https_user, https_pass)
try:
repository = salt.utils.url.add_http_basic_auth(repository,
https_user,
https_pass,
https_only=True)
except ValueError as exc:
raise SaltInvocationError(exc.__str__())
if not opts:
opts = ''
@ -783,7 +789,13 @@ def remote_set(cwd, name='origin', url=None, user=None, https_user=None,
if remote_get(cwd, name):
cmd = 'git remote rm {0}'.format(name)
_git_run(cmd, cwd=cwd, runas=user)
url = _add_http_basic_auth(url, https_user, https_pass)
try:
url = salt.utils.url.add_http_basic_auth(url,
https_user,
https_pass,
https_only=True)
except ValueError as exc:
raise SaltInvocationError(exc.__str__())
cmd = 'git remote add {0} {1}'.format(name, url)
_git_run(cmd, cwd=cwd, runas=user)
return remote_get(cwd=cwd, remote=name, user=None)
@ -982,6 +994,14 @@ def ls_remote(cwd, repository="origin", branch="master", user=None,
'''
_check_git()
repository = _add_http_basic_auth(repository, https_user, https_pass)
try:
repository = salt.utils.url.add_http_basic_auth(repository,
https_user,
https_pass,
https_only=True)
except ValueError as exc:
raise SaltInvocationError(exc.__str__())
cmd = ' '.join(["git", "ls-remote", "-h", "'" + str(repository) + "'", str(branch), "| cut -f 1"])
return _git_run(cmd, cwd=cwd, runas=user, identity=identity)