[pull] master from kevoreilly:master

analyzer/windows/modules/packages/archive.py

@@ -35,6 +35,7 @@ class Archive(Package):
     """Archive analysis package."""
 
     PATHS = [
+        ("SystemRoot", "system32", "msiexec.exe"),
         ("SystemRoot", "system32", "cmd.exe"),
         ("SystemRoot", "system32", "wscript.exe"),
         ("SystemRoot", "system32", "rundll32.exe"),

analyzer/windows/modules/packages/zip.py

@@ -35,6 +35,7 @@ class Zip(Package):
     """Zip analysis package."""
 
     PATHS = [
+        ("SystemRoot", "system32", "msiexec.exe"),
         ("SystemRoot", "system32", "cmd.exe"),
         ("SystemRoot", "system32", "wscript.exe"),
         ("SystemRoot", "system32", "rundll32.exe"),

lib/cuckoo/core/analysis_manager.py

@@ -422,11 +422,15 @@
             options["clock"] = self.db.update_clock(self.task.id)
             self.db.guest_set_status(self.task.id, "starting")
         guest_manager.start_analysis(options)
-        if guest_manager.get_status_from_db() == "starting":
-            guest_manager.set_status_in_db("running")
-            guest_manager.wait_for_completion()
-
-        guest_manager.set_status_in_db("stopping")
+
+        try:
+            if guest_manager.get_status_from_db() == "starting":
+                guest_manager.set_status_in_db("running")
+                guest_manager.wait_for_completion()
+            guest_manager.set_status_in_db("stopping")
+        except Exception as e:
+            guest_manager.set_status_in_db("failed")
+            self.log.exception(f"Unknown exception waiting for guest completion: {e}")
 
         return
 

utils/process.py

@@ -225,12 +225,9 @@ def doRollover(self):
         Override doRollover to force close the old handler before creating a new one.
         """
         if self.stream:
-            logging.debug("Flushing log stream...")
             self.stream.flush()
-            logging.debug("Closing log stream...")
             self.stream.close()
-            logging.debug("Log stream closed.")
-        logging.handlers.TimedRotatingFileHandler.doRollover(self)
+        super().doRollover()
 
 
 def init_logging(debug=False):