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

fix: [stix2 import] Fixed issue with self attribute used before declaration

pull/3725/head
chrisr3d 2018-09-12 10:13:16 +02:00
parent 54aabbb58a
commit 33411192ac
No known key found for this signature in database
GPG Key ID: 6BBED1B63A6D639F
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/files/scripts/stix2/stix2misp.py
View File

@ -70,7 +70,7 @@ class StixParser():
'value': self.stix_version})
self.misp_event.add_object(**original_file)
def handler(self):
def general_handler(self):
self.outputname = '{}.stix2'.format(self.filename)
self.buildMISPDict()
self.set_distribution()
@ -208,6 +208,9 @@ class StixFromMISPParser(StixParser):
self.object_from_refs.update(dict.fromkeys(list(galaxy_types.keys()), self.parse_galaxy))
self.object_from_refs.update(dict.fromkeys(['indicator', 'observed-data'], self.parse_usual_object))
def handler(self):
self.general_handler()
def parsing_process(self, object2parse, object_type):
labels = object2parse.get('labels')
self.object_from_refs[object_type](object2parse, labels)
@ -541,11 +544,14 @@ class StixFromMISPParser(StixParser):
class ExternalStixParser(StixParser):
def __init__(self):
super(ExternalStixParser, self).__init__()
self.version_attribute = {'type': 'text', 'object_relation': 'version', 'value': self.stix_version}
self.object_from_refs = {'course-of-action': self.parse_course_of_action, 'vulnerability': self.parse_external_vulnerability,
'indicator': self.parse_external_indicator, 'observed-data': self.parse_external_observable}
self.object_from_refs.update(dict.fromkeys(list(galaxy_types.keys()), self.parse_external_galaxy))
def handler(self):
self.version_attribute = {'type': 'text', 'object_relation': 'version', 'value': self.stix_version}
self.general_handler()
def parsing_process(self, object2parse, object_type):
self.object_from_refs[object_type](object2parse)