Changeset 5874

Timestamp:

08/12/07 07:02:08 (1 year ago)

Author:

mtredinnick

Message:

Fixed #4947 -- Avoid displaying uploaded file contents in the debug web page. Based on a patch from eibaan@gmail.com.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/http/__init__.py (modified) (2 diffs)
• django/trunk/django/utils/datastructures.py (modified) (1 diff)
• django/trunk/tests/regressiontests/datastructures/tests.py (modified) (1 diff)

django/trunk/AUTHORS

@@ -102 +102 @@
-    Andy Dustman <farcepest@gmail.com>
-    Clint Ecker
+    eibaan@gmail.com
-    enlight
-    Enrico <rico.bl@gmail.com>

django/trunk/django/http/__init__.py

@@ -3 +3 @@
-from pprint import pformat
-from urllib import urlencode
-
+, FileDict
-from django.utils.encoding import smart_str, iri_to_uri, force_unicode
-
@@ -89 +89 @@
-                # client's one.)
-                filename = name_dict['filename'][name_dict['filename'].rfind("\\")+1:]
-
+FileDict(
-                    'filename': filename,
-                    'content-type': 'Content-Type' in submessage and submessage['Content-Type'] or None,
-                    'content': submessage.get_payload(),
-
+)
-            else:
-                POST.appendlist(name_dict['name'], submessage.get_payload())

django/trunk/django/utils/datastructures.py

@@ -268 +268 @@
-            except TypeError: # Special-case if current isn't a dict.
-                current = {bits[-1] : v}
+
+class FileDict(dict):
+    """
+    A dictionary used to hold uploaded file contents. The only special feature
+    here is that repr() of this object won't dump the entire contents of the
+    file to the output. A handy safeguard for a large file upload.
+    """
+    def __repr__(self):
+        if 'content' in self:
+            d = dict(self, content='<omitted>')
+            return dict.__repr__(d)
+        return dict.__repr__(self)
+

django/trunk/tests/regressiontests/datastructures/tests.py

@@ -65 +65 @@
->>> d['person']['2']['firstname']
-['Adrian']
+
+### FileDict ################################################################
+
+>>> d = FileDict({'content': 'once upon a time...'})
+>>> repr(d)
+"{'content': '<omitted>'}"
+>>> d = FileDict({'other-key': 'once upon a time...'})
+>>> repr(d)
+"{'other-key': 'once upon a time...'}"
-"""