Fix #124: Checking "additionalProperties" in "oneOf" items.

Diogo Baeder de Paula Pinto · Diogo Baeder de Paula Pinto · commit b029066addc7 · 2019-03-26T02:30:07.000-03:00
This is important because it does the correct validation over items that
are restricted in "oneOf", so that it's possible to use schemas that are
superset of one another as items of "oneOf".
diff --git a/openapi_core/schema/schemas/models.py b/openapi_core/schema/schemas/models.py
@@ -311,7 +311,12 @@ 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 False:
+        no_more_properties_allowed = (
+                (self.additional_properties is False) or
+                (one_of_schema is not None and
+                 one_of_schema.additional_properties is False)
+        )
+        if extra_props and no_more_properties_allowed:
             raise UndefinedSchemaProperty(extra_props)
 
         properties = {}
@@ -543,7 +548,12 @@ 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 False:
+        no_more_properties_allowed = (
+                (self.additional_properties is False) or
+                (one_of_schema is not None and
+                 one_of_schema.additional_properties is False)
+        )
+        if extra_props and no_more_properties_allowed:
             raise UndefinedSchemaProperty(extra_props)
 
         if self.additional_properties is not True:
diff --git a/tests/unit/schema/test_schemas.py b/tests/unit/schema/test_schemas.py
@@ -711,6 +711,37 @@ def test_object_no_one_of(self, value):
         with pytest.raises(NoOneOfSchema):
             schema.validate(value)
 
+    @pytest.mark.parametrize('value', [
+        Model({
+            'foo': 'FOO',
+        }),
+        Model({
+            'foo': 'FOO',
+            'bar': 'BAR',
+        }),
+    ])
+    def test_unambiguous_one_of(self, value):
+        one_of = [
+            Schema(
+                'object',
+                properties={
+                    'bar': Schema('string'),
+                },
+                additional_properties=False,
+            ),
+            Schema(
+                'object',
+                properties={
+                    'foo': Schema('string'),
+                    'bar': Schema('string'),
+                },
+                additional_properties=False,
+            ),
+        ]
+        schema = Schema('object', one_of=one_of)
+
+        schema.validate(value)
+
     @pytest.mark.parametrize('value', [Model(), ])
     def test_object_default_property(self, value):
         schema = Schema('object', default='value1')
