Add option to delete S3 backups from storage on server deletion

When deleting a server, a checkbox now appears in the confirmation modal
if unlocked backups exist, allowing admins to also remove them from
storage via DeleteBackupService. Locked backups are always preserved.

app/Filament/Admin/Resources/ApiKeys/ApiKeyResource.php

@@ -22,6 +22,7 @@ use Filament\Forms\Components\ToggleButtons;
 use Filament\Resources\Pages\PageRegistration;
 use Filament\Resources\Resource;
 use Filament\Schemas\Components\Fieldset;
+use Filament\Schemas\Components\Section;
 use Filament\Schemas\Schema;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
@@ -113,12 +114,44 @@ class ApiKeyResource extends Resource
      */
     public static function defaultForm(Schema $schema): Schema
     {
+        $permissionList = ApiKey::getPermissionList();
+
         return $schema
             ->components([
+                Section::make(trans('admin/apikey.permissions.all'))
+                    ->description(trans('admin/apikey.permissions.all_description'))
+                    ->columnSpanFull()
+                    ->schema([
+                        ToggleButtons::make('permissions_all')
+                            ->hiddenLabel()
+                            ->inline()
+                            ->options([
+                                0 => trans('admin/apikey.permissions.none'),
+                                1 => trans('admin/apikey.permissions.read'),
+                                3 => trans('admin/apikey.permissions.read_write'),
+                            ])
+                            ->icons([
+                                0 => TablerIcon::BookOff,
+                                1 => TablerIcon::Book,
+                                3 => TablerIcon::Writing,
+                            ])
+                            ->colors([
+                                0 => 'success',
+                                1 => 'warning',
+                                3 => 'danger',
+                            ])
+                            ->live()
+                            ->afterStateUpdated(function ($state, callable $set) use ($permissionList) {
+                                foreach ($permissionList as $resource) {
+                                    $set('permissions_' . $resource, $state);
+                                }
+                            })
+                            ->default(0),
+                    ]),
                 Fieldset::make('Permissions')
                     ->columnSpanFull()
                     ->schema(
-                        collect(ApiKey::getPermissionList())->map(fn ($resource) => ToggleButtons::make('permissions_' . $resource)
+                        collect($permissionList)->map(fn ($resource) => ToggleButtons::make('permissions_' . $resource)
                             ->label(str($resource)->replace('_', ' ')->title())->inline()
                             ->options([
                                 0 => trans('admin/apikey.permissions.none'),

app/Filament/Admin/Resources/Eggs/Pages/EditEgg.php

@@ -450,17 +450,7 @@ class EditEgg extends EditRecord
         return [
             DeleteAction::make()
                 ->disabled(fn (Egg $egg): bool => $egg->servers()->count() > 0)
-                ->tooltip(fn (Egg $egg): string => $egg->servers()->count() <= 0 ? trans('filament-actions::delete.single.label') : trans('admin/egg.in_use'))
-                ->successNotification(fn (Egg $egg) => Notification::make()
-                    ->success()
-                    ->title(trans('admin/egg.delete_success'))
-                    ->body(trans('admin/egg.deleted', ['egg' => $egg->name]))
-                )
-                ->failureNotification(fn (Egg $egg) => Notification::make()
-                    ->danger()
-                    ->title(trans('admin/egg.delete_failed'))
-                    ->body(trans('admin/egg.could_not_delete', ['egg' => $egg->name]))
-                ),
+                ->tooltip(fn (Egg $egg): string => $egg->servers()->count() <= 0 ? trans('filament-actions::delete.single.label') : trans('admin/egg.in_use')),
             ExportEggAction::make(),
             ImportEggAction::make()
                 ->multiple(false),

app/Filament/Admin/Resources/Nodes/Pages/CreateNode.php

@@ -278,6 +278,14 @@ class CreateNode extends CreateRecord
                         ->default(256)
                         ->minValue(1)
                         ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
+                    TextInput::make('daemon_base')
+                        ->label(trans('admin/node.daemon_base'))
+                        ->placeholder('/var/lib/pelican/volumes')
+                        ->hintIcon(TablerIcon::QuestionMark, trans('admin/node.daemon_base_help'))
+                        ->columnSpan(1)
+                        ->required()
+                        ->default('/var/lib/pelican/volumes')
+                        ->rule('regex:/^([\/][\d\w.\-\/]+)$/'),
                     TextInput::make('daemon_sftp')
                         ->columnSpan(1)
                         ->label(trans('admin/node.sftp_port'))
@@ -287,7 +295,7 @@ class CreateNode extends CreateRecord
                         ->required()
                         ->integer(),
                     TextInput::make('daemon_sftp_alias')
-                        ->columnSpan(2)
+                        ->columnSpan(1)
                         ->label(trans('admin/node.sftp_alias'))
                         ->helperText(trans('admin/node.sftp_alias_help')),
                     Grid::make()

app/Filament/Admin/Resources/Nodes/Pages/EditNode.php

@@ -314,7 +314,7 @@ class EditNode extends EditRecord
                             'default' => 1,
                             'sm' => 1,
                             'md' => 2,
-                            'lg' => 2,
+                            'lg' => 3,
                         ]),
                     TextInput::make('upload_size')
                         ->columnSpan([
@@ -329,12 +329,24 @@ class EditNode extends EditRecord
                         ->required()
                         ->minValue(1)
                         ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
+                    TextInput::make('daemon_base')
+                        ->label(trans('admin/node.daemon_base'))
+                        ->placeholder('/var/lib/pelican/volumes')
+                        ->hintIcon(TablerIcon::QuestionMark, trans('admin/node.daemon_base_help'))
+                        ->columnSpan([
+                            'default' => 1,
+                            'sm' => 1,
+                            'md' => 2,
+                            'lg' => 2,
+                        ])
+                        ->required()
+                        ->rule('regex:/^([\/][\d\w.\-\/]+)$/'),
                     TextInput::make('daemon_sftp')
                         ->columnSpan([
                             'default' => 1,
                             'sm' => 1,
-                            'md' => 1,
-                            'lg' => 3,
+                            'md' => 2,
+                            'lg' => 1,
                         ])
                         ->label(trans('admin/node.sftp_port'))
                         ->minValue(1)
@@ -346,8 +358,8 @@ class EditNode extends EditRecord
                         ->columnSpan([
                             'default' => 1,
                             'sm' => 1,
-                            'md' => 1,
-                            'lg' => 3,
+                            'md' => 2,
+                            'lg' => 2,
                         ])
                         ->label(trans('admin/node.sftp_alias'))
                         ->helperText(trans('admin/node.sftp_alias_help')),
@@ -356,7 +368,7 @@ class EditNode extends EditRecord
                             'default' => 1,
                             'sm' => 1,
                             'md' => 1,
-                            'lg' => 3,
+                            'lg' => 2,
                         ])
                         ->label(trans('admin/node.use_for_deploy'))
                         ->inline()
@@ -374,7 +386,7 @@ class EditNode extends EditRecord
                             'default' => 1,
                             'sm' => 1,
                             'md' => 1,
-                            'lg' => 3,
+                            'lg' => 2,
                         ])
                         ->label(trans('admin/node.maintenance_mode'))
                         ->inline()
@@ -572,7 +584,7 @@ class EditNode extends EditRecord
                         ->columnSpanFull()
                         ->schema([
                             Actions::make([
-                                Action::make('autoDeploy')
+                                Action::make('exclude_autoDeploy')
                                     ->label(trans('admin/node.auto_deploy'))
                                     ->color('primary')
                                     ->modalHeading(trans('admin/node.auto_deploy'))
@@ -610,7 +622,7 @@ class EditNode extends EditRecord
                                     }),
                             ])->fullWidth(),
                             Actions::make([
-                                Action::make('resetKey')
+                                Action::make('exclude_resetKey')
                                     ->label(trans('admin/node.reset_token'))
                                     ->color('danger')
                                     ->requiresConfirmation()

app/Filament/Admin/Resources/Servers/Pages/EditServer.php

@@ -30,6 +30,7 @@ use App\Traits\Filament\CanCustomizeTabs;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
+use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\CheckboxList;
 use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Hidden;
@@ -1106,9 +1107,13 @@ class EditServer extends EditRecord
                 ->modalHeading(trans('filament-actions::delete.single.modal.heading', ['label' => $this->getRecordTitle()]))
                 ->modalSubmitActionLabel(trans('filament-actions::delete.single.label'))
                 ->requiresConfirmation()
-                ->action(function (Server $server, ServerDeletionService $service) {
+                ->form(fn (Server $server) => $server->backups()->where('is_locked', false)->exists() ? [
+                    Checkbox::make('delete_backups')
+                        ->label(trans('admin/server.delete_backups', ['count' => $server->backups()->where('is_locked', false)->count()])),
+                ] : [])
+                ->action(function (array $data, Server $server, ServerDeletionService $service) {
                     try {
-                        $service->handle($server);
+                        $service->withDeleteBackups($data['delete_backups'] ?? false)->handle($server);
 
                         return redirect(ListServers::getUrl(panel: 'admin'));
                     } catch (ConnectionException) {
@@ -1132,9 +1137,13 @@ class EditServer extends EditRecord
                 ->modalHeading(trans('filament-actions::force-delete.single.modal.heading', ['label' => $this->getRecordTitle()]))
                 ->modalSubmitActionLabel(trans('filament-actions::force-delete.single.label'))
                 ->requiresConfirmation()
-                ->action(function (Server $server, ServerDeletionService $service) {
+                ->form(fn (Server $server) => $server->backups()->where('is_locked', false)->exists() ? [
+                    Checkbox::make('delete_backups')
+                        ->label(trans('admin/server.delete_backups', ['count' => $server->backups()->where('is_locked', false)->count()])),
+                ] : [])
+                ->action(function (array $data, Server $server, ServerDeletionService $service) {
                     try {
-                        $service->withForce()->handle($server);
+                        $service->withForce()->withDeleteBackups($data['delete_backups'] ?? false)->handle($server);
 
                         return redirect(ListServers::getUrl(panel: 'admin'));
                     } catch (ConnectionException) {

app/Filament/Pages/Auth/Login.php

@@ -66,6 +66,14 @@ class Login extends BaseLogin
             ->extraInputAttributes(['tabindex' => 1]);
     }
 
+    protected function getPasswordFormComponent(): Component
+    {
+        /** @var TextInput $component */
+        $component = parent::getPasswordFormComponent();
+
+        return $component->extraInputAttributes(['tabindex' => 2]);
+    }
+
     protected function getOAuthFormComponent(): Component
     {
         $actions = [];

app/Filament/Server/Pages/Console.php

@@ -78,11 +78,15 @@ class Console extends Page
         $feature = data_get($data, 'key');
 
         $feature = $this->featureService->get($feature);
-        if (!$feature || $this->getMountedAction()) {
+        if (!$feature) {
             return;
         }
-        $this->mountAction($feature->getId());
-        sleep(2); // TODO find a better way
+
+        if ($this->getMountedAction()) {
+            $this->replaceMountedAction($feature->getId());
+        } else {
+            $this->mountAction($feature->getId());
+        }
     }
 
     public function getWidgetData(): array

app/Filament/Server/Resources/Files/Pages/ListFiles.php

@@ -209,16 +209,18 @@ class ListFiles extends ListRecords
                                 ->required()
                                 ->live(),
                             TextEntry::make('new_location')
-                                ->state(fn (Get $get, File $file) => resolve_path(join_paths($this->path, $get('location') ?? '/', $file->name))),
+                                ->state(fn (Get $get, File $file) => resolve_path(join_paths($this->path, str_ends_with($get('location') ?? '/', '/') ? join_paths($get('location') ?? '/', $file->name) : $get('location') ?? '/'))),
                         ])
                         ->action(function ($data, File $file) {
                             $location = $data['location'];
-                            $files = [['to' => join_paths($location, $file->name), 'from' => $file->name]];
+                            $endsWithSlash = str_ends_with($location, '/');
+                            $to = $endsWithSlash ? join_paths($location, $file->name) : $location;
+                            $files = [['to' => $to, 'from' => $file->name]];
 
                             $this->getDaemonFileRepository()->renameFiles($this->path, $files);
 
                             $oldLocation = join_paths($this->path, $file->name);
-                            $newLocation = resolve_path(join_paths($this->path, $location, $file->name));
+                            $newLocation = resolve_path(join_paths($this->path, $to));
 
                             Activity::event('server:file.rename')
                                 ->property('directory', $this->path)

app/Http/Controllers/Auth/OAuthController.php

@@ -74,7 +74,7 @@ class OAuthController extends Controller
         $email = $oauthUser->getEmail();
 
         if (!$email) {
-            return $this->errorRedirect();
+            return $this->errorRedirect('No email was linked to your account on the OAuth provider.');
         }
 
         $user = User::whereEmail($email)->first();

app/Models/Node.php

@@ -358,7 +358,7 @@ class Node extends Model implements Validatable
             'disk_used' => 0,
         ];
 
-        return cache()->remember("nodes.$this->id.statistics", now()->addSeconds(360), function () use ($default) {
+        return cache()->flexible("nodes.$this->id.statistics", [5, 30], function () use ($default) {
             try {
 
                 $data = Http::daemon($this)

app/Services/Servers/ServerDeletionService.php

@@ -5,6 +5,7 @@ namespace App\Services\Servers;
 use App\Exceptions\DisplayException;
 use App\Models\Server;
 use App\Repositories\Daemon\DaemonServerRepository;
+use App\Services\Backups\DeleteBackupService;
 use App\Services\Databases\DatabaseManagementService;
 use Exception;
 use Illuminate\Database\ConnectionInterface;
@@ -16,13 +17,16 @@ class ServerDeletionService
 {
     protected bool $force = false;
 
+    protected bool $deleteBackups = false;
+
     /**
      * ServerDeletionService constructor.
      */
     public function __construct(
         private ConnectionInterface $connection,
         private DaemonServerRepository $daemonServerRepository,
-        private DatabaseManagementService $databaseManagementService
+        private DatabaseManagementService $databaseManagementService,
+        private DeleteBackupService $deleteBackupService
     ) {}
 
     /**
@@ -35,6 +39,16 @@ class ServerDeletionService
         return $this;
     }
 
+    /**
+     * Set if unlocked backups should be deleted from storage when the server is deleted.
+     */
+    public function withDeleteBackups(bool $bool = true): self
+    {
+        $this->deleteBackups = $bool;
+
+        return $this;
+    }
+
     /**
      * Delete a server from the panel and remove any associated databases from hosts.
      *
@@ -78,6 +92,22 @@ class ServerDeletionService
                 }
             }
 
+            if ($this->deleteBackups) {
+                foreach ($server->backups()->where('is_locked', false)->get() as $backup) {
+                    try {
+                        $this->deleteBackupService->handle($backup);
+                    } catch (Exception $exception) {
+                        if (!$this->force) {
+                            throw $exception;
+                        }
+
+                        $backup->delete();
+
+                        logger()->warning($exception);
+                    }
+                }
+            }
+
             $server->allocations()->update([
                 'server_id' => null,
                 'notes' => null,

lang/en/admin/apikey.php

@@ -20,6 +20,8 @@ return [
         'never_used' => 'Never Used',
     ],
     'permissions' => [
+        'all' => 'Set All Permissions',
+        'all_description' => 'Quickly set all permissions below to the same level.',
         'none' => 'None',
         'read' => 'Read',
         'read_write' => 'Read & Write',

lang/en/admin/egg.php

@@ -115,10 +115,6 @@ return [
     'no_update_url' => 'The following eggs do not have a working update URL set: :eggs',
     'cannot_delete' => 'Cannot delete :count egg(s)',
     'eggs_have_servers' => 'The following eggs have servers and cannot be deleted: :eggs',
-    'delete_success' => 'Egg deleted successfully',
-    'deleted' => 'Deleted: :egg',
-    'delete_failed' => 'Failed to delete egg',
-    'could_not_delete' => 'Could not delete: :egg',
     'updated_from' => 'Successfully updated from: :url',
     'update_error' => 'Error: :error',
     'updated_eggs' => 'Updated: :eggs',

lang/en/admin/node.php

@@ -65,6 +65,8 @@ return [
     'sftp_port' => 'SFTP Port',
     'sftp_alias' => 'SFTP Alias',
     'sftp_alias_help' => 'Display alias for the SFTP address. Leave empty to use the Node FQDN.',
+    'daemon_base' => 'Daemon Base Directory',
+    'daemon_base_help' => 'The directory where server data will be stored.',
     'use_for_deploy' => 'Use for Deployments?',
     'maintenance_mode' => 'Maintenance Mode',
     'maintenance_mode_help' => 'If the node is marked \'Under Maintenance\' users won\'t be able to access servers that are on that node',

lang/en/admin/server.php

@@ -98,6 +98,7 @@ return [
     'delete_db' => 'Are you sure you want to delete :name ?',
     'delete_db_heading' => 'Delete Database?',
     'backups' => 'Backups',
+    'delete_backups' => 'Also delete :count backup(s) from storage',
     'egg' => 'Egg',
     'mounts' => 'Mounts',
     'no_mounts' => 'No Mounts exist for this Node',

public/.htaccess

@@ -5,6 +5,10 @@
 
     RewriteEngine On
 
+    # Handle X-Forwarded-Proto Header
+    RewriteCond %{HTTP:X-Forwarded-Proto} =https [NC]
+    RewriteRule .* - [E=HTTPS:on]
+
     # Handle Authorization Header
     RewriteCond %{HTTP:Authorization} .
     RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]

resources/views/filament/server/pages/list-files.blade.php

@@ -1,4 +1,16 @@
 <x-filament-panels::page>
+    @once
+        <style>
+            .files-selection-merged .fi-ta-header-ctn {
+                position: sticky;
+                top: 0;
+                z-index: 1;
+                -webkit-backdrop-filter: blur(8px);
+                backdrop-filter: blur(8px);
+            }
+        </style>
+    @endonce
+
     <div
         x-data="
         {