Merge (#127)

2025-07-02 22:46:16 +00:00 · 2024-03-24 09:56:34 +01:00
parent 884f18db63
commit 4d051330d6
1055 changed files with 14493 additions and 20278 deletions
--- a/app/Actions/FirewallRule/CreateRule.php
+++ b/app/Actions/FirewallRule/CreateRule.php
@ -21,10 +21,20 @@ public function create(Server $server, array $input): FirewallRule
            'port' => $input['port'],
            'source' => $input['source'],
            'mask' => $input['mask'] ?? null,
-            'status' => FirewallRuleStatus::CREATING,
        ]);
+
+        $server->firewall()
+            ->handler()
+            ->addRule(
+                $rule->type,
+                $rule->getRealProtocol(),
+                $rule->port,
+                $rule->source,
+                $rule->mask
+            );
+
+        $rule->status = FirewallRuleStatus::READY;
        $rule->save();
-        $rule->addToServer();

        return $rule;
    }
@ -56,6 +66,6 @@ private function validate(Server $server, array $input): void
            'mask' => [
                'numeric',
            ],
-        ])->validateWithBag('createRule');
+        ])->validate();
    }
 }