openstack/barbican
Code Issues Proposed changes

Add Name restrictions in ContainerValidator

Browse Source 
Though user can add a secret to container without a human-friendly name,
we'd better to assure the name is valid when user specify.

Change-Id: Icc24429bb6982268b6a23f11c65313e5ea6b31c8
This commit is contained in:
ting.wang 2016-01-11 17:19:58 +08:00 committed by ting wang
parent 7adaba348f
commit 112036419d
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
barbican/common/validators.py
View File

@ -696,6 +696,9 @@ class ContainerValidator(ValidatorBase):
"type": "object", "type": "object",
"required": ["secret_ref"], "required": ["secret_ref"],
"properties": { "properties": {
"name": {
"type": ["string", "null"], "maxLength": 255
},
"secret_ref": {"type": "string", "minLength": 1} "secret_ref": {"type": "string", "minLength": 1}
} }
} }

21
barbican/tests/common/test_validators.py
View File

@ -628,6 +628,27 @@ class WhenTestingContainerValidator(utils.BaseTestCase):
self.assertEqual('name', exception.invalid_property) self.assertEqual('name', exception.invalid_property)
self.assertIn('name', exception.message) self.assertIn('name', exception.message)
def test_should_raise_nonstring_secret_name(self):
self.secret_refs[0]["name"] = 5
exception = self.assertRaises(
excep.InvalidObject,
self.validator.validate,
self.container_req,
)
self.assertEqual('secret_refs', exception.invalid_property)
def test_should_raise_secret_name_too_long(self):
self.secret_refs[0]['name'] = 'a' * 256
exception = self.assertRaises(
excep.InvalidObject,
self.validator.validate,
self.container_req,
)
self.assertEqual('secret_refs', exception.invalid_property)
def test_should_raise_numeric_name(self): def test_should_raise_numeric_name(self):
self.container_req['name'] = 123 self.container_req['name'] = 123