From f4d3948f455b8eaccc40017b0d7b6d41275505e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leonard?= <jerome@thehive-project.org>
Date: Tue, 5 Jun 2018 21:44:24 +0200
Subject: [PATCH] #212 clean summary for submodules

---
 analyzers/FileInfo/fileinfo_analyzer.py             |  1 -
 analyzers/FileInfo/submodules/submodule_base.py     |  4 ++--
 analyzers/FileInfo/submodules/submodule_metadata.py |  3 ++-
 analyzers/FileInfo/submodules/submodule_oletools.py | 10 +++++-----
 analyzers/FileInfo/submodules/submodule_pdfid.py    |  5 +++--
 analyzers/FileInfo/submodules/submodule_pe.py       |  3 ++-
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/analyzers/FileInfo/fileinfo_analyzer.py b/analyzers/FileInfo/fileinfo_analyzer.py
index 92495decc..1a8662270 100755
--- a/analyzers/FileInfo/fileinfo_analyzer.py
+++ b/analyzers/FileInfo/fileinfo_analyzer.py
@@ -46,7 +46,6 @@ def run(self):
                     'summary': module_summaries
                 })
 
-
         self.report({'results': results})
 
 
diff --git a/analyzers/FileInfo/submodules/submodule_base.py b/analyzers/FileInfo/submodules/submodule_base.py
index 9b0865fe5..f0be86495 100644
--- a/analyzers/FileInfo/submodules/submodule_base.py
+++ b/analyzers/FileInfo/submodules/submodule_base.py
@@ -2,7 +2,7 @@ class SubmoduleBaseclass(object):
     def __init__(self):
         self.name = 'This is where the module name should go.'
         self.results = []
-        self.summary = []
+        self.summary = {'taxonomies': []}
 
     def get_name(self):
         """
@@ -64,7 +64,7 @@ def module_summary(self):
         :return:
         :rtype: dict
         """
-        pass
+        return self.summary
 
     def add_result_subsection(self, subsection_header, results):
         """
diff --git a/analyzers/FileInfo/submodules/submodule_metadata.py b/analyzers/FileInfo/submodules/submodule_metadata.py
index 524360ba7..bbd9c42f9 100644
--- a/analyzers/FileInfo/submodules/submodule_metadata.py
+++ b/analyzers/FileInfo/submodules/submodule_metadata.py
@@ -39,8 +39,9 @@ def module_summary(self):
                 taxonomies.append(t)
             else:
                 pass
-        return {'taxonomies': taxonomies}
 
+        self.summary['taxonomies'] = taxonomies
+        return self.summary
 
     def analyze_file(self, path):
         # Hash the file
diff --git a/analyzers/FileInfo/submodules/submodule_oletools.py b/analyzers/FileInfo/submodules/submodule_oletools.py
index 729ecf656..ad071effe 100644
--- a/analyzers/FileInfo/submodules/submodule_oletools.py
+++ b/analyzers/FileInfo/submodules/submodule_oletools.py
@@ -41,8 +41,6 @@ def analyze_file(self, path):
 
         return self.results
 
-
-
     def module_summary(self):
         taxonomies = []
         level = 'info'
@@ -76,9 +74,11 @@ def module_summary(self):
                     level = 'suspicious'
                     taxonomies.append(self.build_taxonomy(level, namespace, predicate, 'URL found'))
 
-        return {'taxonomies': taxonomies,
-                'Olevba': olevba_version,
-                'Msodde': msodde_version}
+        self.summary['taxonomies'] = taxonomies
+        self.summary['Olevba'] = olevba_version
+        self.summary['Msodde'] = msodde_version
+
+        return self.summary
 
     def analyze_vba(self, path):
         """Analyze a given sample for malicious vba."""
diff --git a/analyzers/FileInfo/submodules/submodule_pdfid.py b/analyzers/FileInfo/submodules/submodule_pdfid.py
index e2e817361..d97617a7b 100644
--- a/analyzers/FileInfo/submodules/submodule_pdfid.py
+++ b/analyzers/FileInfo/submodules/submodule_pdfid.py
@@ -36,8 +36,9 @@ def module_summary(self):
                                 level = 'suspicious'
                                 taxonomies.append(self.build_taxonomy(level, namespace, predicate, keyword['name']))
 
-        return {'taxonomies': taxonomies,
-                'pdfid': pdfid_version}
+        self.summary['taxonomies'] = taxonomies
+        self.summary['pdfid'] = pdfid_version
+        return self.summary
 
     def pdfid_cmd(self, path):
         try:
diff --git a/analyzers/FileInfo/submodules/submodule_pe.py b/analyzers/FileInfo/submodules/submodule_pe.py
index 3f03e763f..8fe9a2ecf 100644
--- a/analyzers/FileInfo/submodules/submodule_pe.py
+++ b/analyzers/FileInfo/submodules/submodule_pe.py
@@ -118,7 +118,8 @@ def pe_sections(pe):
 
 
     def module_summary(self):
-        return {'pefile': pefile_version}
+        self.summary['pefile'] = pefile_version
+        return self.summary
 
     def analyze_file(self, path):
         try: