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

fix: [interoperability] Added missing `interoperability` param to Property classes that need it

pull/1/head
Christian Studer 2022-05-23 14:48:11 +02:00
parent 276410537d
commit 625576622f
No known key found for this signature in database
GPG Key ID: 6BBED1B63A6D639F
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stix2/base.py
View File

@ -120,9 +120,11 @@ class _STIXBase(collections.abc.Mapping):
self.__now = get_timestamp() self.__now = get_timestamp()
self.__INTEROPERABILITY_types = ( self.__INTEROPERABILITY_types = (
stix2.properties.EmbeddedObjectProperty, stix2.properties.IDProperty, stix2.properties.EmbeddedObjectProperty, stix2.properties.EnumProperty,
stix2.properties.ExtensionsProperty, stix2.properties.DictionaryProperty,
stix2.properties.HashesProperty, stix2.properties.IDProperty,
stix2.properties.ListProperty, stix2.properties.OpenVocabProperty, stix2.properties.ListProperty, stix2.properties.OpenVocabProperty,
stix2.properties.ReferenceProperty stix2.properties.ReferenceProperty, stix2.properties.SelectorProperty,
) )
custom_props = kwargs.pop('custom_properties', {}) custom_props = kwargs.pop('custom_properties', {})
@ -208,7 +210,7 @@ class _STIXBase(collections.abc.Mapping):
prop = defined_properties.get(prop_name) prop = defined_properties.get(prop_name)
if prop: if prop:
temp_custom = self._check_property( temp_custom = self._check_property(
prop_name, prop, setting_kwargs, allow_custom, interoperability prop_name, prop, setting_kwargs, allow_custom, interoperability,
) )
has_custom = has_custom or temp_custom has_custom = has_custom or temp_custom

34
stix2/properties.py
View File

@ -22,7 +22,7 @@ from .utils import (
from .version import DEFAULT_VERSION from .version import DEFAULT_VERSION
ID_REGEX_interoperability = re.compile( ID_REGEX_interoperability = re.compile(
r"[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$" r"[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$",
) )
TYPE_REGEX = re.compile(r'^-?[a-z0-9]+(-[a-z0-9]+)*-?$') TYPE_REGEX = re.compile(r'^-?[a-z0-9]+(-[a-z0-9]+)*-?$')
TYPE_21_REGEX = re.compile(r'^([a-z][a-z0-9]*)+([a-z0-9-]+)*-?$') TYPE_21_REGEX = re.compile(r'^([a-z][a-z0-9]*)+([a-z0-9-]+)*-?$')
@ -54,7 +54,7 @@ def _check_uuid(uuid_str, spec_version, interoperability):
return ok return ok
def _validate_id(id_, spec_version, required_prefix, interoperability): def _validate_id(id_, spec_version, required_prefix, interoperability=False):
""" """
Check the STIX identifier for correctness, raise an exception if there are Check the STIX identifier for correctness, raise an exception if there are
errors. errors.
@ -176,7 +176,7 @@ class Property(object):
""" """
def _default_clean(self, value, allow_custom=False): def _default_clean(self, value, allow_custom=False, interoperability=False):
if value != self._fixed_value: if value != self._fixed_value:
raise ValueError("must equal '{}'.".format(self._fixed_value)) raise ValueError("must equal '{}'.".format(self._fixed_value))
return value, False return value, False
@ -230,7 +230,7 @@ class ListProperty(Property):
super(ListProperty, self).__init__(**kwargs) super(ListProperty, self).__init__(**kwargs)
def clean(self, value, allow_custom, interoperability): def clean(self, value, allow_custom, interoperability=False):
try: try:
iter(value) iter(value)
except TypeError: except TypeError:
@ -317,7 +317,7 @@ class IntegerProperty(Property):
self.max = max self.max = max
super(IntegerProperty, self).__init__(**kwargs) super(IntegerProperty, self).__init__(**kwargs)
def clean(self, value, allow_custom=False): def clean(self, value, allow_custom=False, interoperability=False):
try: try:
value = int(value) value = int(value)
except Exception: except Exception:
@ -397,7 +397,7 @@ class DictionaryProperty(Property):
self.spec_version = spec_version self.spec_version = spec_version
super(DictionaryProperty, self).__init__(**kwargs) super(DictionaryProperty, self).__init__(**kwargs)
def clean(self, value, allow_custom=False): def clean(self, value, allow_custom=False, interoperability=False):
try: try:
dictified = _get_dict(value) dictified = _get_dict(value)
except ValueError: except ValueError:
@ -440,7 +440,7 @@ class HashesProperty(DictionaryProperty):
if alg: if alg:
self.__alg_to_spec_name[alg] = spec_hash_name self.__alg_to_spec_name[alg] = spec_hash_name
def clean(self, value, allow_custom): def clean(self, value, allow_custom, interoperability=False):
# ignore the has_custom return value here; there is no customization # ignore the has_custom return value here; there is no customization
# of DictionaryProperties. # of DictionaryProperties.
clean_dict, _ = super().clean(value, allow_custom) clean_dict, _ = super().clean(value, allow_custom)
@ -547,7 +547,7 @@ class ReferenceProperty(Property):
super(ReferenceProperty, self).__init__(**kwargs) super(ReferenceProperty, self).__init__(**kwargs)
def clean(self, value, allow_custom, interoperability): def clean(self, value, allow_custom, interoperability=False):
if isinstance(value, _STIXBase): if isinstance(value, _STIXBase):
value = value.id value = value.id
value = str(value) value = str(value)
@ -625,7 +625,7 @@ SELECTOR_REGEX = re.compile(r"^([a-z0-9_-]{3,250}(\.(\[\d+\]|[a-z0-9_-]{1,250}))
class SelectorProperty(Property): class SelectorProperty(Property):
def clean(self, value, allow_custom=False): def clean(self, value, allow_custom=False, interoperability=False):
if not SELECTOR_REGEX.match(value): if not SELECTOR_REGEX.match(value):
raise ValueError("must adhere to selector syntax.") raise ValueError("must adhere to selector syntax.")
return value, False return value, False
@ -646,7 +646,7 @@ class EmbeddedObjectProperty(Property):
self.type = type self.type = type
super(EmbeddedObjectProperty, self).__init__(**kwargs) super(EmbeddedObjectProperty, self).__init__(**kwargs)
def clean(self, value, allow_custom, interoperability): def clean(self, value, allow_custom, interoperability=False):
if isinstance(value, dict): if isinstance(value, dict):
value = self.type(allow_custom=allow_custom, **value) value = self.type(allow_custom=allow_custom, **value)
elif not isinstance(value, self.type): elif not isinstance(value, self.type):
@ -674,8 +674,8 @@ class EnumProperty(StringProperty):
self.allowed = allowed self.allowed = allowed
super(EnumProperty, self).__init__(**kwargs) super(EnumProperty, self).__init__(**kwargs)
def clean(self, value, allow_custom): def clean(self, value, allow_custom, interoperability=False):
cleaned_value, _ = super(EnumProperty, self).clean(value, allow_custom) cleaned_value, _ = super(EnumProperty, self).clean(value, allow_custom, interoperability)
if cleaned_value not in self.allowed: if cleaned_value not in self.allowed:
raise ValueError("value '{}' is not valid for this enumeration.".format(cleaned_value)) raise ValueError("value '{}' is not valid for this enumeration.".format(cleaned_value))
@ -695,9 +695,9 @@ class OpenVocabProperty(StringProperty):
allowed = [allowed] allowed = [allowed]
self.allowed = allowed self.allowed = allowed
def clean(self, value, allow_custom, interoperability): def clean(self, value, allow_custom, interoperability=False):
cleaned_value, _ = super(OpenVocabProperty, self).clean( cleaned_value, _ = super(OpenVocabProperty, self).clean(
value, allow_custom, interoperability value, allow_custom, interoperability,
) )
# Disabled: it was decided that enforcing this is too strict (might # Disabled: it was decided that enforcing this is too strict (might
@ -776,7 +776,7 @@ class ExtensionsProperty(DictionaryProperty):
def __init__(self, spec_version=DEFAULT_VERSION, required=False): def __init__(self, spec_version=DEFAULT_VERSION, required=False):
super(ExtensionsProperty, self).__init__(spec_version=spec_version, required=required) super(ExtensionsProperty, self).__init__(spec_version=spec_version, required=required)
def clean(self, value, allow_custom): def clean(self, value, allow_custom, interoperability=False):
try: try:
dictified = _get_dict(value) dictified = _get_dict(value)
# get deep copy since we are going modify the dict and might # get deep copy since we are going modify the dict and might
@ -791,7 +791,7 @@ class ExtensionsProperty(DictionaryProperty):
cls = class_for_type(key, self.spec_version, "extensions") cls = class_for_type(key, self.spec_version, "extensions")
if cls: if cls:
if isinstance(subvalue, dict): if isinstance(subvalue, dict):
ext = cls(allow_custom=allow_custom, **subvalue) ext = cls(allow_custom=allow_custom, interoperability=interoperability, **subvalue)
elif isinstance(subvalue, cls): elif isinstance(subvalue, cls):
# If already an instance of the registered class, assume # If already an instance of the registered class, assume
# it's valid # it's valid
@ -842,7 +842,7 @@ class STIXObjectProperty(Property):
self.spec_version = spec_version self.spec_version = spec_version
super(STIXObjectProperty, self).__init__(*args, **kwargs) super(STIXObjectProperty, self).__init__(*args, **kwargs)
def clean(self, value, allow_custom, interoperability): def clean(self, value, allow_custom, interoperability=False):
# Any STIX Object (SDO, SRO, or Marking Definition) can be added to # Any STIX Object (SDO, SRO, or Marking Definition) can be added to
# a bundle with no further checks. # a bundle with no further checks.
stix2_classes = {'_DomainObject', '_RelationshipObject', 'MarkingDefinition'} stix2_classes = {'_DomainObject', '_RelationshipObject', 'MarkingDefinition'}