Merge pull request johnsensible#54 from Proper-Job/url-quote-fix

Added url quoting to X-Accel-Redirect and Location header

Author: johnsensible

sendfile/backends/_internalredirect.py

@@ -1,6 +1,13 @@
-from django.conf import settings
 import os.path
 
+from django.conf import settings
+from django.utils.encoding import smart_text, smart_bytes
+
+try:
+    from urllib.parse import quote
+except ImportError:
+    from urllib import quote
+
 
 def _convert_file_to_url(filename):
     relpath = os.path.relpath(filename, settings.SENDFILE_ROOT)
@@ -11,4 +18,7 @@ def _convert_file_to_url(filename):
         relpath, head = os.path.split(relpath)
         url.insert(1, head)
 
-    return u'/'.join(url)
+    # Python3 urllib.parse.quote accepts both unicode and bytes, while Python2 urllib.quote only accepts bytes.
+    # So use bytes for quoting and then go back to unicode.
+    url = [smart_bytes(url_component) for url_component in url]
+    return smart_text(quote(b'/'.join(url)))

sendfile/tests.py

@@ -9,6 +9,11 @@
 import shutil
 from sendfile import sendfile as real_sendfile, _get_sendfile
 
+try:
+    from urllib.parse import unquote
+except ImportError:
+    from urllib import unquote
+
 
 def sendfile(request, filename, **kwargs):
     # just a simple response with the filename
@@ -127,4 +132,26 @@ def test_xaccelredirect_header_containing_unicode(self):
         filepath = self.ensure_file(u'péter_là_gueule.txt')
         response = real_sendfile(HttpRequest(), filepath)
         self.assertTrue(response is not None)
-        self.assertEqual(u'/private/péter_là_gueule.txt'.encode('utf-8'), response['X-Accel-Redirect'])
+        self.assertEqual(u'/private/péter_là_gueule.txt'.encode('utf-8'), unquote(response['X-Accel-Redirect']))
+
+
+class TestModWsgiBackend(TempFileTestCase):
+
+    def setUp(self):
+        super(TestModWsgiBackend, self).setUp()
+        settings.SENDFILE_BACKEND = 'sendfile.backends.mod_wsgi'
+        settings.SENDFILE_ROOT = self.TEMP_FILE_ROOT
+        settings.SENDFILE_URL = '/private'
+        _get_sendfile.clear()
+
+    def test_correct_url_in_location_header(self):
+        filepath = self.ensure_file('readme.txt')
+        response = real_sendfile(HttpRequest(), filepath)
+        self.assertTrue(response is not None)
+        self.assertEqual('/private/readme.txt', response['Location'])
+
+    def test_location_header_containing_unicode(self):
+        filepath = self.ensure_file(u'péter_là_gueule.txt')
+        response = real_sendfile(HttpRequest(), filepath)
+        self.assertTrue(response is not None)
+        self.assertEqual(u'/private/péter_là_gueule.txt'.encode('utf-8'), unquote(response['Location']))