Changeset 1259

Timestamp:

08/21/06 01:12:54

Author:

fumanchu

Message:

Support for max_request_body_size when decoding chunked request body (also fixes a long-standing bug when max header size exceeded).

Files:

• trunk/cherrypy/_cpwsgi.py (modified) (1 diff)
• trunk/cherrypy/_cpwsgiserver.py (modified) (1 diff)
• trunk/cherrypy/test/test_conn.py (modified) (2 diffs)
• trunk/cherrypy/test/test_core.py (modified) (2 diffs)

trunk/cherrypy/_cpwsgi.py

@@ -128 +128 @@
-            _cpwsgiserver.HTTPRequest.parse_request(self)
-        except http.MaxSizeExceeded:
-413, "
+"413 
-            cherrypy.log(traceback=True)
+    
+    def decode_chunked(self):
+        """Decode the 'chunked' transfer coding."""
+        if isinstance(self.rfile, http.SizeCheckWrapper):
+            self.rfile = self.rfile.rfile
+        mbs = int(cherrypy.config.get('server.max_request_body_size',
+                                      100 * 1024 * 1024))
+        if mbs > 0:
+            self.rfile = http.SizeCheckWrapper(self.rfile, mbs)
+        try:
+            return _cpwsgiserver.HTTPRequest.decode_chunked(self)
+        except http.MaxSizeExceeded:
+            self.simple_response("413 Request Entity Too Large")
+            cherrypy.log(traceback=True)
+            return False
-
-

trunk/cherrypy/_cpwsgiserver.py

@@ -218 +218 @@
-            cl += chunk_size
-            data.write(self.rfile.read(chunk_size))
-
+
+
-                self.simple_response("400 Bad Request",
-
+
+
-                return
-        

trunk/cherrypy/test/test_conn.py

@@ -40 +40 @@
-    cherrypy.config.update({
-        'log_to_screen': False,
+        'server.max_request_body_size': 100,
-        'show_tracebacks': True,
-        'environment': 'production',
@@ -186 +187 @@
-        self.assertStatus('200 OK')
-        self.assertBody("thanks for 'xx\r\nxxxxyyyyy' (application/x-json)")
+        
+        # Try a chunked request that exceeds max_request_body_size.
+        # Note that the delimiters and trailer are included.
+        body = ("5f\r\n" + ("x" * 95) + "\r\n0\r\n\r\n")
+        self.getPage("/upload",
+                     headers=[("Transfer-Encoding", "chunked"),
+                              ("Content-Type", "text/plain"),
+                              ("Content-Length", len(body)),
+                              ],
+                     body=body, method="POST")
+        self.assertStatus(413)
+        self.assertBody("")
-    
-    def test_HTTP10(self):

trunk/cherrypy/test/test_core.py

@@ -864 +864 @@
-        self.getPage("/", headers=[('From', "x" * 500)])
-        self.assertStatus(413)
-        self.assertInBody("Request Entity Too Large")
-        
-        # Test for http://www.cherrypy.org/ticket/421
@@ -893 +892 @@
-        self.getPage('/upload', h, "POST", b)
-        self.assertStatus(413)
-        self.assertInBody("Request Entity Too Large")
-    
-    def testEmptyThreadlocals(self):