Ticket #18150: fixed indents.diff

django/core/files/uploadedfile.py

@@ -2 +2 @@
 Classes representing uploaded files.
 """
 
-import os
+import ntpath
 from io import BytesIO
 
 from django.conf import settings
@@ -39 +39 @@
     def _set_name(self, name):
         # Sanitize the file name so that it can't be dangerous.
         if name is not None:
+            # If name ends in backslash replace with 0
+            if name[-1] != "\\":
+                name = os.path.basename(name)
             # Just use the basename of the file -- anything else is dangerous.
-            name = os.path.basename(name)
+            name = ntpath.basename(name)
 
             # File names longer than 255 characters can cause problems on older OSes.
             if len(name) > 255:
-                name, ext = os.path.splitext(name)
+                name, ext = ntpath.splitext(name)
                 name = name[:255 - len(ext)] + ext
 
         self._name = name

django/http/multipartparser.py

@@ -173 +173 @@
                     if not file_name:
                         continue
                     file_name = force_text(file_name, encoding, errors='replace')
-                    file_name = self.IE_sanitize(unescape_entities(file_name))
+                    file_name = unescape_entities(file_name)
 
                     content_type = meta_data.get('content-type', ('',))[0].strip()
                     try:
@@ -258 +258 @@
                                        file_obj)
                 break
 
-    def IE_sanitize(self, filename):
-        """Cleanup filename from Internet Explorer full paths."""
-        return filename and filename[filename.rfind("\\")+1:].strip()
-
 class LazyStream(six.Iterator):
     """
     The LazyStream wrapper allows one to get and "unget" bytes from a stream.

tests/regressiontests/file_uploads/tests.py

@@ -362 +362 @@
         # shouldn't differ.
         self.assertEqual(os.path.basename(obj.testfile.path), 'MiXeD_cAsE.txt')
 
+    def test_fail_backslash(self):
+        """
+        Tests filename ending with a backslash, issue #18150 reports crashes 
+        when a filename ends with a backslash
+        """
+        name_backslash = "backslash.jpg\\"
+        payload = client.FakePayload()
+        payload.write('\r\n'.join([
+            '--' + client.BOUNDARY,
+            'Content-Disposition: form-data; name="file1"; filename="%s"' % name_backslash,
+            'Content-Type: application/octet-stream',
+            '',
+            ''
+        ]))
+        payload.write('\r\n--' + client.BOUNDARY + '--\r\n')
+
+        r = {
+            'CONTENT_LENGTH': len(payload),
+            'CONTENT_TYPE':   client.MULTIPART_CONTENT,
+            'PATH_INFO':      "/file_uploads/echo/",
+            'REQUEST_METHOD': 'POST',
+            'wsgi.input':     payload,
+        }
+        response = self.client.request(**r)
+        self.assertEqual(response.status_code, 200)
+
 @override_settings(MEDIA_ROOT=MEDIA_ROOT)
 class DirectoryCreationTests(TestCase):
     """