From d4538382d03bf59a6bdad76a24a9efb15b81cad2 Mon Sep 17 00:00:00 2001 From: chrisr3d Date: Tue, 13 Feb 2018 13:41:22 +0100 Subject: [PATCH] Simplified ObjectReference dictionary reading --- misp_modules/modules/export_mod/goaml.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/misp_modules/modules/export_mod/goaml.py b/misp_modules/modules/export_mod/goaml.py index 798cc00..fd5cde7 100644 --- a/misp_modules/modules/export_mod/goaml.py +++ b/misp_modules/modules/export_mod/goaml.py @@ -101,18 +101,19 @@ class GoAmlGeneration(object): pass def parse_references(self, object_type, next_object_type, uuid, relationship_type, xml_part): + reference = referencesMapping[next_object_type] try: - next_aml_type = referencesMapping[next_object_type][object_type].get('aml_type').format(relationship_type.split('_')[0]) + next_aml_type = reference[object_type].get('aml_type').format(relationship_type.split('_')[0]) try: - bracket = referencesMapping[next_object_type][object_type].get('bracket').format(relationship_type) + bracket = reference[object_type].get('bracket').format(relationship_type) self.xml[xml_part] += "<{}>".format(bracket) self.itterate(next_object_type, next_aml_type, uuid, xml_part) self.xml[xml_part] += "".format(bracket) except KeyError: self.itterate(next_object_type, next_aml_type, uuid, xml_part) except KeyError: - next_aml_type = referencesMapping[next_object_type].get('aml_type').format(relationship_type.split('_')[0]) - bracket = referencesMapping[next_object_type].get('bracket').format(relationship_type) + next_aml_type = reference.get('aml_type').format(relationship_type.split('_')[0]) + bracket = reference.get('bracket').format(relationship_type) self.xml[xml_part] += "<{}>".format(bracket) self.itterate(next_object_type, next_aml_type, uuid, xml_part) self.xml[xml_part] += "".format(bracket)