Merge branch 'release/3.2.9'

TheHive-Project · May 4, 2023 · 583b1f8 · 583b1f8
2 parents 62ec3e5 + 2e4ee92
commit 583b1f8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/analyzers/CIRCLHashlookup/requirements.txt b/analyzers/CIRCLHashlookup/requirements.txt
@@ -0,0 +1,2 @@
+requests
+cortexutils
diff --git a/analyzers/CIRCLHashlookup/requirments.txt b/analyzers/CIRCLHashlookup/requirments.txt
diff --git a/analyzers/Crowdsec/requirements.txt b/analyzers/Crowdsec/requirements.txt
@@ -0,0 +1 @@
+cortexutils
diff --git a/analyzers/EmlParser/parse.py b/analyzers/EmlParser/parse.py
@@ -254,7 +254,13 @@ def parseEml(filepath, job_directory, wkhtmltoimage, sanitized_rendering):
         for a in decoded_email.get("attachment"):
             a["mime"] = magic.from_buffer(binascii.a2b_base64(a.get("raw")))
             if isinstance(a.get("raw"), bytes):
-                filepath = os.path.join(job_directory, "output", a.get("filename", ""))
+                path, filename = os.path.split(a.get("filename", ""))
+                if path != "":
+                    os.umask(0)
+                    os.makedirs(
+                        f"{job_directory}/output/{path}", exist_ok=True, mode=0o777
+                    )
+                filepath = os.path.join(job_directory, "output", path, filename)
                 with open(filepath, "wb") as f:
                     f.write(base64.b64decode(a["raw"]))
                 f.close()

diff --git a/analyzers/MISP/mispclient.py b/analyzers/MISP/mispclient.py
@@ -173,6 +173,7 @@ def __clean_event(self, misp_event):
         """
 
         filters = ['Attribute',
+                   'Object',
                    'ShadowAttribute',
                    'Org',
                    'ShadowAttribute',