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

Merge pull request #21157 from c-nixon/GitPython-git-remote-helper-support

Browse Source 
Add support for git remote helpers to gitfs
This commit is contained in:
Erik Johnson 2015-02-28 17:30:21 -06:00
commit 39d635d04c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/fileserver/gitfs.py
View File

@ -595,7 +595,7 @@ def _verify_auth(repo):
# These transports do not use auth
return True
elif transport == 'ssh':
elif 'ssh' in transport:
required_params = ('pubkey', 'privkey')
user = address.split('@')[0]
if user == address:
@ -616,7 +616,7 @@ def _verify_auth(repo):
missing_auth = [x for x in required_params if not bool(repo[x])]
_incomplete_auth(repo['url'], missing_auth)
elif transport in ('https', 'http'):
elif 'http' in transport:
required_params = ('user', 'password')
password_ok = all(bool(repo[x]) for x in required_params)
no_password_auth = not any(bool(repo[x]) for x in required_params)