Merge branch 'develop' into feature/react-admin

app/Http/Controllers/Api/Remote/Backups/BackupStatusController.php

@@ -8,26 +8,22 @@ use Illuminate\Http\Response;
 use Pterodactyl\Models\Backup;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Models\AuditLog;
-use Illuminate\Http\JsonResponse;
 use League\Flysystem\AwsS3v3\AwsS3Adapter;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Extensions\Backups\BackupManager;
-use Pterodactyl\Repositories\Eloquent\BackupRepository;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Pterodactyl\Http\Requests\Api\Remote\ReportBackupCompleteRequest;
 
 class BackupStatusController extends Controller
 {
-    private BackupRepository $repository;
     private BackupManager $backupManager;
 
     /**
      * BackupStatusController constructor.
      */
-    public function __construct(BackupRepository $repository, BackupManager $backupManager)
+    public function __construct(BackupManager $backupManager)
     {
-        $this->repository = $repository;
         $this->backupManager = $backupManager;
     }
 
@@ -56,6 +52,10 @@ class BackupStatusController extends Controller
             $successful = $request->input('successful') ? true : false;
             $model->fill([
                 'is_successful' => $successful,
+                // Change the lock state to unlocked if this was a failed backup so that it can be
+                // deleted easily. Also does not make sense to have a locked backup on the system
+                // that is failed.
+                'is_locked' => $successful && $model->is_locked,
                 'checksum' => $successful ? ($request->input('checksum_type') . ':' . $request->input('checksum')) : null,
                 'bytes' => $successful ? $request->input('size') : 0,
                 'completed_at' => CarbonImmutable::now(),

app/Models/AuditLog.php

@@ -69,6 +69,7 @@ class AuditLog extends Model
      * @var string[]
      */
     protected $casts = [
+        'is_system' => 'bool',
         'device' => 'array',
         'metadata' => 'array',
     ];

app/Models/Backup.php

@@ -21,6 +21,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property \Carbon\CarbonImmutable $updated_at
  * @property \Carbon\CarbonImmutable|null $deleted_at
  * @property \Pterodactyl\Models\Server $server
+ * @property \Pterodactyl\Models\AuditLog[] $audits
  */
 class Backup extends Model
 {
@@ -98,4 +99,14 @@ class Backup extends Model
     {
         return $this->belongsTo(Server::class);
     }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function audits()
+    {
+        return $this->hasMany(AuditLog::class, 'metadata->backup_uuid', 'uuid')
+            ->where('action', 'LIKE', 'server:backup.%');
+            // ->where('metadata->backup_uuid', $this->uuid);
+    }
 }

app/Services/Backups/DeleteBackupService.php

@@ -50,13 +50,20 @@ class DeleteBackupService
     }
 
     /**
-     * Deletes a backup from the system.
+     * Deletes a backup from the system. If the backup is stored in S3 a request
+     * will be made to delete that backup from the disk as well.
      *
      * @throws \Throwable
      */
     public function handle(Backup $backup)
     {
-        if ($backup->is_locked) {
+        // If the backup is marked as failed it can still be deleted, even if locked
+        // since the UI doesn't allow you to unlock a failed backup in the first place.
+        //
+        // I also don't really see any reason you'd have a locked, failed backup to keep
+        // around. The logic that updates the backup to the failed state will also remove
+        // the lock, so this condition should really never happen.
+        if ($backup->is_locked && ($backup->completed_at && $backup->is_successful)) {
             throw new BackupLockedException();
         }
 

app/Services/Servers/ServerCreationService.php

@@ -162,7 +162,12 @@ class ServerCreationService
 
         try {
             $this->daemonServerRepository->setServer($server)->create(
-                $this->configurationStructureService->handle($server)
+                array_merge(
+                    $this->configurationStructureService->handle($server),
+                    [
+                        'start_on_completion' => Arr::get($data, 'start_on_completion', false),
+                    ],
+                ),
             );
         } catch (DaemonConnectionException $exception) {
             $this->serverDeletionService->withForce(true)->handle($server);