x/valet
Code Issues Proposed changes

Merge "Only admin role can access valet"

Browse Source
This commit is contained in:
Jenkins 2017-05-26 19:27:51 +00:00 committed by Gerrit Code Review
commit 0844b8b5ad
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
valet/api/v1/controllers/v1.py
View File

@ -53,7 +53,7 @@ class V1Controller(SecureController):
if token:
api.LOG.debug("Checking token permissions")
msg = "Unauthorized - Permission was not granted"
if V1Controller._permission_granted(request, token):
if conf.identity.engine.is_token_admin(token):
tenant_id = conf.identity.engine.tenant_from_token(token)
api.LOG.info("tenant_id - " + str(tenant_id))
if tenant_id:
@ -72,12 +72,6 @@ class V1Controller(SecureController):
and "action" in request.json \
and request.json["action"] == "migrate"
@classmethod
def _permission_granted(cls, request, token):
return not ("group" in request.path or
V1Controller._action_is_migrate(request)) or\
(conf.identity.engine.is_token_admin(token))
@classmethod
def allow(cls):
"""Allowed methods."""