x/distil
Code Issues Proposed changes

Fix getting context info when doing policy check

Browse Source 
Use 'to_policy_values' method to get context information for policy
checking to avoid exception when using older version of oslo.context,
e.g. in oslo.context==2.2.0, the property 'user_id' doesn't exist in
RequestContext.

Change-Id: I736d008365e28a2826646c1677f739a0a7fbb518
This commit is contained in:
Lingxian Kong 2017-08-07 12:24:32 +12:00
parent e2dbdd4b50
commit d0f142d1e8
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
distil/api/acl.py
View File

@ -43,13 +43,14 @@ def enforce(rule):
def handler(*args, **kwargs): def handler(*args, **kwargs):
ctx = context.ctx() ctx = context.ctx()
ctx.is_admin = check_is_admin(ctx) ctx.is_admin = check_is_admin(ctx)
ctx_dict = ctx.to_policy_values()
target = { target = {
'project_id': ctx.project_id, 'project_id': ctx_dict['project_id'],
'user_id': ctx.user_id, 'user_id': ctx_dict['user_id'],
} }
ENFORCER.enforce(rule, target, ctx.to_policy_values(), ENFORCER.enforce(rule, target, ctx_dict,
do_raise=True, exc=exceptions.Forbidden) do_raise=True, exc=exceptions.Forbidden)
return func(*args, **kwargs) return func(*args, **kwargs)

17
distil/context.py
View File

@ -46,23 +46,6 @@ class RequestContext(context.RequestContext):
context._request_store.context = self context._request_store.context = self
def make_context(*args, **kwargs):
return RequestContext(*args, **kwargs)
def make_admin_context(show_deleted=False, all_tenants=False):
"""Create an administrator context.
:param show_deleted: if True, will show deleted items when query db
"""
context = RequestContext(user_id=None,
project=None,
is_admin=True,
show_deleted=show_deleted,
all_tenants=all_tenants)
return context
_CTX_STORE = threading.local() _CTX_STORE = threading.local()
_CTX_KEY = 'current_ctx' _CTX_KEY = 'current_ctx'