Skip to content

Normalize content type when parsing options headers #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kludex merged 4 commits into from
Oct 31, 2026
Merged

Normalize content type when parsing options headers #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
836d145
Normalize content type with parameters
Edneam May 14, 2026
89a230b
Merge remote-tracking branch 'origin/main' into pr-287
Kludex Oct 31, 2026
777f711
Keep a single regression test for mixed-case content types
Kludex Oct 31, 2026
a5519c5
Revert "Keep a single regression test for mixed-case content types"
Kludex Oct 31, 2026
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 python_multipart/multipart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ def parse_options_header(value: str | bytes | None) -> tuple[bytes, dict[bytes,
if key == "filename" and (val[1:3] == ":\\" or val[:2] == "\\\\"):
val = val.split("\\")[-1]
options[key.encode("latin-1")] = val.encode("latin-1")
return ctype.encode("latin-1"), options
return ctype.lower().encode("latin-1"), options


class Field:
Expand Down
15 changes: 9 additions & 6 deletions tests/test_multipart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,11 @@ def test_multiple_params(self) -> None:
self.assertEqual(t, b"application/json")
self.assertEqual(p, {b"par": b"val", b"asdf": b"foo"})

def test_content_type_with_parameters_is_normalized(self) -> None:
t, p = parse_options_header(b"Multipart/Form-Data; boundary=abc")
self.assertEqual(t, b"multipart/form-data")
self.assertEqual(p, {b"boundary": b"abc"})

def test_quoted_param(self) -> None:
t, p = parse_options_header(b'application/json;param="quoted"')
self.assertEqual(t, b"application/json")
Expand Down Expand Up @@ -345,12 +350,6 @@ def test_preserves_quoted_semicolons_and_escapes(self) -> None:

self.assertEqual(p, {b"a": b"x;y", b"b": b'esc " quote'})

def test_preserves_content_type_case(self) -> None:
t, p = parse_options_header(b"Text/Plain; a=b")

self.assertEqual(t, b"Text/Plain")
self.assertEqual(p, {b"a": b"b"})

def test_preserves_backslash_unquoting_order(self) -> None:
_, p = parse_options_header(b'text/plain; q="a\\\\b"')

Expand Down Expand Up @@ -1680,6 +1679,10 @@ def test_create_form_parser(self) -> None:
r = create_form_parser({"Content-Type": b"application/octet-stream"}, None, None)
self.assertTrue(isinstance(r, FormParser))

def test_create_form_parser_accepts_mixed_case_content_type(self) -> None:
r = create_form_parser({"Content-Type": b"Multipart/Form-Data; boundary=abc"}, None, None)
self.assertTrue(isinstance(r, FormParser))

def test_create_form_parser_error(self) -> None:
headers: dict[str, bytes] = {}
with self.assertRaises(ValueError):
Expand Down
Loading