openstack
/
glance
Code Issues Proposed changes

Forbidden update message diffs images/tasks/member 

On an forbidden update, the message returned to the user
is not tied to the type of object modified by the operation.
For example: a forbidden image member update will return
`You are not permitted to modify 'status' on this image.`
instead of image_member.

This patch fixes the issue for images, image members and tasks.

Change-Id: Ie9774807f0190a517a619aeb56c1398741ac4407
Closes-Bug: #1250228
This commit is contained in:
Arnaud Legendre 2013-12-05 17:31:51 -08:00
parent 2f97e120ec
commit 53d055d5b0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glance/api/authorization.py
View File

@ -201,8 +201,9 @@ def _immutable_attr(target, attr, proxy=None):
return value
def forbidden(self, *args, **kwargs):
message = _("You are not permitted to modify '%s' on this image.")
raise exception.Forbidden(message % attr)
resource = getattr(self, 'resource_name', 'resource')
message = _("You are not permitted to modify '%s' on this %s.")
raise exception.Forbidden(message % (attr, resource))
return property(get_attr, forbidden, forbidden)
@ -264,6 +265,7 @@ class ImmutableImageProxy(object):
def __init__(self, base, context):
self.base = base
self.context = context
self.resource_name = 'image'
name = _immutable_attr('base', 'name')
image_id = _immutable_attr('base', 'image_id')
@ -304,6 +306,7 @@ class ImmutableImageProxy(object):
class ImmutableMemberProxy(object):
def __init__(self, base):
self.base = base
self.resource_name = 'image member'
id = _immutable_attr('base', 'id')
image_id = _immutable_attr('base', 'image_id')
@ -316,6 +319,7 @@ class ImmutableMemberProxy(object):
class ImmutableTaskProxy(object):
def __init__(self, base):
self.base = base
self.resource_name = 'task'
task_id = _immutable_attr('base', 'task_id')
type = _immutable_attr('base', 'type')