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

Merge pull request #204 from oasis-open/refactor-properties 

Refactor Properties
stix2.0
Greg Back 2018-07-05 17:16:25 -05:00 committed by GitHub
parent 23925017a7 12a22c0939
commit 68aac583c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
stix2/properties.py
View File

@ -80,9 +80,8 @@ class Property(object):
raise ValueError("must equal '{0}'.".format(self._fixed_value)) raise ValueError("must equal '{0}'.".format(self._fixed_value))
return value return value
def __init__(self, required=False, fixed=None, default=None, type=None): def __init__(self, required=False, fixed=None, default=None):
self.required = required self.required = required
self.type = type
if fixed: if fixed:
self._fixed_value = fixed self._fixed_value = fixed
self.clean = self._default_clean self.clean = self._default_clean
@ -204,6 +203,7 @@ class IntegerProperty(Property):
class FloatProperty(Property): class FloatProperty(Property):
def clean(self, value): def clean(self, value):
try: try:
return float(value) return float(value)
@ -320,12 +320,12 @@ class HexProperty(Property):
class ReferenceProperty(Property): class ReferenceProperty(Property):
def __init__(self, required=False, type=None): def __init__(self, type=None, **kwargs):
""" """
references sometimes must be to a specific object type references sometimes must be to a specific object type
""" """
self.type = type self.type = type
super(ReferenceProperty, self).__init__(required, type=type) super(ReferenceProperty, self).__init__(**kwargs)
def clean(self, value): def clean(self, value):
if isinstance(value, _STIXBase): if isinstance(value, _STIXBase):
@ -344,10 +344,6 @@ SELECTOR_REGEX = re.compile("^[a-z0-9_-]{3,250}(\\.(\\[\\d+\\]|[a-z0-9_-]{1,250}
class SelectorProperty(Property): class SelectorProperty(Property):
def __init__(self, type=None):
# ignore type
super(SelectorProperty, self).__init__()
def clean(self, value): def clean(self, value):
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.")
@ -365,9 +361,9 @@ class ObjectReferenceProperty(StringProperty):
class EmbeddedObjectProperty(Property): class EmbeddedObjectProperty(Property):
def __init__(self, type, required=False): def __init__(self, type, **kwargs):
self.type = type self.type = type
super(EmbeddedObjectProperty, self).__init__(required, type=type) super(EmbeddedObjectProperty, self).__init__(**kwargs)
def clean(self, value): def clean(self, value):
if type(value) is dict: if type(value) is dict:
@ -394,9 +390,6 @@ class EnumProperty(StringProperty):
class PatternProperty(StringProperty): class PatternProperty(StringProperty):
def __init__(self, **kwargs):
super(PatternProperty, self).__init__(**kwargs)
def clean(self, value): def clean(self, value):
str_value = super(PatternProperty, self).clean(value) str_value = super(PatternProperty, self).clean(value)
errors = run_validator(str_value) errors = run_validator(str_value)