archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Do not assume that users and groups keys exist in permissions

Browse Source
This commit is contained in:
Francesco Siddi
2017-09-11 22:35:44 +02:00
parent 3329788be8
commit 901fea3361
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pillar/api/utils/node_type_utils.py
View File

@@ -27,9 +27,11 @@ def assign_permissions(project, node_types, permission_callback):
permissions = {} permissions = {}
for key in ('users', 'groups'): for key in ('users', 'groups'):
perms = proj_perms[key] perms = proj_perms.get(key)
singular = key.rstrip('s') if not perms:
continue
singular = key.rstrip('s')
for perm in perms: for perm in perms:
assert isinstance(perm, dict), 'perm should be dict, but is %r' % perm assert isinstance(perm, dict), 'perm should be dict, but is %r' % perm
ident = perm[singular] # group or user ID. ident = perm[singular] # group or user ID.