archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Schema change for IP range, use validator instead of type

Browse Source 
Custom types became rather useless in Cerberus 1.0 since the type checker
is cripled (doesn't know field name, cannot return useful/detailed error
messages). Instead we use a validator now.
This commit is contained in:
Sybren A. Stüvel
2018-07-13 15:03:35 +02:00
parent a699138fd6
commit 8dc3296bd5
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pillar/api/custom_field_validation.py
View File

@@ -143,7 +143,7 @@ class ValidateCustomFields(Validator):
if not value: if not value:
self._error(field, "Value is required once the document was created") self._error(field, "Value is required once the document was created")
def _validate_type_iprange(self, field_name: str, value: str): def _validator_iprange(self, field_name: str, value: str):
"""Ensure the field contains a valid IP address. """Ensure the field contains a valid IP address.
Supports both IPv6 and IPv4 ranges. Requires the IPy module. Supports both IPv6 and IPv4 ranges. Requires the IPy module.

2
pillar/api/eve_settings.py
View File

@@ -227,7 +227,7 @@ organizations_schema = {
'start': {'type': 'binary', 'required': True}, 'start': {'type': 'binary', 'required': True},
'end': {'type': 'binary', 'required': True}, 'end': {'type': 'binary', 'required': True},
'prefix': {'type': 'integer', 'required': True}, 'prefix': {'type': 'integer', 'required': True},
'human': {'type': 'iprange', 'required': True}, 'human': {'type': 'string', 'required': True, 'validator': 'iprange'},
} }
}, },
}, },

10
tests/test_api/test_cerberus.py
View File

@@ -173,7 +173,7 @@ class NodeValidationTest(ValidationTest):
class IPRangeValidatorTest(ValidationTest): class IPRangeValidatorTest(ValidationTest):
schema = {'iprange': {'type': 'iprange', 'required': True}} schema = {'iprange': {'type': 'string', 'required': True, 'validator': 'iprange'}}
def assertValid(self, document, schema=None): def assertValid(self, document, schema=None):
return super().assertValid(document, schema or self.schema) return super().assertValid(document, schema or self.schema)
@@ -199,3 +199,11 @@ class IPRangeValidatorTest(ValidationTest):
self.assertValid({'iprange': '127.0.0.0/8'}) self.assertValid({'iprange': '127.0.0.0/8'})
self.assertInvalid({'iprange': '127.0.0.0/0'}) self.assertInvalid({'iprange': '127.0.0.0/0'})
self.assertInvalid({'iprange': 'garbled'}) self.assertInvalid({'iprange': 'garbled'})
def test_descriptive_error_message(self):
is_valid = self.validator.validate({'iprange': '::/0'}, self.schema)
self.assertFalse(is_valid)
self.assertEquals(1, len(self.validator._errors))
err = self.validator._errors[0]
self.assertEquals(('iprange', ), err.document_path)
self.assertEquals(('Zero-length prefix is not allowed',), err.info)