generate zipped json report

Author: doomedraven

conf/default/reporting.conf.default

@@ -49,6 +49,7 @@ drive_credentials_location = data/google_creds.json
 enabled = yes
 indent = 4
 encoding = latin-1
+store_compressed = no
 
 # Community
 [reporthtml]

modules/reporting/jsondump.py

@@ -4,6 +4,7 @@
 
 import os
 
+from lib.cuckoo.common.utils import create_zip
 from lib.cuckoo.common.abstracts import Report
 from lib.cuckoo.common.exceptions import CuckooReportError
 from lib.cuckoo.common.path_utils import path_write_file
@@ -17,7 +18,6 @@
 
     HAVE_ORJSON = False
 
-
 class JsonDump(Report):
     """Saves analysis results in JSON format."""
 
@@ -48,5 +48,13 @@ def run(self, results):
             else:
                 with open(path, "w") as report:
                     json.dump(results, report, sort_keys=False, indent=int(indent), ensure_ascii=False)
+
+            # useful if you frequently fetch zipped reports to not compress in memory all the time
+            if self.options.get("store_compressed") and os.path.exists(path):
+                zip_path = path + ".zip"
+                zipped_io = create_zip(path)
+                with open(zip_path, "wb") as f:
+                    f.write(zipped_io.getvalue())
+
         except (UnicodeError, TypeError, IOError) as e:
             raise CuckooReportError(f"Failed to generate JSON report: {e}")

web/apiv2/views.py

@@ -1256,14 +1256,22 @@ def tasks_report(request, task_id, report_format="json", make_zip=False):
             fname = "%s_report.%s" % (task_id, ext)
 
             if make_zip:
-                mem_zip = create_zip(files=report_path)
-                if mem_zip is False:
-                    resp = {"error": True, "error_value": "Can't create zip archive for report file"}
-                    return Response(resp)
-
-                resp = StreamingHttpResponse(mem_zip, content_type="application/zip")
-                resp["Content-Length"] = len(mem_zip.getvalue())
-                resp["Content-Disposition"] = f"attachment; filename={report_format}.zip"
+                if os.path.exists(report_path + ".zip"):
+                    report_path += ".zip"
+                    resp = StreamingHttpResponse(
+                        FileWrapper(open(report_path, "rb"), 8096), content_type="application/zip"
+                    )
+                    resp["Content-Length"] = os.path.getsize(report_path)
+                    resp["Content-Disposition"] = "attachment; filename=" + fname
+                else:
+                    mem_zip = create_zip(files=report_path)
+                    if mem_zip is False:
+                        resp = {"error": True, "error_value": "Can't create zip archive for report file"}
+                        return Response(resp)
+
+                    resp = StreamingHttpResponse(mem_zip, content_type="application/zip")
+                    resp["Content-Length"] = len(mem_zip.getvalue())
+                    resp["Content-Disposition"] = f"attachment; filename={report_format}.zip"
             else:
                 resp = StreamingHttpResponse(
                     FileWrapper(open(report_path, "rb"), 8096), content_type=content or "application/octet-stream;"