Merge "Fix auth logic for PUT /v2/alarms"

This commit is contained in:
Jenkins 2013-06-25 08:45:08 +00:00 committed by Gerrit Code Review
commit 911f8ce6fa

View File

@ -838,11 +838,10 @@ class AlarmsController(rest.RestController):
conn = pecan.request.storage_conn
data.state_timestamp = wsme.Unset
data.alarm_id = alarm_id
data.user_id = pecan.request.headers.get('X-User-Id')
data.project_id = pecan.request.headers.get('X-Project-Id')
auth_project = acl.get_limited_to_project(pecan.request.headers)
alarms = list(conn.get_alarms(alarm_id=alarm_id,
project=data.project_id))
project=auth_project))
if len(alarms) < 1:
raise wsme.exc.ClientSideError(_("Unknown alarm"))