2.x - firewall/metrics/services/cronjobs

2025-07-02 14:36:17 +00:00 · 2024-10-01 19:09:38 +02:00
parent 2e9620409b
commit 906ddc38de
58 changed files with 1625 additions and 631 deletions
--- a/app/Actions/CronJob/CreateCronJob.php
+++ b/app/Actions/CronJob/CreateCronJob.php
@ -6,15 +6,11 @@
 use App\Models\CronJob;
 use App\Models\Server;
 use App\ValidationRules\CronRule;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\ValidationException;

 class CreateCronJob
 {
    public function create(Server $server, array $input): void
    {
-        $this->validate($input);
-
        $cronJob = new CronJob([
            'server_id' => $server->id,
            'user' => $input['user'],
@ -29,12 +25,9 @@ public function create(Server $server, array $input): void
        $cronJob->save();
    }

-    /**
-     * @throws ValidationException
-     */
-    private function validate(array $input): void
+    public static function rules(array $input): array
    {
-        Validator::make($input, [
+        $rules = [
            'command' => [
                'required',
            ],
@ -46,15 +39,15 @@ private function validate(array $input): void
                'required',
                new CronRule(acceptCustom: true),
            ],
-        ])->validate();
+        ];

-        if ($input['frequency'] == 'custom') {
-            Validator::make($input, [
-                'custom' => [
-                    'required',
-                    new CronRule,
-                ],
-            ])->validate();
+        if (isset($input['frequency']) && $input['frequency'] == 'custom') {
+            $rules['custom'] = [
+                'required',
+                new CronRule,
+            ];
        }
+
+        return $rules;
    }
 }
--- a/app/Actions/FirewallRule/CreateRule.php
+++ b/app/Actions/FirewallRule/CreateRule.php
@ -5,15 +5,13 @@
 use App\Enums\FirewallRuleStatus;
 use App\Models\FirewallRule;
 use App\Models\Server;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\ValidationException;
+use App\SSH\Services\Firewall\Firewall;
+use Illuminate\Validation\Rule;

 class CreateRule
 {
    public function create(Server $server, array $input): FirewallRule
    {
-        $this->validate($server, $input);
-
        $rule = new FirewallRule([
            'server_id' => $server->id,
            'type' => $input['type'],
@ -23,15 +21,15 @@ public function create(Server $server, array $input): FirewallRule
            'mask' => $input['mask'] ?? null,
        ]);

-        $server->firewall()
-            ->handler()
-            ->addRule(
-                $rule->type,
-                $rule->getRealProtocol(),
-                $rule->port,
-                $rule->source,
-                $rule->mask
-            );
+        /** @var Firewall $firewallHandler */
+        $firewallHandler = $server->firewall()->handler();
+        $firewallHandler->addRule(
+            $rule->type,
+            $rule->getRealProtocol(),
+            $rule->port,
+            $rule->source,
+            $rule->mask
+        );

        $rule->status = FirewallRuleStatus::READY;
        $rule->save();
@ -39,19 +37,16 @@ public function create(Server $server, array $input): FirewallRule
        return $rule;
    }

-    /**
-     * @throws ValidationException
-     */
-    private function validate(Server $server, array $input): void
+    public static function rules(): array
    {
-        Validator::make($input, [
+        return [
            'type' => [
                'required',
                'in:allow,deny',
            ],
            'protocol' => [
                'required',
-                'in:'.implode(',', array_keys(config('core.firewall_protocols_port'))),
+                Rule::in(array_keys(config('core.firewall_protocols_port'))),
            ],
            'port' => [
                'required',
@ -64,8 +59,9 @@ private function validate(Server $server, array $input): void
                'ip',
            ],
            'mask' => [
+                'required',
                'numeric',
            ],
-        ])->validate();
+        ];
    }
 }
--- a/app/Actions/Monitoring/GetMetrics.php
+++ b/app/Actions/Monitoring/GetMetrics.php
@ -5,13 +5,13 @@
 use App\Models\Server;
 use Carbon\Carbon;
 use Illuminate\Contracts\Database\Query\Expression;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;

 class GetMetrics
 {
-    public function filter(Server $server, array $input): array
+    public function filter(Server $server, array $input): Collection
    {
        if (isset($input['from']) && isset($input['to']) && $input['from'] === $input['to']) {
            $input['from'] = Carbon::parse($input['from'])->format('Y-m-d').' 00:00:00';
@ -24,8 +24,6 @@ public function filter(Server $server, array $input): array

        $input = array_merge($defaultInput, $input);

-        $this->validate($input);
-
        return $this->metrics(
            server: $server,
            fromDate: $this->getFromDate($input),
@ -39,8 +37,8 @@ private function metrics(
        Carbon $fromDate,
        Carbon $toDate,
        ?Expression $interval = null
-    ): array {
-        $metrics = DB::table('metrics')
+    ): Collection {
+        return DB::table('metrics')
            ->where('server_id', $server->id)
            ->whereBetween('created_at', [$fromDate->format('Y-m-d H:i:s'), $toDate->format('Y-m-d H:i:s')])
            ->select(
@ -64,10 +62,6 @@ private function metrics(

                return $item;
            });
-
-        return [
-            'metrics' => $metrics,
-        ];
    }

    private function getFromDate(array $input): Carbon
@ -110,14 +104,12 @@ private function getInterval(array $input): Expression
            return DB::raw("strftime('%Y-%m-%d %H:00:00', created_at) as date_interval");
        }

-        if ($periodInHours > 24) {
-            return DB::raw("strftime('%Y-%m-%d 00:00:00', created_at) as date_interval");
-        }
+        return DB::raw("strftime('%Y-%m-%d 00:00:00', created_at) as date_interval");
    }

-    private function validate(array $input): void
+    public static function rules(array $input): array
    {
-        Validator::make($input, [
+        $rules = [
            'period' => [
                'required',
                Rule::in([
@ -130,21 +122,13 @@ private function validate(array $input): void
                    'custom',
                ]),
            ],
-        ])->validate();
+        ];

-        if ($input['period'] === 'custom') {
-            Validator::make($input, [
-                'from' => [
-                    'required',
-                    'date',
-                    'before:to',
-                ],
-                'to' => [
-                    'required',
-                    'date',
-                    'after:from',
-                ],
-            ])->validate();
+        if (isset($input['period']) && $input['period'] === 'custom') {
+            $rules['from'] = ['required', 'date', 'before:to'];
+            $rules['to'] = ['required', 'date', 'after:from'];
        }
+
+        return $rules;
    }
 }
--- a/app/Actions/Service/Install.php
+++ b/app/Actions/Service/Install.php
@ -12,12 +12,10 @@ class Install
 {
    public function install(Server $server, array $input): Service
    {
-        $this->validate($server, $input);
-
        $service = new Service([
            'server_id' => $server->id,
            'name' => $input['name'],
-            'type' => $input['type'],
+            'type' => config('core.service_types')[$input['name']],
            'version' => $input['version'],
            'status' => ServiceStatus::INSTALLING,
        ]);
@ -40,18 +38,21 @@ public function install(Server $server, array $input): Service
        return $service;
    }

-    private function validate(Server $server, array $input): void
+    public static function rules(array $input): array
    {
-        Validator::make($input, [
-            'type' => [
-                'required',
-                Rule::in(config('core.service_types')),
-            ],
+        $rules = [
            'name' => [
                'required',
                Rule::in(array_keys(config('core.service_types'))),
            ],
-            'version' => 'required',
-        ])->validate();
+            'version' => [
+                'required',
+            ],
+        ];
+        if (isset($input['name'])) {
+            $rules['version'][] = Rule::in(config("core.service_versions.{$input['name']}"));
+        }
+
+        return $rules;
    }
 }
--- a/app/Actions/SshKey/CreateSshKey.php
+++ b/app/Actions/SshKey/CreateSshKey.php
@ -5,7 +5,6 @@
 use App\Models\SshKey;
 use App\Models\User;
 use App\ValidationRules\SshKeyRule;
-use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;

 class CreateSshKey
@ -15,8 +14,6 @@ class CreateSshKey
     */
    public function create(User $user, array $input): SshKey
    {
-        $this->validate($input);
-
        $key = new SshKey([
            'user_id' => $user->id,
            'name' => $input['name'],
@ -30,14 +27,14 @@ public function create(User $user, array $input): SshKey
    /**
     * @throws ValidationException
     */
-    private function validate(array $input): void
+    public static function rules(): array
    {
-        Validator::make($input, [
+        return [
            'name' => 'required',
            'public_key' => [
                'required',
                new SshKeyRule,
            ],
-        ])->validate();
+        ];
    }
 }
--- a/app/Actions/SshKey/DeployKeyToServer.php
+++ b/app/Actions/SshKey/DeployKeyToServer.php
@ -6,17 +6,14 @@
 use App\Models\Server;
 use App\Models\SshKey;
 use App\Models\User;
-use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;

 class DeployKeyToServer
 {
-    public function deploy(User $user, Server $server, array $input): void
+    public function deploy(Server $server, array $input): void
    {
-        $this->validate($user, $input);
-
        /** @var SshKey $sshKey */
-        $sshKey = SshKey::findOrFail($input['key_id']);
+        $sshKey = SshKey::query()->findOrFail($input['key_id']);
        $server->sshKeys()->attach($sshKey, [
            'status' => SshKeyStatus::ADDING,
        ]);
@ -26,13 +23,14 @@ public function deploy(User $user, Server $server, array $input): void
        ]);
    }

-    private function validate(User $user, array $input): void
+    public static function rules(User $user, Server $server): array
    {
-        Validator::make($input, [
+        return [
            'key_id' => [
                'required',
                Rule::exists('ssh_keys', 'id')->where('user_id', $user->id),
+                Rule::unique('server_ssh_keys', 'ssh_key_id')->where('server_id', $server->id),
            ],
-        ])->validate();
+        ];
    }
 }
--- a/app/Actions/StorageProvider/CreateStorageProvider.php
+++ b/app/Actions/StorageProvider/CreateStorageProvider.php
@ -55,8 +55,6 @@ public static function rules(array $input): array
            $rules = array_merge($rules, $provider->validationRules());
        }

-        ds($rules);
-
        return $rules;
    }
 }