From 0039be49b206906c3bcf6047b996c7bfac35068d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Tue, 11 Nov 2025 11:30:17 +0100
Subject: [PATCH] fix(DeleteResourceJob): escape deployment UUID and stack name
 in Docker commands

---
 app/Jobs/DeleteResourceJob.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Jobs/DeleteResourceJob.php b/app/Jobs/DeleteResourceJob.php
index 9ff70e53d..e1d6957a4 100644
--- a/app/Jobs/DeleteResourceJob.php
+++ b/app/Jobs/DeleteResourceJob.php
@@ -145,11 +145,12 @@ private function deleteApplicationPreview()
 
                 // Check if helper container exists and kill it
                 $deployment_uuid = $activeDeployment->deployment_uuid;
-                $checkCommand = "docker ps -a --filter name={$deployment_uuid} --format '{{.Names}}'";
+                $escapedDeploymentUuid = escapeshellarg($deployment_uuid);
+                $checkCommand = "docker ps -a --filter name={$escapedDeploymentUuid} --format '{{.Names}}'";
                 $containerExists = instant_remote_process([$checkCommand], $server);
 
                 if ($containerExists && str($containerExists)->trim()->isNotEmpty()) {
-                    instant_remote_process(["docker rm -f {$deployment_uuid}"], $server);
+                    instant_remote_process(["docker rm -f {$escapedDeploymentUuid}"], $server);
                     $activeDeployment->addLogEntry('Deployment container stopped.');
                 } else {
                     $activeDeployment->addLogEntry('Helper container not yet started. Deployment will be cancelled when job checks status.');
@@ -162,7 +163,8 @@ private function deleteApplicationPreview()
 
         try {
             if ($server->isSwarm()) {
-                instant_remote_process(["docker stack rm {$application->uuid}-{$pull_request_id}"], $server);
+                $escapedStackName = escapeshellarg("{$application->uuid}-{$pull_request_id}");
+                instant_remote_process(["docker stack rm {$escapedStackName}"], $server);
             } else {
                 $containers = getCurrentApplicationContainerStatus($server, $application->id, $pull_request_id)->toArray();
                 $this->stopPreviewContainers($containers, $server);