Skip to content

Commit 6a4914d

Browse files
committed
Properly validate schedule names; closes pterodactyl#2405
1 parent 48a1046 commit 6a4914d

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

app/Http/Requests/Api/Client/Servers/Schedules/StoreScheduleRequest.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Pterodactyl\Http\Requests\Api\Client\Servers\Schedules;
44

5+
use Pterodactyl\Models\Schedule;
56
use Pterodactyl\Models\Permission;
67

78
class StoreScheduleRequest extends ViewScheduleRequest
@@ -19,13 +20,15 @@ public function permission(): string
1920
*/
2021
public function rules(): array
2122
{
23+
$rules = Schedule::getRules();
24+
2225
return [
23-
'name' => 'required|string|min:1',
24-
'is_active' => 'filled|boolean',
25-
'minute' => 'required|string',
26-
'hour' => 'required|string',
27-
'day_of_month' => 'required|string',
28-
'day_of_week' => 'required|string',
26+
'name' => $rules['name'],
27+
'is_active' => array_merge(['filled'], $rules['is_active']),
28+
'minute' => $rules['cron_minute'],
29+
'hour' => $rules['cron_hour'],
30+
'day_of_month' => $rules['cron_day_of_month'],
31+
'day_of_week' => $rules['cron_day_of_week'],
2932
];
3033
}
3134
}

app/Models/Schedule.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class Schedule extends Model
103103
*/
104104
public static $validationRules = [
105105
'server_id' => 'required|exists:servers,id',
106-
'name' => 'nullable|string|max:255',
106+
'name' => 'required|string|max:255',
107107
'cron_day_of_week' => 'required|string',
108108
'cron_day_of_month' => 'required|string',
109109
'cron_hour' => 'required|string',

0 commit comments

Comments
 (0)