x
/
mogan
Code Issues Proposed changes

Merge "Authorize the instance "get_one" and "create" action."

This commit is contained in:
Jenkins 2016-10-26 16:52:07 +00:00 committed by Gerrit Code Review
parent f45ba022f6 2162c5b59f
commit d9d0819839
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nimble/api/controllers/v1/instances.py
View File

@ -28,6 +28,7 @@ from nimble.api import expose
from nimble.common import exception
from nimble.common.i18n import _
from nimble.common.i18n import _LW
from nimble.common import policy
from nimble.engine.baremetal.ironic import get_node_by_instance
from nimble.engine.baremetal.ironic import get_node_list
from nimble.engine.baremetal import ironic_states as ir_states
@ -237,6 +238,13 @@ class InstanceController(rest.RestController):
'detail': ['GET']
}
_resource = None
# This _resource is used for authorization.
def _get_resource(self, uuid, *args, **kwargs):
self._resource = objects.Instance.get(pecan.request.context, uuid)
return self._resource
def _get_instance_collection(self, fields=None):
instances = objects.Instance.list(pecan.request.context)
instances_data = [instance.as_dict() for instance in instances]
@ -277,6 +285,7 @@ class InstanceController(rest.RestController):
fields = _DEFAULT_INSTANCE_RETURN_FIELDS
return self._get_instance_collection(fields=fields)
@policy.authorize_wsgi("nimble:instance", "get")
@expose.expose(Instance, types.uuid, types.listtype)
def get_one(self, instance_uuid, fields=None):
"""Retrieve information about the given instance.
@ -285,8 +294,7 @@ class InstanceController(rest.RestController):
:param fields: Optional, a list with a specified set of fields
of the resource to be returned.
"""
rpc_instance = objects.Instance.get(pecan.request.context,
instance_uuid)
rpc_instance = self._resource or self._get_resource(instance_uuid)
instance_data = rpc_instance.as_dict()
if fields is None or 'power_state' in fields:
# Only fetch node info if fields parameter is not specified
@ -312,6 +320,7 @@ class InstanceController(rest.RestController):
raise exception.NotFound()
return self._get_instance_collection()
@policy.authorize_wsgi("nimble:instance", "create", False)
@expose.expose(Instance, body=types.jsontype,
status_code=http_client.CREATED)
def post(self, instance):