Merge pull request #121 from ondratu/master

Object additionalProperties support

Author: p1c2u

openapi_core/schema/schemas/factories.py

@@ -28,7 +28,8 @@ def create(self, schema_spec):
         deprecated = schema_deref.get('deprecated', False)
         all_of_spec = schema_deref.get('allOf', None)
         one_of_spec = schema_deref.get('oneOf', None)
-        additional_properties_spec = schema_deref.get('additionalProperties')
+        additional_properties_spec = schema_deref.get('additionalProperties',
+                                                      True)
         min_items = schema_deref.get('minItems', None)
         max_items = schema_deref.get('maxItems', None)
         min_length = schema_deref.get('minLength', None)
@@ -59,8 +60,8 @@ def create(self, schema_spec):
         if items_spec:
             items = self._create_items(items_spec)
 
-        additional_properties = None
-        if additional_properties_spec:
+        additional_properties = additional_properties_spec
+        if isinstance(additional_properties_spec, dict):
             additional_properties = self.create(additional_properties_spec)
 
         return Schema(

openapi_core/schema/schemas/models.py

@@ -65,7 +65,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, min_items=None, max_items=None,
+            additional_properties=True, min_items=None, max_items=None,
             min_length=None, max_length=None, pattern=None, unique_items=False,
             minimum=None, maximum=None, multiple_of=None,
             exclusive_minimum=False, exclusive_maximum=False,
@@ -311,14 +311,15 @@ def _unmarshal_properties(self, value, one_of_schema=None,
 
         value_props_names = value.keys()
         extra_props = set(value_props_names) - set(all_props_names)
-        if extra_props and self.additional_properties is None:
+        if extra_props and self.additional_properties is False:
             raise UndefinedSchemaProperty(extra_props)
 
         properties = {}
-        for prop_name in extra_props:
-            prop_value = value[prop_name]
-            properties[prop_name] = self.additional_properties.unmarshal(
-                prop_value, custom_formatters=custom_formatters)
+        if self.additional_properties is not True:
+            for prop_name in extra_props:
+                prop_value = value[prop_name]
+                properties[prop_name] = self.additional_properties.unmarshal(
+                    prop_value, custom_formatters=custom_formatters)
 
         for prop_name, prop in iteritems(all_props):
             try:
@@ -542,13 +543,14 @@ def _validate_properties(self, value, one_of_schema=None,
 
         value_props_names = value.keys()
         extra_props = set(value_props_names) - set(all_props_names)
-        if extra_props and self.additional_properties is None:
+        if extra_props and self.additional_properties is False:
             raise UndefinedSchemaProperty(extra_props)
 
-        for prop_name in extra_props:
-            prop_value = value[prop_name]
-            self.additional_properties.validate(
-                prop_value, custom_formatters=custom_formatters)
+        if self.additional_properties is not True:
+            for prop_name in extra_props:
+                prop_value = value[prop_name]
+                self.additional_properties.validate(
+                    prop_value, custom_formatters=custom_formatters)
 
         for prop_name, prop in iteritems(all_props):
             try:

tests/integration/data/v3.0/petstore.yaml

@@ -286,6 +286,7 @@ components:
           $ref: "#/components/schemas/Utctime"
         name:
           type: string
+      additionalProperties: false
     TagList:
       type: array
       items:

tests/unit/schema/test_schemas.py

@@ -7,6 +7,7 @@
 from openapi_core.extensions.models.models import Model
 from openapi_core.schema.schemas.exceptions import (
     InvalidSchemaValue, MultipleOneOfSchema, NoOneOfSchema, OpenAPISchemaError,
+    UndefinedSchemaProperty
 )
 from openapi_core.schema.schemas.models import Schema
 
@@ -777,6 +778,26 @@ def test_object_max_properties(self, value):
 
         assert result == value
 
+    @pytest.mark.parametrize('value', [Model({'additional': 1}), ])
+    def test_object_additional_propetries(self, value):
+        schema = Schema('object')
+
+        schema.validate(value)
+
+    @pytest.mark.parametrize('value', [Model({'additional': 1}), ])
+    def test_object_additional_propetries_false(self, value):
+        schema = Schema('object', additional_properties=False)
+
+        with pytest.raises(UndefinedSchemaProperty):
+            schema.validate(value)
+
+    @pytest.mark.parametrize('value', [Model({'additional': 1}), ])
+    def test_object_additional_propetries_object(self, value):
+        additional_properties = Schema('integer')
+        schema = Schema('object', additional_properties=additional_properties)
+
+        schema.validate(value)
+
     @pytest.mark.parametrize('value', [[], ])
     def test_list_min_items_invalid_schema(self, value):
         schema = Schema(