openstack/zaqar
Code Issues Proposed changes

Merge "Add missing policy check for queue stats and share"

Browse Source
This commit is contained in:
Jenkins 2016-12-08 02:52:01 +00:00 committed by Gerrit Code Review
commit cd1ccb0c66
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/policy.json.sample
View File

@ -9,6 +9,7 @@
"queues:delete": "", "queues:delete": "",
"queues:update": "", "queues:update": "",
"queues:stats": "", "queues:stats": "",
"queues:share": "",
"messages:get_all": "", "messages:get_all": "",
"messages:create": "", "messages:create": "",

1
zaqar/tests/etc/policy.json
View File

@ -9,6 +9,7 @@
"queues:delete": "", "queues:delete": "",
"queues:update": "", "queues:update": "",
"queues:stats": "", "queues:stats": "",
"queues:share": "",
"messages:get_all": "", "messages:get_all": "",
"messages:create": "", "messages:create": "",

2
zaqar/transport/wsgi/v2_0/stats.py
View File

@ -18,6 +18,7 @@ import six
from zaqar.i18n import _ from zaqar.i18n import _
from zaqar.storage import errors as storage_errors from zaqar.storage import errors as storage_errors
from zaqar.transport import acl
from zaqar.transport import utils from zaqar.transport import utils
from zaqar.transport.wsgi import errors as wsgi_errors from zaqar.transport.wsgi import errors as wsgi_errors
@ -32,6 +33,7 @@ class Resource(object):
def __init__(self, queue_controller): def __init__(self, queue_controller):
self._queue_ctrl = queue_controller self._queue_ctrl = queue_controller
@acl.enforce("queues:stats")
def on_get(self, req, resp, project_id, queue_name): def on_get(self, req, resp, project_id, queue_name):
try: try:
resp_dict = self._queue_ctrl.stats(queue_name, resp_dict = self._queue_ctrl.stats(queue_name,

2
zaqar/transport/wsgi/v2_0/urls.py
View File

@ -19,6 +19,7 @@ import six
from zaqar.common import urls from zaqar.common import urls
from zaqar.i18n import _LE from zaqar.i18n import _LE
from zaqar.transport import acl
from zaqar.transport import utils from zaqar.transport import utils
from zaqar.transport.wsgi import errors as wsgi_errors from zaqar.transport.wsgi import errors as wsgi_errors
from zaqar.transport.wsgi import utils as wsgi_utils from zaqar.transport.wsgi import utils as wsgi_utils
@ -38,6 +39,7 @@ class Resource(object):
self._driver = driver self._driver = driver
self._conf = driver._conf self._conf = driver._conf
@acl.enforce("queues:share")
def on_post(self, req, resp, project_id, queue_name): def on_post(self, req, resp, project_id, queue_name):
LOG.debug(u'Pre-Signed URL Creation for queue: %(queue)s, ' LOG.debug(u'Pre-Signed URL Creation for queue: %(queue)s, '
u'project: %(project)s', u'project: %(project)s',