Index: django/http/file_descriptor.py
===================================================================
--- django/http/file_descriptor.py (revision 0)
+++ django/http/file_descriptor.py (revision 0)
@@ -0,0 +1,151 @@
+"""
+This file contains a fallback FileProgressDescriptor
+for file upload progress.
+"""
+import pickle
+import os
+
+class DefaultFileProgressDescriptor(object):
+
+ def __init__(self, FileException):
+ self.FileException = FileException
+
+ def __get__(self, request, HttpRequest):
+ """
+ Returns the file progress for this request.
+ If no file progress is known, returns an empty
+ dictionary.
+ The request also keeps a local copy so that
+ the file is not accessed every time one wants to
+ ask for something.
+ """
+ from django.conf import settings
+
+ file_upload_dir = settings.FILE_UPLOAD_DIR
+ progress_id = request.META['UPLOAD_PROGRESS_ID']
+
+ if not progress_id or not file_upload_dir:
+ return {}
+
+ if getattr(self, '_file_progress', False) != False:
+ return self._file_progress
+
+ try:
+ f = open(os.path.join(file_upload_dir, progress_id), 'rb')
+ progress = pickle.load(f)
+ f.close()
+ self._file_progress = progress
+ return progress
+ except:
+ self._file_progress = {}
+ return {}
+
+ def __set__(self, request, new_progress):
+ """
+ Sets the value of the file progress for this request.
+ If no file progress is underway, raises an error.
+ """
+
+ from django.conf import settings
+
+ file_upload_dir = settings.FILE_UPLOAD_DIR
+ progress_id = request.META['UPLOAD_PROGRESS_ID']
+
+ if not progress_id or not file_upload_dir:
+ raise self.FileException('There is no upload in progress.')
+
+ self._file_progress = new_progress
+ f = open(os.path.join(file_upload_dir, progress_id), 'wb')
+ pickle.dump(new_progress, f)
+ f.close()
+
+ def __delete__(self, request):
+ """
+ Removes the file if there is an upload in process.
+ """
+ file_upload_dir = settings.FILE_UPLOAD_DIR
+ progress_id = request.META['UPLOAD_PROGRESS_ID']
+
+ if not progress_id or not file_upload_dir:
+ raise self.FileException('There is no upload in progress.')
+
+ try:
+ os.remove(os.path.join(file_upload_dir, progress_id))
+ except:
+ pass
+"""
+This file contains a fallback FileProgressDescriptor
+for file upload progress.
+"""
+import pickle
+import os
+
+class DefaultFileProgressDescriptor(object):
+
+ def __init__(self, FileException):
+ self.FileException = FileException
+
+ def __get__(self, request, HttpRequest):
+ """
+ Returns the file progress for this request.
+ If no file progress is known, returns an empty
+ dictionary.
+ The request also keeps a local copy so that
+ the file is not accessed every time one wants to
+ ask for something.
+ """
+ from django.conf import settings
+
+ file_upload_dir = settings.FILE_UPLOAD_DIR
+ progress_id = request.META['UPLOAD_PROGRESS_ID']
+
+ if not progress_id or not file_upload_dir:
+ return {'wow': 'true'}
+ return {}
+
+ if getattr(self, '_file_progress', False) != False:
+ return self._file_progress
+
+ try:
+ f = open(os.path.join(file_upload_dir, progress_id), 'rb')
+ progress = pickle.load(f)
+ f.close()
+ self._file_progress = progress
+ return progress
+ except:
+ self._file_progress = {}
+ return {}
+
+ def __set__(self, request, new_progress):
+ """
+ Sets the value of the file progress for this request.
+ If no file progress is underway, raises an error.
+ """
+
+ from django.conf import settings
+
+ file_upload_dir = settings.FILE_UPLOAD_DIR
+ progress_id = request.META['UPLOAD_PROGRESS_ID']
+
+ if not progress_id or not file_upload_dir:
+ raise self.FileException('There is no upload in progress.')
+
+ self._file_progress = new_progress
+ f = open(os.path.join(file_upload_dir, progress_id), 'wb')
+ pickle.dump(new_progress, f)
+ f.close()
+
+ def __delete__(self, request):
+ """
+ Removes the file if there is an upload in process.
+ """
+ file_upload_dir = settings.FILE_UPLOAD_DIR
+ progress_id = request.META['UPLOAD_PROGRESS_ID']
+
+ if not progress_id or not file_upload_dir:
+ raise self.FileException('There is no upload in progress.')
+
+ try:
+ os.remove(os.path.join(file_upload_dir, progress_id))
+ except:
+ pass
Index: django/http/__init__.py
===================================================================
--- django/http/__init__.py (revision 5116)
+++ django/http/__init__.py (working copy)
@@ -1,22 +1,48 @@
-import os
+import os, pickle
from Cookie import SimpleCookie
from pprint import pformat
from urllib import urlencode, quote
from django.utils.datastructures import MultiValueDict
+from django.http.file_descriptor import DefaultFileProgressDescriptor
+import re
+try:
+ from cStringIO import StringIO
+except ImportError:
+ from StringIO import StringIO
+
RESERVED_CHARS="!*'();:@&=+$,/?%#[]"
+
try:
# The mod_python version is more efficient, so try importing it first.
from mod_python.util import parse_qsl
except ImportError:
from cgi import parse_qsl
+class MetaFileProgressDescriptor(object):
+ """
+ This descriptor allows other descriptors to
+ be loaded in runtime to a request instance.
+ """
+ def __get__(self, request, *args, **kwargs):
+ return request._file_progress.__get__(request, *args, **kwargs)
+
+ def __set__(self, request, *args, **kwargs):
+ return request._file_progress.__set__(request, *args, **kwargs)
+
+ def __delete__(self, request, *args, **kwargs):
+ return request._file_progress.__delete__(request, *args, **kwargs)
+
class Http404(Exception):
pass
class HttpRequest(object):
"A basic HTTP request"
+
+ upload_id_re = re.compile(r'^[a-fA-F0-9]{32}$')
+ file_progress = MetaFileProgressDescriptor()
+
def __init__(self):
self.GET, self.POST, self.COOKIES, self.META, self.FILES = {}, {}, {}, {}, {}
self.path = ''
@@ -41,38 +67,332 @@
def is_secure(self):
return os.environ.get("HTTPS") == "on"
+
+ def _get_file_progress_from_args(self, headers, get, querystring):
-def parse_file_upload(header_dict, post_data):
- "Returns a tuple of (POST MultiValueDict, FILES MultiValueDict)"
- import email, email.Message
- from cgi import parse_header
- raw_message = '\r\n'.join(['%s:%s' % pair for pair in header_dict.items()])
- raw_message += '\r\n\r\n' + post_data
- msg = email.message_from_string(raw_message)
- POST = MultiValueDict()
- FILES = MultiValueDict()
- for submessage in msg.get_payload():
- if submessage and isinstance(submessage, email.Message.Message):
- name_dict = parse_header(submessage['Content-Disposition'])[1]
- # name_dict is something like {'name': 'file', 'filename': 'test.txt'} for file uploads
- # or {'name': 'blah'} for POST fields
- # We assume all uploaded files have a 'filename' set.
- if 'filename' in name_dict:
- assert type([]) != type(submessage.get_payload()), "Nested MIME messages are not supported"
- if not name_dict['filename'].strip():
- continue
- # IE submits the full path, so trim everything but the basename.
- # (We can't use os.path.basename because it expects Linux paths.)
- filename = name_dict['filename'][name_dict['filename'].rfind("\\")+1:]
- FILES.appendlist(name_dict['name'], {
- '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())
- return POST, FILES
+ if 'X-Upload-ID' in headers:
+ progress_id = headers['X-Upload-ID']
+ elif 'X-Progress-ID' in headers:
+ progress_id = headers['X-Progress-ID']
+ elif 'upload_id' in get:
+ progress_id = get['upload_id']
+ elif 'progress_id' in get:
+ progress_id = get['progress_id']
+ elif querystring != None and len(querystring.strip()) == 32:
+ progress_id = querystring
+ else:
+ return None
+ if not self.upload_id_re.match(progress_id):
+ return None
+
+ return progress_id
+
+
+def parse_file_upload(headers, input, request):
+ from django.conf import settings
+
+ # Only stream files to disk if FILE_STREAMING_DIR is set
+ file_upload_dir = settings.FILE_UPLOAD_DIR
+ streaming_min_post_size = settings.STREAMING_MIN_POST_SIZE
+
+ try:
+ parser = MultiPartParser(headers, input, request, file_upload_dir, streaming_min_post_size)
+ return parser.parse()
+ except MultiPartParserError, e:
+ return MultiValueDict({ '_file_upload_error': [e.message] }), {}
+
+class MultiPartParserError(Exception):
+ def __init__(self, message):
+ self.message = message
+ def __str__(self):
+ return repr(self.message)
+
+class MultiPartParser(object):
+ """
+ A rfc2388 multipart/form-data parser.
+
+ parse() reads the input stream in chunk_size chunks and returns a
+ tuple of (POST MultiValueDict, FILES MultiValueDict). If
+ file_upload_dir is defined files will be streamed to temporary
+ files in the specified directory.
+
+ The FILES dictionary will have 'filename', 'content-type',
+ 'content' and 'content-length' entries. For streamed files it will
+ also have 'tmpfilename' and 'tmpfile'. The 'content' entry will
+ only be read from disk when referenced for streamed files.
+
+ If the header X-Progress-ID is sent with a 32 character hex string
+ a temporary file with the same name will be created in
+ `file_upload_dir`` with a pickled { 'received', 'size' }
+ dictionary with the number of bytes received and the size expected
+ respectively. The file will be unlinked when the parser finishes.
+
+ """
+
+ def __init__(self, headers, input, request, file_upload_dir=None, streaming_min_post_size=None, chunk_size=1024*64):
+ try:
+ content_length = int(headers['Content-Length'])
+ except:
+ raise MultiPartParserError('Invalid Content-Length: %s' % headers.get('Content-Length'))
+
+ content_type = headers.get('Content-Type')
+
+ if not content_type or not content_type.startswith('multipart/'):
+ raise MultiPartParserError('Invalid Content-Type: %s' % content_type)
+
+ ctype, opts = self.parse_header(content_type)
+ boundary = opts.get('boundary')
+ from cgi import valid_boundary
+ if not boundary or not valid_boundary(boundary):
+ raise MultiPartParserError('Invalid boundary in multipart form: %s' % boundary)
+
+ progress_id = request.META['UPLOAD_PROGRESS_ID']
+
+ if file_upload_dir and progress_id:
+ self._progress_filename = os.path.join(file_upload_dir, progress_id)
+ else:
+ self._progress_filename = None
+ self._boundary = '--' + boundary
+ self._input = input
+ self._size = content_length
+ self._received = 0
+ self._file_upload_dir = file_upload_dir
+ self._chunk_size = chunk_size
+ self._state = 'PREAMBLE'
+ self._partial = ''
+ self._post = MultiValueDict()
+ self._files = MultiValueDict()
+ self._request = request
+
+ if streaming_min_post_size is not None and content_length < streaming_min_post_size:
+ self._file_upload_dir = None # disable file streaming for small request
+
+ try:
+ # use mx fast string search if available
+ from mx.TextTools import FS
+ self._fs = FS(self._boundary)
+ except ImportError:
+ self._fs = None
+
+ def parse(self):
+ try:
+ self._parse()
+ finally:
+ if self._progress_filename:
+ self._request.file_progress = {'state': 'done'}
+
+
+ return self._post, self._files
+
+ def _parse(self):
+ size = self._size
+
+ try:
+ while size > 0:
+ n = self._read(self._input, min(self._chunk_size, size))
+ if not n:
+ break
+ size -= n
+ except:
+ # consume any remaining data so we dont generate a "Connection Reset" error
+ size = self._size - self._received
+ while size > 0:
+ data = self._input.read(min(self._chunk_size, size))
+ size -= len(data)
+ raise
+
+ def _find_boundary(self, data, start, stop):
+ """
+ Find the next boundary and return the end of current part
+ and start of next part.
+ """
+ if self._fs:
+ boundary = self._fs.find(data, start, stop)
+ else:
+ boundary = data.find(self._boundary, start, stop)
+ if boundary >= 0:
+ end = boundary
+ next = boundary + len(self._boundary)
+
+ # backup over CRLF
+ if end > 0 and data[end-1] == '\n': end -= 1
+ if end > 0 and data[end-1] == '\r': end -= 1
+ # skip over --CRLF
+ if next < stop and data[next] == '-': next += 1
+ if next < stop and data[next] == '-': next += 1
+ if next < stop and data[next] == '\r': next += 1
+ if next < stop and data[next] == '\n': next += 1
+
+ return True, end, next
+ else:
+ return False, stop, stop
+
+ class TemporaryFile(object):
+ "A temporary file that tries to delete itself when garbage collected."
+ def __init__(self, dir):
+ import tempfile
+ (fd, name) = tempfile.mkstemp(suffix='.upload', dir=dir)
+ self.file = os.fdopen(fd, 'w+b')
+ self.name = name
+
+ def __getattr__(self, name):
+ a = getattr(self.__dict__['file'], name)
+ if type(a) != type(0):
+ setattr(self, name, a)
+ return a
+
+ def __del__(self):
+ try:
+ os.unlink(self.name)
+ except OSError:
+ pass
+
+ class LazyContent(dict):
+ """
+ A lazy FILES dictionary entry that reads the contents from
+ tmpfile only when referenced.
+ """
+ def __init__(self, data):
+ dict.__init__(self, data)
+
+ def __getitem__(self, key):
+ if key == 'content' and not self.has_key(key):
+ self['tmpfile'].seek(0)
+ self['content'] = self['tmpfile'].read()
+ return dict.__getitem__(self, key)
+
+ def _read(self, input, size):
+ data = input.read(size)
+
+ if not data:
+ return 0
+
+ read_size = len(data)
+ self._received += read_size
+
+ if self._partial:
+ data = self._partial + data
+
+ start = 0
+ stop = len(data)
+
+ while start < stop:
+ boundary, end, next = self._find_boundary(data, start, stop)
+
+ if not boundary and read_size:
+ # make sure we dont treat a partial boundary (and its separators) as data
+ stop -= len(self._boundary) + 16
+ end = next = stop
+ if end <= start:
+ break # need more data
+
+ if self._state == 'PREAMBLE':
+ # Preamble, just ignore it
+ self._state = 'HEADER'
+
+ elif self._state == 'HEADER':
+ # Beginning of header, look for end of header and parse it if found.
+
+ header_end = data.find('\r\n\r\n', start, stop)
+ if header_end == -1:
+ break # need more data
+
+ header = data[start:header_end]
+
+ self._fieldname = None
+ self._filename = None
+ self._content_type = None
+
+ for line in header.split('\r\n'):
+ ctype, opts = self.parse_header(line)
+ if ctype == 'content-disposition: form-data':
+ self._fieldname = opts.get('name')
+ self._filename = opts.get('filename')
+ elif ctype.startswith('content-type: '):
+ self._content_type = ctype[14:]
+
+ if self._filename is not None:
+ # cleanup filename from IE full paths:
+ self._filename = self._filename[self._filename.rfind("\\")+1:].strip()
+
+ if self._filename: # ignore files without filenames
+ if self._file_upload_dir:
+ try:
+ self._file = self.TemporaryFile(dir=self._file_upload_dir)
+ except:
+ raise MultiPartParserError("Failed to create temporary file.")
+ else:
+ self._file = StringIO()
+ else:
+ self._file = None
+ self._filesize = 0
+ self._state = 'FILE'
+ else:
+ self._field = StringIO()
+ self._state = 'FIELD'
+ next = header_end + 4
+
+ elif self._state == 'FIELD':
+ # In a field, collect data until a boundary is found.
+
+ self._field.write(data[start:end])
+ if boundary:
+ if self._fieldname:
+ self._post.appendlist(self._fieldname, self._field.getvalue())
+ self._field.close()
+ self._state = 'HEADER'
+
+ elif self._state == 'FILE':
+ # In a file, collect data until a boundary is found.
+
+ if self._file:
+ try:
+ self._file.write(data[start:end])
+ except IOError, e:
+ raise MultiPartParserError("Failed to write to temporary file.")
+ self._filesize += end-start
+
+ if self._progress_filename:
+ self._request.file_progress = {'received': self._received,
+ 'size': self._size,
+ 'state': 'uploading'}
+
+ if boundary:
+ if self._file:
+ if self._file_upload_dir:
+ self._file.seek(0)
+ file = self.LazyContent({
+ 'filename': self._filename,
+ 'content-type': self._content_type,
+ # 'content': is read on demand
+ 'content-length': self._filesize,
+ 'tmpfilename': self._file.name,
+ 'tmpfile': self._file
+ })
+ else:
+ file = {
+ 'filename': self._filename,
+ 'content-type': self._content_type,
+ 'content': self._file.getvalue(),
+ 'content-length': self._filesize
+ }
+ self._file.close()
+
+ self._files.appendlist(self._fieldname, file)
+
+ self._state = 'HEADER'
+
+ start = next
+
+ self._partial = data[start:]
+
+ return read_size
+
+ def parse_header(self, line):
+ from cgi import parse_header
+ return parse_header(line)
+
class QueryDict(MultiValueDict):
"""A specialized MultiValueDict that takes a query string when initialized.
This is immutable unless you create a copy of it."""
@@ -306,3 +626,4 @@
if not host:
host = request.META.get('HTTP_HOST', '')
return host
+
Index: django/oldforms/__init__.py
===================================================================
--- django/oldforms/__init__.py (revision 5116)
+++ django/oldforms/__init__.py (working copy)
@@ -666,17 +666,22 @@
self.validator_list = [self.isNonEmptyFile] + validator_list
def isNonEmptyFile(self, field_data, all_data):
- try:
- content = field_data['content']
- except TypeError:
+ if field_data.has_key('_file_upload_error'):
+ raise validators.CriticalValidationError, field_data['_file_upload_error']
+ if not field_data.has_key('filename'):
raise validators.CriticalValidationError, gettext("No file was submitted. Check the encoding type on the form.")
- if not content:
+ if not field_data['content-length']:
raise validators.CriticalValidationError, gettext("The submitted file is empty.")
def render(self, data):
return '' % \
(self.get_id(), self.__class__.__name__, self.field_name)
+ def prepare(self, new_data):
+ if new_data.has_key('_file_upload_error'):
+ # pretend we got something in the field to raise a validation error later
+ new_data[self.field_name] = { '_file_upload_error': new_data['_file_upload_error'] }
+
def html2python(data):
if data is None:
raise EmptyValue
Index: django/db/models/base.py
===================================================================
--- django/db/models/base.py (revision 5116)
+++ django/db/models/base.py (working copy)
@@ -12,12 +12,14 @@
from django.dispatch import dispatcher
from django.utils.datastructures import SortedDict
from django.utils.functional import curry
+from django.utils.file import file_move_safe
from django.conf import settings
from itertools import izip
import types
import sys
import os
+
class ModelBase(type):
"Metaclass for all models"
def __new__(cls, name, bases, attrs):
@@ -361,7 +363,7 @@
def _get_FIELD_size(self, field):
return os.path.getsize(self._get_FIELD_filename(field))
- def _save_FIELD_file(self, field, filename, raw_contents, save=True):
+ def _save_FIELD_file(self, field, filename, raw_field, save=True):
directory = field.get_directory_name()
try: # Create the date-based directory if it doesn't exist.
os.makedirs(os.path.join(settings.MEDIA_ROOT, directory))
@@ -383,9 +385,13 @@
setattr(self, field.attname, filename)
full_filename = self._get_FIELD_filename(field)
- fp = open(full_filename, 'wb')
- fp.write(raw_contents)
- fp.close()
+ if raw_field.has_key('tmpfilename'):
+ raw_field['tmpfile'].close()
+ file_move_safe(raw_field['tmpfilename'], full_filename)
+ else:
+ fp = open(full_filename, 'wb')
+ fp.write(raw_field['content'])
+ fp.close()
# Save the width and/or height, if applicable.
if isinstance(field, ImageField) and (field.width_field or field.height_field):
Index: django/db/models/fields/__init__.py
===================================================================
--- django/db/models/fields/__init__.py (revision 5116)
+++ django/db/models/fields/__init__.py (working copy)
@@ -636,7 +636,7 @@
setattr(cls, 'get_%s_filename' % self.name, curry(cls._get_FIELD_filename, field=self))
setattr(cls, 'get_%s_url' % self.name, curry(cls._get_FIELD_url, field=self))
setattr(cls, 'get_%s_size' % self.name, curry(cls._get_FIELD_size, field=self))
- setattr(cls, 'save_%s_file' % self.name, lambda instance, filename, raw_contents, save=True: instance._save_FIELD_file(self, filename, raw_contents, save))
+ setattr(cls, 'save_%s_file' % self.name, lambda instance, filename, raw_field, save=True: instance._save_FIELD_file(self, filename, raw_field, save))
dispatcher.connect(self.delete_file, signal=signals.post_delete, sender=cls)
def delete_file(self, instance):
@@ -659,9 +659,9 @@
if new_data.get(upload_field_name, False):
func = getattr(new_object, 'save_%s_file' % self.name)
if rel:
- func(new_data[upload_field_name][0]["filename"], new_data[upload_field_name][0]["content"], save)
+ func(new_data[upload_field_name][0]["filename"], new_data[upload_field_name][0], save)
else:
- func(new_data[upload_field_name]["filename"], new_data[upload_field_name]["content"], save)
+ func(new_data[upload_field_name]["filename"], new_data[upload_field_name], save)
def get_directory_name(self):
return os.path.normpath(datetime.datetime.now().strftime(self.upload_to))
Index: django/conf/global_settings.py
===================================================================
--- django/conf/global_settings.py (revision 5116)
+++ django/conf/global_settings.py (working copy)
@@ -240,6 +240,20 @@
# isExistingURL validator.
URL_VALIDATOR_USER_AGENT = "Django/0.96pre (http://www.djangoproject.com)"
+# The directory to place streamed file uploads. The web server needs write
+# permissions on this directory.
+# If this is None, streaming uploads are disabled.
+FILE_UPLOAD_DIR = None
+
+
+# The minimum size of a POST before file uploads are streamed to disk.
+# Any less than this number, and the file is uploaded to memory.
+# Size is in bytes.
+STREAMING_MIN_POST_SIZE = 512 * (2**10)
+
+
+
+
##############
# MIDDLEWARE #
##############
@@ -335,3 +349,5 @@
# The list of directories to search for fixtures
FIXTURE_DIRS = ()
+
+
Index: django/core/handlers/wsgi.py
===================================================================
--- django/core/handlers/wsgi.py (revision 5116)
+++ django/core/handlers/wsgi.py (working copy)
@@ -75,6 +75,7 @@
self.environ = environ
self.path = environ['PATH_INFO']
self.META = environ
+ self.META['UPLOAD_PROGRESS_ID'] = self._get_file_progress_id()
self.method = environ['REQUEST_METHOD'].upper()
def __repr__(self):
@@ -111,7 +112,14 @@
if self.environ.get('CONTENT_TYPE', '').startswith('multipart'):
header_dict = dict([(k, v) for k, v in self.environ.items() if k.startswith('HTTP_')])
header_dict['Content-Type'] = self.environ.get('CONTENT_TYPE', '')
- self._post, self._files = http.parse_file_upload(header_dict, self.raw_post_data)
+ header_dict['Content-Length'] = self.environ.get('CONTENT_LENGTH', '')
+ header_dict['X-Progress-ID'] = self.environ.get('HTTP_X_PROGRESS_ID', '')
+ try:
+ self._post, self._files = http.parse_file_upload(header_dict, self.environ['wsgi.input'], self)
+ except:
+ self._post, self._files = {}, {} # make sure we dont read the input stream again
+ raise
+ self._raw_post_data = None # raw data is not available for streamed multipart messages
else:
self._post, self._files = http.QueryDict(self.raw_post_data), datastructures.MultiValueDict()
else:
@@ -167,6 +175,17 @@
buf.close()
return self._raw_post_data
+ def _get_file_progress_id(self):
+ """
+ Returns the Progress ID of the request,
+ usually provided if there is a file upload
+ going on.
+ Returns ``None`` if no progress ID is specified.
+ """
+ return self._get_file_progress_from_args(self.environ,
+ self.GET,
+ self._req.args)
+
GET = property(_get_get, _set_get)
POST = property(_get_post, _set_post)
COOKIES = property(_get_cookies, _set_cookies)
Index: django/core/handlers/base.py
===================================================================
--- django/core/handlers/base.py (revision 5116)
+++ django/core/handlers/base.py (working copy)
@@ -5,7 +5,7 @@
class BaseHandler(object):
def __init__(self):
- self._request_middleware = self._view_middleware = self._response_middleware = self._exception_middleware = None
+ self._upload_middleware = self._request_middleware = self._view_middleware = self._response_middleware = self._exception_middleware = None
def load_middleware(self):
"""
@@ -19,6 +19,7 @@
self._view_middleware = []
self._response_middleware = []
self._exception_middleware = []
+ self._upload_middleware = []
for middleware_path in settings.MIDDLEWARE_CLASSES:
try:
dot = middleware_path.rindex('.')
@@ -47,13 +48,29 @@
self._response_middleware.insert(0, mw_instance.process_response)
if hasattr(mw_instance, 'process_exception'):
self._exception_middleware.insert(0, mw_instance.process_exception)
+ if hasattr(mw_instance, 'process_upload'):
+ self._upload_middleware.append(mw_instance.process_upload)
+ def file_progress_descriptor(self, request):
+ """
+ Returns a descriptor that manages the file_progress
+ """
+ for mw_call in self._upload_middleware:
+ result = mw_call(http.MultiPartParserError)
+ if result != None:
+ return result
+
+ return http.DefaultFileProgressDescriptor(http.MultiPartParserError)
+
def get_response(self, request):
"Returns an HttpResponse object for the given HttpRequest"
from django.core import exceptions, urlresolvers
from django.core.mail import mail_admins
from django.conf import settings
+ # Add file_progress descriptor
+ request._file_progress = self.file_progress_descriptor(request)
+
# Apply request middleware
for middleware_method in self._request_middleware:
response = middleware_method(request)
Index: django/core/handlers/modpython.py
===================================================================
--- django/core/handlers/modpython.py (revision 5116)
+++ django/core/handlers/modpython.py (working copy)
@@ -47,7 +47,12 @@
def _load_post_and_files(self):
"Populates self._post and self._files"
if 'content-type' in self._req.headers_in and self._req.headers_in['content-type'].startswith('multipart'):
- self._post, self._files = http.parse_file_upload(self._req.headers_in, self.raw_post_data)
+ self._raw_post_data = None # raw data is not available for streamed multipart messages
+ try:
+ self._post, self._files = http.parse_file_upload(self._req.headers_in, self._req, self)
+ except:
+ self._post, self._files = {}, {} # make sure we dont read the input stream again
+ raise
else:
self._post, self._files = http.QueryDict(self.raw_post_data), datastructures.MultiValueDict()
@@ -92,20 +97,21 @@
'AUTH_TYPE': self._req.ap_auth_type,
'CONTENT_LENGTH': self._req.clength, # This may be wrong
'CONTENT_TYPE': self._req.content_type, # This may be wrong
- 'GATEWAY_INTERFACE': 'CGI/1.1',
- 'PATH_INFO': self._req.path_info,
- 'PATH_TRANSLATED': None, # Not supported
- 'QUERY_STRING': self._req.args,
- 'REMOTE_ADDR': self._req.connection.remote_ip,
- 'REMOTE_HOST': None, # DNS lookups not supported
- 'REMOTE_IDENT': self._req.connection.remote_logname,
- 'REMOTE_USER': self._req.user,
- 'REQUEST_METHOD': self._req.method,
- 'SCRIPT_NAME': None, # Not supported
- 'SERVER_NAME': self._req.server.server_hostname,
- 'SERVER_PORT': self._req.server.port,
- 'SERVER_PROTOCOL': self._req.protocol,
- 'SERVER_SOFTWARE': 'mod_python'
+ 'GATEWAY_INTERFACE': 'CGI/1.1',
+ 'PATH_INFO': self._req.path_info,
+ 'PATH_TRANSLATED': None, # Not supported
+ 'QUERY_STRING': self._req.args,
+ 'REMOTE_ADDR': self._req.connection.remote_ip,
+ 'REMOTE_HOST': None, # DNS lookups not supported
+ 'REMOTE_IDENT': self._req.connection.remote_logname,
+ 'REMOTE_USER': self._req.user,
+ 'REQUEST_METHOD': self._req.method,
+ 'SCRIPT_NAME': None, # Not supported
+ 'SERVER_NAME': self._req.server.server_hostname,
+ 'SERVER_PORT': self._req.server.port,
+ 'SERVER_PROTOCOL': self._req.protocol,
+ 'UPLOAD_PROGRESS_ID': self._get_file_progress_id(),
+ 'SERVER_SOFTWARE': 'mod_python'
}
for key, value in self._req.headers_in.items():
key = 'HTTP_' + key.upper().replace('-', '_')
@@ -122,6 +128,18 @@
def _get_method(self):
return self.META['REQUEST_METHOD'].upper()
+ def _get_file_progress_id(self):
+ """
+ Returns the Progress ID of the request,
+ usually provided if there is a file upload
+ going on.
+ Returns ``None`` if no progress ID is specified.
+ """
+ return self._get_file_progress_from_args(self._req.headers_in,
+ self.GET,
+ self._req.args)
+
+
GET = property(_get_get, _set_get)
POST = property(_get_post, _set_post)
COOKIES = property(_get_cookies, _set_cookies)
Index: django/utils/file.py
===================================================================
--- django/utils/file.py (revision 0)
+++ django/utils/file.py (revision 0)
@@ -0,0 +1,72 @@
+import os
+
+try:
+ import shutils
+ file_move = shutils.move
+except:
+ file_move = os.rename
+
+def file_move_safe(old_file_name, new_file_name, chunk_size = 1024*64):
+ """
+ Moves a file from one location to another in the safest way possible.
+
+ First, it tries using shutils.move, which is OS-dependent but doesn't
+ break with change of filesystems. Then it tries os.rename, which will
+ break if it encounters a change in filesystems. Lastly, it streams
+ it manually from one file to another in python.
+ """
+
+ try:
+ file_move(old_file_name, new_file_name)
+ return
+ except:
+ pass
+
+ new_file = open(new_file_name, 'wb')
+ old_file = open(old_file_name, 'rb')
+ current_chunk = None
+
+ while current_chunk != '':
+ current_chunk = old_file.read(chunk_size)
+ new_file.write(current_chunk)
+
+ new_file.close()
+ old_file.close()
+
+ os.remove(old_file_name)
+import os
+
+try:
+ import shutils
+ file_move = shutils.move
+except:
+ file_move = os.rename
+
+def file_move_safe(old_file_name, new_file_name, chunk_size = 1024*64):
+ """
+ Moves a file from one location to another in the safest way possible.
+
+ First, it tries using shutils.move, which is OS-dependent but doesn't
+ break with change of filesystems. Then it tries os.rename, which will
+ break if it encounters a change in filesystems. Lastly, it streams
+ it manually from one file to another in python.
+ """
+
+ try:
+ file_move(old_file_name, new_file_name)
+ return
+ except:
+ pass
+
+ new_file = open(new_file_name, 'wb')
+ old_file = open(old_file_name, 'rb')
+ current_chunk = None
+
+ while current_chunk != '':
+ current_chunk = old_file.read(chunk_size)
+ new_file.write(current_chunk)
+
+ new_file.close()
+ old_file.close()
+
+ os.remove(old_file_name)
Index: tests/modeltests/test_client/views.py
===================================================================
--- tests/modeltests/test_client/views.py (revision 5116)
+++ tests/modeltests/test_client/views.py (working copy)
@@ -44,6 +44,12 @@
return HttpResponse(t.render(c))
+def post_file_view(request):
+ "A view that expects a multipart post and returns a file in the context"
+ t = Template('File {{ file.filename }} received', name='POST Template')
+ c = Context({'file': request.FILES['file_file']})
+ return HttpResponse(t.render(c))
+
def redirect_view(request):
"A view that redirects all requests to the GET view"
return HttpResponseRedirect('/test_client/get_view/')
Index: tests/modeltests/test_client/models.py
===================================================================
--- tests/modeltests/test_client/models.py (revision 5116)
+++ tests/modeltests/test_client/models.py (working copy)
@@ -75,6 +75,21 @@
self.assertEqual(response.template.name, "Book template")
self.assertEqual(response.content, "Blink - Malcolm Gladwell")
+ def test_post_file_view(self):
+ "POST this python file to a view"
+ import os, tempfile
+ from django.conf import settings
+ file = __file__.replace('.pyc', '.py')
+ for upload_dir in [None, tempfile.gettempdir()]:
+ settings.FILE_UPLOAD_DIR = upload_dir
+ post_data = { 'name': file, 'file': open(file) }
+ response = self.client.post('/test_client/post_file_view/', post_data)
+ self.failUnless('models.py' in response.context['file']['filename'])
+ self.failUnless(len(response.context['file']['content']) == os.path.getsize(file))
+ if upload_dir:
+ self.failUnless(response.context['file']['tmpfilename'])
+
+
def test_redirect(self):
"GET a URL that redirects elsewhere"
response = self.client.get('/test_client/redirect_view/')
Index: tests/modeltests/test_client/urls.py
===================================================================
--- tests/modeltests/test_client/urls.py (revision 5116)
+++ tests/modeltests/test_client/urls.py (working copy)
@@ -4,6 +4,7 @@
urlpatterns = patterns('',
(r'^get_view/$', views.get_view),
(r'^post_view/$', views.post_view),
+ (r'^post_file_view/$', views.post_file_view),
(r'^raw_post_view/$', views.raw_post_view),
(r'^redirect_view/$', views.redirect_view),
(r'^form_view/$', views.form_view),
Index: docs/request_response.txt
===================================================================
--- docs/request_response.txt (revision 5116)
+++ docs/request_response.txt (working copy)
@@ -72,13 +72,25 @@
``FILES``
A dictionary-like object containing all uploaded files. Each key in
``FILES`` is the ``name`` from the ````. Each
- value in ``FILES`` is a standard Python dictionary with the following three
+ value in ``FILES`` is a standard Python dictionary with the following four
keys:
* ``filename`` -- The name of the uploaded file, as a Python string.
* ``content-type`` -- The content type of the uploaded file.
* ``content`` -- The raw content of the uploaded file.
+ * ``content-length`` -- The length of the content in bytes.
+ If streaming file uploads are enabled two additional keys
+ describing the uploaded file will be present:
+
+ * ``tmpfilename`` -- The filename for the temporary file.
+ * ``tmpfile`` -- An open file object for the temporary file.
+
+ The temporary file will be removed when the request finishes.
+
+ Note that accessing ``content`` when streaming uploads are enabled
+ will read the whole file into memory which may not be what you want.
+
Note that ``FILES`` will only contain data if the request method was POST
and the ``