Merge branch 'master' of github.com:kevoreilly/CAPEv2

kevoreilly · Jan 27, 2025 · 0e8900b · 0e8900b
2 parents 35dedb0 + 6ab5264
commit 0e8900b
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 223 deletions.
diff --git a/analyzer/windows/dll/capemon.dll b/analyzer/windows/dll/capemon.dll
diff --git a/analyzer/windows/dll/capemon_x64.dll b/analyzer/windows/dll/capemon_x64.dll
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+### [27.01.2025]
+* Monitor update: Fix import reconstruction (advanced submission option)
+
 ### [23.01.2025]
 * Monitor update: Fix bug with dumping PE images with abnormally large PE header (e.g. 5ba3d13c57f6b08f34d8ec4f200091b458fdf48141c23ce959d9cda4804a7f5e) (thanks Kevin Ross)
 

diff --git a/requirements.txt b/requirements.txt
diff --git a/utils/process.py b/utils/process.py
@@ -286,18 +286,11 @@ def processing_finished(future):
             _ = future.result()
             log.info("Reports generation completed for Task #%d", task_id)
         except TimeoutError as error:
-            exc_clsname = error.__class__.__name__
-            exc_message = str(error) or "unknown error"
-            log.error("[%d] Processing Timeout %s. Function: %s - %s", task_id, exc_message, error.args[1], exc_clsname)
-            Database().set_status(task_id, TASK_FAILED_PROCESSING)
-        except pebble.ProcessExpired as error:
-            exc_clsname = error.__class__.__name__
-            exc_message = str(error) or "unknown error"
-            log.error("[%d] Exception when processing task: %s - %s", task_id, exc_message, exc_clsname, exc_info=True)
-            Database().set_status(task_id, TASK_FAILED_PROCESSING)
-        except Exception as error:
+            log.error("[%d] Processing timeout: %s. Function: %s", task_id, error, error.args[1])
+            db.set_status(task_id, TASK_FAILED_PROCESSING)
+        except (pebble.ProcessExpired, Exception) as error:
             log.error("[%d] Exception when processing task: %s", task_id, error, exc_info=True)
-            Database().set_status(task_id, TASK_FAILED_PROCESSING)
+            db.set_status(task_id, TASK_FAILED_PROCESSING)
 
     pending_future_map.pop(future)
     pending_task_id_map.pop(task_id)

diff --git a/web/analysis/views.py b/web/analysis/views.py
@@ -2515,7 +2515,9 @@ def on_demand(request, service: str, task_id: str, category: str, sha256):
         "xlsdeobf",
         "strings",
         "floss",
-    ) and not getattr(on_demand_config_mapper.get(service, {}), service).get("on_demand"):
+    ) and not getattr(
+        on_demand_config_mapper.get(service, {}), service
+    ).get("on_demand"):
         return render(request, "error.html", {"error": "Not supported/enabled service on demand"})
 
     # Self Extracted support folder