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

Simplified effective permission computation.

Browse Source
This commit is contained in:
Sybren A. Stüvel
2016-04-15 14:28:44 +02:00
parent 4e9182ef38
commit 222b2e95e2
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ def check_permissions(resource, method, append_allowed_methods=False):
# matching permission originally set at node_type level) # matching permission originally set at node_type level)
resource_permissions = resource['permissions'] resource_permissions = resource['permissions']
else: else:
resource_permissions = None resource_permissions = {}
if 'node_type' in resource: if 'node_type' in resource:
if type(resource['node_type']) is dict: if type(resource['node_type']) is dict:
# If the node_type is embedded in the document, extract permissions # If the node_type is embedded in the document, extract permissions
@@ -47,14 +47,10 @@ def check_permissions(resource, method, append_allowed_methods=False):
and item['name'] == resource['node_type']), None) and item['name'] == resource['node_type']), None)
computed_permissions = node_type['permissions'] computed_permissions = node_type['permissions']
else: else:
computed_permissions = None computed_permissions = {}
# Override computed_permissions if override is provided # Override computed_permissions if override is provided
if resource_permissions and computed_permissions: computed_permissions.update(resource_permissions)
for k, v in resource_permissions.iteritems():
computed_permissions[k] = v
elif resource_permissions and not computed_permissions:
computed_permissions = resource_permissions
if not computed_permissions: if not computed_permissions:
log.info('No permissions available to compute for %s on resource %r', log.info('No permissions available to compute for %s on resource %r',