Skip to content

deserialize data form media type #303

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 2 commits into from
Mar 30, 2021
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
7 changes: 5 additions & 2 deletions openapi_core/deserializing/media_types/factories.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
from openapi_core.deserializing.media_types.util import json_loads, form_loads
from openapi_core.deserializing.media_types.util import (
json_loads, urlencoded_form_loads, data_form_loads,
)

from openapi_core.deserializing.media_types.deserializers import (
PrimitiveDeserializer,
Expand All @@ -9,7 +11,8 @@ class MediaTypeDeserializersFactory(object):

MEDIA_TYPE_DESERIALIZERS = {
'application/json': json_loads,
'application/x-www-form-urlencoded': form_loads,
'application/x-www-form-urlencoded': urlencoded_form_loads,
'multipart/form-data': data_form_loads,
}

def __init__(self, custom_deserializers=None):
Expand Down
17 changes: 16 additions & 1 deletion openapi_core/deserializing/media_types/util.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from email.parser import Parser
from json import loads

from six import binary_type
Expand All @@ -11,5 +12,19 @@ def json_loads(value):
return loads(value)


def form_loads(value):
def urlencoded_form_loads(value):
return dict(parse_qsl(value))


def data_form_loads(value):
if issubclass(type(value), binary_type):
value = value.decode('ASCII', errors='surrogateescape')
parser = Parser()
parts = parser.parsestr(value, headersonly=False)
return dict(
(
part.get_param('name', header='content-disposition'),
part.get_payload(decode=True),
)
for part in parts.get_payload()
)
30 changes: 28 additions & 2 deletions tests/unit/deserializing/test_media_types_deserializers.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import pytest

from six import b, u

from openapi_core.deserializing.exceptions import DeserializeError
from openapi_core.deserializing.media_types.factories import (
MediaTypeDeserializersFactory,
Expand Down Expand Up @@ -31,22 +33,46 @@ def test_json_empty_object(self, deserializer_factory):

assert result == {}

def test_form_urlencoded_empty(self, deserializer_factory):
def test_urlencoded_form_empty(self, deserializer_factory):
media_type = MediaType('application/x-www-form-urlencoded')
value = ''

result = deserializer_factory(media_type)(value)

assert result == {}

def test_form_urlencoded_simple(self, deserializer_factory):
def test_urlencoded_form_simple(self, deserializer_factory):
media_type = MediaType('application/x-www-form-urlencoded')
value = 'param1=test'

result = deserializer_factory(media_type)(value)

assert result == {'param1': 'test'}

@pytest.mark.parametrize('value', [b(''), u('')])
def test_data_form_empty(self, deserializer_factory, value):
media_type = MediaType('multipart/form-data')

result = deserializer_factory(media_type)(value)

assert result == {}

def test_data_form_simple(self, deserializer_factory):
media_type = MediaType('multipart/form-data')
value = b(
'Content-Type: multipart/form-data; boundary="'
'===============2872712225071193122=="\n'
'MIME-Version: 1.0\n\n'
'--===============2872712225071193122==\n'
'Content-Type: text/plain\nMIME-Version: 1.0\n'
'Content-Disposition: form-data; name="param1"\n\ntest\n'
'--===============2872712225071193122==--\n'
)

result = deserializer_factory(media_type)(value)

assert result == {'param1': b('test')}

def test_custom_simple(self, deserializer_factory):
custom_mimetype = 'application/custom'
media_type = MediaType(custom_mimetype)
Expand Down