openstack/zaqar
Code Issues Proposed changes

Merge "Fix freeze on some requests"

Browse Source
This commit is contained in:
Jenkins 2016-03-03 15:12:22 +00:00 committed by Gerrit Code Review
commit e6236b4050
5 changed files with 131 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
zaqar/common/transport/wsgi/helpers.py
View File

@ -186,6 +186,41 @@ media type support with the "Accept" header.''',
href_text=u'14.1 Accept, Hypertext Transfer Protocol -- HTTP/1.1')
def require_content_type_be_non_urlencoded(req, resp, params):
"""Raises an exception on "x-www-form-urlencoded" content type of request.
If request has body and "Content-Type" header has
"application/x-www-form-urlencoded" value (case-insensitive), this function
raises falcon.HTTPBadRequest exception.
This strange function exists only to prevent bug/1547100 in a backward
compatible way.
Meant to be used as a `before` hook.
:param req: request sent
:type req: falcon.request.Request
:param resp: response object to return
:type resp: falcon.response.Response
:param params: additional parameters passed to responders
:type params: dict
:rtype: None
:raises: falcon.HTTPBadRequest
"""
if req.content_length is None:
return
if req.content_type and (req.content_type.lower() ==
'application/x-www-form-urlencoded'):
title = _(u'Invalid Content-Type')
description = _(u'Endpoint does not accept '
u'`application/x-www-form-urlencoded` content; '
u'currently supported media type is '
u'`application/json`; specify proper client-side '
u'media type with the "Content-Type" header.')
raise falcon.HTTPBadRequest(title, description)
def inject_context(req, resp, params):
"""Inject context value into request environment.

32
zaqar/tests/unit/transport/wsgi/v1/test_media_type.py
View File

@ -17,6 +17,7 @@ import uuid
import falcon
from falcon import testing
from oslo_serialization import jsonutils
from zaqar.tests.unit.transport.wsgi import base
@ -26,7 +27,7 @@ class TestMediaType(base.V1Base):
config_file = 'wsgi_mongodb.conf'
def test_json_only_endpoints(self):
def test_json_only_endpoints_with_wrong_accept_header(self):
endpoints = (
('GET', self.url_prefix + '/queues'),
('GET', self.url_prefix + '/queues/nonexistent/metadata'),
@ -50,3 +51,32 @@ class TestMediaType(base.V1Base):
self.app(env, self.srmock)
self.assertEqual(falcon.HTTP_406, self.srmock.status)
def test_request_with_body_and_urlencoded_contenttype_header_fails(self):
# NOTE(Eva-i): this test case makes sure wsgi 'before' hook
# "require_content_type_be_non_urlencoded" works to prevent
# bug/1547100.
eww_queue_path = self.url_prefix + '/queues/eww'
eww_queue_messages_path = eww_queue_path + '/messages'
sample_message = jsonutils.dumps([{'body': {'eww!'}, 'ttl': 200}])
bad_headers = {
'Client-ID': str(uuid.uuid4()),
'Content-Type': 'application/x-www-form-urlencoded',
}
# Create queue request with bad headers. Should still work, because it
# has no body.
self.simulate_put(eww_queue_path, headers=bad_headers)
self.addCleanup(self.simulate_delete, eww_queue_path,
headers=self.headers)
self.assertEqual(falcon.HTTP_201, self.srmock.status)
# Post message request with good headers. Should work.
self.simulate_post(eww_queue_messages_path, body=sample_message,
headers=self.headers)
self.assertEqual(falcon.HTTP_201, self.srmock.status)
# Post message request with bad headers. Should not work.
self.simulate_post(eww_queue_messages_path, body=sample_message,
headers=bad_headers)
self.assertEqual(falcon.HTTP_400, self.srmock.status)

33
zaqar/tests/unit/transport/wsgi/v1_1/test_media_type.py
View File

@ -17,6 +17,7 @@ import uuid
import falcon
from falcon import testing
from oslo_serialization import jsonutils
from zaqar.tests.unit.transport.wsgi import base
@ -25,7 +26,7 @@ class TestMediaType(base.V1_1Base):
config_file = 'wsgi_mongodb.conf'
def test_json_only_endpoints(self):
def test_json_only_endpoints_with_wrong_accept_header(self):
endpoints = (
('GET', self.url_prefix + '/queues'),
('GET', self.url_prefix + '/queues/nonexistent/stats'),
@ -48,3 +49,33 @@ class TestMediaType(base.V1_1Base):
self.app(env, self.srmock)
self.assertEqual(falcon.HTTP_406, self.srmock.status)
def test_request_with_body_and_urlencoded_contenttype_header_fails(self):
# NOTE(Eva-i): this test case makes sure wsgi 'before' hook
# "require_content_type_be_non_urlencoded" works to prevent
# bug/1547100.
eww_queue_path = self.url_prefix + '/queues/eww'
eww_queue_messages_path = eww_queue_path + '/messages'
sample_message = jsonutils.dumps({'messages': [{'body': {'eww!'},
'ttl': 200}]})
bad_headers = {
'Client-ID': str(uuid.uuid4()),
'Content-Type': 'application/x-www-form-urlencoded',
}
# Create queue request with bad headers. Should still work, because it
# has no body.
self.simulate_put(eww_queue_path, headers=bad_headers)
self.addCleanup(self.simulate_delete, eww_queue_path,
headers=self.headers)
self.assertEqual(falcon.HTTP_201, self.srmock.status)
# Post message request with good headers. Should work.
self.simulate_post(eww_queue_messages_path, body=sample_message,
headers=self.headers)
self.assertEqual(falcon.HTTP_201, self.srmock.status)
# Post message request with bad headers. Should not work.
self.simulate_post(eww_queue_messages_path, body=sample_message,
headers=bad_headers)
self.assertEqual(falcon.HTTP_400, self.srmock.status)

33
zaqar/tests/unit/transport/wsgi/v2_0/test_media_type.py
View File

@ -17,6 +17,7 @@ import uuid
import falcon
from falcon import testing
from oslo_serialization import jsonutils
from zaqar.tests.unit.transport.wsgi import base
@ -25,7 +26,7 @@ class TestMediaType(base.V2Base):
config_file = 'wsgi_mongodb.conf'
def test_json_only_endpoints(self):
def test_json_only_endpoints_with_wrong_accept_header(self):
endpoints = (
('GET', self.url_prefix + '/queues'),
('GET', self.url_prefix + '/queues/nonexistent/stats'),
@ -48,3 +49,33 @@ class TestMediaType(base.V2Base):
self.app(env, self.srmock)
self.assertEqual(falcon.HTTP_406, self.srmock.status)
def test_request_with_body_and_urlencoded_contenttype_header_fails(self):
# NOTE(Eva-i): this test case makes sure wsgi 'before' hook
# "require_content_type_be_non_urlencoded" works to prevent
# bug/1547100.
eww_queue_path = self.url_prefix + '/queues/eww'
eww_queue_messages_path = eww_queue_path + '/messages'
sample_message = jsonutils.dumps({'messages': [{'body': {'eww!'},
'ttl': 200}]})
bad_headers = {
'Client-ID': str(uuid.uuid4()),
'Content-Type': 'application/x-www-form-urlencoded',
}
# Create queue request with bad headers. Should still work, because it
# has no body.
self.simulate_put(eww_queue_path, headers=bad_headers)
self.addCleanup(self.simulate_delete, eww_queue_path,
headers=self.headers)
self.assertEqual(falcon.HTTP_201, self.srmock.status)
# Post message request with good headers. Should work.
self.simulate_post(eww_queue_messages_path, body=sample_message,
headers=self.headers)
self.assertEqual(falcon.HTTP_201, self.srmock.status)
# Post message request with bad headers. Should not work.
self.simulate_post(eww_queue_messages_path, body=sample_message,
headers=bad_headers)
self.assertEqual(falcon.HTTP_400, self.srmock.status)

1
zaqar/transport/wsgi/driver.py
View File

@ -75,6 +75,7 @@ class Driver(transport.DriverBase):
"""Exposed to facilitate unit testing."""
return [
self._verify_pre_signed_url,
helpers.require_content_type_be_non_urlencoded,
helpers.require_accepts_json,
helpers.require_client_id,
helpers.extract_project_id,