Skip to content
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
24 changes: 15 additions & 9 deletions flask_restx/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,14 @@ class RawModel(ModelBase):

:param str name: The model public name
:param str mask: an optional default model mask
:param bool strict: validation should raise error when there is param not provided in schema
"""

wrapper = dict

def __init__(self, name, *args, **kwargs):
self.__mask__ = kwargs.pop("mask", None)
self.__strict__ = kwargs.pop("strict", False)
if self.__mask__ and not isinstance(self.__mask__, Mask):
self.__mask__ = Mask(self.__mask__)
super(RawModel, self).__init__(name, *args, **kwargs)
Expand All @@ -160,15 +162,18 @@ def _schema(self):
if getattr(field, "discriminator", False):
discriminator = name

return not_none(
{
"required": sorted(list(required)) or None,
"properties": properties,
"discriminator": discriminator,
"x-mask": str(self.__mask__) if self.__mask__ else None,
"type": "object",
}
)
definition = {
"required": sorted(list(required)) or None,
"properties": properties,
"discriminator": discriminator,
"x-mask": str(self.__mask__) if self.__mask__ else None,
"type": "object",
}

if self.__strict__:
definition['additionalProperties'] = False

return not_none(definition)

@cached_property
def resolved(self):
Expand Down Expand Up @@ -240,6 +245,7 @@ def __deepcopy__(self, memo):
self.name,
[(key, copy.deepcopy(value, memo)) for key, value in iteritems(self)],
mask=self.__mask__,
strict=self.__strict__,
)
obj.__parents__ = self.__parents__
return obj
Expand Down
7 changes: 5 additions & 2 deletions flask_restx/namespace.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,17 @@ def add_model(self, name, definition):
api.models[name] = definition
return definition

def model(self, name=None, model=None, mask=None, **kwargs):
def model(self, name=None, model=None, mask=None, strict=False, **kwargs):
"""
Register a model

:param bool strict - should model validation raise error when non-specified param
is provided?

.. seealso:: :class:`Model`
"""
cls = OrderedModel if self.ordered else Model
model = cls(name, model, mask=mask)
model = cls(name, model, mask=mask, strict=strict)
model.__apidoc__.update(kwargs)
return self.add_model(name, model)

Expand Down
33 changes: 33 additions & 0 deletions tests/test_namespace.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
import re

import flask_restx as restx

Expand Down Expand Up @@ -143,3 +144,35 @@ def post(self):
client.post_json("/apples/validation/", data)

assert Payload.payload == data

def test_api_payload_strict_verification(self, app, client):
api = restx.Api(app, validate=True)
ns = restx.Namespace("apples")
api.add_namespace(ns)

fields = ns.model(
"Person",
{
"name": restx.fields.String(required=True),
"age": restx.fields.Integer,
"birthdate": restx.fields.DateTime,
},
strict=True,
)

@ns.route("/validation/")
class Payload(restx.Resource):
payload = None

@ns.expect(fields)
def post(self):
Payload.payload = ns.payload
return {}

data = {
"name": "John Doe",
"agge": 15, # typo
}

resp = client.post_json("/apples/validation/", data, status=400)
assert re.match("Additional properties are not allowed \(u*'agge' was unexpected\)", resp["errors"][""])