Handle missing MIME types in MediaTypeFinder

jparise · jparise · commit 770359108d9c · 2021-08-13T12:51:41.000-07:00
It's possible for a request not to have a MIME type (mimetype=None).
Previously, this would result in an exception from within fnmatch():

  TypeError: expected str, bytes or os.PathLike object, not NoneType

This change guards against that condition and raises MediaTypeNotFound
instead. Tests have also been added for this module.
diff --git a/openapi_core/templating/media_types/finders.py b/openapi_core/templating/media_types/finders.py
@@ -12,8 +12,9 @@ def find(self, request):
         if request.mimetype in self.content:
             return self.content / request.mimetype, request.mimetype
 
-        for key, value in self.content.items():
-            if fnmatch.fnmatch(request.mimetype, key):
-                return value, key
+        if request.mimetype:
+            for key, value in self.content.items():
+                if fnmatch.fnmatch(request.mimetype, key):
+                    return value, key
 
         raise MediaTypeNotFound(request.mimetype, list(self.content.keys()))
diff --git a/tests/unit/templating/test_media_types_finders.py b/tests/unit/templating/test_media_types_finders.py
@@ -0,0 +1,58 @@
+import pytest
+
+from openapi_core.spec.paths import SpecPath
+from openapi_core.templating.media_types.exceptions import MediaTypeNotFound
+from openapi_core.templating.media_types.finders import MediaTypeFinder
+from openapi_core.testing import MockRequest
+
+
+class TestMediaTypes:
+    @pytest.fixture(scope="class")
+    def spec(self):
+        return {
+            "application/json": {"schema": {"type": "object"}},
+            "text/*": {"schema": {"type": "object"}},
+        }
+
+    @pytest.fixture(scope="class")
+    def content(self, spec):
+        return SpecPath.from_spec(spec)
+
+    @pytest.fixture(scope="class")
+    def finder(self, content):
+        return MediaTypeFinder(content)
+
+    def test_exact(self, finder, content):
+        request = MockRequest(
+            "http://petstore.swagger.io",
+            "get",
+            "/pets",
+            mimetype="application/json",
+        )
+
+        _, mimetype = finder.find(request)
+        assert mimetype == "application/json"
+
+    def test_match(self, finder, content):
+        request = MockRequest(
+            "http://petstore.swagger.io", "get", "/pets", mimetype="text/html"
+        )
+
+        _, mimetype = finder.find(request)
+        assert mimetype == "text/*"
+
+    def test_not_found(self, finder, content):
+        request = MockRequest(
+            "http://petstore.swagger.io", "get", "/pets", mimetype="unknown"
+        )
+
+        with pytest.raises(MediaTypeNotFound):
+            finder.find(request)
+
+    def test_missing(self, finder, content):
+        request = MockRequest(
+            "http://petstore.swagger.io", "get", "/pets", mimetype=None
+        )
+
+        with pytest.raises(MediaTypeNotFound):
+            finder.find(request)
