Merge "check content type in JSONRequestDeserializer"

heat/common/wsgi.py

@@ -427,6 +427,26 @@ class Request(webob.Request):
             return content_type
 
 
+def is_json_content_type(request):
+    if request.method == 'GET':
+        try:
+            aws_content_type = request.params.get("ContentType")
+        except Exception:
+            aws_content_type = None
+        #respect aws_content_type when both available
+        content_type = aws_content_type or request.content_type
+    else:
+        content_type = request.content_type
+    #bug #1887882
+    #for back compatible for null or plain content type
+    if not content_type or content_type.startswith('text/plain'):
+        content_type = 'application/json'
+    if content_type in ('JSON', 'application/json')\
+            and request.body.startswith('{'):
+        return True
+    return False
+
+
 class JSONRequestDeserializer(object):
     def has_body(self, request):
         """
@@ -434,9 +454,7 @@ class JSONRequestDeserializer(object):
 
         :param request:  Webob.Request object
         """
-        if 'transfer-encoding' in request.headers:
+        if request.content_length > 0 and is_json_content_type(request):
-            return True
-        elif request.content_length > 0:
             return True
 
         return False

heat/tests/test_wsgi.py

@@ -200,6 +200,7 @@ class JSONRequestDeserializerTest(HeatTestCase):
         request.method = 'POST'
         request.body = 'asdf'
         request.headers.pop('Content-Length')
+        request.headers['Content-Type'] = 'application/json'
         self.assertFalse(wsgi.JSONRequestDeserializer().has_body(request))
 
     def test_has_body_zero_content_length(self):
@@ -207,13 +208,68 @@ class JSONRequestDeserializerTest(HeatTestCase):
         request.method = 'POST'
         request.body = 'asdf'
         request.headers['Content-Length'] = 0
+        request.headers['Content-Type'] = 'application/json'
         self.assertFalse(wsgi.JSONRequestDeserializer().has_body(request))
 
-    def test_has_body_has_content_length(self):
+    def test_has_body_has_content_length_no_content_type(self):
+        request = wsgi.Request.blank('/')
+        request.method = 'POST'
+        request.body = '{"key": "value"}'
+        self.assertTrue('Content-Length' in request.headers)
+        self.assertTrue(wsgi.JSONRequestDeserializer().has_body(request))
+
+    def test_has_body_has_content_length_plain_content_type(self):
+        request = wsgi.Request.blank('/')
+        request.method = 'POST'
+        request.body = '{"key": "value"}'
+        self.assertTrue('Content-Length' in request.headers)
+        request.headers['Content-Type'] = 'text/plain'
+        self.assertTrue(wsgi.JSONRequestDeserializer().has_body(request))
+
+    def test_has_body_has_content_type_malformed(self):
         request = wsgi.Request.blank('/')
         request.method = 'POST'
         request.body = 'asdf'
         self.assertTrue('Content-Length' in request.headers)
+        request.headers['Content-Type'] = 'application/json'
+        self.assertFalse(wsgi.JSONRequestDeserializer().has_body(request))
+
+    def test_has_body_has_content_type(self):
+        request = wsgi.Request.blank('/')
+        request.method = 'POST'
+        request.body = '{"key": "value"}'
+        self.assertTrue('Content-Length' in request.headers)
+        request.headers['Content-Type'] = 'application/json'
+        self.assertTrue(wsgi.JSONRequestDeserializer().has_body(request))
+
+    def test_has_body_has_wrong_content_type(self):
+        request = wsgi.Request.blank('/')
+        request.method = 'POST'
+        request.body = '{"key": "value"}'
+        self.assertTrue('Content-Length' in request.headers)
+        request.headers['Content-Type'] = 'application/xml'
+        self.assertFalse(wsgi.JSONRequestDeserializer().has_body(request))
+
+    def test_has_body_has_aws_content_type_only(self):
+        request = wsgi.Request.blank('/?ContentType=JSON')
+        request.method = 'GET'
+        request.body = '{"key": "value"}'
+        self.assertTrue('Content-Length' in request.headers)
+        self.assertTrue(wsgi.JSONRequestDeserializer().has_body(request))
+
+    def test_has_body_respect_aws_content_type(self):
+        request = wsgi.Request.blank('/?ContentType=JSON')
+        request.method = 'GET'
+        request.body = '{"key": "value"}'
+        self.assertTrue('Content-Length' in request.headers)
+        request.headers['Content-Type'] = 'application/xml'
+        self.assertTrue(wsgi.JSONRequestDeserializer().has_body(request))
+
+    def test_has_body_content_type_with_get(self):
+        request = wsgi.Request.blank('/')
+        request.method = 'GET'
+        request.body = '{"key": "value"}'
+        self.assertTrue('Content-Length' in request.headers)
         self.assertTrue(wsgi.JSONRequestDeserializer().has_body(request))
 
     def test_no_body_no_content_length(self):
@@ -245,10 +301,18 @@ class JSONRequestDeserializerTest(HeatTestCase):
         expected = {"body": {"key": "value"}}
         self.assertEqual(actual, expected)
 
-    def test_has_body_has_transfer_encoding(self):
+    def test_default_with_get_with_body(self):
         request = wsgi.Request.blank('/')
-        request.method = 'POST'
+        request.method = 'GET'
-        request.body = 'fake_body'
+        request.body = '{"key": "value"}'
-        request.headers['transfer-encoding'] = 0
+        actual = wsgi.JSONRequestDeserializer().default(request)
-        self.assertTrue('transfer-encoding' in request.headers)
+        expected = {"body": {"key": "value"}}
-        self.assertTrue(wsgi.JSONRequestDeserializer().has_body(request))
+        self.assertEqual(actual, expected)
+
+    def test_default_with_get_with_body_with_aws(self):
+        request = wsgi.Request.blank('/?ContentType=JSON')
+        request.method = 'GET'
+        request.body = '{"key": "value"}'
+        actual = wsgi.JSONRequestDeserializer().default(request)
+        expected = {"body": {"key": "value"}}
+        self.assertEqual(actual, expected)