api: fix sequence_id being ignored in server task API

Closes #4434
This commit is contained in:
Matthew Penner 2023-01-24 15:57:24 -07:00
parent 20f23a0b27
commit 2b14e46eec
No known key found for this signature in database
2 changed files with 57 additions and 20 deletions

View file

@ -9,6 +9,7 @@ use Pterodactyl\Models\Schedule;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Pterodactyl\Facades\Activity; use Pterodactyl\Facades\Activity;
use Pterodactyl\Models\Permission; use Pterodactyl\Models\Permission;
use Illuminate\Database\ConnectionInterface;
use Pterodactyl\Repositories\Eloquent\TaskRepository; use Pterodactyl\Repositories\Eloquent\TaskRepository;
use Pterodactyl\Exceptions\Http\HttpForbiddenException; use Pterodactyl\Exceptions\Http\HttpForbiddenException;
use Pterodactyl\Transformers\Api\Client\TaskTransformer; use Pterodactyl\Transformers\Api\Client\TaskTransformer;
@ -23,8 +24,10 @@ class ScheduleTaskController extends ClientApiController
/** /**
* ScheduleTaskController constructor. * ScheduleTaskController constructor.
*/ */
public function __construct(private TaskRepository $repository) public function __construct(
{ private ConnectionInterface $connection,
private TaskRepository $repository
) {
parent::__construct(); parent::__construct();
} }
@ -49,14 +52,30 @@ class ScheduleTaskController extends ClientApiController
$lastTask = $schedule->tasks()->orderByDesc('sequence_id')->first(); $lastTask = $schedule->tasks()->orderByDesc('sequence_id')->first();
/** @var \Pterodactyl\Models\Task $task */ /** @var \Pterodactyl\Models\Task $task */
$task = $this->repository->create([ $task = $this->connection->transaction(function () use ($request, $schedule, $lastTask) {
$sequenceId = ($lastTask->sequence_id ?? 0) + 1;
$requestSequenceId = $request->integer('sequence_id', $sequenceId);
// If the sequence id from the request is greater than or equal to the next available
// sequence id, we don't need to do anything special. Otherwise, we need to update
// the sequence id of all tasks that are greater than or equal to the request sequence
// id to be one greater than the current value.
if ($requestSequenceId < $sequenceId) {
$schedule->tasks()
->where('sequence_id', '>=', $requestSequenceId)
->increment('sequence_id');
$sequenceId = $requestSequenceId;
}
return $this->repository->create([
'schedule_id' => $schedule->id, 'schedule_id' => $schedule->id,
'sequence_id' => ($lastTask->sequence_id ?? 0) + 1, 'sequence_id' => $sequenceId,
'action' => $request->input('action'), 'action' => $request->input('action'),
'payload' => $request->input('payload') ?? '', 'payload' => $request->input('payload') ?? '',
'time_offset' => $request->input('time_offset'), 'time_offset' => $request->input('time_offset'),
'continue_on_failure' => (bool) $request->input('continue_on_failure'), 'continue_on_failure' => $request->boolean('continue_on_failure'),
]); ]);
});
Activity::event('server:task.create') Activity::event('server:task.create')
->subject($schedule, $task) ->subject($schedule, $task)
@ -84,12 +103,30 @@ class ScheduleTaskController extends ClientApiController
throw new HttpForbiddenException("A backup task cannot be created when the server's backup limit is set to 0."); throw new HttpForbiddenException("A backup task cannot be created when the server's backup limit is set to 0.");
} }
$this->connection->transaction(function () use ($request, $schedule, $task) {
$sequenceId = $request->integer('sequence_id', $task->sequence_id);
// Shift all other tasks in the schedule up or down to make room for the new task.
if ($sequenceId < $task->sequence_id) {
$schedule->tasks()
->where('sequence_id', '>=', $sequenceId)
->where('sequence_id', '<', $task->sequence_id)
->increment('sequence_id');
} elseif ($sequenceId > $task->sequence_id) {
$schedule->tasks()
->where('sequence_id', '>', $task->sequence_id)
->where('sequence_id', '<=', $sequenceId)
->decrement('sequence_id');
}
$this->repository->update($task->id, [ $this->repository->update($task->id, [
'sequence_id' => $sequenceId,
'action' => $request->input('action'), 'action' => $request->input('action'),
'payload' => $request->input('payload') ?? '', 'payload' => $request->input('payload') ?? '',
'time_offset' => $request->input('time_offset'), 'time_offset' => $request->input('time_offset'),
'continue_on_failure' => (bool) $request->input('continue_on_failure'), 'continue_on_failure' => $request->boolean('continue_on_failure'),
]); ]);
});
Activity::event('server:task.update') Activity::event('server:task.update')
->subject($schedule, $task) ->subject($schedule, $task)
@ -117,10 +154,9 @@ class ScheduleTaskController extends ClientApiController
throw new HttpForbiddenException('You do not have permission to perform this action.'); throw new HttpForbiddenException('You do not have permission to perform this action.');
} }
$schedule->tasks()->where('sequence_id', '>', $task->sequence_id)->update([ $schedule->tasks()
'sequence_id' => $schedule->tasks()->getConnection()->raw('(sequence_id - 1)'), ->where('sequence_id', '>', $task->sequence_id)
]); ->decrement('sequence_id');
$task->delete(); $task->delete();
Activity::event('server:task.delete')->subject($schedule, $task)->property('name', $schedule->name)->log(); Activity::event('server:task.delete')->subject($schedule, $task)->property('name', $schedule->name)->log();

View file

@ -23,6 +23,7 @@ class StoreTaskRequest extends ViewScheduleRequest
'payload' => 'required_unless:action,backup|string|nullable', 'payload' => 'required_unless:action,backup|string|nullable',
'time_offset' => 'required|numeric|min:0|max:900', 'time_offset' => 'required|numeric|min:0|max:900',
'sequence_id' => 'sometimes|required|numeric|min:1', 'sequence_id' => 'sometimes|required|numeric|min:1',
'continue_on_failure' => 'sometimes|required|boolean',
]; ];
} }
} }