Skip to content

Fix content-type when no space after semicolon #814

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.

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
merged 1 commit into from
Mar 20, 2024
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
27 changes: 24 additions & 3 deletions openapi_core/templating/media_types/finders.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""OpenAPI core templating media types finders module"""

import fnmatch
import re
from typing import Mapping
from typing import Tuple

Expand Down Expand Up @@ -38,12 +39,32 @@ def find(self, mimetype: str) -> MediaType:
raise MediaTypeNotFound(mimetype, list(self.content.keys()))

def _parse_mimetype(self, mimetype: str) -> Tuple[str, Mapping[str, str]]:
mimetype_parts = mimetype.split("; ")
mime_type = mimetype_parts[0]
mimetype_parts = mimetype.split(";")
mime_type = mimetype_parts[0].lower().rstrip()
parameters = {}
if len(mimetype_parts) > 1:
parameters_list = (
param_str.split("=") for param_str in mimetype_parts[1:]
self._parse_parameter(param_str)
for param_str in mimetype_parts[1:]
)
parameters = dict(parameters_list)
return mime_type, parameters

def _parse_parameter(self, parameter: str) -> Tuple[str, str]:
"""Parse a parameter according to RFC 9110.

See https://www.rfc-editor.org/rfc/rfc9110.html#name-parameters

Important points:
* parameter names are case-insensitive
* parameter values are case-sensitive
except "charset" which is case-insensitive
https://www.rfc-editor.org/rfc/rfc2046#section-4.1.2
"""
name, value = parameter.split("=")
name = name.lower().lstrip()
# remove surrounding quotes from value
value = re.sub('^"(.*)"$', r"\1", value, count=1)
if name == "charset":
value = value.lower()
return name, value.rstrip()
17 changes: 13 additions & 4 deletions tests/unit/templating/test_media_types_finders.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,19 @@ def content(self, spec):
def finder(self, content):
return MediaTypeFinder(content)

def test_charset(self, finder, content):
mimetype = "text/html; charset=utf-8"

mimetype, parameters, _ = finder.find(mimetype)
@pytest.mark.parametrize(
"media_type",
[
# equivalent according to RFC 9110
"text/html;charset=utf-8",
'Text/HTML;Charset="utf-8"',
'text/html; charset="utf-8"',
"text/html;charset=UTF-8",
"text/html ; charset=utf-8",
],
)
def test_charset(self, finder, content, media_type):
mimetype, parameters, _ = finder.find(media_type)
assert mimetype == "text/*"
assert parameters == {"charset": "utf-8"}

Expand Down
Loading