Skip to content

Fix integration Request Response factories check types fix #490

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
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
2 changes: 2 additions & 0 deletions openapi_core/contrib/django/requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ class DjangoOpenAPIRequest:
path_regex = re.compile(PATH_PARAMETER_PATTERN)

def __init__(self, request: HttpRequest):
if not isinstance(request, HttpRequest):
raise TypeError(f"'request' argument is not type of {HttpRequest}")
self.request = request

path = (
Expand Down
4 changes: 4 additions & 0 deletions openapi_core/contrib/django/responses.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@

class DjangoOpenAPIResponse:
def __init__(self, response: HttpResponse):
if not isinstance(response, HttpResponse):
raise TypeError(
f"'response' argument is not type of {HttpResponse}"
)
self.response = response

@property
Expand Down
2 changes: 2 additions & 0 deletions openapi_core/contrib/falcon/requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ def __init__(
request: Request,
default_when_empty: Optional[Dict[Any, Any]] = None,
):
if not isinstance(request, Request):
raise TypeError(f"'request' argument is not type of {Request}")
self.request = request
if default_when_empty is None:
default_when_empty = {}
Expand Down
2 changes: 2 additions & 0 deletions openapi_core/contrib/falcon/responses.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

class FalconOpenAPIResponse:
def __init__(self, response: Response):
if not isinstance(response, Response):
raise TypeError(f"'response' argument is not type of {Response}")
self.response = response

@property
Expand Down
2 changes: 2 additions & 0 deletions openapi_core/contrib/flask/requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

class FlaskOpenAPIRequest(WerkzeugOpenAPIRequest):
def __init__(self, request: Request):
if not isinstance(request, Request):
raise TypeError(f"'request' argument is not type of {Request}")
self.request: Request = request

self.parameters = RequestParameters(
Expand Down
5 changes: 5 additions & 0 deletions openapi_core/contrib/requests/requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ class RequestsOpenAPIRequest:
"""

def __init__(self, request: Union[Request, PreparedRequest]):
if not isinstance(request, (Request, PreparedRequest)):
raise TypeError(
"'request' argument is not type of "
f"{Request} or {PreparedRequest}"
)
if isinstance(request, Request):
request = request.prepare()

Expand Down
2 changes: 2 additions & 0 deletions openapi_core/contrib/requests/responses.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

class RequestsOpenAPIResponse:
def __init__(self, response: Response):
if not isinstance(response, Response):
raise TypeError(f"'response' argument is not type of {Response}")
self.response = response

@property
Expand Down
2 changes: 2 additions & 0 deletions openapi_core/contrib/starlette/requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

class StarletteOpenAPIRequest:
def __init__(self, request: Request):
if not isinstance(request, Request):
raise TypeError(f"'request' argument is not type of {Request}")
self.request = request

self.parameters = RequestParameters(
Expand Down
2 changes: 2 additions & 0 deletions openapi_core/contrib/starlette/responses.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

class StarletteOpenAPIResponse:
def __init__(self, response: Response):
if not isinstance(response, Response):
raise TypeError(f"'response' argument is not type of {Response}")
self.response = response

@property
Expand Down
2 changes: 2 additions & 0 deletions openapi_core/contrib/werkzeug/requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ class WerkzeugOpenAPIRequest:
path_regex = re.compile(PATH_PARAMETER_PATTERN)

def __init__(self, request: Request):
if not isinstance(request, Request):
raise TypeError(f"'request' argument is not type of {Request}")
self.request = request

self.parameters = RequestParameters(
Expand Down
2 changes: 2 additions & 0 deletions openapi_core/contrib/werkzeug/responses.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

class WerkzeugOpenAPIResponse:
def __init__(self, response: Response):
if not isinstance(response, Response):
raise TypeError(f"'response' argument is not type of {Response}")
self.response = response

@property
Expand Down
8 changes: 8 additions & 0 deletions tests/unit/contrib/django/test_django.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ def create(content=b"", status_code=None):


class TestDjangoOpenAPIRequest(BaseTestDjango):
def test_type_invalid(self):
with pytest.raises(TypeError):
DjangoOpenAPIRequest(None)

def test_no_resolver(self, request_factory):
data = {"test1": "test2"}
request = request_factory.get("/admin/", data)
Expand Down Expand Up @@ -168,6 +172,10 @@ def test_drf_default_value_pattern(self, request_factory):


class TestDjangoOpenAPIResponse(BaseTestDjango):
def test_type_invalid(self):
with pytest.raises(TypeError):
DjangoOpenAPIResponse(None)

def test_stream_response(self, response_factory):
response = response_factory()
response.writelines(["foo\n", "bar\n", "baz\n"])
Expand Down
5 changes: 5 additions & 0 deletions tests/unit/contrib/flask/test_flask_requests.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from urllib.parse import urljoin

import pytest
from werkzeug.datastructures import Headers
from werkzeug.datastructures import ImmutableMultiDict

Expand All @@ -8,6 +9,10 @@


class TestFlaskOpenAPIRequest:
def test_type_invalid(self):
with pytest.raises(TypeError):
FlaskOpenAPIRequest(None)

def test_simple(self, request_factory, request):
request = request_factory("GET", "/", subdomain="www")

Expand Down
6 changes: 6 additions & 0 deletions tests/unit/contrib/flask/test_flask_responses.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
import pytest

from openapi_core.contrib.flask import FlaskOpenAPIResponse


class TestFlaskOpenAPIResponse:
def test_type_invalid(self):
with pytest.raises(TypeError):
FlaskOpenAPIResponse(None)

def test_invalid_server(self, response_factory):
data = "Not Found"
status_code = 404
Expand Down
5 changes: 5 additions & 0 deletions tests/unit/contrib/requests/test_requests_requests.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import pytest
from werkzeug.datastructures import Headers
from werkzeug.datastructures import ImmutableMultiDict

Expand All @@ -6,6 +7,10 @@


class TestRequestsOpenAPIRequest:
def test_type_invalid(self):
with pytest.raises(TypeError):
RequestsOpenAPIRequest(None)

def test_simple(self, request_factory, request):
request = request_factory("GET", "/", subdomain="www")

Expand Down
6 changes: 6 additions & 0 deletions tests/unit/contrib/requests/test_requests_responses.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
import pytest

from openapi_core.contrib.requests import RequestsOpenAPIResponse


class TestRequestsOpenAPIResponse:
def test_type_invalid(self):
with pytest.raises(TypeError):
RequestsOpenAPIResponse(None)

def test_invalid_server(self, response_factory):
data = "Not Found"
status_code = 404
Expand Down