Validate more deeply required attribute

horejsek · Jun 15, 2024 · d2fbc8f · d2fbc8f
1 parent efc04da
commit d2fbc8f
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 6 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,9 @@
+=== 2.20.0 (2024-06-15)
+
+* Added validations at compile time:
+    * `required` must have unique items
+    * checking if schema is not allowing `required` items (item is required, but is not listed in properties)
+
 === 2.19.1 (2023-12-28)
 
 * Fixed date format to accept only two digit months and days

diff --git a/fastjsonschema/draft04.py b/fastjsonschema/draft04.py
@@ -460,6 +460,18 @@ def generate_required(self):
         with self.l('if {variable}_is_dict:'):
             if not isinstance(self._definition['required'], (list, tuple)):
                 raise JsonSchemaDefinitionException('required must be an array')
+            if len(self._definition['required']) != len(set(self._definition['required'])):
+                raise JsonSchemaDefinitionException('required must contain unique elements')
+            if not self._definition.get('additionalProperties', True):
+                not_possible = [
+                    prop
+                    for prop in self._definition['required']
+                    if
+                        prop not in self._definition.get('properties', {})
+                        and not any(re.search(regex, prop) for regex in self._definition.get('patternProperties', {}))
+                ]
+                if not_possible:
+                    raise JsonSchemaDefinitionException('{}: items {} are required but not allowed'.format(self._variable, not_possible))
             self.l('{variable}__missing_keys = set({required}) - {variable}.keys()')
             with self.l('if {variable}__missing_keys:'):
                 dynamic = 'str(sorted({variable}__missing_keys)) + " properties"'

diff --git a/fastjsonschema/version.py b/fastjsonschema/version.py
@@ -1 +1 @@
-VERSION = '2.19.1'
+VERSION = '2.20.0'
diff --git a/tests/test_object.py b/tests/test_object.py
@@ -74,13 +74,53 @@ def test_properties(asserter, value, expected):
     }, value, expected)
 
 
-def test_invalid_properties(asserter):
+@pytest.mark.parametrize('definition', (
+    {
+        'properties': {
+            'item': ['wrong'],
+        },
+    },
+    {
+        'properties': {
+            'x': {
+                'type': 'number',
+            },
+        },
+        'required': ['x', 'y'],
+        'additionalProperties': False,
+    },
+    {
+        'properties': {
+            'x': {
+                'type': 'number',
+            },
+        },
+        'required': ['x', 'x'],
+    }
+))
+def test_invalid_properties(asserter, definition):
     with pytest.raises(JsonSchemaDefinitionException):
-        fastjsonschema.compile({
-            'properties': {
-                'item': ['wrong'],
+        fastjsonschema.compile(definition)
+
+
+@pytest.mark.parametrize('definition', (
+    {
+        'properties': {
+            'x': {
+                'type': 'number',
+            },
+        },
+        'patternProperties': {
+            '^y': {
+                'type': 'number',
             },
-        })
+        },
+        'required': ['x', 'y'],
+        'additionalProperties': False,
+    },
+))
+def test_valid_properties(asserter, definition):
+    asserter(definition, {'x': 1, 'y': 2}, {'x': 1, 'y': 2})
 
 
 @pytest.mark.parametrize('value, expected', [