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

Merge pull request #13891 from whiteinge/salt-api-glob-eauth-user

Browse source 
Add glob support to username key in salt-api eauth perms lookup
This commit is contained in:
Thomas S Hatch 2014-07-01 14:45:30 -06:00
commit 0989d01e0f
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/netapi/rest_cherrypy/app.py
View file

@ -188,6 +188,7 @@ The following example (in JSON format) causes Salt to execute two commands::
# Import Python libs
import collections
import itertools
import fnmatch
import functools
import logging
import json
@ -1017,8 +1018,10 @@ class Login(LowDataAdapter):
# Grab eauth config for the current backend for the current user
try:
perms = self.opts['external_auth'][token['eauth']][token['name']]
except (AttributeError, IndexError):
eauth = self.opts.get('external_auth', {}).get(token['eauth'], {})
perms = next((eauth[username] for username in eauth.keys()
if fnmatch.fnmatch(token['name'], username)))
except (AttributeError, IndexError, KeyError, StopIteration):
logger.debug("Configuration for external_auth malformed for "
"eauth '{0}', and user '{1}'."
.format(token.get('eauth'), token.get('name')), exc_info=True)