Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only allow restoring valid backups, set the server correctly on the repository

Browse source
This commit is contained in:
Dane Everitt 2021-01-18 20:11:49 -08:00
parent 575eab9072
commit 8d69a60e28
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Api/Client/Servers/BackupController.php
View file

@ -213,6 +213,10 @@ class BackupController extends ClientApiController
throw new BadRequestHttpException('This server is not currently in a state that allows for a backup to be restored.'); throw new BadRequestHttpException('This server is not currently in a state that allows for a backup to be restored.');
} }
if (!$backup->is_successful && !$backup->completed_at) {
throw new BadRequestHttpException('This backup cannot be restored at this time: not completed or failed.');
}
$server->audit(AuditLog::SERVER__BACKUP_RESTORE_STARTED, function (AuditLog $audit, Server $server) use ($backup, $request) { $server->audit(AuditLog::SERVER__BACKUP_RESTORE_STARTED, function (AuditLog $audit, Server $server) use ($backup, $request) {
$audit->metadata = ['backup_uuid' => $backup->uuid]; $audit->metadata = ['backup_uuid' => $backup->uuid];
@ -226,7 +230,7 @@ class BackupController extends ClientApiController
// actions against it via the Panel API. // actions against it via the Panel API.
$server->update(['status' => Server::STATUS_RESTORING_BACKUP]); $server->update(['status' => Server::STATUS_RESTORING_BACKUP]);
$this->repository->restore($backup, $url ?? null, $request->input('truncate') === 'true'); $this->repository->setServer($server)->restore($backup, $url ?? null, $request->input('truncate') === 'true');
}); });
return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT); return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT);