Commit fc379b48 authored by Claude Paroz's avatar Claude Paroz
Browse files

[1.5.x] Fixed #19036 -- Fixed base64 uploads decoding 

Thanks anthony at adsorbtion.org for the report, and johannesl for
bringing the patch up-to-date.
Backport of 2a67374b from master.
parent 1b6e7514

django/http/multipartparser.py

+6 −0
Original line number Diff line number Diff line
@@ -199,6 +199,12 @@ class MultiPartParser(object): 
                        for chunk in field_stream:

                            if transfer_encoding == 'base64':

                                # We only special-case base64 transfer encoding

                                # We should always read base64 streams by multiple of 4

                                over_bytes = len(chunk) % 4

                                if over_bytes:

                                    over_chunk = field_stream.read(4 - over_bytes)

                                    chunk += over_chunk



                                try:

                                    chunk = base64.b64decode(chunk)

                                except Exception as e:

tests/regressiontests/file_uploads/tests.py

+9 −4
Original line number Diff line number Diff line
@@ -74,15 +74,14 @@ class FileUploadTests(TestCase): 


        self.assertEqual(response.status_code, 200)



    def test_base64_upload(self):

        test_string = "This data will be transmitted base64-encoded."

    def _test_base64_upload(self, content):

        payload = client.FakePayload("\r\n".join([

            '--' + client.BOUNDARY,

            'Content-Disposition: form-data; name="file"; filename="test.txt"',

            'Content-Type: application/octet-stream',

            'Content-Transfer-Encoding: base64',

            '',]))

        payload.write(b"\r\n" + base64.b64encode(force_bytes(test_string)) + b"\r\n")

        payload.write(b"\r\n" + base64.b64encode(force_bytes(content)) + b"\r\n")

        payload.write('--' + client.BOUNDARY + '--\r\n')

        r = {

            'CONTENT_LENGTH': len(payload),
@@ -94,7 +93,13 @@ class FileUploadTests(TestCase): 
        response = self.client.request(**r)

        received = json.loads(response.content.decode('utf-8'))



        self.assertEqual(received['file'], test_string)

        self.assertEqual(received['file'], content)



    def test_base64_upload(self):

        self._test_base64_upload("This data will be transmitted base64-encoded.")



    def test_big_base64_upload(self):

        self._test_base64_upload("Big data" * 68000)  # > 512Kb



    def test_unicode_file_name(self):

        tdir = sys_tempfile.mkdtemp()