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

more acl fixes

Browse Source
This commit is contained in:
Thomas S Hatch 2012-08-17 22:11:25 -06:00
parent f670816b5c
commit 2fdeacd63e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/master.py
View File

@ -1274,6 +1274,9 @@ class ClearFuncs(object):
if clear_load['user'].startswith('sudo_'):
if not clear_load.pop('key') == self.key['root']:
return ''
elif clear_load['user'] == self.opts.get('user', 'root'):
if not clear_load.pop('key') == self.key[self.opts.get('user', 'root')]:
return ''
else:
if clear_load['user'] in self.key:
# User is authorised, check key and check perms
@ -1285,6 +1288,9 @@ class ClearFuncs(object):
good = True
if not good:
return ''
else:
if not clear_load.pop('key') == self.key[getpass.getuser()]:
return ''
if not clear_load['jid']:
clear_load['jid'] = salt.utils.prep_jid(
self.opts['cachedir'],