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

Small code clarifications

Browse Source
This commit is contained in:
Sybren A. Stüvel 2016-05-06 18:28:08 +02:00
parent 899497b3b1
commit 2cdde04a8b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pillar/application/utils/authorization.py
View File

@ -52,11 +52,11 @@ def check_permissions(collection_name, resource, method, append_allowed_methods=
current_user = g.current_user current_user = g.current_user
if current_user: if current_user:
# If the user is authenticated, proceed to compare the group permissions # If the user is authenticated, proceed to compare the group permissions
for permission in computed_permissions.get('groups', []): for permission in computed_permissions.get('groups', ()):
if permission['group'] in current_user['groups']: if permission['group'] in current_user['groups']:
allowed_methods.update(permission['methods']) allowed_methods.update(permission['methods'])
for permission in computed_permissions.get('users', []): for permission in computed_permissions.get('users', ()):
if current_user['user_id'] == permission['user']: if current_user['user_id'] == permission['user']:
allowed_methods.update(permission['methods']) allowed_methods.update(permission['methods'])
@ -161,9 +161,11 @@ def merge_permissions(*args):
asdict1 = {permission[field_name]: permission['methods'] for permission in from1} asdict1 = {permission[field_name]: permission['methods'] for permission in from1}
keys = set(asdict0.keys() + asdict1.keys()) keys = set(asdict0.keys() + asdict1.keys())
for user_id in maybe_sorted(keys): for key in maybe_sorted(keys):
methods = maybe_sorted(set(asdict0.get(user_id, []) + asdict1.get(user_id, []))) methods0 = asdict0.get(key, [])
effective.setdefault(plural_name, []).append({field_name: user_id, u'methods': methods}) methods1 = asdict1.get(key, [])
methods = maybe_sorted(set(methods0 + methods1))
effective.setdefault(plural_name, []).append({field_name: key, u'methods': methods})
merge(u'user') merge(u'user')
merge(u'group') merge(u'group')