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

fix: [stix2 export] Catching errors that could happen with custom tags

pull/5216/head
chrisr3d 2019-09-24 14:18:07 +02:00
parent 25003e13ae
commit 97c298f898
No known key found for this signature in database
GPG Key ID: 6BBED1B63A6D639F
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/files/scripts/stix2/misp2stix2.py
View File

@ -96,8 +96,7 @@ class StixBuilder():
return {'source_name': source, 'url': url}
def add_all_markings(self):
for marking_args in self.markings.values():
marking = MarkingDefinition(**marking_args)
for marking in self.markings.values():
self.append_object(marking)
def add_all_relationships(self):
@ -713,16 +712,18 @@ class StixBuilder():
'from_object']
def create_marking(self, tag):
try:
if tag in tlp_markings:
marking_definition = globals()[tlp_markings[tag]]
id = marking_definition.id
except KeyError:
id = 'marking-definition--%s' % uuid.uuid4()
definition_type, definition = tag.split(':')
marking_definition = {'type': 'marking-definition', 'id': id, 'definition_type': definition_type,
'definition': {definition_type: definition}}
self.markings[tag] = marking_definition
return id
return marking_definition.id
marking_id = 'marking-definition--%s' % uuid.uuid4()
definition_type, definition = tag.split(':')
marking_definition = {'type': 'marking-definition', 'id': marking_id, 'definition_type': definition_type,
'definition': {definition_type: definition}}
try:
self.markings[tag] = MarkingDefinition(**marking_definition)
except exceptions.TLPMarkingDefinitionError:
return
return marking_id
@staticmethod
def _parse_tag(namespace, predicate):
@ -778,7 +779,12 @@ class StixBuilder():
return name, description, references
def handle_tags(self, tags):
return [self.markings[tag]['id'] if tag in self.markings else self.create_marking(tag) for tag in tags]
marking_ids = []
for tag in tags:
marking_id = self.markings[tag]['id'] if tag in self.markings else self.create_marking(tag)
if marking_id:
marking_ids.append(marking_id)
return marking_ids
def resolve_asn_observable(self, attributes, object_id):
asn = objectsMapping['asn']['observable']