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

Convert most old-style properties to Property classes

stix2.1
Greg Back 2017-03-21 20:06:09 -04:00
parent 19146c8327
commit 9bcf064213
3 changed files with 70 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stix2/common.py
View File

@ -14,7 +14,7 @@ COMMON_PROPERTIES = {
'modified': {
'default': NOW,
},
'external_references': {},
'external_references': Property(),
'revoked': BooleanProperty(),
'created_by_ref': ReferenceProperty(),
}
@ -31,10 +31,6 @@ class ExternalReference(_STIXBase):
class KillChainPhase(_STIXBase):
_properties = {
'kill_chain_name': {
'required': True,
},
'phase_name': {
'required': True,
},
'kill_chain_name': Property(required=True),
'phase_name': Property(required=True),
}

160
stix2/sdo.py
View File

@ -2,7 +2,7 @@
from .base import _STIXBase
from .common import COMMON_PROPERTIES
from .properties import IDProperty, TypeProperty
from .properties import IDProperty, TypeProperty, Property
from .utils import NOW
@ -13,11 +13,9 @@ class AttackPattern(_STIXBase):
_properties.update({
'type': TypeProperty(_type),
'id': IDProperty(_type),
'name': {
'required': True,
},
'description': {},
'kill_chain_phases': {},
'name': Property(required=True),
'description': Property(),
'kill_chain_phases': Property(),
})
def __init__(self, **kwargs):
@ -40,14 +38,12 @@ class Campaign(_STIXBase):
_properties.update({
'type': TypeProperty(_type),
'id': IDProperty(_type),
'name': {
'required': True,
},
'description': {},
'aliases': {},
'first_seen': {},
'last_seen': {},
'objective': {},
'name': Property(required=True),
'description': Property(),
'aliases': Property(),
'first_seen': Property(),
'last_seen': Property(),
'objective': Property(),
})
def __init__(self, **kwargs):
@ -73,10 +69,8 @@ class CourseOfAction(_STIXBase):
_properties.update({
'type': TypeProperty(_type),
'id': IDProperty(_type),
'name': {
'required': True,
},
'description': {},
'name': Property(required=True),
'description': Property(),
})
def __init__(self, **kwargs):
@ -98,15 +92,11 @@ class Identity(_STIXBase):
_properties.update({
'type': TypeProperty(_type),
'id': IDProperty(_type),
'name': {
'required': True,
},
'description': {},
'identity_class': {
'required': True,
},
'sectors': {},
'contact_information': {},
'name': Property(required=True),
'description': Property(),
'identity_class': Property(required=True),
'sectors': Property(),
'contact_information': Property(),
})
def __init__(self, **kwargs):
@ -131,19 +121,15 @@ class Indicator(_STIXBase):
_properties.update({
'type': TypeProperty(_type),
'id': IDProperty(_type),
'labels': {
'required': True,
},
'name': {},
'description': {},
'pattern': {
'required': True,
},
'labels': Property(required=True),
'name': Property(),
'description': Property(),
'pattern': Property(required=True),
'valid_from': {
'default': NOW,
},
'valid_until': {},
'kill_chain_phases': {},
'valid_until': Property(),
'kill_chain_phases': Property(),
})
def __init__(self, **kwargs):
@ -168,17 +154,15 @@ class IntrusionSet(_STIXBase):
_properties.update({
'type': TypeProperty(_type),
'id': IDProperty(_type),
'name': {
'required': True,
},
'description': {},
'aliases': {},
'first_seen': {},
'last_seen ': {},
'goals': {},
'resource_level': {},
'primary_motivation': {},
'secondary_motivations': {},
'name': Property(required=True),
'description': Property(),
'aliases': Property(),
'first_seen': Property(),
'last_seen ': Property(),
'goals': Property(),
'resource_level': Property(),
'primary_motivation': Property(),
'secondary_motivations': Property(),
})
def __init__(self, **kwargs):
@ -207,14 +191,10 @@ class Malware(_STIXBase):
_properties.update({
'type': TypeProperty(_type),
'id': IDProperty(_type),
'labels': {
'required': True,
},
'name': {
'required': True,
},
'description': {},
'kill_chain_phases': {},
'labels': Property(required=True),
'name': Property(required=True),
'description': Property(),
'kill_chain_phases': Property(),
})
def __init__(self, **kwargs):
@ -237,10 +217,10 @@ class ObservedData(_STIXBase):
_properties.update({
'type': TypeProperty(_type),
'id': IDProperty(_type),
'first_observed': {},
'last_observed': {},
'number_observed': {},
'objects': {},
'first_observed': Property(),
'last_observed': Property(),
'number_observed': Property(),
'objects': Property(),
})
def __init__(self, **kwargs):
@ -265,15 +245,11 @@ class Report(_STIXBase):
_properties.update({
'type': TypeProperty(_type),
'id': IDProperty(_type),
'labels': {
'required': True,
},
'name': {
'required': True,
},
'description': {},
'published': {},
'object_refs': {},
'labels': Property(required=True),
'name': Property(required=True),
'description': Property(),
'published': Property(),
'object_refs': Property(),
})
def __init__(self, **kwargs):
@ -297,21 +273,17 @@ class ThreatActor(_STIXBase):
_properties.update({
'type': TypeProperty(_type),
'id': IDProperty(_type),
'labels': {
'required': True,
},
'name': {
'required': True,
},
'description': {},
'aliases': {},
'roles': {},
'goals': {},
'sophistication': {},
'resource_level': {},
'primary_motivation': {},
'secondary_motivations': {},
'personal_motivations': {},
'labels': Property(required=True),
'name': Property(required=True),
'description': Property(),
'aliases': Property(),
'roles': Property(),
'goals': Property(),
'sophistication': Property(),
'resource_level': Property(),
'primary_motivation': Property(),
'secondary_motivations': Property(),
'personal_motivations': Property(),
})
def __init__(self, **kwargs):
@ -341,15 +313,11 @@ class Tool(_STIXBase):
_properties.update({
'type': TypeProperty(_type),
'id': IDProperty(_type),
'labels': {
'required': True,
},
'name': {
'required': True,
},
'description': {},
'kill_chain_phases': {},
'tool_version': {},
'labels': Property(required=True),
'name': Property(required=True),
'description': Property(),
'kill_chain_phases': Property(),
'tool_version': Property(),
})
def __init__(self, **kwargs):
@ -373,10 +341,8 @@ class Vulnerability(_STIXBase):
_properties.update({
'type': TypeProperty(_type),
'id': IDProperty(_type),
'name': {
'required': True,
},
'description': {},
'name': Property(required=True),
'description': Property(),
})
def __init__(self, **kwargs):

14
stix2/sro.py
View File

@ -2,7 +2,7 @@
from .base import _STIXBase
from .common import COMMON_PROPERTIES
from .properties import IDProperty, TypeProperty
from .properties import IDProperty, TypeProperty, Property
class Relationship(_STIXBase):
@ -12,15 +12,9 @@ class Relationship(_STIXBase):
_properties.update({
'id': IDProperty(_type),
'type': TypeProperty(_type),
'relationship_type': {
'required': True,
},
'source_ref': {
'required': True,
},
'target_ref': {
'required': True,
},
'relationship_type': Property(required=True),
'source_ref': Property(required=True),
'target_ref': Property(required=True),
})
# Explicitly define the first three kwargs to make readable Relationship declarations.