MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

Check custom extension properties is not empty

stix2.1
Chris Lenk 2017-10-06 15:05:39 -04:00
parent 2b65f7205b
commit e57c36f525
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stix2/observables.py
View File

@ -916,7 +916,7 @@ def CustomExtension(observable=None, type='x-custom-observable', properties=None
'extensions': ExtensionsProperty(enclosing_type=_type), 'extensions': ExtensionsProperty(enclosing_type=_type),
} }
if not isinstance(properties, dict): if not isinstance(properties, dict) or not properties:
raise ValueError("'properties' must be a dict!") raise ValueError("'properties' must be a dict!")
_properties.update(properties) _properties.update(properties)

10
stix2/test/test_custom.py
View File

@ -366,7 +366,15 @@ def test_custom_extension_invalid_observable():
def test_custom_extension_no_properties(): def test_custom_extension_no_properties():
with pytest.raises(ValueError) as excinfo: with pytest.raises(ValueError) as excinfo:
@stix2.observables.CustomExtension(stix2.DomainName, 'x-new-ext', None) @stix2.observables.CustomExtension(stix2.DomainName, 'x-new-ext2', None)
class BarExtension():
pass
assert "'properties' must be a dict!" in str(excinfo.value)
def test_custom_extension_empty_properties():
with pytest.raises(ValueError) as excinfo:
@stix2.observables.CustomExtension(stix2.DomainName, 'x-new-ext2', {})
class BarExtension(): class BarExtension():
pass pass
assert "'properties' must be a dict!" in str(excinfo.value) assert "'properties' must be a dict!" in str(excinfo.value)