Changeset 1898

Timestamp:

02/20/08 14:35:14

Author:

fumanchu

Message:

New test case from patch on #783 (File uploads corrupt when using built in SSL). Thanks to noah for providing it!

Files:

• trunk/cherrypy/test/test_http.py (modified) (3 diffs)

trunk/cherrypy/test/test_http.py

@@ -6 +6 @@
-import httplib
-import cherrypy
+import md5, mimetypes
+
+
+def encode_multipart_formdata(files):
+    """Return (content_type, body) ready for httplib.HTTP instance.
+    
+    files: a sequence of (name, filename, value) tuples for multipart uploads.
+    """
+    BOUNDARY = '----------ThIs_Is_tHe_bouNdaRY_$'
+    L = []
+    for key, filename, value in files:
+        L.append('--' + BOUNDARY)
+        L.append('Content-Disposition: form-data; name="%s"; filename="%s"' %
+                 (key, filename))
+        ct = mimetypes.guess_type(filename)[0] or 'application/octet-stream'
+        L.append('Content-Type: %s' % ct)
+        L.append('')
+        L.append(value)
+    L.append('--' + BOUNDARY + '--')
+    L.append('')
+    body = '\r\n'.join(L)
+    content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
+    return content_type, body
-
-
@@ -14 +37 @@
-            return "Hello world!"
-        index.exposed = True
+        
+        def post_multipart(self, file):
+            # compute and return md5 of posted file
+            contents = file.file.read()
+            return md5.md5(contents).hexdigest()
+        post_multipart.exposed = True
-    
-    cherrypy.tree.mount(Root())
@@ -30 +59 @@
-        c.request("POST", "/")
-        self.assertEqual(c.getresponse().status, 411)
+    
+    def test_post_multipart(self):
+        # generate file contents for a large post
+        contents = "abcdefghijklmnopqrstuvwxyz" * 1000000
+        post_md5 = md5.md5(contents).hexdigest()
+        
+        # encode as multipart form data
+        files=[('file', 'file.txt', contents)]
+        content_type, body = encode_multipart_formdata(files)
+        
+        # post file
+        if self.scheme == 'https':
+            c = httplib.HTTPS('127.0.0.1:%s' % self.PORT)
+        else:
+            c = httplib.HTTP('127.0.0.1:%s' % self.PORT)
+        c.putrequest('POST', '/post_multipart')
+        c.putheader('Content-Type', content_type)
+        c.putheader('Content-Length', str(len(body)))
+        c.endheaders()
+        c.send(body)
+        
+        errcode, errmsg, headers = c.getreply()
+        self.assertEqual(errcode, 200)
+        
+        response_body = c.file.read()
+        self.assertEquals(post_md5, response_body)
-
-