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

Add wildcard back into the eauth matching

Browse Source 
Looks like it was just omitted from 403699697, so this allows users
to run with a config like the following again:

```
external_auth:
  ldap:
    '*':
      - .*
```
This commit is contained in:
Tait Clarridge 2015-12-22 10:37:58 -05:00
parent 135b863b20
commit be5c9d8f35
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/master.py
View File

@ -1960,6 +1960,8 @@ class ClearFuncs(object):
# what the user has access to. # what the user has access to.
auth_list = [] auth_list = []
if '*' in self.opts['external_auth'][extra['eauth']]:
auth_list.extend(self.opts['external_auth'][extra['eauth']]['*'])
if name in self.opts['external_auth'][extra['eauth']]: if name in self.opts['external_auth'][extra['eauth']]:
auth_list = self.opts['external_auth'][extra['eauth']][name] auth_list = self.opts['external_auth'][extra['eauth']][name]
if group_auth_match: if group_auth_match: