Do not break with GET requests that have a query string and a Content…

…-Type header (#1117)

* Support Plone REST API calls with a query string.

Refs plone/plone.restapi#1611

CHANGES.rst

@@ -10,6 +10,10 @@ https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
 5.8.2 (unreleased)
 ------------------
 
+- Do not break on GET requests that pass a query string
+  and a `Content-Type` header.
+  For details see `#1117 <https://github.com/zopefoundation/Zope/pull/1117>`_.
+
 - Implement code change suggestions from CodeQL scanning.
 
 - Added Japanese translations for some Sphinx docs

src/ZPublisher/HTTPRequest.py

@@ -1441,7 +1441,7 @@ def __init__(self, fp, environ):
                 raise NotImplementedError("request parameters and body")
             if fpos is not None:
                 fp.seek(fpos)
-        elif url_qs and content_type != "application/x-www-form-urlencoded":
+        elif url_qs and fp is not None:
             raise NotImplementedError("request parameters and body")
         fl = []
         add_field = fl.append

src/ZPublisher/tests/testHTTPRequest.py

@@ -1332,6 +1332,36 @@ def test_bytes_converter(self):
         req.processInputs()
         self.assertEqual(req.form["a"], val)
 
+    def test_get_with_body_and_query_string_ignores_body(self):
+        req_factory = self._getTargetClass()
+        req = req_factory(
+            BytesIO(b"foo"),
+            {
+                "SERVER_NAME": "localhost",
+                "SERVER_PORT": "8080",
+                "REQUEST_METHOD": "GET",
+                "QUERY_STRING": "bar"
+            },
+            None,
+        )
+        req.processInputs()
+        self.assertDictEqual(req.form, {"bar": ""})
+
+    def test_put_with_body_and_query_string_raises(self):
+        req_factory = self._getTargetClass()
+        req = req_factory(
+            BytesIO(b"foo"),
+            {
+                "SERVER_NAME": "localhost",
+                "SERVER_PORT": "8080",
+                "REQUEST_METHOD": "PUT",
+                "QUERY_STRING": "bar"
+            },
+            None,
+        )
+        with self.assertRaises(NotImplementedError):
+            req.processInputs()
+
     def test_issue_1095(self):
         body = TEST_ISSUE_1095_DATA
         env = self._makePostEnviron(body)