Changeset 1258

Timestamp:

08/21/06 00:27:00

Author:

fumanchu

Message:

Fix for #497 (decode a "Transfer-Encoding: chunked" request).

Files:

• trunk/cherrypy/_cpwsgiserver.py (modified) (5 diffs)
• trunk/cherrypy/test/test_conn.py (modified) (5 diffs)

trunk/cherrypy/_cpwsgiserver.py

@@ -7 +7 @@
-import rfc822
-import socket
+try:
+    import cStringIO as StringIO
+except ImportError:
+    import StringIO
-import sys
-import threading
@@ -128 +132 @@
-        # then all the http headers
-        headers = mimetools.Message(self.rfile)
-["CONTENT_TYPE"] = headers.getheader("Content-type", ""
+.update(self.parse_headers(headers)
-        
-        cl = headers.getheader("Content-length")
@@ -139 +143 @@
-            self.simple_response("411 Length Required")
-            return
-
-
-
-
-
-
-
-
-
+
+
-        if self.environ["SERVER_PROTOCOL"] == "HTTP/1.1":
-            if headers.getheader("Connection", "") == "close":
@@ -158 +155 @@
-            else:
-                self.close_connection = True
+        
+        # Transfer-Encoding support
+        te = headers.getheader("Transfer-Encoding", "")
+        te = [x.strip() for x in te.split(",") if x.strip()]
+        while te:
+            enc = te.pop()
+            if enc.lower() == "chunked":
+                if not self.decode_chunked():
+                    return
+            else:
+                self.simple_response("501 Unimplemented")
+                self.close_connection = True
+                return
-        
-        # From PEP 333:
@@ -180 +190 @@
-        
-        self.ready = True
+    
+    def parse_headers(self, headers):
+        environ = {}
+        environ["CONTENT_TYPE"] = headers.getheader("Content-type", "")
+        environ["CONTENT_LENGTH"] = headers.getheader("Content-length") or ""
+        
+        for k in headers:
+            envname = "HTTP_" + k.upper().replace("-", "_")
+            if k in comma_separated_headers:
+                environ[envname] = ", ".join(headers.getheaders(k))
+            elif k in ('Transfer-Encoding',):
+                pass
+            else:
+                environ[envname] = headers[k]
+        return environ
+    
+    def decode_chunked(self):
+        """Decode the 'chunked' transfer coding."""
+        cl = 0
+        data = StringIO.StringIO()
+        while True:
+            line = self.rfile.readline().strip().split(" ", 1)
+            chunk_size = int(line.pop(0), 16)
+            if chunk_size <= 0:
+                break
+##            if line: chunk_extension = line[0]
+            cl += chunk_size
+            data.write(self.rfile.read(chunk_size))
+            if self.rfile.read(2) != "\r\n":
+                self.simple_response("400 Bad Request",
+                                     "Bad chunked transfer coding")
+                return
+        
+        headers = mimetools.Message(self.rfile)
+        self.environ.update(self.parse_headers(headers))
+        data.seek(0)
+        self.environ["wsgi.input"] = data
+        self.environ["CONTENT_LENGTH"] = str(cl) or ""
+        return True
-    
-    def respond(self):

trunk/cherrypy/test/test_conn.py

@@ -32 +32 @@
-        
-        def upload(self):
-
+
+
+
-        upload.exposed = True
-    
@@ -38 +40 @@
-    cherrypy.config.update({
-        'log_to_screen': False,
+        'show_tracebacks': True,
-        'environment': 'production',
-        })
@@ -85 +88 @@
-    
-    def test_HTTP11_pipelining(self):
+        self.PROTOCOL = "HTTP/1.1"
+        
-        # Test pipelining. httplib doesn't support this directly.
-        conn = httplib.HTTPConnection(self.HOST, self.PORT)
@@ -117 +122 @@
-    
-    def test_100_Continue(self):
+        self.PROTOCOL = "HTTP/1.1"
+        
-        conn = httplib.HTTPConnection(self.HOST, self.PORT)
-        conn.auto_open = False
@@ -160 +167 @@
-        self.status, self.headers, self.body = webtest.shb(response)
-        self.assertStatus(200)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    def test_HTTP10(self):