From 5be9ba016bd37721cbc92fb53a2f247f5dc6feca Mon Sep 17 00:00:00 2001 From: JiWei Date: Thu, 22 Mar 2018 01:21:25 +0800 Subject: [PATCH] admin cannot operate ordinary tenant's container Admin user should be able to manipulate containers created by normal users. For example: start container, delete container, show container, etc. Change-Id: Ia3a38497d5b9cdb241bc80ab506f156c98d9dded Closes-Bug: #1756017 --- zun/api/utils.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/zun/api/utils.py b/zun/api/utils.py index e083ca2d7..79c0c9cc2 100644 --- a/zun/api/utils.py +++ b/zun/api/utils.py @@ -85,11 +85,13 @@ def get_resource(resource, resource_ident): :returns: The resource. """ resource = getattr(objects, resource) - + context = pecan.request.context + if context.is_admin: + context.all_projects = True if uuidutils.is_uuid_like(resource_ident): - return resource.get_by_uuid(pecan.request.context, resource_ident) + return resource.get_by_uuid(context, resource_ident) - return resource.get_by_name(pecan.request.context, resource_ident) + return resource.get_by_name(context, resource_ident) def _do_enforce_content_types(pecan_req, valid_content_types):