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

Merge pull request #27271 from isbm/isbm-bufix-27270

Browse Source 
Bugfix: crash on token authentication via API
This commit is contained in:
Justin Findlay 2015-09-21 09:53:09 -06:00
commit c0943dd4d1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/master.py
View File

@ -1779,10 +1779,11 @@ class ClearFuncs(object):
# If there are groups in the token, check if any of them are listed in the eauth config # If there are groups in the token, check if any of them are listed in the eauth config
group_auth_match = False group_auth_match = False
try: try:
for group in token['groups']: if token.get('groups'):
if group in eauth_groups: for group in token['groups']:
group_auth_match = True if group in eauth_groups:
break group_auth_match = True
break
except KeyError: except KeyError:
pass pass
if '*' not in eauth_users and token['name'] not in eauth_users and not group_auth_match: if '*' not in eauth_users and token['name'] not in eauth_users and not group_auth_match: