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

update test

Browse source
This commit is contained in:
Frode Gundersen 2018-03-13 20:54:25 +00:00
parent 19a2244cb7
commit e6a56016df
No known key found for this signature in database
GPG key ID: 49E5BDBFA6AFB570
2 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/acl/__init__.py
View file

@ -18,9 +18,8 @@ class PublisherACL(object):
Represents the publisher ACL and provides methods
to query the ACL for given operations
'''
def __init__(self, blacklist, whitelist):
def __init__(self, blacklist):
self.blacklist = blacklist
self.whitelist = whitelist
def user_is_blacklisted(self, user):
'''
@ -39,13 +38,13 @@ class PublisherACL(object):
return False
def user_is_whitelisted(self, user):
return salt.utils.check_whitelist_blacklist(user, whitelist=self.whitelist.get('users', []))
return salt.utils.check_whitelist_blacklist(user, whitelist=self.blacklist.get('users', []))
def cmd_is_whitelisted(self, cmd):
# If this is a regular command, it is a single function
if isinstance(cmd, str):
cmd = [cmd]
for fun in cmd:
if salt.utils.check_whitelist_blacklist(fun, whitelist=self.whitelist.get('modules', [])):
if salt.utils.check_whitelist_blacklist(fun, whitelist=self.blacklist.get('modules', [])):
return True
return False

32
tests/unit/acl/test_client.py
View file

@ -32,7 +32,7 @@ class ClientACLTestCase(TestCase):
'''
test user_is_blacklisted
'''
client_acl = acl.PublisherACL(self.blacklist, self.whitelist)
client_acl = acl.PublisherACL(self.blacklist)
self.assertTrue(client_acl.user_is_blacklisted('joker'))
self.assertTrue(client_acl.user_is_blacklisted('penguin'))
@ -56,7 +56,7 @@ class ClientACLTestCase(TestCase):
'''
test cmd_is_blacklisted
'''
client_acl = acl.PublisherACL(self.blacklist, self.whitelist)
client_acl = acl.PublisherACL(self.blacklist)
self.assertTrue(client_acl.cmd_is_blacklisted('cmd.run'))
self.assertTrue(client_acl.cmd_is_blacklisted('test.fib'))
@ -69,18 +69,24 @@ class ClientACLTestCase(TestCase):
self.assertTrue(client_acl.cmd_is_blacklisted(['cmd.run', 'state.sls']))
self.assertFalse(client_acl.cmd_is_blacklisted(['state.highstate', 'state.sls']))
def test_publisher_acl_whitelisted(self):
def test_user_is_whitelisted(self):
'''
test publisher_acl
test user_is_whitelisted
'''
publisher_acl = acl.PublisherACL(self.blacklist, self.whitelist)
client_acl = acl.PublisherACL(self.whitelist)
self.assertTrue(publisher_acl.user_is_whitelisted('testuser'))
self.assertTrue(publisher_acl.user_is_whitelisted('saltuser'))
self.assertTrue(publisher_acl.cmd_is_whitelisted('test.ping'))
self.assertTrue(publisher_acl.cmd_is_whitelisted('grains.items'))
self.assertTrue(client_acl.user_is_whitelisted('testuser'))
self.assertTrue(client_acl.user_is_whitelisted('saltuser'))
self.assertTrue(client_acl.cmd_is_whitelisted('test.ping'))
self.assertTrue(client_acl.cmd_is_whitelisted('grains.items'))
self.assertFalse(publisher_acl.cmd_is_whitelisted('devuser'))
self.assertFalse(publisher_acl.cmd_is_whitelisted('superuser'))
self.assertFalse(publisher_acl.cmd_is_whitelisted('cmd.run'))
self.assertFalse(publisher_acl.cmd_is_whitelisted('test.version'))
def test_cmd_is_whitelisted(self):
'''
test cmd_is_whitelisted
'''
client_acl = acl.PublisherACL(self.whitelist)
self.assertFalse(client_acl.cmd_is_whitelisted('devuser'))
self.assertFalse(client_acl.cmd_is_whitelisted('superuser'))
self.assertFalse(client_acl.cmd_is_whitelisted('cmd.run'))
self.assertFalse(client_acl.cmd_is_whitelisted('test.version'))