From b354c8b27581b2666b9d9ba4d04efa314d769cdf Mon Sep 17 00:00:00 2001 From: Nuno Alves Date: Tue, 30 Dec 2025 06:37:22 +0000 Subject: [PATCH 1/2] Fix delete disk on GCP machinery (#2818) --- modules/machinery/gcp.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/machinery/gcp.py b/modules/machinery/gcp.py index 9655e14e38f..9680aa53228 100644 --- a/modules/machinery/gcp.py +++ b/modules/machinery/gcp.py @@ -189,11 +189,12 @@ def _restore(self, label, snapshot): self._wait_and_check_operation(operation, label, "unable to detach disk") # Delete old disk - log.debug("Deleting disk %s", old_disk.device_name) + disk_name = old_disk.source.split("/")[-1] + log.debug("Deleting disk %s", disk_name) request = compute_v1.DeleteDiskRequest( project=self.project, zone=self.zone, - disk=old_disk.device_name + disk=disk_name ) operation = self.disks_client.delete(request=request) self._wait_and_check_operation(operation, label, "unable to delete disk") From 1e778a646a478fea6734253dcdbcc5d32494383d Mon Sep 17 00:00:00 2001 From: Stefano De Rosa <50182623+CaptWake@users.noreply.github.com> Date: Tue, 30 Dec 2025 08:10:18 +0100 Subject: [PATCH 2/2] Fix clock handling for API submissions (#2770) * Fix timeshift issue * Fix fallback to timestamp 0 --- lib/cuckoo/common/web_utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/cuckoo/common/web_utils.py b/lib/cuckoo/common/web_utils.py index a8ab2cd0961..cccebf212be 100644 --- a/lib/cuckoo/common/web_utils.py +++ b/lib/cuckoo/common/web_utils.py @@ -1535,10 +1535,10 @@ def parse_request_arguments(request, keyword="POST"): tags = getattr(request, keyword).get("tags") custom = getattr(request, keyword).get("custom", "") memory = force_bool(getattr(request, keyword).get("memory", False)) - clock = getattr(request, keyword).get("clock", datetime.now().strftime("%m-%d-%Y %H:%M:%S")) + clock = getattr(request, keyword).get("clock", "") if not clock: - clock = datetime.now().strftime("%m-%d-%Y %H:%M:%S") - if "1970" in clock: + clock = datetime.utcfromtimestamp(0) + elif "1970" in clock: clock = datetime.now().strftime("%m-%d-%Y %H:%M:%S") enforce_timeout = force_bool(getattr(request, keyword).get("enforce_timeout", False)) unique = force_bool(getattr(request, keyword).get("unique", False))