encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-04-26 12:03:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

More graceful handling of malformed Content-Disposition

Browse Source
This commit is contained in:
Tom Christie 2015-01-23 12:26:44 +00:00
parent 4cb164b66c
commit f1ac9d3f9b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/parsers.py
View File

@ -298,7 +298,7 @@ class FileUploadParser(BaseParser):
if 'filename*' in filename_parm: if 'filename*' in filename_parm:
return self.get_encoded_filename(filename_parm) return self.get_encoded_filename(filename_parm)
return force_text(filename_parm['filename']) return force_text(filename_parm['filename'])
except (AttributeError, KeyError): except (AttributeError, KeyError, ValueError):
pass pass
def get_encoded_filename(self, filename_parm): def get_encoded_filename(self, filename_parm):

4
tests/test_parsers.py
View File

@ -161,7 +161,9 @@ class TestFileUploadParser(TestCase):
self.__replace_content_disposition('inline; filename=fallback.txt; filename*=utf-8--ÀĥƦ.txt') self.__replace_content_disposition('inline; filename=fallback.txt; filename*=utf-8--ÀĥƦ.txt')
filename = parser.get_filename(self.stream, None, self.parser_context) filename = parser.get_filename(self.stream, None, self.parser_context)
self.assertEqual(filename, 'fallback.txt') # Malformed. Either None or 'fallback.txt' will be acceptable.
# See also https://code.djangoproject.com/ticket/24209
self.assertIn(filename, ('fallback.txt', None))
def __replace_content_disposition(self, disposition): def __replace_content_disposition(self, disposition):
self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = disposition self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = disposition