Implementation working

conf/default/cuckoo.conf.default

@@ -33,6 +33,11 @@ scaling_semaphore = off
 # A configurable wait time between updating the limit value of the scaling bounded semaphore
 scaling_semaphore_update_timer = 10
 
+# Specify a timeout for tasks, useful if you are bound to timely reports awaited by users
+task_timeout = off
+task_pending_timeout = 0 
+task_timeout_scan_interval = 30
+
 # Enable creation of memory dump of the analysis machine before shutting
 # down. Even if turned off, this functionality can also be enabled at
 # submission. Currently available for: VirtualBox and libvirt modules (KVM).

lib/cuckoo/core/database.py

@@ -169,8 +169,8 @@
 tasks_tags = Table(
     "tasks_tags",
     Base.metadata,
-    Column("task_id", Integer, ForeignKey("tasks.id")),
-    Column("tag_id", Integer, ForeignKey("tags.id")),
+    Column("task_id", Integer, ForeignKey("tasks.id", ondelete='cascade')),
+    Column("tag_id", Integer, ForeignKey("tags.id", ondelete='cascade')),
 )
 
 
@@ -268,7 +268,7 @@ class Guest(Base):
     manager = Column(String(255), nullable=False)
     started_on = Column(DateTime(timezone=False), default=datetime.now, nullable=False)
     shutdown_on = Column(DateTime(timezone=False), nullable=True)
-    task_id = Column(Integer, ForeignKey("tasks.id"), nullable=False, unique=True)
+    task_id = Column(Integer, ForeignKey("tasks.id", ondelete='cascade'), nullable=False, unique=True)
 
     def __repr__(self):
         return f"<Guest({self.id}, '{self.name}')>"
@@ -2083,12 +2083,15 @@ def check_tasks_timeout(self, timeout):
         """
         tasks: List[Task] = []
         ids_to_delete = []
-        search = self.session.query(Task).order_by(Task.added_on.des())
+        if timeout == 0:
+            return
+        search = self.session.query(Task).filter(Task.status == TASK_PENDING).order_by(Task.added_on.desc())
         tasks = search.all()
         for task in tasks:
             if task.added_on + timedelta(seconds = timeout) < datetime.now():
                 ids_to_delete.append(task.id)
-        self.delete_tasks(ids_to_delete)
+        if len(ids_to_delete) > 0:
+            self.session.query(Task).filter(Task.id.in_(ids_to_delete)).delete(synchronize_session=False)
 
     def minmax_tasks(self):
         """Find tasks minimum and maximum

lib/cuckoo/core/scheduler.py

@@ -64,6 +64,8 @@ def __init__(self, maxcount=0):
         self.analysis_threads: List[AnalysisManager] = []
         self.analyzing_categories, categories_need_VM = load_categories()
         self.machinery_manager = MachineryManager() if categories_need_VM else None
+        if self.cfg.cuckoo.get("task_timeout", False):
+            self.next_timeout_time = time.time() + self.cfg.cuckoo.get("task_timeout_scan_interval", 30)
         log.info("Creating scheduler with max_analysis_count=%s", self.max_analysis_count or "unlimited")
 
     @property
@@ -98,6 +100,12 @@ def do_main_loop_work(self, error_queue: queue.Queue) -> SchedulerCycleDelay:
         if self.is_short_on_disk_space():
             return SchedulerCycleDelay.LOW_DISK_SPACE
 
+        if self.cfg.cuckoo.get("task_timeout", False):
+            if self.next_timeout_time < time.time():
+                self.next_timeout_time = time.time() + self.cfg.cuckoo.get("task_timeout_scan_interval", 30) 
+                with self.db.session.begin():
+                    self.db.check_tasks_timeout(self.cfg.cuckoo.get("task_pending_timeout", 0))
+
         analysis_manager: Optional[AnalysisManager] = None
         with self.db.session.begin():
             max_machines_reached = False