Schema source

p1c2u · p1c2u · commit 328fc0002c9c · 2018-10-25T12:56:56.000+01:00
diff --git a/openapi_core/extensions/models/factories.py b/openapi_core/extensions/models/factories.py
@@ -1,10 +1,10 @@
 """OpenAPI X-Model extension factories module"""
-from openapi_core.extensions.models.models import Model
+from openapi_core.extensions.models.models import Model, DictModel
 
 
 class ModelClassFactory(object):
 
-    base_class = Model
+    base_class = DictModel
 
     def create(self, name):
         return type(name, (self.base_class, ), {})
diff --git a/openapi_core/extensions/models/models.py b/openapi_core/extensions/models/models.py
@@ -9,6 +9,19 @@ def __dict__(self):
         raise NotImplementedError
 
 
+class DictModel(dict, BaseModel):
+
+    @property
+    def __dict__(self):
+        return self
+
+    def __getattr__(self, name):
+        try:
+            return self[name]
+        except KeyError:
+            raise AttributeError
+
+
 class Model(BaseModel):
     """Model class for OpenAPI X-Model."""
 
diff --git a/openapi_core/schema/schemas/factories.py b/openapi_core/schema/schemas/factories.py
@@ -56,6 +56,7 @@ def create(self, schema_spec):
             default=default, nullable=nullable, enum=enum,
             deprecated=deprecated, all_of=all_of, one_of=one_of,
             additional_properties=additional_properties,
+            _source=schema_deref,
         )
 
     @property
diff --git a/openapi_core/schema/schemas/models.py b/openapi_core/schema/schemas/models.py
@@ -61,7 +61,7 @@ def __init__(
             self, schema_type=None, model=None, properties=None, items=None,
             schema_format=None, required=None, default=None, nullable=False,
             enum=None, deprecated=False, all_of=None, one_of=None,
-            additional_properties=None):
+            additional_properties=None, _source=None):
         self.type = SchemaType(schema_type)
         self.model = model
         self.properties = properties and dict(properties) or {}
@@ -76,9 +76,28 @@ def __init__(
         self.one_of = one_of and list(one_of) or []
         self.additional_properties = additional_properties
 
+        self._source = _source
+
         self._all_required_properties_cache = None
         self._all_optional_properties_cache = None
 
+    @property
+    def __dict__(self):
+        data = {
+            'type': self.type.value,
+        }
+
+        if self.format:
+            data['format'] = self.format
+
+        if self.all_of:
+            data['allOf'] = list(map(lambda x: x.__dict__, self.all_of))
+
+        if self.one_of:
+            data['oneOf'] = list(map(lambda x: x.__dict__, self.one_of))
+        
+        return data
+
     def __getitem__(self, name):
         return self.properties[name]
 
diff --git a/openapi_core/schema/schemas/validators.py b/openapi_core/schema/schemas/validators.py
@@ -1,3 +1,7 @@
+from jsonschema import validators
+from jsonschema.validators import Draft4Validator
+
+
 class TypeValidator(object):
 
     def __init__(self, *types, **options):
@@ -24,3 +28,63 @@ def __call__(self, value):
             return False
 
         return True
+
+
+class Draft4ExtendedValidatorFactory(Draft4Validator):
+    """Draft4Validator with extra validators factory."""
+
+    @classmethod
+    def create(cls):
+        """Creates a customized Draft4ExtendedValidator."""
+        spec_validators = cls._get_spec_validators()
+        return validators.extend(Draft4Validator, spec_validators)
+
+    @classmethod
+    def _get_spec_validators(cls):
+        from jsonschema import _validators
+
+        return {
+            '$ref': _validators.ref,
+            'properties': _validators.properties_draft4,
+            'additionalProperties': _validators.additionalProperties,
+            'patternProperties': _validators.patternProperties,
+            'type': _validators.type_draft4,
+            'dependencies': _validators.dependencies,
+            'required': _validators.required_draft4,
+            'minProperties': _validators.minProperties_draft4,
+            'maxProperties': _validators.maxProperties_draft4,
+            'allOf': _validators.allOf_draft4,
+            'oneOf': _validators.oneOf_draft4,
+            'anyOf': _validators.anyOf_draft4,
+            'not': _validators.not_draft4,
+        }
+
+
+
+class SchemaValidator(object):
+
+    def __init__(self, spec_dict, schema_dict):
+        self.spec_dict = spec_dict
+        self.schema_dict = schema_dict
+
+    def __call__(self, value):
+        nullable = self.spec_dict.get('nullable', 'false')
+        if nullable == 'true' and value is None:
+            return True
+
+        validator = self.validator_cls(self.schema_dict)
+        validator.validate(value)
+        return True
+
+    def iter_errors(self, value):
+        nullable = self.spec_dict.get('nullable', 'false')
+        if nullable == 'true' and value is None:
+            return
+
+        validator = self.validator_cls(self.schema_dict)
+        for err in validator.iter_errors(value):
+            yield err
+
+    @property
+    def validator_cls(self):
+        return Draft4ExtendedValidatorFactory.create()
diff --git a/openapi_core/schema/specs/factories.py b/openapi_core/schema/specs/factories.py
@@ -34,7 +34,9 @@ def create(self, spec_dict, spec_url=''):
         paths = self.paths_generator.generate(paths)
         components = self.components_factory.create(components_spec)
         spec = Spec(
-            info, list(paths), servers=list(servers), components=components)
+            info, list(paths), servers=list(servers), components=components,
+            _source=spec_dict_deref,
+        )
         return spec
 
     @property
diff --git a/openapi_core/schema/specs/models.py b/openapi_core/schema/specs/models.py
@@ -13,12 +13,15 @@
 class Spec(object):
     """Represents an OpenAPI Specification for a service."""
 
-    def __init__(self, info, paths, servers=None, components=None):
+    def __init__(
+        self, info, paths, servers=None, components=None, _source=None):
         self.info = info
         self.paths = paths and dict(paths)
         self.servers = servers or []
         self.components = components
 
+        self._source = _source
+
     def __getitem__(self, path_name):
         return self.paths[path_name]
 
diff --git a/openapi_core/validation/request/validators.py b/openapi_core/validation/request/validators.py
@@ -58,6 +58,14 @@ def _get_parameters(self, request, operation):
             else:
                 parameters[param.location.value][param_name] = value
 
+            if param.schema and value is not None:
+                from jsonschema.exceptions import ValidationError
+                from openapi_core.schema.schemas.validators import SchemaValidator
+                validator = SchemaValidator(
+                    self.spec._source, param.schema.__dict__)
+                errs = validator.iter_errors(value)
+                errors.extend(errs)
+
         return parameters, errors
 
     def _get_body(self, request, operation):

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ def create(self, schema_spec):`
`56`	`56`	`default=default, nullable=nullable, enum=enum,`
`57`	`57`	`deprecated=deprecated, all_of=all_of, one_of=one_of,`
`58`	`58`	`additional_properties=additional_properties,`
	`59`	`+ _source=schema_deref,`
`59`	`60`	`)`
`60`	`61`
`61`	`62`	`@property`