Browse Source

Merge "The admin role judge exception caused the policy to fail"

changes/92/596192/1
Zuul 4 years ago committed by Gerrit Code Review
parent
commit
2ecacc34b3
  1. 2
      tricircle/api/controllers/root.py
  2. 2
      tricircle/common/context.py

2
tricircle/api/controllers/root.py

@ -119,7 +119,7 @@ def _extract_context_from_environ(environ):
context_paras[key] = environ.get(context_paras[key])
role = environ.get('HTTP_X_ROLE')
# TODO(zhiyuan): replace with policy check
context_paras['is_admin'] = role == 'admin'
context_paras['is_admin'] = 'admin' in role.split(',') if role else False
return t_context.Context(**context_paras)

2
tricircle/common/context.py

@ -55,7 +55,7 @@ def extract_context_from_environ():
context_paras[key] = environ.get(context_paras[key])
role = environ.get('HTTP_X_ROLE')
context_paras['is_admin'] = role == 'admin'
context_paras['is_admin'] = 'admin' in role.split(',') if role else False
return Context(**context_paras)

Loading…
Cancel
Save