From d4e037db9cff74c49e06fa6019ff0e937ac8ed75 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sat, 9 May 2020 19:19:45 -0700
Subject: [PATCH] Don't abort deleting a backup if the daemon cannot find it

---
 .../Http/Connection/DaemonConnectionException.php  |  3 +++
 app/Services/Backups/DeleteBackupService.php       | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/Exceptions/Http/Connection/DaemonConnectionException.php b/app/Exceptions/Http/Connection/DaemonConnectionException.php
index ea1ab4799..f2f8ba13d 100644
--- a/app/Exceptions/Http/Connection/DaemonConnectionException.php
+++ b/app/Exceptions/Http/Connection/DaemonConnectionException.php
@@ -6,6 +6,9 @@ use Illuminate\Http\Response;
 use GuzzleHttp\Exception\GuzzleException;
 use Pterodactyl\Exceptions\DisplayException;
 
+/**
+ * @method \GuzzleHttp\Exception\GuzzleException getPrevious()
+ */
 class DaemonConnectionException extends DisplayException
 {
     /**
diff --git a/app/Services/Backups/DeleteBackupService.php b/app/Services/Backups/DeleteBackupService.php
index b0318e852..15fd02a97 100644
--- a/app/Services/Backups/DeleteBackupService.php
+++ b/app/Services/Backups/DeleteBackupService.php
@@ -2,10 +2,13 @@
 
 namespace Pterodactyl\Services\Backups;
 
+use Illuminate\Http\Response;
 use Pterodactyl\Models\Backup;
+use GuzzleHttp\Exception\ClientException;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Repositories\Eloquent\BackupRepository;
 use Pterodactyl\Repositories\Wings\DaemonBackupRepository;
+use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 
 class DeleteBackupService
 {
@@ -50,7 +53,16 @@ class DeleteBackupService
     public function handle(Backup $backup)
     {
         $this->connection->transaction(function () use ($backup) {
-            $this->daemonBackupRepository->setServer($backup->server)->delete($backup);
+            try {
+                $this->daemonBackupRepository->setServer($backup->server)->delete($backup);
+            } catch (DaemonConnectionException $exception) {
+                $previous = $exception->getPrevious();
+                // Don't fail the request if the Daemon responds with a 404, just assume the backup
+                // doesn't actually exist and remove it's reference from the Panel as well.
+                if (! $previous instanceof ClientException || $previous->getResponse()->getStatusCode() !== Response::HTTP_NOT_FOUND) {
+                    throw $exception;
+                }
+            }
 
             $this->repository->delete($backup->id);
         });