From d06438626aea9d3dff416dfdc979f10bc8fe575c Mon Sep 17 00:00:00 2001 From: Jon Parise Date: Fri, 13 Aug 2021 12:51:41 -0700 Subject: [PATCH] Handle missing MIME types in MediaTypeFinder It's possible for a response 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. --- .../templating/media_types/finders.py | 7 +-- .../templating/test_media_types_finders.py | 47 +++++++++++++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 tests/unit/templating/test_media_types_finders.py diff --git a/openapi_core/templating/media_types/finders.py b/openapi_core/templating/media_types/finders.py index c9fa7d86..3425be96 100644 --- 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 new file mode 100644 index 00000000..4c1fe9ef --- /dev/null +++ b/tests/unit/templating/test_media_types_finders.py @@ -0,0 +1,47 @@ +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 MockResponse + + +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): + response = MockResponse("", mimetype="application/json") + + _, mimetype = finder.find(response) + assert mimetype == "application/json" + + def test_match(self, finder, content): + response = MockResponse("", mimetype="text/html") + + _, mimetype = finder.find(response) + assert mimetype == "text/*" + + def test_not_found(self, finder, content): + response = MockResponse("", mimetype="unknown") + + with pytest.raises(MediaTypeNotFound): + finder.find(response) + + def test_missing(self, finder, content): + response = MockResponse("", mimetype=None) + + with pytest.raises(MediaTypeNotFound): + finder.find(response) pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy