Refactor firewall and add edit rule (#488)

app/Web/Pages/Servers/Firewall/Index.php

@@ -2,14 +2,17 @@
 
 namespace App\Web\Pages\Servers\Firewall;
 
-use App\Actions\FirewallRule\CreateRule;
+use App\Actions\FirewallRule\ManageRule;
 use App\Models\FirewallRule;
 use App\Web\Pages\Servers\Page;
 use Filament\Actions\Action;
+use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
+use Filament\Forms\Get;
 use Filament\Notifications\Notification;
 use Filament\Support\Enums\MaxWidth;
+use Illuminate\Support\Facades\Request;
 
 class Index extends Page
 {
@@ -31,6 +34,64 @@ public function getWidgets(): array
         ];
     }
 
+    public static function getFirewallForm(?FirewallRule $record = null): array
+    {
+        return [
+            TextInput::make('name')
+                ->label('Purpose')
+                ->default($record->name ?? null)
+                ->rules(ManageRule::rules()['name']),
+            Select::make('type')
+                ->label('Type')
+                ->default($record->type ?? 'allow')
+                ->options([
+                    'allow' => 'Allow',
+                    'deny' => 'Deny',
+                ])
+                ->rules(ManageRule::rules()['type']),
+            Select::make('protocol')
+                ->label('Protocol')
+                ->default($record->protocol ?? 'tcp')
+                ->options([
+                    'tcp' => 'TCP',
+                    'udp' => 'UDP',
+                ])
+                ->rules(ManageRule::rules()['protocol']),
+            TextInput::make('port')
+                ->label('Port')
+                ->default($record->port ?? null)
+                ->rules(['required', 'integer']),
+            Checkbox::make('source_any')
+                ->label('Any Source')
+                ->default(($record->source ?? null) == null)
+                ->rules(['boolean'])
+                ->helperText('Allow connections from any source, regardless of their IP address or subnet mask.')
+                ->live(),
+            TextInput::make('source')
+                ->hidden(fn (Get $get) => $get('source_any') == true)
+                ->label('Source')
+                ->helperText('The IP address of the source of the connection.')
+                ->rules(ManageRule::rules()['source'])
+                ->default($record->source ?? null)
+                ->suffixAction(
+                    \Filament\Forms\Components\Actions\Action::make('get_ip')
+                        ->icon('heroicon-o-globe-alt')
+                        ->color('primary')
+                        ->tooltip('Use My IP')
+                        ->action(function ($set) {
+                            $ip = Request::ip();
+                            $set('source', $ip);
+                        })
+                ),
+            TextInput::make('mask')
+                ->hidden(fn (Get $get) => $get('source_any') == true)
+                ->label('Mask')
+                ->default($record->mask ?? null)
+                ->helperText('The subnet mask of the source of the connection. Leave blank for a single IP address.')
+                ->rules(ManageRule::rules()['mask']),
+        ];
+    }
+
     protected function getHeaderActions(): array
     {
         return [
@@ -45,37 +106,19 @@ protected function getHeaderActions(): array
                 ->label('Create a Rule')
                 ->icon('heroicon-o-plus')
                 ->modalWidth(MaxWidth::Large)
-                ->form([
-                    Select::make('type')
-                        ->native(false)
-                        ->options([
-                            'allow' => 'Allow',
-                            'deny' => 'Deny',
-                        ])
-                        ->rules(CreateRule::rules()['type']),
-                    Select::make('protocol')
-                        ->native(false)
-                        ->options([
-                            'tcp' => 'TCP',
-                            'udp' => 'UDP',
-                        ])
-                        ->rules(CreateRule::rules()['protocol']),
-                    TextInput::make('port')
-                        ->rules(CreateRule::rules()['port']),
-                    TextInput::make('source')
-                        ->rules(CreateRule::rules()['source']),
-                    TextInput::make('mask')
-                        ->rules(CreateRule::rules()['mask']),
-                ])
+                ->modalHeading('Create Firewall Rule')
+                ->modalDescription('Add a new rule to the firewall')
+                ->modalSubmitActionLabel('Create')
+                ->form(self::getFirewallForm())
                 ->action(function (array $data) {
                     run_action($this, function () use ($data) {
-                        app(CreateRule::class)->create($this->server, $data);
+                        app(ManageRule::class)->create($this->server, $data);
 
                         $this->dispatch('$refresh');
 
                         Notification::make()
                             ->success()
-                            ->title('Firewall rule created!')
+                            ->title('Applying Firewall Rule')
                             ->send();
                     });
                 }),

app/Web/Pages/Servers/Firewall/Widgets/RulesList.php

@@ -2,15 +2,18 @@
 
 namespace App\Web\Pages\Servers\Firewall\Widgets;
 
-use App\Actions\FirewallRule\DeleteRule;
+use App\Actions\FirewallRule\ManageRule;
 use App\Models\FirewallRule;
 use App\Models\Server;
+use App\Web\Pages\Servers\Firewall\Index;
 use Filament\Notifications\Notification;
+use Filament\Support\Enums\MaxWidth;
 use Filament\Tables\Actions\Action;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Filament\Widgets\TableWidget as Widget;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Str;
 
 class RulesList extends Widget
 {
@@ -26,19 +29,40 @@ protected function getTableQuery(): Builder
     protected function getTableColumns(): array
     {
         return [
+            TextColumn::make('name')
+                ->searchable()
+                ->sortable()
+                ->label('Purpose'),
             TextColumn::make('type')
                 ->sortable()
-                ->extraAttributes(['class' => 'uppercase'])
-                ->color(fn (FirewallRule $record) => $record->type === 'allow' ? 'green' : 'red'),
+                ->badge()
+                ->color(fn ($state) => $state === 'allow' ? 'success' : 'warning')
+                ->label('Type')
+                ->formatStateUsing(fn ($state) => Str::upper($state)),
+            TextColumn::make('id')
+                ->sortable()
+                ->label('Source')
+                ->formatStateUsing(function (FirewallRule $record) {
+                    $source = $record->source == null ? 'any' : $record->source;
+                    if ($source !== 'any' && $record->mask !== null) {
+                        $source .= '/'.$record->mask;
+                    }
+
+                    return $source;
+                }),
             TextColumn::make('protocol')
                 ->sortable()
-                ->extraAttributes(['class' => 'uppercase']),
+                ->badge()
+                ->color('primary')
+                ->label('Protocol')
+                ->formatStateUsing(fn ($state) => Str::upper($state)),
             TextColumn::make('port')
-                ->sortable(),
-            TextColumn::make('source')
-                ->sortable(),
-            TextColumn::make('mask')
-                ->sortable(),
+                ->sortable()
+                ->label('Port'),
+            TextColumn::make('status')
+                ->label('Status')
+                ->badge()
+                ->color(fn (FirewallRule $record) => $record->getStatusColor()),
         ];
     }
 
@@ -49,6 +73,28 @@ public function table(Table $table): Table
             ->query($this->getTableQuery())
             ->columns($this->getTableColumns())
             ->actions([
+                Action::make('edit')
+                    ->icon('heroicon-o-pencil')
+                    ->tooltip('Edit')
+                    ->hiddenLabel()
+                    ->modalWidth(MaxWidth::Large)
+                    ->modalHeading('Edit Firewall Rule')
+                    ->modalDescription('Edit the associated servers firewall rule.')
+                    ->modalSubmitActionLabel('Update')
+                    ->authorize(fn (FirewallRule $record) => auth()->user()->can('update', $record))
+                    ->form(fn ($record) => Index::getFirewallForm($record))
+                    ->action(function (FirewallRule $record, array $data) {
+                        run_action($this, function () use ($record, $data) {
+                            app(ManageRule::class)->update($record, $data);
+
+                            $this->dispatch('$refresh');
+
+                            Notification::make()
+                                ->success()
+                                ->title('Applying Firewall Rule')
+                                ->send();
+                        });
+                    }),
                 Action::make('delete')
                     ->icon('heroicon-o-trash')
                     ->tooltip('Delete')
@@ -58,7 +104,7 @@ public function table(Table $table): Table
                     ->authorize(fn (FirewallRule $record) => auth()->user()->can('delete', $record))
                     ->action(function (FirewallRule $record) {
                         try {
-                            app(DeleteRule::class)->delete($this->server, $record);
+                            app(ManageRule::class)->delete($record);
                         } catch (\Exception $e) {
                             Notification::make()
                                 ->danger()