Ticket #17277: django.unreadablepost.patch

django/http/__init__.py

@@ -3 +3 @@
 import datetime
 import os
 import re
+import sys
 import time
 from pprint import pformat
 from urllib import urlencode, quote
@@ -175 +176 @@
                       unicode(cookies),
                       unicode(meta)))
 
+class UnreadablePostError(IOError):
+    pass
 
 class HttpRequest(object):
     """A basic HTTP request."""
@@ -304 +307 @@
         if not hasattr(self, '_raw_post_data'):
             if self._read_started:
                 raise Exception("You cannot access raw_post_data after reading from request's data stream")
-            self._raw_post_data = self.read()
+            try:
+                self._raw_post_data = self.read()
+            except IOError, e:
+                raise UnreadablePostError, e, sys.exc_traceback
             self._stream = StringIO(self._raw_post_data)
         return self._raw_post_data
     raw_post_data = property(_get_raw_post_data)

tests/regressiontests/requests/tests.py

@@ -5 +5 @@
 from django.conf import settings
 from django.core.handlers.modpython import ModPythonRequest
 from django.core.handlers.wsgi import WSGIRequest, LimitedStream
-from django.http import HttpRequest, HttpResponse, parse_cookie, build_request_repr
+from django.http import HttpRequest, HttpResponse, parse_cookie, build_request_repr, UnreadablePostError
 from django.utils import unittest
 from django.utils.http import cookie_date
 
@@ -410 +410 @@
         # Consume enough data to mess up the parsing:
         self.assertEqual(request.read(13), u'--boundary\r\nC')
         self.assertEqual(request.POST, {u'name': [u'value']})
+
+    def test_POST_connection_error(self):
+        """
+        If wsgi.input.read() raises an exception while trying to read() the
+        POST, the exception should be identifiable (not a generic IOError).
+        """
+        class ExplodingStringIO(StringIO):
+            def read(self, len=0):
+                raise IOError("kaboom!")
+
+        payload = 'name=value'
+        request = WSGIRequest({'REQUEST_METHOD': 'POST',
+                               'CONTENT_LENGTH': len(payload),
+                               'wsgi.input': ExplodingStringIO(payload)})
+        self.assertRaises(UnreadablePostError, lambda: request.raw_post_data)