diff --git a/misp_modules/lib/joe_parser.py b/misp_modules/lib/joe_parser.py index ccbfb7c7..00aa868f 100644 --- a/misp_modules/lib/joe_parser.py +++ b/misp_modules/lib/joe_parser.py @@ -405,7 +405,7 @@ class JoeParser(): def finalize_results(self): if self.references: self.build_references() - event = json.loads(self.misp_event.to_json())['Event'] + event = json.loads(self.misp_event.to_json()) self.results = {key: event[key] for key in ('Attribute', 'Object', 'Tag') if (key in event and event[key])} @staticmethod diff --git a/misp_modules/modules/expansion/cve_advanced.py b/misp_modules/modules/expansion/cve_advanced.py index 3c7f6119..dab06dee 100644 --- a/misp_modules/modules/expansion/cve_advanced.py +++ b/misp_modules/modules/expansion/cve_advanced.py @@ -31,7 +31,7 @@ class VulnerabilityParser(): def get_result(self): if self.references: self.__build_references() - event = json.loads(self.misp_event.to_json())['Event'] + event = json.loads(self.misp_event.to_json()) results = {key: event[key] for key in ('Attribute', 'Object') if (key in event and event[key])} return {'results': results} diff --git a/misp_modules/modules/expansion/urlhaus.py b/misp_modules/modules/expansion/urlhaus.py index 64d75279..21a37185 100644 --- a/misp_modules/modules/expansion/urlhaus.py +++ b/misp_modules/modules/expansion/urlhaus.py @@ -31,7 +31,7 @@ class URLhaus(): return vt_object def get_result(self): - event = json.loads(self.misp_event.to_json())['Event'] + event = json.loads(self.misp_event.to_json()) results = {key: event[key] for key in ('Attribute', 'Object') if (key in event and event[key])} return {'results': results} diff --git a/misp_modules/modules/expansion/virustotal.py b/misp_modules/modules/expansion/virustotal.py index 9660b5f6..c6263fc6 100644 --- a/misp_modules/modules/expansion/virustotal.py +++ b/misp_modules/modules/expansion/virustotal.py @@ -35,7 +35,7 @@ class VirusTotalParser(object): return self.input_types_mapping[self.attribute.type](self.attribute.value, recurse=True) def get_result(self): - event = json.loads(self.misp_event.to_json())['Event'] + event = json.loads(self.misp_event.to_json()) results = {key: event[key] for key in ('Attribute', 'Object') if (key in event and event[key])} return {'results': results} diff --git a/misp_modules/modules/expansion/virustotal_public.py b/misp_modules/modules/expansion/virustotal_public.py index a614a8c5..70748261 100644 --- a/misp_modules/modules/expansion/virustotal_public.py +++ b/misp_modules/modules/expansion/virustotal_public.py @@ -23,7 +23,7 @@ class VirusTotalParser(): self.apikey = apikey def get_result(self): - event = json.loads(self.misp_event.to_json())['Event'] + event = json.loads(self.misp_event.to_json()) results = {key: event[key] for key in ('Attribute', 'Object') if (key in event and event[key])} return {'results': results} diff --git a/misp_modules/modules/import_mod/csvimport.py b/misp_modules/modules/import_mod/csvimport.py index 5d7408ca..adce34ad 100644 --- a/misp_modules/modules/import_mod/csvimport.py +++ b/misp_modules/modules/import_mod/csvimport.py @@ -194,7 +194,7 @@ class CsvParser(): return list2pop, misp, list(reversed(head)) def finalize_results(self): - event = json.loads(self.misp_event.to_json())['Event'] + event = json.loads(self.misp_event.to_json()) self.results = {key: event[key] for key in ('Attribute', 'Object') if (key in event and event[key])}