Fix too lax expected JSON content-type parsing

E.g. application/jsonfoobar is not expected for it, but ones with parameters -- for example charset -- are. The IANA registered application/json-seq is a good example.
aio-libs · Nov 1, 2021 · 4a4dc9f · 4a4dc9f
1 parent 203e3cf
commit 4a4dc9f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGES/6180.bugfix b/CHANGES/6180.bugfix
@@ -0,0 +1 @@
+Fix JSON media type matching to not accept everything starting with application/json.
diff --git a/aiohttp/helpers.py b/aiohttp/helpers.py
@@ -124,7 +124,9 @@ def iscoroutinefunction(func: Any) -> bool:
         return asyncio.iscoroutinefunction(func)
 
 
-json_re = re.compile(r"(?:application/|[\w.-]+/[\w.+-]+?\+)json", re.IGNORECASE)
+json_re = re.compile(
+    r"(?:application/|[\w.-]+/[\w.+-]+?\+)json(?:\s*;.*)?$", re.IGNORECASE
+)
 
 
 class BasicAuth(namedtuple("BasicAuth", ["login", "password", "encoding"])):
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix JSON media type matching to not accept everything starting with application/json.