openstack/zun
Code Issues Proposed changes

Merge "Use to_policy_values for policy credentials"

Browse Source
This commit is contained in:
Jenkins
2017-10-05 18:30:39 +00:00
committed by Gerrit Code Review
parent 8fa8843dbc 3c6d246d88
commit 6e50011b34
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zun/common/context.py
View File

@@ -88,6 +88,11 @@ class RequestContext(context.RequestContext):
'all_tenants': self.all_tenants}) 'all_tenants': self.all_tenants})
return value return value
def to_policy_values(self):
policy = super(RequestContext, self).to_policy_values()
policy['is_admin'] = self.is_admin
return policy
@classmethod @classmethod
def from_dict(cls, values): def from_dict(cls, values):
return cls(**values) return cls(**values)

4
zun/common/policy.py
View File

@@ -86,7 +86,7 @@ def enforce(context, rule=None, target=None,
expression. expression.
""" """
enforcer = init() enforcer = init()
credentials = context.to_dict() credentials = context.to_policy_values()
if not exc: if not exc:
exc = exception.PolicyNotAuthorized exc = exception.PolicyNotAuthorized
if target is None: if target is None:
@@ -142,5 +142,5 @@ def check_is_admin(context):
""" """
init() init()
target = {} target = {}
credentials = context.to_dict() credentials = context.to_policy_values()
return _ENFORCER.enforce('context_is_admin', target, credentials) return _ENFORCER.enforce('context_is_admin', target, credentials)