Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion django/http/multipartparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ def parse_boundary_stream(stream, max_header_size):
name = header_name.lower().rstrip(" ")
value, params = parse_header_parameters(value_and_params.lstrip(" "))
params = {k: v.encode() for k, v in params.items()}
except ValueError: # Invalid header.
except (ValueError, LookupError): # Invalid header.
continue

if name == "content-disposition":
Expand Down
19 changes: 13 additions & 6 deletions tests/requests_tests/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -455,11 +455,18 @@ def test_body_after_POST_multipart_form_data(self):
request.body

def test_malformed_multipart_header(self):
for header in [
'Content-Disposition : form-data; name="name"',
'Content-Disposition:form-data; name="name"',
'Content-Disposition :form-data; name="name"',
]:
tests = [
('Content-Disposition : form-data; name="name"', {"name": ["value"]}),
('Content-Disposition:form-data; name="name"', {"name": ["value"]}),
('Content-Disposition :form-data; name="name"', {"name": ["value"]}),
# The invalid encoding causes the entire part to be skipped.
(
'Content-Disposition: form-data; name="name"; '
"filename*=BOGUS''test%20file.txt",
{},
),
]
for header, expected_post in tests:
with self.subTest(header):
payload = FakePayload(
"\r\n".join(
Expand All @@ -480,7 +487,7 @@ def test_malformed_multipart_header(self):
"wsgi.input": payload,
}
)
self.assertEqual(request.POST, {"name": ["value"]})
self.assertEqual(request.POST, expected_post)

def test_body_after_POST_multipart_related(self):
"""
Expand Down