Support posting binary data with query string (#16)

Author: Cito

webware/WebUtils/FieldStorage.py

@@ -413,6 +413,18 @@ def read_single(self):
         else:
             self.read_lines()
         self.file.seek(0)
+        # contrary to the standard library, we also parse the query string
+        if self.qs_on_post:
+            kwargs = {
+                'keep_blank_values': self.keep_blank_values,
+                'strict_parsing': self.strict_parsing,
+                'encoding': self.encoding, 'errors': self.errors}
+            if self.max_num_fields is not None:  # Python >= 3.8
+                kwargs['max_num_fields'] = self.max_num_fields
+            if self.separator != '&':  # Python >= 3.9.2
+                kwargs['separator'] = self.separator
+            query = parse_qsl(self.qs_on_post, **kwargs)
+            self.list = [MiniFieldStorage(key, value) for key, value in query]
 
     bufsize = 8 * 1024
 

webware/WebUtils/Tests/TestFieldStorageModified.py

@@ -257,6 +257,46 @@ def testPostRequestWithNonUtf8TextData(self):
         self.assertEqual(fs.bytes_read, length)
         self.assertEqual(fs.file.read(), content)
 
+    def testPostRequestWithTextDataAndQueryParams(self):
+        text = 'The \u2603 by Raymond Briggs'
+        content = text.encode('utf-8')
+        length = len(content)
+        fs = FieldStorage(fp=BytesIO(content), environ={
+            'CONTENT_LENGTH': length, 'REQUEST_METHOD': 'POST',
+            'CONTENT_TYPE': 'text/plain',
+            'QUERY_STRING': 'a=1&b=2&b=2'})
+        self.assertEqual(fs.headers, {
+            'content-type': 'text/plain',
+            'content-length': length})
+        self.assertEqual(fs.type, 'text/plain')
+        self.assertEqual(fs.length, length)
+        self.assertEqual(fs.bytes_read, length)
+        self.assertEqual(fs.file.read(), text)
+        self.assertEqual(fs.getfirst('a'), '1')
+        self.assertEqual(fs.getfirst('b'), '2')
+        self.assertEqual(fs.getlist('a'), ['1'])
+        self.assertEqual(fs.getlist('b'), ['2', '2'])
+
+    def testPostRequestWithBinaryDataAndQueryParams(self):
+        content = b'\xfe\xff\xc0'
+        length = len(content)
+        fs = FieldStorage(fp=BytesIO(content), environ={
+            'REQUEST_METHOD': 'POST',
+            'CONTENT_LENGTH': length,
+            'CONTENT_TYPE': 'application/octet-stream',
+            'QUERY_STRING': 'a=1&b=2&b=2'})
+        self.assertEqual(fs.headers, {
+            'content-type': 'application/octet-stream',
+            'content-length': length})
+        self.assertEqual(fs.type, 'application/octet-stream')
+        self.assertEqual(fs.length, length)
+        self.assertEqual(fs.bytes_read, length)
+        self.assertEqual(fs.file.read(), content)
+        self.assertEqual(fs.getfirst('a'), '1')
+        self.assertEqual(fs.getfirst('b'), '2')
+        self.assertEqual(fs.getlist('a'), ['1'])
+        self.assertEqual(fs.getlist('b'), ['2', '2'])
+
     def testPostRequestWithSmallPayloadWithContentLength(self):
         length = 1000  # much smaller than buffer size
         payload = 'x' * length