Make JSON media type matching case insensitive (#6181)

Per RFC 2045, section 2 and appendix A.
aio-libs · Oct 31, 2021 · 15adfbc · 15adfbc
1 parent 9c7f3d3
commit 15adfbc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/CHANGES/6181.bugfix b/CHANGES/6181.bugfix
@@ -0,0 +1 @@
+Make JSON media type matching case insensitive per RFC 2045.
diff --git a/aiohttp/helpers.py b/aiohttp/helpers.py
@@ -124,7 +124,7 @@ def iscoroutinefunction(func: Any) -> bool:
         return asyncio.iscoroutinefunction(func)
 
 
-json_re = re.compile(r"(?:application/|[\w.-]+/[\w.+-]+?\+)json")
+json_re = re.compile(r"(?:application/|[\w.-]+/[\w.+-]+?\+)json", re.IGNORECASE)
 
 
 class BasicAuth(namedtuple("BasicAuth", ["login", "password", "encoding"])):

diff --git a/tests/test_helpers.py b/tests/test_helpers.py
@@ -747,6 +747,15 @@ def test_is_expected_content_type_non_application_json_private_suffix():
     )
 
 
+def test_is_expected_content_type_json_non_lowercase():
+    """Per RFC 2045, media type matching is case insensitive."""
+    expected_ct = "application/json"
+    response_ct = "Application/JSON"
+    assert is_expected_content_type(
+        response_content_type=response_ct, expected_content_type=expected_ct
+    )
+
+
 def test_is_expected_content_type_non_json_match_exact():
     expected_ct = "text/javascript"
     response_ct = "text/javascript"