openstack/zaqar
Code Issues Proposed changes

Merge "Remove unnecessary parameter in Zaqar"

Browse Source
This commit is contained in:
Jenkins 2017-06-26 05:42:29 +00:00 committed by Gerrit Code Review
commit b1cd63c41c
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zaqar/transport/wsgi/v1_0/metadata.py
View File

@ -63,7 +63,7 @@ class Resource(object):
self._validate.queue_metadata_length(req.content_length) self._validate.queue_metadata_length(req.content_length)
# Deserialize queue metadata # Deserialize queue metadata
document = wsgi_utils.deserialize(req.stream, req.content_length) document = wsgi_utils.deserialize(req.stream, req.content_length)
metadata = wsgi_utils.sanitize(document, spec=None) metadata = wsgi_utils.sanitize(document)
# Restrict setting any reserved queue attributes # Restrict setting any reserved queue attributes
for key in metadata: for key in metadata:
if key.startswith('_'): if key.startswith('_'):

2
zaqar/transport/wsgi/v1_1/queues.py
View File

@ -66,7 +66,7 @@ class ItemResource(object):
if req.content_length: if req.content_length:
document = wsgi_utils.deserialize(req.stream, document = wsgi_utils.deserialize(req.stream,
req.content_length) req.content_length)
metadata = wsgi_utils.sanitize(document, spec=None) metadata = wsgi_utils.sanitize(document)
# NOTE(Eva-i): reserved queue attributes is Zaqar's feature since # NOTE(Eva-i): reserved queue attributes is Zaqar's feature since
# API v2. But we have to ensure the bad data will not come from # API v2. But we have to ensure the bad data will not come from
# older APIs, so we validate metadata here. # older APIs, so we validate metadata here.

5
zaqar/transport/wsgi/v2_0/queues.py
View File

@ -81,7 +81,7 @@ class ItemResource(object):
if req.content_length: if req.content_length:
document = wsgi_utils.deserialize(req.stream, document = wsgi_utils.deserialize(req.stream,
req.content_length) req.content_length)
metadata = wsgi_utils.sanitize(document, spec=None) metadata = wsgi_utils.sanitize(document)
self._validate.queue_metadata_putting(metadata) self._validate.queue_metadata_putting(metadata)
except validation.ValidationFailed as ex: except validation.ValidationFailed as ex:
LOG.debug(ex) LOG.debug(ex)
@ -156,8 +156,7 @@ class ItemResource(object):
if req.content_length: if req.content_length:
try: try:
changes = utils.read_json(req.stream, req.content_length) changes = utils.read_json(req.stream, req.content_length)
changes = wsgi_utils.sanitize(changes, changes = wsgi_utils.sanitize(changes, doctype=list)
spec=None, doctype=list)
except utils.MalformedJSON as ex: except utils.MalformedJSON as ex:
LOG.debug(ex) LOG.debug(ex)
description = _(u'Request body could not be parsed.') description = _(u'Request body could not be parsed.')