Add custom properties via 'allow_custom'
Custom properties can be specified by passing them to a STIX object constructor in the 'custom_properties' argument, or with the 'allow_custom' argument set to True, which will add any unrecognized keyword arguments as properties on the object. The 'allow_custom' argument can also be used with the parse() and parse_observable() functions. An error is now raised when attempting to parse objects without a 'type' property, such as external references, kill chain phases, and granular markings. The object which contains them is what should be parsed, not these objects themselves.stix2.1
parent
9036c7f7b8
commit
8f1ae4e6d3
|
@ -95,46 +95,58 @@ EXT_MAP = {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
def parse(data):
|
def parse(data, allow_custom=False):
|
||||||
"""Deserialize a string or file-like object into a STIX object"""
|
"""Deserialize a string or file-like object into a STIX object.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
data: The STIX 2 string to be parsed.
|
||||||
|
allow_custom (bool): Whether to allow custom properties or not. Default: False.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
An instantiated Python STIX object.
|
||||||
|
"""
|
||||||
|
|
||||||
obj = get_dict(data)
|
obj = get_dict(data)
|
||||||
|
|
||||||
if 'type' not in obj:
|
if 'type' not in obj:
|
||||||
# TODO parse external references, kill chain phases, and granular markings
|
raise exceptions.ParseError("Can't parse object with no 'type' property: %s" % str(obj))
|
||||||
pass
|
|
||||||
else:
|
|
||||||
try:
|
|
||||||
obj_class = OBJ_MAP[obj['type']]
|
|
||||||
except KeyError:
|
|
||||||
# TODO handle custom objects
|
|
||||||
raise ValueError("Can't parse unknown object type '%s'!" % obj['type'])
|
|
||||||
return obj_class(**obj)
|
|
||||||
|
|
||||||
return obj
|
try:
|
||||||
|
obj_class = OBJ_MAP[obj['type']]
|
||||||
|
except KeyError:
|
||||||
|
# TODO handle custom objects
|
||||||
|
raise exceptions.ParseError("Can't parse unknown object type '%s'!" % obj['type'])
|
||||||
|
return obj_class(allow_custom=allow_custom, **obj)
|
||||||
|
|
||||||
|
|
||||||
def parse_observable(data, _valid_refs):
|
def parse_observable(data, _valid_refs, allow_custom=False):
|
||||||
"""Deserialize a string or file-like object into a STIX Cyber Observable
|
"""Deserialize a string or file-like object into a STIX Cyber Observable object.
|
||||||
object.
|
|
||||||
|
Args:
|
||||||
|
data: The STIX 2 string to be parsed.
|
||||||
|
_valid_refs: A list of object references valid for the scope of the object being parsed.
|
||||||
|
allow_custom: Whether to allow custom properties or not. Default: False.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
An instantiated Python STIX Cyber Observable object.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
obj = get_dict(data)
|
obj = get_dict(data)
|
||||||
obj['_valid_refs'] = _valid_refs
|
obj['_valid_refs'] = _valid_refs
|
||||||
|
|
||||||
if 'type' not in obj:
|
if 'type' not in obj:
|
||||||
raise ValueError("'type' is a required property!")
|
raise exceptions.ParseError("Can't parse object with no 'type' property: %s" % str(obj))
|
||||||
try:
|
try:
|
||||||
obj_class = OBJ_MAP_OBSERVABLE[obj['type']]
|
obj_class = OBJ_MAP_OBSERVABLE[obj['type']]
|
||||||
except KeyError:
|
except KeyError:
|
||||||
# TODO handle custom observable objects
|
# TODO handle custom observable objects
|
||||||
raise ValueError("Can't parse unknown object type '%s'!" % obj['type'])
|
raise exceptions.ParseError("Can't parse unknown object type '%s'!" % obj['type'])
|
||||||
|
|
||||||
if 'extensions' in obj and obj['type'] in EXT_MAP:
|
if 'extensions' in obj and obj['type'] in EXT_MAP:
|
||||||
for name, ext in obj['extensions'].items():
|
for name, ext in obj['extensions'].items():
|
||||||
if name not in EXT_MAP[obj['type']]:
|
if name not in EXT_MAP[obj['type']]:
|
||||||
raise ValueError("Can't parse Unknown extension type '%s' for object type '%s'!" % (name, obj['type']))
|
raise exceptions.ParseError("Can't parse Unknown extension type '%s' for object type '%s'!" % (name, obj['type']))
|
||||||
ext_class = EXT_MAP[obj['type']][name]
|
ext_class = EXT_MAP[obj['type']][name]
|
||||||
obj['extensions'][name] = ext_class(**obj['extensions'][name])
|
obj['extensions'][name] = ext_class(allow_custom=allow_custom, **obj['extensions'][name])
|
||||||
|
|
||||||
return obj_class(**obj)
|
return obj_class(allow_custom=allow_custom, **obj)
|
||||||
|
|
|
@ -83,7 +83,7 @@ class _STIXBase(collections.Mapping):
|
||||||
# TODO: check selectors
|
# TODO: check selectors
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def __init__(self, **kwargs):
|
def __init__(self, allow_custom=False, **kwargs):
|
||||||
cls = self.__class__
|
cls = self.__class__
|
||||||
|
|
||||||
# Use the same timestamp for any auto-generated datetimes
|
# Use the same timestamp for any auto-generated datetimes
|
||||||
|
@ -93,9 +93,10 @@ class _STIXBase(collections.Mapping):
|
||||||
custom_props = kwargs.pop('custom_properties', {})
|
custom_props = kwargs.pop('custom_properties', {})
|
||||||
if custom_props and not isinstance(custom_props, dict):
|
if custom_props and not isinstance(custom_props, dict):
|
||||||
raise ValueError("'custom_properties' must be a dictionary")
|
raise ValueError("'custom_properties' must be a dictionary")
|
||||||
extra_kwargs = list(set(kwargs) - set(cls._properties))
|
if not allow_custom:
|
||||||
if extra_kwargs:
|
extra_kwargs = list(set(kwargs) - set(cls._properties))
|
||||||
raise ExtraPropertiesError(cls, extra_kwargs)
|
if extra_kwargs:
|
||||||
|
raise ExtraPropertiesError(cls, extra_kwargs)
|
||||||
|
|
||||||
# Remove any keyword arguments whose value is None
|
# Remove any keyword arguments whose value is None
|
||||||
setting_kwargs = {}
|
setting_kwargs = {}
|
||||||
|
|
|
@ -150,3 +150,10 @@ class RevokeError(STIXError, ValueError):
|
||||||
return "Cannot revoke an already revoked object."
|
return "Cannot revoke an already revoked object."
|
||||||
else:
|
else:
|
||||||
return "Cannot create a new version of a revoked object."
|
return "Cannot create a new version of a revoked object."
|
||||||
|
|
||||||
|
|
||||||
|
class ParseError(STIXError, ValueError):
|
||||||
|
"""Could not parse object"""
|
||||||
|
|
||||||
|
def __init__(self, msg):
|
||||||
|
super(ParseError, self).__init__(msg)
|
||||||
|
|
|
@ -52,6 +52,16 @@ def test_parse_identity(data):
|
||||||
|
|
||||||
|
|
||||||
def test_identity_custom_property():
|
def test_identity_custom_property():
|
||||||
|
with pytest.raises(ValueError):
|
||||||
|
stix2.Identity(
|
||||||
|
id="identity--311b2d2d-f010-5473-83ec-1edf84858f4c",
|
||||||
|
created="2015-12-21T19:59:11Z",
|
||||||
|
modified="2015-12-21T19:59:11Z",
|
||||||
|
name="John Smith",
|
||||||
|
identity_class="individual",
|
||||||
|
custom_properties="foobar",
|
||||||
|
)
|
||||||
|
|
||||||
identity = stix2.Identity(
|
identity = stix2.Identity(
|
||||||
id="identity--311b2d2d-f010-5473-83ec-1edf84858f4c",
|
id="identity--311b2d2d-f010-5473-83ec-1edf84858f4c",
|
||||||
created="2015-12-21T19:59:11Z",
|
created="2015-12-21T19:59:11Z",
|
||||||
|
@ -77,4 +87,48 @@ def test_identity_custom_property_invalid():
|
||||||
x_foo="bar",
|
x_foo="bar",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_identity_custom_property_allowed():
|
||||||
|
identity = stix2.Identity(
|
||||||
|
id="identity--311b2d2d-f010-5473-83ec-1edf84858f4c",
|
||||||
|
created="2015-12-21T19:59:11Z",
|
||||||
|
modified="2015-12-21T19:59:11Z",
|
||||||
|
name="John Smith",
|
||||||
|
identity_class="individual",
|
||||||
|
x_foo="bar",
|
||||||
|
allow_custom=True,
|
||||||
|
)
|
||||||
|
assert identity.x_foo == "bar"
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize("data", [
|
||||||
|
"""{
|
||||||
|
"type": "identity",
|
||||||
|
"id": "identity--311b2d2d-f010-5473-83ec-1edf84858f4c",
|
||||||
|
"created": "2015-12-21T19:59:11Z",
|
||||||
|
"modified": "2015-12-21T19:59:11Z",
|
||||||
|
"name": "John Smith",
|
||||||
|
"identity_class": "individual",
|
||||||
|
"foo": "bar"
|
||||||
|
}""",
|
||||||
|
])
|
||||||
|
def test_parse_identity_custom_property(data):
|
||||||
|
with pytest.raises(stix2.exceptions.ExtraPropertiesError):
|
||||||
|
identity = stix2.parse(data)
|
||||||
|
|
||||||
|
identity = stix2.parse(data, allow_custom=True)
|
||||||
|
assert identity.foo == "bar"
|
||||||
|
|
||||||
|
|
||||||
|
def test_parse_no_type():
|
||||||
|
with pytest.raises(stix2.exceptions.ParseError):
|
||||||
|
stix2.parse("""
|
||||||
|
{
|
||||||
|
"id": "identity--311b2d2d-f010-5473-83ec-1edf84858f4c",
|
||||||
|
"created": "2015-12-21T19:59:11Z",
|
||||||
|
"modified": "2015-12-21T19:59:11Z",
|
||||||
|
"name": "John Smith",
|
||||||
|
"identity_class": "individual"
|
||||||
|
}""")
|
||||||
|
|
||||||
# TODO: Add other examples
|
# TODO: Add other examples
|
||||||
|
|
Loading…
Reference in New Issue