ci(release): bump version

.env.example

@@ -17,6 +17,9 @@ CACHE_STORE=file
 QUEUE_CONNECTION=database
 SESSION_DRIVER=file
 
+HASHIDS_SALT=
+HASHIDS_LENGTH=8
+
 MAIL_MAILER=log
 MAIL_HOST=smtp.example.com
 MAIL_PORT=25
@@ -30,8 +33,3 @@ MAIL_FROM_NAME="Pelican Admin"
 SESSION_ENCRYPT=false
 SESSION_PATH=/
 SESSION_DOMAIN=null
-
-# Set this to true, and set start & end ports to auto create allocations.
-PANEL_CLIENT_ALLOCATIONS_ENABLED=false
-PANEL_CLIENT_ALLOCATIONS_RANGE_START=
-PANEL_CLIENT_ALLOCATIONS_RANGE_END=

.github/workflows/ci.yaml

@@ -34,6 +34,7 @@ jobs:
       MAIL_MAILER: array
       SESSION_DRIVER: array
       QUEUE_CONNECTION: sync
+      HASHIDS_SALT: alittlebitofsalt1234
       DB_CONNECTION: mysql
       DB_HOST: 127.0.0.1
       DB_DATABASE: testing
@@ -59,7 +60,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
           tools: composer:v2
           coverage: none
 
@@ -96,8 +97,9 @@ jobs:
       MAIL_MAILER: array
       SESSION_DRIVER: array
       QUEUE_CONNECTION: sync
+      HASHIDS_SALT: alittlebitofsalt1234
       DB_CONNECTION: sqlite
-      DB_DATABASE: testing.sqlite
+      DB_DATABASE: ${{ github.workspace }}/database/testing.sqlite
     steps:
       - name: Code Checkout
         uses: actions/checkout@v4
@@ -119,7 +121,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
           tools: composer:v2
           coverage: none
 

.gitignore

@@ -1,28 +1,41 @@
-/.phpunit.cache
-/node_modules
-/public/build
-/public/hot
-/public/storage
-/storage/*.key
-/storage/clockwork/*
 /vendor
 *.DS_Store*
-.env
-.env.backup
-.env.production
-.phpactor.json
-.phpunit.result.cache
-Homestead.json
-Homestead.yaml
-auth.json
-npm-debug.log
-yarn-error.log
-/.fleet
+!.env.ci
+!.env.example
+.env*
+.vagrant/*
+.vscode/*
+storage/framework/*
 /.idea
-/.vscode
+/nbproject
+/.direnv
 
+node_modules
+*.log
+_ide_helper.php
+_ide_helper_models.php
+.phpstorm.meta.php
+.yarn
 public/assets/manifest.json
-/database/*.sqlite
-filament-monaco-editor/
-_ide_helper*
-/.phpstorm.meta.php
+*.sqlite
+
+# For local development with docker
+# Remove if we ever put the Dockerfile in the repo
+.dockerignore
+docker-compose.yml
+
+# for image related files
+misc
+.php-cs-fixer.cache
+coverage.xml
+resources/lang/locales.js
+.phpunit.result.cache
+
+/public/build
+/public/hot
+result
+docker-compose.yaml
+
+public/css/filament-monaco-editor/
+
+public/js/filament-monaco-editor/

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -24,14 +24,15 @@ class AppSettingsCommand extends Command
     ];
 
     public const QUEUE_DRIVERS = [
-        'database' => 'Database (recommended)',
+        'sync' => 'Synchronous (recommended)',
+        'database' => 'Database',
         'redis' => 'Redis',
-        'sync' => 'Synchronous',
     ];
 
     protected $description = 'Configure basic environment settings for the Panel.';
 
     protected $signature = 'p:environment:setup
+                            {--new-salt : Whether or not to generate a new salt for Hashids.}
                             {--url= : The URL that this Panel is running on.}
                             {--cache= : The cache driver backend to use.}
                             {--session= : The session driver backend to use.}
@@ -60,6 +61,10 @@ class AppSettingsCommand extends Command
     {
         $this->variables['APP_TIMEZONE'] = 'UTC';
 
+        if (empty(config('hashids.salt')) || $this->option('new-salt')) {
+            $this->variables['HASHIDS_SALT'] = str_random(20);
+        }
+
         $this->output->comment(__('commands.appsettings.comment.url'));
         $this->variables['APP_URL'] = $this->option('url') ?? $this->ask(
             'Application URL',
@@ -98,13 +103,7 @@ class AppSettingsCommand extends Command
             $this->variables['SESSION_SECURE_COOKIE'] = 'true';
         }
 
-        $redisUsed = count(collect($this->variables)->filter(function ($item) {
-            return $item === 'redis';
-        })) !== 0;
-
-        if ($redisUsed) {
-            $this->requestRedisSettings();
-        }
+        $this->checkForRedis();
 
         $path = base_path('.env');
         if (!file_exists($path)) {
@@ -117,22 +116,25 @@ class AppSettingsCommand extends Command
             Artisan::call('key:generate');
         }
 
-        if ($this->variables['QUEUE_CONNECTION'] !== 'sync') {
-            $this->call('p:environment:queue-service', [
-                '--use-redis' => $redisUsed,
-            ]);
-        }
-
         $this->info($this->console->output());
 
         return 0;
     }
 
     /**
-     * Request redis connection details and verify them.
+     * Check if redis is selected, if so, request connection details and verify them.
      */
-    private function requestRedisSettings(): void
+    private function checkForRedis()
     {
+        $items = collect($this->variables)->filter(function ($item) {
+            return $item === 'redis';
+        });
+
+        // Redis was not selected, no need to continue.
+        if (count($items) === 0) {
+            return;
+        }
+
         $this->output->note(__('commands.appsettings.redis.note'));
         $this->variables['REDIS_HOST'] = $this->option('redis-host') ?? $this->ask(
             'Redis Host',

app/Console/Commands/Environment/DatabaseSettingsCommand.php

@@ -98,7 +98,7 @@ class DatabaseSettingsCommand extends Command
         } elseif ($this->variables['DB_CONNECTION'] === 'sqlite') {
             $this->variables['DB_DATABASE'] = $this->option('database') ?? $this->ask(
                 'Database Path',
-                env('DB_DATABASE', 'database.sqlite')
+                config('database.connections.sqlite.database', database_path('database.sqlite'))
             );
         }
 

app/Console/Commands/Environment/QueueWorkerServiceCommand.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Environment;
-
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Process;
-
-class QueueWorkerServiceCommand extends Command
-{
-    protected $description = 'Create the service for the queue worker.';
-
-    protected $signature = 'p:environment:queue-service
-        {--service-name= : Name of the queue worker service.}
-        {--user= : The user that PHP runs under.}
-        {--group= : The group that PHP runs under.}
-        {--use-redis : Whether redis is used.}
-        {--overwrite : Force overwrite if the service file already exists.}';
-
-    public function handle(): void
-    {
-        $serviceName = $this->option('service-name') ?? $this->ask('Queue worker service name', 'pelican-queue');
-        $path = '/etc/systemd/system/' . $serviceName  . '.service';
-
-        $fileExists = file_exists($path);
-        if ($fileExists && !$this->option('overwrite') && !$this->confirm('The service file already exists. Do you want to overwrite it?')) {
-            $this->line('Creation of queue worker service file aborted because serive file already exists.');
-
-            return;
-        }
-
-        $user = $this->option('user') ?? $this->ask('Webserver User', 'www-data');
-        $group = $this->option('group') ?? $this->ask('Webserver Group', 'www-data');
-
-        $afterRedis = $this->option('use-redis') ? '\nAfter=redis-server.service' : '';
-
-        $basePath = base_path();
-
-        $success = File::put($path, "# Pelican Queue File
-# ----------------------------------
-
-[Unit]
-Description=Pelican Queue Service$afterRedis
-
-[Service]
-User=$user
-Group=$group
-Restart=always
-ExecStart=/usr/bin/php $basePath/artisan queue:work --tries=3
-StartLimitInterval=180
-StartLimitBurst=30
-RestartSec=5s
-
-[Install]
-WantedBy=multi-user.target
-        ");
-
-        if (!$success) {
-            $this->error('Error creating service file');
-
-            return;
-        }
-
-        if ($fileExists) {
-            $result = Process::run("systemctl restart $serviceName.service");
-            if ($result->failed()) {
-                $this->error('Error restarting service: ' . $result->errorOutput());
-
-                return;
-            }
-
-            $this->line('Queue worker service file updated successfully.');
-        } else {
-            $result = Process::run("systemctl enable --now $serviceName.service");
-            if ($result->failed()) {
-                $this->error('Error enabling service: ' . $result->errorOutput());
-
-                return;
-            }
-
-            $this->line('Queue worker service file created successfully.');
-        }
-    }
-}

app/Console/Commands/InfoCommand.php

@@ -26,7 +26,7 @@ class InfoCommand extends Command
     {
         $this->output->title('Version Information');
         $this->table([], [
-            ['Panel Version', $this->versionService->versionData()['version']],
+            ['Panel Version', config('app.version')],
             ['Latest Version', $this->versionService->getPanel()],
             ['Up-to-Date', $this->versionService->isLatestPanel() ? 'Yes' : $this->formatText('No', 'bg=red')],
         ], 'compact');

app/Console/Commands/Node/MakeNodeCommand.php

@@ -20,12 +20,9 @@ class MakeNodeCommand extends Command
                             {--overallocateMemory= : Enter the amount of ram to overallocate (% or -1 to overallocate the maximum).}
                             {--maxDisk= : Set the max disk amount.}
                             {--overallocateDisk= : Enter the amount of disk to overallocate (% or -1 to overallocate the maximum).}
-                            {--maxCpu= : Set the max cpu amount.}
-                            {--overallocateCpu= : Enter the amount of cpu to overallocate (% or -1 to overallocate the maximum).}
                             {--uploadSize= : Enter the maximum upload filesize.}
                             {--daemonListeningPort= : Enter the daemon listening port.}
                             {--daemonSFTPPort= : Enter the daemon SFTP listening port.}
-                            {--daemonSFTPAlias= : Enter the daemon SFTP alias.}
                             {--daemonBase= : Enter the base folder.}';
 
     protected $description = 'Creates a new node on the system via the CLI.';
@@ -61,12 +58,9 @@ class MakeNodeCommand extends Command
         $data['memory_overallocate'] = $this->option('overallocateMemory') ?? $this->ask(__('commands.make_node.memory_overallocate'));
         $data['disk'] = $this->option('maxDisk') ?? $this->ask(__('commands.make_node.disk'));
         $data['disk_overallocate'] = $this->option('overallocateDisk') ?? $this->ask(__('commands.make_node.disk_overallocate'));
-        $data['cpu'] = $this->option('maxCpu') ?? $this->ask(__('commands.make_node.cpu'));
-        $data['cpu_overallocate'] = $this->option('overallocateCpu') ?? $this->ask(__('commands.make_node.cpu_overallocate'));
         $data['upload_size'] = $this->option('uploadSize') ?? $this->ask(__('commands.make_node.upload_size'), '100');
         $data['daemon_listen'] = $this->option('daemonListeningPort') ?? $this->ask(__('commands.make_node.daemonListen'), '8080');
         $data['daemon_sftp'] = $this->option('daemonSFTPPort') ?? $this->ask(__('commands.make_node.daemonSFTP'), '2022');
-        $data['daemon_sftp_alias'] = $this->option('daemonSFTPAlias') ?? $this->ask(__('commands.make_node.daemonSFTPAlias'), '');
         $data['daemon_base'] = $this->option('daemonBase') ?? $this->ask(__('commands.make_node.daemonBase'), '/var/lib/pelican/volumes');
 
         $node = $this->creationService->handle($data);

app/Console/Commands/Schedule/ProcessRunnableCommand.php

@@ -24,7 +24,7 @@ class ProcessRunnableCommand extends Command
             ->whereRelation('server', fn (Builder $builder) => $builder->whereNull('status'))
             ->where('is_active', true)
             ->where('is_processing', false)
-            ->whereDate('next_run_at', '<=', Carbon::now()->toDateTimeString())
+            ->whereDate('next_run_at', '<=', Carbon::now()->toDateString())
             ->get();
 
         if ($schedules->count() < 1) {
@@ -62,7 +62,7 @@ class ProcessRunnableCommand extends Command
 
             $this->line(trans('command/messages.schedule.output_line', [
                 'schedule' => $schedule->name,
-                'id' => $schedule->id,
+                'hash' => $schedule->hashid,
             ]));
         } catch (\Throwable|\Exception $exception) {
             logger()->error($exception, ['schedule_id' => $schedule->id]);

app/Console/Commands/User/MakeUserCommand.php

@@ -30,7 +30,7 @@ class MakeUserCommand extends Command
     public function handle(): int
     {
         try {
-            DB::connection()->getPdo();
+            DB::select('select 1 where 1');
         } catch (Exception $exception) {
             $this->error($exception->getMessage());
 

app/Contracts/Extensions/HashidsInterface.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Contracts\Extensions;
+
+use Hashids\HashidsInterface as VendorHashidsInterface;
+
+interface HashidsInterface extends VendorHashidsInterface
+{
+    /**
+     * Decode an encoded hashid and return the first result.
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function decodeFirst(string $encoded, string $default = null): mixed;
+}

app/Exceptions/DisplayException.php

@@ -48,7 +48,7 @@ class DisplayException extends PanelException implements HttpExceptionInterface
      */
     public function render(Request $request)
     {
-        if ($request->is('livewire/update')) {
+        if (str($request->url())->contains('livewire')) {
             Notification::make()
                 ->title(static::class)
                 ->body($this->getMessage())

app/Exceptions/Service/Deployment/NoViableNodeException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Exceptions\Service\Deployment;
+
+use App\Exceptions\DisplayException;
+
+class NoViableNodeException extends DisplayException
+{
+}

app/Exceptions/Service/User/TwoFactorAuthenticationTokenInvalid.php

@@ -6,9 +6,9 @@ use App\Exceptions\DisplayException;
 
 class TwoFactorAuthenticationTokenInvalid extends DisplayException
 {
-    public string $title = 'Invalid 2FA Code';
-    public string $icon = 'tabler-2fa';
-
+    /**
+     * TwoFactorAuthenticationTokenInvalid constructor.
+     */
     public function __construct()
     {
         parent::__construct('The provided two-factor authentication token was not valid.');

app/Extensions/DynamicDatabaseConnection.php

@@ -25,7 +25,7 @@ class DynamicDatabaseConnection
             'port' => $host->port,
             'database' => $database,
             'username' => $host->username,
-            'password' => $host->password,
+            'password' => decrypt($host->password),
             'charset' => self::DB_CHARSET,
             'collation' => self::DB_COLLATION,
         ]);

app/Extensions/Hashids.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Extensions;
+
+use Hashids\Hashids as VendorHashids;
+use App\Contracts\Extensions\HashidsInterface;
+
+class Hashids extends VendorHashids implements HashidsInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function decodeFirst(string $encoded, string $default = null): mixed
+    {
+        $result = $this->decode($encoded);
+        if (!is_array($result)) {
+            return $default;
+        }
+
+        return array_first($result, null, $default);
+    }
+}

app/Filament/Pages/Dashboard.php

@@ -7,7 +7,6 @@ use App\Models\Egg;
 use App\Models\Node;
 use App\Models\Server;
 use App\Models\User;
-use App\Services\Helpers\SoftwareVersionService;
 use Filament\Actions\CreateAction;
 use Filament\Pages\Page;
 
@@ -30,14 +29,8 @@ class Dashboard extends Page
 
     public function getViewData(): array
     {
-        /** @var SoftwareVersionService $softwareVersionService */
-        $softwareVersionService = app(SoftwareVersionService::class);
-
         return [
             'inDevelopment' => config('app.version') === 'canary',
-            'version' => $softwareVersionService->versionData()['version'],
-            'latestVersion' => $softwareVersionService->getPanel(),
-            'isLatest' => $softwareVersionService->isLatestPanel(),
             'eggsCount' => Egg::query()->count(),
             'nodesList' => ListNodes::getUrl(),
             'nodesCount' => Node::query()->count(),
@@ -46,17 +39,15 @@ class Dashboard extends Page
 
             'devActions' => [
                 CreateAction::make()
-                    ->label('Bugs & Features')
+                    ->label(trans('dashboard/index.sections.intro-developers.button_issues'))
+                    ->icon('tabler-brand-github')
+                    ->url('https://github.com/pelican-dev/panel/issues/new/choose', true)
+                    ->color('warning'),
+                CreateAction::make()
+                    ->label(trans('dashboard/index.sections.intro-developers.button_features'))
                     ->icon('tabler-brand-github')
                     ->url('https://github.com/pelican-dev/panel/discussions', true),
             ],
-            'updateActions' => [
-                CreateAction::make()
-                    ->label('Read Documentation')
-                    ->icon('tabler-clipboard-text')
-                    ->url('https://pelican.dev/docs/panel/update', true)
-                    ->color('warning'),
-            ],
             'nodeActions' => [
                 CreateAction::make()
                     ->label(trans('dashboard/index.sections.intro-first-node.button_label'))
@@ -64,10 +55,14 @@ class Dashboard extends Page
                     ->url(route('filament.admin.resources.nodes.create')),
             ],
             'supportActions' => [
+                CreateAction::make()
+                    ->label(trans('dashboard/index.sections.intro-support.button_translate'))
+                    ->icon('tabler-language')
+                    ->url('https://crowdin.com/project/pelican-dev', true),
                 CreateAction::make()
                     ->label(trans('dashboard/index.sections.intro-support.button_donate'))
                     ->icon('tabler-cash')
-                    ->url($softwareVersionService->getDonations(), true)
+                    ->url('https://pelican.dev/donate', true)
                     ->color('success'),
             ],
             'helpActions' => [
@@ -75,6 +70,11 @@ class Dashboard extends Page
                     ->label(trans('dashboard/index.sections.intro-help.button_docs'))
                     ->icon('tabler-speedboat')
                     ->url('https://pelican.dev/docs', true),
+                CreateAction::make()
+                    ->label(trans('dashboard/index.sections.intro-help.button_discord'))
+                    ->icon('tabler-brand-discord')
+                    ->url('https://discord.gg/pelican-panel', true)
+                    ->color('blurple'),
             ],
         ];
     }

app/Filament/Resources/ApiKeyResource.php

@@ -4,7 +4,9 @@ namespace App\Filament\Resources;
 
 use App\Filament\Resources\ApiKeyResource\Pages;
 use App\Models\ApiKey;
+use Filament\Resources\Components\Tab;
 use Filament\Resources\Resource;
+use Illuminate\Database\Eloquent\Builder;
 
 class ApiKeyResource extends Resource
 {
@@ -14,7 +16,7 @@ class ApiKeyResource extends Resource
 
     public static function getNavigationBadge(): ?string
     {
-        return static::getModel()::where('key_type', '2')->count() ?: null;
+        return static::getModel()::count() ?: null;
     }
 
     public static function canEdit($record): bool
@@ -22,6 +24,20 @@ class ApiKeyResource extends Resource
         return false;
     }
 
+    public function getTabs(): array
+    {
+        return [
+            'all' => Tab::make('All Keys'),
+            'application' => Tab::make('Application Keys')
+                ->modifyQueryUsing(fn (Builder $query) => $query->where('key_type', ApiKey::TYPE_APPLICATION)),
+        ];
+    }
+
+    public function getDefaultActiveTab(): string|int|null
+    {
+        return 'application';
+    }
+
     public static function getRelations(): array
     {
         return [

app/Filament/Resources/ApiKeyResource/Pages/CreateApiKey.php

@@ -19,16 +19,30 @@ class CreateApiKey extends CreateRecord
         return $form
             ->schema([
                 Forms\Components\Hidden::make('identifier')->default(ApiKey::generateTokenIdentifier(ApiKey::TYPE_APPLICATION)),
-                Forms\Components\Hidden::make('token')->default(str_random(ApiKey::KEY_LENGTH)),
+                Forms\Components\Hidden::make('token')->default(encrypt(str_random(ApiKey::KEY_LENGTH))),
 
                 Forms\Components\Hidden::make('user_id')
                     ->default(auth()->user()->id)
                     ->required(),
 
-                Forms\Components\Hidden::make('key_type')
+                Forms\Components\Select::make('key_type')
                     ->inlineLabel()
-                    ->default(ApiKey::TYPE_APPLICATION)
-                    ->required(),
+                    ->options(function (ApiKey $apiKey) {
+                        $originalOptions = [
+                            //ApiKey::TYPE_NONE => 'None',
+                            ApiKey::TYPE_ACCOUNT => 'Account',
+                            ApiKey::TYPE_APPLICATION => 'Application',
+                            //ApiKey::TYPE_DAEMON_USER => 'Daemon User',
+                            //ApiKey::TYPE_DAEMON_APPLICATION => 'Daemon Application',
+                        ];
+
+                        return collect($originalOptions)
+                            ->filter(fn ($value, $key) => $key <= ApiKey::TYPE_APPLICATION || $apiKey->key_type === $key)
+                            ->all();
+                    })
+                    ->selectablePlaceholder(false)
+                    ->required()
+                    ->default(ApiKey::TYPE_APPLICATION),
 
                 Forms\Components\Fieldset::make('Permissions')
                     ->columns([

app/Filament/Resources/ApiKeyResource/Pages/ListApiKeys.php

@@ -5,8 +5,10 @@ namespace App\Filament\Resources\ApiKeyResource\Pages;
 use App\Filament\Resources\ApiKeyResource;
 use App\Models\ApiKey;
 use Filament\Actions;
+use Filament\Resources\Components\Tab;
 use Filament\Resources\Pages\ListRecords;
 use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
 use Filament\Tables;
 
 class ListApiKeys extends ListRecords
@@ -17,12 +19,16 @@ class ListApiKeys extends ListRecords
     {
         return $table
             ->searchable(false)
-            ->modifyQueryUsing(fn ($query) => $query->where('key_type', ApiKey::TYPE_APPLICATION))
             ->columns([
+                Tables\Columns\TextColumn::make('user.username')
+                    ->hidden()
+                    ->searchable()
+                    ->sortable(),
+
                 Tables\Columns\TextColumn::make('key')
                     ->copyable()
                     ->icon('tabler-clipboard-text')
-                    ->state(fn (ApiKey $key) => $key->identifier . $key->token),
+                    ->state(fn (ApiKey $key) => $key->identifier . decrypt($key->token)),
 
                 Tables\Columns\TextColumn::make('memo')
                     ->label('Description')
@@ -35,7 +41,6 @@ class ListApiKeys extends ListRecords
 
                 Tables\Columns\TextColumn::make('last_used_at')
                     ->label('Last Used')
-                    ->placeholder('Not Used')
                     ->dateTime()
                     ->sortable(),
 
@@ -43,13 +48,13 @@ class ListApiKeys extends ListRecords
                     ->label('Created')
                     ->dateTime()
                     ->sortable(),
-
-                Tables\Columns\TextColumn::make('user.username')
-                    ->label('Created By')
-                    ->url(fn (ApiKey $apiKey): string => route('filament.admin.resources.users.edit', ['record' => $apiKey->user])),
+            ])
+            ->filters([
+                //
             ])
             ->actions([
                 Tables\Actions\DeleteAction::make(),
+                //Tables\Actions\EditAction::make()
             ]);
     }
 
@@ -59,4 +64,22 @@ class ListApiKeys extends ListRecords
             Actions\CreateAction::make(),
         ];
     }
+
+    public function getTabs(): array
+    {
+        return [
+            'all' => Tab::make('All Keys'),
+            'application' => Tab::make('Application Keys')
+                ->modifyQueryUsing(fn (Builder $query) => $query->where('key_type', ApiKey::TYPE_APPLICATION)
+                ),
+            'account' => Tab::make('Account Keys')
+                ->modifyQueryUsing(fn (Builder $query) => $query->where('key_type', ApiKey::TYPE_ACCOUNT)
+                ),
+        ];
+    }
+
+    public function getDefaultActiveTab(): string|int|null
+    {
+        return 'application';
+    }
 }

app/Filament/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php

@@ -74,6 +74,15 @@ class CreateDatabaseHost extends CreateRecord
             ]);
     }
 
+    protected function mutateFormDataBeforeCreate(array $data): array
+    {
+        if (isset($data['password'])) {
+            $data['password'] = encrypt($data['password']);
+        }
+
+        return $data;
+    }
+
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php

@@ -3,7 +3,6 @@
 namespace App\Filament\Resources\DatabaseHostResource\Pages;
 
 use App\Filament\Resources\DatabaseHostResource;
-use App\Models\DatabaseHost;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 use Filament\Forms;
@@ -72,13 +71,20 @@ class EditDatabaseHost extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make()
-                ->label(fn (DatabaseHost $databaseHost) => $databaseHost->databases()->count() > 0 ? 'Database Host Has Databases' : 'Delete')
-                ->disabled(fn (DatabaseHost $databaseHost) => $databaseHost->databases()->count() > 0),
+            Actions\DeleteAction::make(),
             $this->getSaveFormAction()->formId('form'),
         ];
     }
 
+    protected function mutateFormDataBeforeSave(array $data): array
+    {
+        if (isset($data['password'])) {
+            $data['password'] = encrypt($data['password']);
+        }
+
+        return $data;
+    }
+
     protected function getFormActions(): array
     {
         return [];

app/Filament/Resources/DatabaseHostResource/RelationManagers/DatabasesRelationManager.php

@@ -15,6 +15,8 @@ class DatabasesRelationManager extends RelationManager
 {
     protected static string $relationship = 'databases';
 
+    protected $listeners = ['refresh' => 'refreshForm'];
+
     public function form(Form $form): Form
     {
         return $form
@@ -26,15 +28,15 @@ class DatabasesRelationManager extends RelationManager
                         Action::make('rotate')
                             ->icon('tabler-refresh')
                             ->requiresConfirmation()
-                            ->action(fn (DatabasePasswordService $service, Database $database, $set, $get) => $this->rotatePassword($service, $database, $set, $get))
+                            ->action(fn (DatabasePasswordService $service, Database $database) => $service->handle($database))
                     )
-                    ->formatStateUsing(fn (Database $database) => $database->password),
+                    ->formatStateUsing(fn (Database $database) => decrypt($database->password)),
                 Forms\Components\TextInput::make('remote')->label('Connections From'),
                 Forms\Components\TextInput::make('max_connections'),
                 Forms\Components\TextInput::make('JDBC')
                     ->label('JDBC Connection String')
                     ->columnSpanFull()
-                    ->formatStateUsing(fn (Forms\Get $get, Database $database) => 'jdbc:mysql://' . $get('username') . ':' . urlencode($database->password) . '@' . $database->host->host . ':' . $database->host->port . '/' . $get('database')),
+                    ->formatStateUsing(fn (Forms\Get $get, Database $database) => 'jdbc:mysql://' . $get('username') . ':' . urlencode(decrypt($database->password)) . '@' . $database->host->host . ':' . $database->host->port . '/' . $get('database')),
             ]);
     }
     public function table(Table $table): Table
@@ -58,13 +60,4 @@ class DatabasesRelationManager extends RelationManager
                 //Tables\Actions\EditAction::make(),
             ]);
     }
-
-    protected function rotatePassword(DatabasePasswordService $service, Database $database, $set, $get): void
-    {
-        $newPassword = $service->handle($database);
-        $jdbcString = 'jdbc:mysql://' . $get('username') . ':' . urlencode($newPassword) . '@' . $database->host->host . ':' . $database->host->port . '/' . $get('database');
-
-        $set('password', $newPassword);
-        $set('JDBC', $jdbcString);
-    }
 }

app/Filament/Resources/EggResource/Pages/EditEgg.php

@@ -25,12 +25,12 @@ class EditEgg extends EditRecord
                             Forms\Components\TextInput::make('name')
                                 ->required()
                                 ->maxLength(191)
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 1])
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 1])
                                 ->helperText('A simple, human-readable name to use as an identifier for this Egg.'),
                             Forms\Components\TextInput::make('uuid')
                                 ->label('Egg UUID')
                                 ->disabled()
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
                                 ->helperText('This is the globally unique identifier for this Egg which Wings uses as an identifier.'),
                             Forms\Components\TextInput::make('id')
                                 ->label('Egg ID')

app/Filament/Resources/EggResource/Pages/ListEggs.php

@@ -8,7 +8,6 @@ use App\Services\Eggs\Sharing\EggImporterService;
 use Exception;
 use Filament\Actions;
 use Filament\Forms;
-use Filament\Forms\Components\Tabs;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\ListRecords;
 use Filament\Tables\Table;
@@ -32,13 +31,28 @@ class ListEggs extends ListRecords
                     ->searchable(),
                 Tables\Columns\TextColumn::make('name')
                     ->icon('tabler-egg')
-                    ->description(fn ($record): ?string => (strlen($record->description) > 120) ? substr($record->description, 0, 120).'...' : $record->description)
+                    ->description(fn ($record): ?string => $record->description)
                     ->wrap()
                     ->searchable(),
+                Tables\Columns\TextColumn::make('author')
+                    ->hidden()
+                    ->searchable(),
                 Tables\Columns\TextColumn::make('servers_count')
                     ->counts('servers')
                     ->icon('tabler-server')
                     ->label('Servers'),
+                Tables\Columns\TextColumn::make('script_container')
+                    ->searchable()
+                    ->hidden(),
+                Tables\Columns\TextColumn::make('copyFrom.name')
+                    ->hidden()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('script_entry')
+                    ->hidden()
+                    ->searchable(),
+            ])
+            ->filters([
+                //
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),
@@ -49,6 +63,9 @@ class ListEggs extends ListRecords
                     // TODO uses old admin panel export service
                     ->url(fn (Egg $egg): string => route('admin.eggs.export', ['egg' => $egg])),
             ])
+            ->headerActions([
+                //
+            ])
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([
                     Tables\Actions\DeleteBulkAction::make(),
@@ -63,58 +80,21 @@ class ListEggs extends ListRecords
             Actions\Action::make('import')
                 ->label('Import')
                 ->form([
-                    Tabs::make('Tabs')
-                        ->tabs([
-                            Tabs\Tab::make('From File')
-                                ->icon('tabler-file-upload')
-                                ->schema([
-                                    Forms\Components\FileUpload::make('egg')
-                                        ->label('Egg')
-                                        ->hint('This should be the json file ( egg-minecraft.json )')
-                                        ->acceptedFileTypes(['application/json'])
-                                        ->storeFiles(false)
-                                        ->multiple(),
-                                ]),
-                            Tabs\Tab::make('From URL')
-                                ->icon('tabler-world-upload')
-                                ->schema([
-                                    Forms\Components\TextInput::make('url')
-                                        ->label('URL')
-                                        ->hint('This URL should point to a single json file')
-                                        ->url(),
-                                ]),
-                        ])
-                        ->contained(false),
-
+                    Forms\Components\FileUpload::make('egg')
+                        ->acceptedFileTypes(['application/json'])
+                        ->storeFiles(false)
+                        ->multiple(),
                 ])
                 ->action(function (array $data): void {
+                    /** @var TemporaryUploadedFile $eggFile */
+                    $eggFile = $data['egg'];
 
                     /** @var EggImporterService $eggImportService */
                     $eggImportService = resolve(EggImporterService::class);
 
-                    if (!empty($data['egg'])) {
-                        /** @var TemporaryUploadedFile[] $eggFile */
-                        $eggFile = $data['egg'];
-
-                        foreach ($eggFile as $file) {
-                            try {
-                                $eggImportService->fromFile($file);
-                            } catch (Exception $exception) {
-                                Notification::make()
-                                    ->title('Import Failed')
-                                    ->danger()
-                                    ->send();
-
-                                report($exception);
-
-                                return;
-                            }
-                        }
-                    }
-
-                    if (!empty($data['url'])) {
+                    foreach ($eggFile as $file) {
                         try {
-                            $eggImportService->fromUrl($data['url']);
+                            $eggImportService->handle($file);
                         } catch (Exception $exception) {
                             Notification::make()
                                 ->title('Import Failed')

app/Filament/Resources/NodeResource/Pages/CreateNode.php

@@ -311,47 +311,6 @@ class CreateNode extends CreateRecord
                                         ->default(0)
                                         ->suffix('%'),
                                 ]),
-                            Forms\Components\Grid::make()
-                                ->columns(6)
-                                ->columnSpanFull()
-                                ->schema([
-                                    Forms\Components\ToggleButtons::make('unlimited_cpu')
-                                        ->label('CPU')->inlineLabel()->inline()
-                                        ->live()
-                                        ->afterStateUpdated(fn (Forms\Set $set) => $set('cpu', 0))
-                                        ->afterStateUpdated(fn (Forms\Set $set) => $set('cpu_overallocate', 0))
-                                        ->formatStateUsing(fn (Forms\Get $get) => $get('cpu') == 0)
-                                        ->options([
-                                            true => 'Unlimited',
-                                            false => 'Limited',
-                                        ])
-                                        ->colors([
-                                            true => 'primary',
-                                            false => 'warning',
-                                        ])
-                                        ->columnSpan(2),
-                                    Forms\Components\TextInput::make('cpu')
-                                        ->dehydratedWhenHidden()
-                                        ->hidden(fn (Forms\Get $get) => $get('unlimited_cpu'))
-                                        ->label('CPU Limit')->inlineLabel()
-                                        ->suffix('%')
-                                        ->columnSpan(2)
-                                        ->numeric()
-                                        ->default(0)
-                                        ->minValue(0),
-                                    Forms\Components\TextInput::make('cpu_overallocate')
-                                        ->dehydratedWhenHidden()
-                                        ->hidden(fn (Forms\Get $get) => $get('unlimited_cpu'))
-                                        ->label('Overallocate')->inlineLabel()
-                                        ->hintIcon('tabler-question-mark')
-                                        ->hintIconTooltip('The % allowable to go over the set limit.')
-                                        ->columnSpan(2)
-                                        ->numeric()
-                                        ->default(0)
-                                        ->minValue(-1)
-                                        ->maxValue(100)
-                                        ->suffix('%'),
-                                ]),
                         ]),
                 ]),
         ]);

app/Filament/Resources/NodeResource/Pages/EditNode.php

@@ -6,11 +6,9 @@ use App\Filament\Resources\NodeResource;
 use App\Filament\Resources\NodeResource\Widgets\NodeMemoryChart;
 use App\Filament\Resources\NodeResource\Widgets\NodeStorageChart;
 use App\Models\Node;
-use App\Services\Nodes\NodeUpdateService;
 use Filament\Actions;
 use Filament\Forms;
 use Filament\Forms\Components\Tabs;
-use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
 use Illuminate\Support\HtmlString;
 use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
@@ -187,49 +185,26 @@ class EditNode extends EditRecord
                                 ])
                                 ->default(fn () => request()->isSecure() ? 'https' : 'http'), ]),
                     Tabs\Tab::make('Advanced Settings')
-                        ->columns(['default' => 1, 'sm' => 1, 'md' => 4, 'lg' => 6])
                         ->icon('tabler-server-cog')
                         ->schema([
                             Forms\Components\TextInput::make('id')
                                 ->label('Node ID')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 1])
                                 ->disabled(),
                             Forms\Components\TextInput::make('uuid')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
                                 ->label('Node UUID')
                                 ->hintAction(CopyAction::make())
+                                ->columnSpan(2)
                                 ->disabled(),
                             Forms\Components\TagsInput::make('tags')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
                                 ->label('Tags')
                                 ->disabled()
                                 ->placeholder('Not Implemented')
                                 ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip('Not Implemented'),
-                            Forms\Components\TextInput::make('upload_size')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 1])
-                                ->label('Upload Limit')
-                                ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip('Enter the maximum size of files that can be uploaded through the web-based file manager.')
-                                ->numeric()->required()
-                                ->minValue(1)
-                                ->maxValue(1024)
-                                ->suffix('MiB'),
-                            Forms\Components\TextInput::make('daemon_sftp')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
-                                ->label('SFTP Port')
-                                ->minValue(0)
-                                ->maxValue(65536)
-                                ->default(2022)
-                                ->required()
-                                ->integer(),
-                            Forms\Components\TextInput::make('daemon_sftp_alias')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
-                                ->label('SFTP Alias')
-                                ->helperText('Display alias for the SFTP address. Leave empty to use the Node FQDN.'),
+                                ->hintIconTooltip('Not Implemented')
+                                ->columnSpan(1),
                             Forms\Components\ToggleButtons::make('public')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
                                 ->label('Automatic Allocation')->inline()
+                                ->columnSpan(1)
                                 ->options([
                                     true => 'Yes',
                                     false => 'No',
@@ -239,20 +214,29 @@ class EditNode extends EditRecord
                                     false => 'danger',
                                 ]),
                             Forms\Components\ToggleButtons::make('maintenance_mode')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
                                 ->label('Maintenance Mode')->inline()
+                                ->columnSpan(1)
                                 ->hinticon('tabler-question-mark')
                                 ->hintIconTooltip("If the node is marked 'Under Maintenance' users won't be able to access servers that are on this node.")
                                 ->options([
-                                    false => 'Disable',
                                     true => 'Enable',
+                                    false => 'Disable',
                                 ])
                                 ->colors([
-                                    false => 'success',
                                     true => 'danger',
+                                    false => 'success',
                                 ]),
+                            Forms\Components\TextInput::make('upload_size')
+                                ->label('Upload Limit')
+                                ->hintIcon('tabler-question-mark')
+                                ->hintIconTooltip('Enter the maximum size of files that can be uploaded through the web-based file manager.')
+                                ->columnStart(4)->columnSpan(1)
+                                ->numeric()->required()
+                                ->minValue(1)
+                                ->maxValue(1024)
+                                ->suffix('MiB'),
                             Forms\Components\Grid::make()
-                                ->columns(['default' => 1, 'sm' => 1, 'md' => 3, 'lg' => 6])
+                                ->columns(6)
                                 ->columnSpanFull()
                                 ->schema([
                                     Forms\Components\ToggleButtons::make('unlimited_mem')
@@ -269,14 +253,14 @@ class EditNode extends EditRecord
                                             true => 'primary',
                                             false => 'warning',
                                         ])
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2]),
+                                        ->columnSpan(2),
                                     Forms\Components\TextInput::make('memory')
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Forms\Get $get) => $get('unlimited_mem'))
                                         ->label('Memory Limit')->inlineLabel()
                                         ->suffix('MiB')
                                         ->required()
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
+                                        ->columnSpan(2)
                                         ->numeric()
                                         ->minValue(0),
                                     Forms\Components\TextInput::make('memory_overallocate')
@@ -286,14 +270,15 @@ class EditNode extends EditRecord
                                         ->hidden(fn (Forms\Get $get) => $get('unlimited_mem'))
                                         ->hintIcon('tabler-question-mark')
                                         ->hintIconTooltip('The % allowable to go over the set limit.')
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
+                                        ->columnSpan(2)
                                         ->numeric()
                                         ->minValue(-1)
                                         ->maxValue(100)
                                         ->suffix('%'),
                                 ]),
                             Forms\Components\Grid::make()
-                                ->columns(['default' => 1, 'sm' => 1, 'md' => 3, 'lg' => 6])
+                                ->columns(6)
+                                ->columnSpanFull()
                                 ->schema([
                                     Forms\Components\ToggleButtons::make('unlimited_disk')
                                         ->label('Disk')->inlineLabel()->inline()
@@ -309,14 +294,14 @@ class EditNode extends EditRecord
                                             true => 'primary',
                                             false => 'warning',
                                         ])
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2]),
+                                        ->columnSpan(2),
                                     Forms\Components\TextInput::make('disk')
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Forms\Get $get) => $get('unlimited_disk'))
                                         ->label('Disk Limit')->inlineLabel()
                                         ->suffix('MiB')
                                         ->required()
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
+                                        ->columnSpan(2)
                                         ->numeric()
                                         ->minValue(0),
                                     Forms\Components\TextInput::make('disk_overallocate')
@@ -325,47 +310,6 @@ class EditNode extends EditRecord
                                         ->label('Overallocate')->inlineLabel()
                                         ->hintIcon('tabler-question-mark')
                                         ->hintIconTooltip('The % allowable to go over the set limit.')
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
-                                        ->required()
-                                        ->numeric()
-                                        ->minValue(-1)
-                                        ->maxValue(100)
-                                        ->suffix('%'),
-                                ]),
-                            Forms\Components\Grid::make()
-                                ->columns(6)
-                                ->columnSpanFull()
-                                ->schema([
-                                    Forms\Components\ToggleButtons::make('unlimited_cpu')
-                                        ->label('CPU')->inlineLabel()->inline()
-                                        ->live()
-                                        ->afterStateUpdated(fn (Forms\Set $set) => $set('cpu', 0))
-                                        ->afterStateUpdated(fn (Forms\Set $set) => $set('cpu_overallocate', 0))
-                                        ->formatStateUsing(fn (Forms\Get $get) => $get('cpu') == 0)
-                                        ->options([
-                                            true => 'Unlimited',
-                                            false => 'Limited',
-                                        ])
-                                        ->colors([
-                                            true => 'primary',
-                                            false => 'warning',
-                                        ])
-                                        ->columnSpan(2),
-                                    Forms\Components\TextInput::make('cpu')
-                                        ->dehydratedWhenHidden()
-                                        ->hidden(fn (Forms\Get $get) => $get('unlimited_cpu'))
-                                        ->label('CPU Limit')->inlineLabel()
-                                        ->suffix('%')
-                                        ->required()
-                                        ->columnSpan(2)
-                                        ->numeric()
-                                        ->minValue(0),
-                                    Forms\Components\TextInput::make('cpu_overallocate')
-                                        ->dehydratedWhenHidden()
-                                        ->hidden(fn (Forms\Get $get) => $get('unlimited_cpu'))
-                                        ->label('Overallocate')->inlineLabel()
-                                        ->hintIcon('tabler-question-mark')
-                                        ->hintIconTooltip('The % allowable to go over the set limit.')
                                         ->columnSpan(2)
                                         ->required()
                                         ->numeric()
@@ -388,18 +332,6 @@ class EditNode extends EditRecord
                                 ->rows(19)
                                 ->hintAction(CopyAction::make())
                                 ->columnSpanFull(),
-                            Forms\Components\Actions::make([
-                                Forms\Components\Actions\Action::make('resetKey')
-                                    ->label('Reset Daemon Token')
-                                    ->color('danger')
-                                    ->requiresConfirmation()
-                                    ->modalHeading('Reset Daemon Token?')
-                                    ->modalDescription('Resetting the daemon token will void any request coming from the old token. This token is used for all sensitive operations on the daemon including server creation and deletion. We suggest changing this token regularly for security.')
-                                    ->action(fn (NodeUpdateService $nodeUpdateService, Node $node) => $nodeUpdateService->handle($node, [], true)
-                                        && Notification::make()->success()->title('Daemon Key Reset')->send()
-                                        && $this->fillForm()
-                                    ),
-                            ]),
                         ]),
                 ]),
         ]);
@@ -435,9 +367,4 @@ class EditNode extends EditRecord
             NodeMemoryChart::class,
         ];
     }
-
-    protected function afterSave(): void
-    {
-        $this->fillForm();
-    }
 }

app/Filament/Resources/NodeResource/Pages/ListNodes.php

@@ -52,12 +52,6 @@ class ListNodes extends ListRecords
                     ->suffix(' GiB')
                     ->formatStateUsing(fn ($state) => number_format($state / 1024, 2))
                     ->sortable(),
-                Tables\Columns\TextColumn::make('cpu')
-                    ->visibleFrom('sm')
-                    ->icon('tabler-file')
-                    ->numeric()
-                    ->suffix(' %')
-                    ->sortable(),
                 Tables\Columns\IconColumn::make('scheme')
                     ->visibleFrom('xl')
                     ->label('SSL')

app/Filament/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php

@@ -40,10 +40,6 @@ class AllocationsRelationManager extends RelationManager
             ->checkIfRecordIsSelectableUsing(fn (Allocation $allocation) => $allocation->server_id === null)
             ->searchable()
             ->columns([
-                Tables\Columns\TextColumn::make('id'),
-                Tables\Columns\TextColumn::make('port')
-                    ->searchable()
-                    ->label('Port'),
                 Tables\Columns\TextColumn::make('server.name')
                     ->label('Server')
                     ->icon('tabler-brand-docker')
@@ -55,6 +51,9 @@ class AllocationsRelationManager extends RelationManager
                 Tables\Columns\TextInputColumn::make('ip')
                     ->searchable()
                     ->label('IP'),
+                Tables\Columns\TextColumn::make('port')
+                    ->searchable()
+                    ->label('Port'),
             ])
             ->filters([
                 //
@@ -113,7 +112,7 @@ class AllocationsRelationManager extends RelationManager
 
                                     $start = max((int) $start, 0);
                                     $end = min((int) $end, 2 ** 16 - 1);
-                                    foreach (range($start, $end) as $i) {
+                                    for ($i = $start; $i <= $end; $i++) {
                                         $ports->push($i);
                                     }
                                 }

app/Filament/Resources/ServerResource/Pages/CreateServer.php

@@ -23,8 +23,6 @@ class CreateServer extends CreateRecord
     protected static string $resource = ServerResource::class;
     protected static bool $canCreateAnother = false;
 
-    public ?Node $node = null;
-
     public function form(Form $form): Form
     {
         return $form
@@ -79,16 +77,13 @@ class CreateServer extends CreateRecord
                 Forms\Components\Select::make('node_id')
                     ->disabledOn('edit')
                     ->prefixIcon('tabler-server-2')
-                    ->default(fn () => ($this->node = Node::query()->latest()->first())?->id)
+                    ->default(fn () => Node::query()->latest()->first()?->id)
                     ->columnSpan(2)
                     ->live()
                     ->relationship('node', 'name')
                     ->searchable()
                     ->preload()
-                    ->afterStateUpdated(function (Forms\Set $set, $state) {
-                        $set('allocation_id', null);
-                        $this->node = Node::find($state);
-                    })
+                    ->afterStateUpdated(fn (Forms\Set $set) => $set('allocation_id', null))
                     ->required(),
 
                 Forms\Components\Select::make('allocation_id')
@@ -314,6 +309,55 @@ class CreateServer extends CreateRecord
                     ->inline()
                     ->required(),
 
+                Forms\Components\Select::make('select_image')
+                    ->label('Docker Image Name')
+                    ->prefixIcon('tabler-brand-docker')
+                    ->live()
+                    ->afterStateUpdated(fn (Forms\Set $set, $state) => $set('image', $state))
+                    ->options(function ($state, Forms\Get $get, Forms\Set $set) {
+                        $egg = Egg::query()->find($get('egg_id'));
+                        $images = $egg->docker_images ?? [];
+
+                        $currentImage = $get('image');
+                        if (!$currentImage && $images) {
+                            $defaultImage = collect($images)->first();
+                            $set('image', $defaultImage);
+                            $set('select_image', $defaultImage);
+                        }
+
+                        return array_flip($images) + ['ghcr.io/custom-image' => 'Custom Image'];
+                    })
+                    ->selectablePlaceholder(false)
+                    ->columnSpan([
+                        'default' => 2,
+                        'sm' => 2,
+                        'md' => 2,
+                        'lg' => 3,
+                    ]),
+
+                Forms\Components\TextInput::make('image')
+                    ->label('Docker Image')
+                    ->prefixIcon('tabler-brand-docker')
+                    ->live()
+                    ->debounce(500)
+                    ->afterStateUpdated(function ($state, Forms\Get $get, Forms\Set $set) {
+                        $egg = Egg::query()->find($get('egg_id'));
+                        $images = $egg->docker_images ?? [];
+
+                        if (in_array($state, $images)) {
+                            $set('select_image', $state);
+                        } else {
+                            $set('select_image', 'ghcr.io/custom-image');
+                        }
+                    })
+                    ->placeholder('Enter a custom Image')
+                    ->columnSpan([
+                        'default' => 2,
+                        'sm' => 2,
+                        'md' => 2,
+                        'lg' => 3,
+                    ]),
+
                 Forms\Components\Textarea::make('startup')
                     ->hintIcon('tabler-code')
                     ->label('Startup Command')
@@ -349,12 +393,7 @@ class CreateServer extends CreateRecord
                     ]))
                     ->schema([
                         Forms\Components\Placeholder::make('Select an egg first to show its variables!')
-                            ->hidden(fn (Forms\Get $get) => $get('egg_id')),
-
-                        Forms\Components\Placeholder::make('The selected egg has no variables!')
-                            ->hidden(fn (Forms\Get $get) => !$get('egg_id') ||
-                                Egg::query()->find($get('egg_id'))?->variables()?->count()
-                            ),
+                            ->hidden(fn (Forms\Get $get) => !empty($get('server_variables'))),
 
                         Forms\Components\Repeater::make('server_variables')
                             ->relationship('serverVariables')
@@ -371,20 +410,19 @@ class CreateServer extends CreateRecord
                                 $text = Forms\Components\TextInput::make('variable_value')
                                     ->hidden($this->shouldHideComponent(...))
                                     ->maxLength(191)
-                                    ->required(fn (Forms\Get $get) => in_array('required', explode('|', $get('rules'))))
-                                    ->rules(
+                                    ->rules([
                                         fn (Forms\Get $get): Closure => function (string $attribute, $value, Closure $fail) use ($get) {
                                             $validator = Validator::make(['validatorkey' => $value], [
                                                 'validatorkey' => $get('rules'),
                                             ]);
 
                                             if ($validator->fails()) {
-                                                $message = str($validator->errors()->first())->replace('validatorkey', $get('name'))->toString();
+                                                $message = str($validator->errors()->first())->replace('validatorkey', $get('name'));
 
                                                 $fail($message);
                                             }
                                         },
-                                    );
+                                    ]);
 
                                 $select = Forms\Components\Select::make('variable_value')
                                     ->hidden($this->shouldHideComponent(...))
@@ -414,7 +452,7 @@ class CreateServer extends CreateRecord
                             ->columnSpan(2),
                     ]),
 
-                Forms\Components\Section::make('Environment Management')
+                Forms\Components\Section::make('Resource Management')
                     ->collapsed()
                     ->icon('tabler-server-cog')
                     ->iconColor('primary')
@@ -426,190 +464,175 @@ class CreateServer extends CreateRecord
                     ])
                     ->columnSpanFull()
                     ->schema([
-                        Forms\Components\Fieldset::make('Resource Limits')
-                            ->columnSpan([
-                                'default' => 2,
-                                'sm' => 4,
-                                'md' => 4,
-                                'lg' => 6,
-                            ])
-                            ->columns([
-                                'default' => 1,
-                                'sm' => 2,
-                                'md' => 3,
-                                'lg' => 3,
-                            ])
+                        Forms\Components\Grid::make()
+                            ->columns(4)
+                            ->columnSpanFull()
                             ->schema([
-                                Forms\Components\Grid::make()
-                                    ->columns(4)
-                                    ->columnSpanFull()
-                                    ->schema([
-                                        Forms\Components\ToggleButtons::make('unlimited_mem')
-                                            ->label('Memory')->inlineLabel()->inline()
-                                            ->default(true)
-                                            ->afterStateUpdated(fn (Forms\Set $set) => $set('memory', 0))
-                                            ->live()
-                                            ->options([
-                                                true => 'Unlimited',
-                                                false => 'Limited',
-                                            ])
-                                            ->colors([
-                                                true => 'primary',
-                                                false => 'warning',
-                                            ])
-                                            ->columnSpan(2),
+                                Forms\Components\ToggleButtons::make('unlimited_mem')
+                                    ->label('Memory')->inlineLabel()->inline()
+                                    ->default(true)
+                                    ->afterStateUpdated(fn (Forms\Set $set) => $set('memory', 0))
+                                    ->live()
+                                    ->options([
+                                        true => 'Unlimited',
+                                        false => 'Limited',
+                                    ])
+                                    ->colors([
+                                        true => 'primary',
+                                        false => 'warning',
+                                    ])
+                                    ->columnSpan(2),
 
-                                        Forms\Components\TextInput::make('memory')
-                                            ->dehydratedWhenHidden()
-                                            ->hidden(fn (Forms\Get $get) => $get('unlimited_mem'))
-                                            ->label('Memory Limit')->inlineLabel()
-                                            ->suffix('MiB')
-                                            ->default(0)
-                                            ->required()
-                                            ->columnSpan(2)
-                                            ->numeric()
-                                            ->minValue(0),
-                                    ]),
-
-                                Forms\Components\Grid::make()
-                                    ->columns(4)
-                                    ->columnSpanFull()
-                                    ->schema([
-                                        Forms\Components\ToggleButtons::make('unlimited_disk')
-                                            ->label('Disk Space')->inlineLabel()->inline()
-                                            ->default(true)
-                                            ->live()
-                                            ->afterStateUpdated(fn (Forms\Set $set) => $set('disk', 0))
-                                            ->options([
-                                                true => 'Unlimited',
-                                                false => 'Limited',
-                                            ])
-                                            ->colors([
-                                                true => 'primary',
-                                                false => 'warning',
-                                            ])
-                                            ->columnSpan(2),
-
-                                        Forms\Components\TextInput::make('disk')
-                                            ->dehydratedWhenHidden()
-                                            ->hidden(fn (Forms\Get $get) => $get('unlimited_disk'))
-                                            ->label('Disk Space Limit')->inlineLabel()
-                                            ->suffix('MiB')
-                                            ->default(0)
-                                            ->required()
-                                            ->columnSpan(2)
-                                            ->numeric()
-                                            ->minValue(0),
-                                    ]),
-
-                                Forms\Components\Grid::make()
-                                    ->columns(4)
-                                    ->columnSpanFull()
-                                    ->schema([
-                                        Forms\Components\ToggleButtons::make('unlimited_cpu')
-                                            ->label('CPU')->inlineLabel()->inline()
-                                            ->default(true)
-                                            ->afterStateUpdated(fn (Forms\Set $set) => $set('cpu', 0))
-                                            ->live()
-                                            ->options([
-                                                true => 'Unlimited',
-                                                false => 'Limited',
-                                            ])
-                                            ->colors([
-                                                true => 'primary',
-                                                false => 'warning',
-                                            ])
-                                            ->columnSpan(2),
-
-                                        Forms\Components\TextInput::make('cpu')
-                                            ->dehydratedWhenHidden()
-                                            ->hidden(fn (Forms\Get $get) => $get('unlimited_cpu'))
-                                            ->label('CPU Limit')->inlineLabel()
-                                            ->suffix('%')
-                                            ->default(0)
-                                            ->required()
-                                            ->columnSpan(2)
-                                            ->numeric()
-                                            ->minValue(0)
-                                            ->helperText('100% equals one CPU core.'),
-                                    ]),
-
-                                Forms\Components\Grid::make()
-                                    ->columns(4)
-                                    ->columnSpanFull()
-                                    ->schema([
-                                        Forms\Components\ToggleButtons::make('swap_support')
-                                            ->live()
-                                            ->label('Enable Swap Memory')
-                                            ->inlineLabel()
-                                            ->inline()
-                                            ->columnSpan(2)
-                                            ->default('disabled')
-                                            ->afterStateUpdated(function ($state, Forms\Set $set) {
-                                                $value = match ($state) {
-                                                    'unlimited' => -1,
-                                                    'disabled' => 0,
-                                                    'limited' => 128,
-                                                };
-
-                                                $set('swap', $value);
-                                            })
-                                            ->options([
-                                                'unlimited' => 'Unlimited',
-                                                'limited' => 'Limited',
-                                                'disabled' => 'Disabled',
-                                            ])
-                                            ->colors([
-                                                'unlimited' => 'primary',
-                                                'limited' => 'warning',
-                                                'disabled' => 'danger',
-                                            ]),
-
-                                        Forms\Components\TextInput::make('swap')
-                                            ->dehydratedWhenHidden()
-                                            ->hidden(fn (Forms\Get $get) => match ($get('swap_support')) {
-                                                'disabled', 'unlimited' => true,
-                                                'limited' => false,
-                                            })
-                                            ->label('Swap Memory')
-                                            ->default(0)
-                                            ->suffix('MiB')
-                                            ->minValue(-1)
-                                            ->columnSpan(2)
-                                            ->inlineLabel()
-                                            ->required()
-                                            ->integer(),
-                                    ]),
-
-                                Forms\Components\Hidden::make('io')
-                                    ->helperText('The IO performance relative to other running containers')
-                                    ->label('Block IO Proportion')
-                                    ->default(500),
-
-                                Forms\Components\Grid::make()
-                                    ->columns(4)
-                                    ->columnSpanFull()
-                                    ->schema([
-                                        Forms\Components\ToggleButtons::make('oom_killer')
-                                            ->label('OOM Killer')
-                                            ->inlineLabel()->inline()
-                                            ->default(false)
-                                            ->columnSpan(2)
-                                            ->options([
-                                                false => 'Disabled',
-                                                true => 'Enabled',
-                                            ])
-                                            ->colors([
-                                                false => 'success',
-                                                true => 'danger',
-                                            ]),
-
-                                        Forms\Components\TextInput::make('oom_disabled_hidden')
-                                            ->hidden(),
-                                    ]),
+                                Forms\Components\TextInput::make('memory')
+                                    ->dehydratedWhenHidden()
+                                    ->hidden(fn (Forms\Get $get) => $get('unlimited_mem'))
+                                    ->label('Memory Limit')->inlineLabel()
+                                    ->suffix('MiB')
+                                    ->default(0)
+                                    ->required()
+                                    ->columnSpan(2)
+                                    ->numeric()
+                                    ->minValue(0),
                             ]),
 
-                        Forms\Components\Fieldset::make('Feature Limits')
+                        Forms\Components\Grid::make()
+                            ->columns(4)
+                            ->columnSpanFull()
+                            ->schema([
+                                Forms\Components\ToggleButtons::make('unlimited_disk')
+                                    ->label('Disk Space')->inlineLabel()->inline()
+                                    ->default(true)
+                                    ->live()
+                                    ->afterStateUpdated(fn (Forms\Set $set) => $set('disk', 0))
+                                    ->options([
+                                        true => 'Unlimited',
+                                        false => 'Limited',
+                                    ])
+                                    ->colors([
+                                        true => 'primary',
+                                        false => 'warning',
+                                    ])
+                                    ->columnSpan(2),
+
+                                Forms\Components\TextInput::make('disk')
+                                    ->dehydratedWhenHidden()
+                                    ->hidden(fn (Forms\Get $get) => $get('unlimited_disk'))
+                                    ->label('Disk Space Limit')->inlineLabel()
+                                    ->suffix('MiB')
+                                    ->default(0)
+                                    ->required()
+                                    ->columnSpan(2)
+                                    ->numeric()
+                                    ->minValue(0),
+                            ]),
+
+                        Forms\Components\Grid::make()
+                            ->columns(4)
+                            ->columnSpanFull()
+                            ->schema([
+                                Forms\Components\ToggleButtons::make('unlimited_cpu')
+                                    ->label('CPU')->inlineLabel()->inline()
+                                    ->default(true)
+                                    ->afterStateUpdated(fn (Forms\Set $set) => $set('cpu', 0))
+                                    ->live()
+                                    ->options([
+                                        true => 'Unlimited',
+                                        false => 'Limited',
+                                    ])
+                                    ->colors([
+                                        true => 'primary',
+                                        false => 'warning',
+                                    ])
+                                    ->columnSpan(2),
+
+                                Forms\Components\TextInput::make('cpu')
+                                    ->dehydratedWhenHidden()
+                                    ->hidden(fn (Forms\Get $get) => $get('unlimited_cpu'))
+                                    ->label('CPU Limit')->inlineLabel()
+                                    ->suffix('%')
+                                    ->default(0)
+                                    ->required()
+                                    ->columnSpan(2)
+                                    ->numeric()
+                                    ->minValue(0)
+                                    ->helperText('100% equals one logical thread'),
+                            ]),
+
+                        Forms\Components\Grid::make()
+                            ->columns(4)
+                            ->columnSpanFull()
+                            ->schema([
+                                Forms\Components\ToggleButtons::make('swap_support')
+                                    ->live()
+                                    ->label('Enable Swap Memory')
+                                    ->inlineLabel()
+                                    ->inline()
+                                    ->columnSpan(2)
+                                    ->default('disabled')
+                                    ->afterStateUpdated(function ($state, Forms\Set $set) {
+                                        $value = match ($state) {
+                                            'unlimited' => -1,
+                                            'disabled' => 0,
+                                            'limited' => 128,
+                                        };
+
+                                        $set('swap', $value);
+                                    })
+                                    ->options([
+                                        'unlimited' => 'Unlimited',
+                                        'limited' => 'Limited',
+                                        'disabled' => 'Disabled',
+                                    ])
+                                    ->colors([
+                                        'unlimited' => 'primary',
+                                        'limited' => 'warning',
+                                        'disabled' => 'danger',
+                                    ]),
+
+                                Forms\Components\TextInput::make('swap')
+                                    ->dehydratedWhenHidden()
+                                    ->hidden(fn (Forms\Get $get) => match ($get('swap_support')) {
+                                        'disabled', 'unlimited' => true,
+                                        'limited' => false,
+                                    })
+                                    ->label('Swap Memory')
+                                    ->default(0)
+                                    ->suffix('MiB')
+                                    ->minValue(-1)
+                                    ->columnSpan(2)
+                                    ->inlineLabel()
+                                    ->required()
+                                    ->integer(),
+                            ]),
+
+                        Forms\Components\Hidden::make('io')
+                            ->helperText('The IO performance relative to other running containers')
+                            ->label('Block IO Proportion')
+                            ->default(500),
+
+                        Forms\Components\Grid::make()
+                            ->columns(4)
+                            ->columnSpanFull()
+                            ->schema([
+                                Forms\Components\ToggleButtons::make('oom_killer')
+                                    ->label('OOM Killer')
+                                    ->inlineLabel()->inline()
+                                    ->default(false)
+                                    ->columnSpan(2)
+                                    ->options([
+                                        false => 'Disabled',
+                                        true => 'Enabled',
+                                    ])
+                                    ->colors([
+                                        false => 'success',
+                                        true => 'danger',
+                                    ]),
+
+                                Forms\Components\TextInput::make('oom_disabled_hidden')
+                                    ->hidden(),
+                            ]),
+
+                        Forms\Components\Fieldset::make('Application Feature Limits')
                             ->inlineLabel()
                             ->columnSpan([
                                 'default' => 2,
@@ -640,70 +663,6 @@ class CreateServer extends CreateRecord
                                     ->numeric()
                                     ->default(0),
                             ]),
-                        Forms\Components\Fieldset::make('Docker Settings')
-                            ->columnSpan([
-                                'default' => 2,
-                                'sm' => 4,
-                                'md' => 4,
-                                'lg' => 6,
-                            ])
-                            ->columns([
-                                'default' => 1,
-                                'sm' => 2,
-                                'md' => 3,
-                                'lg' => 3,
-                            ])
-                            ->schema([
-                                Forms\Components\Select::make('select_image')
-                                    ->label('Image Name')
-                                    ->afterStateUpdated(fn (Forms\Set $set, $state) => $set('image', $state))
-                                    ->options(function ($state, Forms\Get $get, Forms\Set $set) {
-                                        $egg = Egg::query()->find($get('egg_id'));
-                                        $images = $egg->docker_images ?? [];
-
-                                        $currentImage = $get('image');
-                                        if (!$currentImage && $images) {
-                                            $defaultImage = collect($images)->first();
-                                            $set('image', $defaultImage);
-                                            $set('select_image', $defaultImage);
-                                        }
-
-                                        return array_flip($images) + ['ghcr.io/custom-image' => 'Custom Image'];
-                                    })
-                                    ->selectablePlaceholder(false)
-                                    ->columnSpan(1),
-
-                                Forms\Components\TextInput::make('image')
-                                    ->label('Image')
-                                    ->debounce(500)
-                                    ->afterStateUpdated(function ($state, Forms\Get $get, Forms\Set $set) {
-                                        $egg = Egg::query()->find($get('egg_id'));
-                                        $images = $egg->docker_images ?? [];
-
-                                        if (in_array($state, $images)) {
-                                            $set('select_image', $state);
-                                        } else {
-                                            $set('select_image', 'ghcr.io/custom-image');
-                                        }
-                                    })
-                                    ->placeholder('Enter a custom Image')
-                                    ->columnSpan(1),
-
-                                Forms\Components\KeyValue::make('docker_labels')
-                                    ->label('Container Labels')
-                                    ->keyLabel('Title')
-                                    ->valueLabel('Description')
-                                    ->columnSpan(3),
-
-                                Forms\Components\CheckboxList::make('mounts')
-                                    ->live()
-                                    ->relationship('mounts')
-                                    ->options(fn () => $this->node?->mounts->mapWithKeys(fn ($mount) => [$mount->id => $mount->name]) ?? [])
-                                    ->descriptions(fn () => $this->node?->mounts->mapWithKeys(fn ($mount) => [$mount->id => "$mount->source -> $mount->target"]) ?? [])
-                                    ->label('Mounts')
-                                    ->helperText(fn () => $this->node?->mounts->isNotEmpty() ? '' : 'No Mounts exist for this Node')
-                                    ->columnSpanFull(),
-                            ]),
                     ]),
             ]);
     }

app/Filament/Resources/ServerResource/RelationManagers/AllocationsRelationManager.php

@@ -27,15 +27,13 @@ class AllocationsRelationManager extends RelationManager
     {
         return $table
             ->recordTitleAttribute('ip')
-            ->recordTitle(fn (Allocation $allocation) => "$allocation->ip:$allocation->port")
             ->checkIfRecordIsSelectableUsing(fn (Allocation $record) => $record->id !== $this->getOwnerRecord()->allocation_id)
             // ->actions
             // ->groups
-            ->inverseRelationship('server')
             ->columns([
+                Tables\Columns\TextInputColumn::make('ip_alias')->label('Alias'),
                 Tables\Columns\TextColumn::make('ip')->label('IP'),
                 Tables\Columns\TextColumn::make('port')->label('Port'),
-                Tables\Columns\TextInputColumn::make('ip_alias')->label('Alias'),
                 Tables\Columns\IconColumn::make('primary')
                     ->icon(fn ($state) => match ($state) {
                         false => 'tabler-star',
@@ -59,11 +57,7 @@ class AllocationsRelationManager extends RelationManager
             ])
             ->headerActions([
                 //TODO Tables\Actions\CreateAction::make()->label('Create Allocation'),
-                Tables\Actions\AssociateAction::make()
-                    ->multiple()
-                    ->preloadRecordSelect()
-                    ->recordSelectOptionsQuery(fn ($query) => $query->whereBelongsTo($this->getOwnerRecord()->node))
-                    ->label('Add Allocation'),
+                //TODO Tables\Actions\AssociateAction::make()->label('Add Allocation'),
             ])
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([

app/Filament/Resources/UserResource/Pages/EditProfile.php

@@ -2,12 +2,10 @@
 
 namespace App\Filament\Resources\UserResource\Pages;
 
-use App\Exceptions\Service\User\TwoFactorAuthenticationTokenInvalid;
 use App\Facades\Activity;
 use App\Models\ActivityLog;
 use App\Models\ApiKey;
 use App\Models\User;
-use App\Services\Users\ToggleTwoFactorService;
 use App\Services\Users\TwoFactorSetupService;
 use chillerlan\QRCode\Common\EccLevel;
 use chillerlan\QRCode\Common\Version;
@@ -22,10 +20,8 @@ use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Tabs;
 use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\Tabs\Tab;
-use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Get;
-use Filament\Notifications\Notification;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\HtmlString;
@@ -103,26 +99,12 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
 
                                         if ($this->getUser()->use_totp) {
                                             return [
-                                                Placeholder::make('2fa-already-enabled')
-                                                    ->label('Two Factor Authentication is currently enabled!'),
-                                                Textarea::make('backup-tokens')
-                                                    ->hidden(fn () => !cache()->get("users.{$this->getUser()->id}.2fa.tokens"))
-                                                    ->rows(10)
-                                                    ->readOnly()
-                                                    ->formatStateUsing(fn () => cache()->get("users.{$this->getUser()->id}.2fa.tokens"))
-                                                    ->helperText('These will not be shown again!')
-                                                    ->label('Backup Tokens:'),
-                                                TextInput::make('2fa-disable-code')
-                                                    ->label('Disable 2FA')
-                                                    ->helperText('Enter your current 2FA code to disable Two Factor Authentication'),
+                                                Placeholder::make('2FA already enabled!'),
                                             ];
                                         }
                                         $setupService = app(TwoFactorSetupService::class);
 
-                                        ['image_url_data' => $url, 'secret' => $secret] = cache()->remember(
-                                            "users.{$this->getUser()->id}.2fa.state",
-                                            now()->addMinutes(5), fn () => $setupService->handle($this->getUser())
-                                        );
+                                        ['image_url_data' => $url] = $setupService->handle($this->getUser());
 
                                         $options = new QROptions([
                                             'svgLogo' => public_path('pelican.svg'),
@@ -165,19 +147,9 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
                                             Placeholder::make('qr')
                                                 ->label('Scan QR Code')
                                                 ->content(fn () => new HtmlString("
-                                                <div style='width: 300px; background-color: rgb(24, 24, 27);'>$image</div>
+                                                <div style='width: 300px'>$image</div>
                                             "))
-                                                ->helperText('Setup Key: '. $secret),
-                                            TextInput::make('2facode')
-                                                ->label('Code')
-                                                ->requiredWith('2fapassword')
-                                                ->helperText('Scan the QR code above using your two-step authentication app, then enter the code generated.'),
-                                            TextInput::make('2fapassword')
-                                                ->label('Current Password')
-                                                ->requiredWith('2facode')
-                                                ->currentPassword()
-                                                ->password()
-                                                ->helperText('Enter your current password to verify.'),
+                                                ->default('asdfasdf'),
                                         ];
                                     }),
 
@@ -186,7 +158,7 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
                                     ->schema([
                                         Grid::make('asdf')->columns(5)->schema([
                                             Section::make('Create API Key')->columnSpan(3)->schema([
-                                                TextInput::make('description')->required(),
+                                                TextInput::make('description'),
                                                 TagsInput::make('allowed_ips')
                                                     ->splitKeys([',', ' ', 'Tab'])
                                                     ->placeholder('Example: 127.0.0.1 or 192.168.1.1')
@@ -210,9 +182,8 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
                                                         $action->success();
                                                     }),
                                             ]),
-                                            Section::make('Keys')->columnSpan(2)->schema([
+                                            Section::make('API Keys')->columnSpan(2)->schema([
                                                 Repeater::make('keys')
-                                                    ->label('')
                                                     ->relationship('apiKeys')
                                                     ->addable(false)
                                                     ->itemLabel(fn ($state) => $state['identifier'])
@@ -264,43 +235,4 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
             ),
         ];
     }
-
-    protected function handleRecordUpdate($record, $data): \Illuminate\Database\Eloquent\Model
-    {
-        if ($token = $data['2facode'] ?? null) {
-            /** @var ToggleTwoFactorService $service */
-            $service = resolve(ToggleTwoFactorService::class);
-
-            $tokens = $service->handle($record, $token, true);
-            cache()->set("users.$record->id.2fa.tokens", implode("\n", $tokens), now()->addSeconds(15));
-
-            $this->redirectRoute('filament.admin.auth.profile', ['tab' => '-2fa-tab']);
-        }
-
-        if ($token = $data['2fa-disable-code'] ?? null) {
-            /** @var ToggleTwoFactorService $service */
-            $service = resolve(ToggleTwoFactorService::class);
-
-            $service->handle($record, $token, false);
-
-            cache()->forget("users.$record->id.2fa.state");
-        }
-
-        return parent::handleRecordUpdate($record, $data);
-    }
-
-    public function exception($e, $stopPropagation): void
-    {
-        if ($e instanceof TwoFactorAuthenticationTokenInvalid) {
-            Notification::make()
-                ->title('Invalid 2FA Code')
-                ->body($e->getMessage())
-                ->color('danger')
-                ->icon('tabler-2fa')
-                ->danger()
-                ->send();
-
-            $stopPropagation();
-        }
-    }
 }

app/Filament/Resources/UserResource/Pages/EditUser.php

@@ -3,7 +3,6 @@
 namespace App\Filament\Resources\UserResource\Pages;
 
 use App\Filament\Resources\UserResource;
-use App\Services\Exceptions\FilamentExceptionHandler;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 use App\Models\User;
@@ -67,9 +66,7 @@ class EditUser extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make()
-                ->label(fn (User $user) => auth()->user()->id === $user->id ? 'Can\'t Delete Yourself' : ($user->servers()->count() > 0 ? 'User Has Servers' : 'Delete'))
-                ->disabled(fn (User $user) => auth()->user()->id === $user->id || $user->servers()->count() > 0),
+            Actions\DeleteAction::make(),
             $this->getSaveFormAction()->formId('form'),
         ];
     }
@@ -78,9 +75,4 @@ class EditUser extends EditRecord
     {
         return [];
     }
-
-    public function exception($exception, $stopPropagation): void
-    {
-        (new FilamentExceptionHandler())->handle($exception, $stopPropagation);
-    }
 }

app/Http/Controllers/Admin/Eggs/EggShareController.php

@@ -46,7 +46,7 @@ class EggShareController extends Controller
      */
     public function import(EggImportFormRequest $request): RedirectResponse
     {
-        $egg = $this->importerService->fromFile($request->file('import_file'));
+        $egg = $this->importerService->handle($request->file('import_file'));
         $this->alert->success(trans('admin/eggs.notices.imported'))->flash();
 
         return redirect()->route('admin.eggs.view', ['egg' => $egg->id]);
@@ -61,7 +61,7 @@ class EggShareController extends Controller
      */
     public function update(EggImportFormRequest $request, Egg $egg): RedirectResponse
     {
-        $this->updateImporterService->fromFile($egg, $request->file('import_file'));
+        $this->updateImporterService->handle($egg, $request->file('import_file'));
         $this->alert->success(trans('admin/eggs.notices.updated_via_import'))->flash();
 
         return redirect()->route('admin.eggs.view', ['egg' => $egg]);

app/Http/Controllers/Admin/NodeAutoDeployController.php

@@ -56,7 +56,7 @@ class NodeAutoDeployController extends Controller
 
         return new JsonResponse([
             'node' => $node->id,
-            'token' => $key->identifier . $key->token,
+            'token' => $key->identifier . decrypt($key->token),
         ]);
     }
 }

app/Http/Controllers/Admin/Nodes/NodeController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin\Nodes;
 
 use Illuminate\View\View;
+use Illuminate\Http\Request;
 use App\Models\Node;
 use Spatie\QueryBuilder\QueryBuilder;
 use App\Http\Controllers\Controller;
@@ -12,7 +13,7 @@ class NodeController extends Controller
     /**
      * Returns a listing of nodes on the system.
      */
-    public function index(): View
+    public function index(Request $request): View
     {
         $nodes = QueryBuilder::for(
             Node::query()->withCount('servers')

app/Http/Controllers/Admin/Nodes/NodeViewController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin\Nodes;
 
 use Illuminate\View\View;
+use Illuminate\Http\Request;
 use App\Models\Node;
 use Illuminate\Support\Collection;
 use App\Models\Allocation;
@@ -28,10 +29,16 @@ class NodeViewController extends Controller
     /**
      * Returns index view for a specific node on the system.
      */
-    public function index(Node $node): View
+    public function index(Request $request, Node $node): View
     {
         $node->loadCount('servers');
 
+        $stats = Node::query()
+            ->selectRaw('IFNULL(SUM(servers.memory), 0) as sum_memory, IFNULL(SUM(servers.disk), 0) as sum_disk')
+            ->join('servers', 'servers.node_id', '=', 'nodes.id')
+            ->where('node_id', '=', $node->id)
+            ->first();
+
         return view('admin.nodes.view.index', [
             'node' => $node,
             'version' => $this->versionService,
@@ -41,7 +48,7 @@ class NodeViewController extends Controller
     /**
      * Returns the settings page for a specific node.
      */
-    public function settings(Node $node): View
+    public function settings(Request $request, Node $node): View
     {
         return view('admin.nodes.view.settings', [
             'node' => $node,
@@ -51,7 +58,7 @@ class NodeViewController extends Controller
     /**
      * Return the node configuration page for a specific node.
      */
-    public function configuration(Node $node): View
+    public function configuration(Request $request, Node $node): View
     {
         return view('admin.nodes.view.configuration', compact('node'));
     }
@@ -59,7 +66,7 @@ class NodeViewController extends Controller
     /**
      * Return the node allocation management page.
      */
-    public function allocations(Node $node): View
+    public function allocations(Request $request, Node $node): View
     {
         $node->setRelation(
             'allocations',
@@ -85,7 +92,7 @@ class NodeViewController extends Controller
     /**
      * Return a listing of servers that exist for this specific node.
      */
-    public function servers(Node $node): View
+    public function servers(Request $request, Node $node): View
     {
         $this->plainInject([
             'node' => Collection::wrap($node->makeVisible(['daemon_token_id', 'daemon_token']))

app/Http/Controllers/Admin/Servers/CreateServerController.php

@@ -53,6 +53,7 @@ class CreateServerController extends Controller
      * @throws \Illuminate\Validation\ValidationException
      * @throws \App\Exceptions\DisplayException
      * @throws \App\Exceptions\Service\Deployment\NoViableAllocationException
+     * @throws \App\Exceptions\Service\Deployment\NoViableNodeException
      * @throws \Throwable
      */
     public function store(ServerFormRequest $request): RedirectResponse

app/Http/Controllers/Admin/Servers/ServerController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin\Servers;
 
 use Illuminate\View\View;
+use Illuminate\Http\Request;
 use App\Models\Server;
 use Spatie\QueryBuilder\QueryBuilder;
 use Spatie\QueryBuilder\AllowedFilter;
@@ -15,7 +16,7 @@ class ServerController extends Controller
      * Returns all the servers that exist on the system using a paginated result set. If
      * a query is passed along in the request it is also passed to the repository function.
      */
-    public function index(): View
+    public function index(Request $request): View
     {
         $servers = QueryBuilder::for(Server::query()->with('node', 'user', 'allocation'))
             ->allowedFilters([

app/Http/Controllers/Admin/ServersController.php

@@ -3,13 +3,13 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Enums\ServerState;
-use Filament\Notifications\Notification;
 use Illuminate\Http\Request;
 use App\Models\User;
 use Illuminate\Http\Response;
 use App\Models\Mount;
 use App\Models\Server;
 use App\Models\Database;
+use App\Models\MountServer;
 use Illuminate\Http\RedirectResponse;
 use Prologue\Alerts\AlertsMessageBag;
 use App\Exceptions\DisplayException;
@@ -70,7 +70,7 @@ class ServersController extends Controller
      * @throws \App\Exceptions\DisplayException
      * @throws \App\Exceptions\Model\DataValidationException
      */
-    public function toggleInstall(Server $server)
+    public function toggleInstall(Server $server): RedirectResponse
     {
         if ($server->status === ServerState::InstallFailed) {
             throw new DisplayException(trans('admin/server.exceptions.marked_as_failed'));
@@ -79,13 +79,9 @@ class ServersController extends Controller
         $server->status = $server->isInstalled() ? ServerState::Installing : null;
         $server->save();
 
-        Notification::make()
-            ->title('Success!')
-            ->body(trans('admin/server.alerts.install_toggled'))
-            ->success()
-            ->send();
+        $this->alert->success(trans('admin/server.alerts.install_toggled'))->flash();
 
-        return null;
+        return redirect()->route('admin.servers.view.manage', $server->id);
     }
 
     /**
@@ -94,15 +90,12 @@ class ServersController extends Controller
      * @throws \App\Exceptions\DisplayException
      * @throws \App\Exceptions\Model\DataValidationException
      */
-    public function reinstallServer(Server $server)
+    public function reinstallServer(Server $server): RedirectResponse
     {
         $this->reinstallService->handle($server);
+        $this->alert->success(trans('admin/server.alerts.server_reinstalled'))->flash();
 
-        Notification::make()
-            ->title('Success!')
-            ->body(trans('admin/server.alerts.server_reinstalled'))
-            ->success()
-            ->send();
+        return redirect()->route('admin.servers.view.manage', $server->id);
     }
 
     /**
@@ -235,7 +228,12 @@ class ServersController extends Controller
      */
     public function addMount(Request $request, Server $server): RedirectResponse
     {
-        $server->mounts()->attach($request->input('mount_id'));
+        $mountServer = (new MountServer())->forceFill([
+            'mount_id' => $request->input('mount_id'),
+            'server_id' => $server->id,
+        ]);
+
+        $mountServer->saveOrFail();
 
         $this->alert->success('Mount was added successfully.')->flash();
 
@@ -247,7 +245,7 @@ class ServersController extends Controller
      */
     public function deleteMount(Server $server, Mount $mount): RedirectResponse
     {
-        $server->mounts()->detach($mount);
+        MountServer::where('mount_id', $mount->id)->where('server_id', $server->id)->delete();
 
         $this->alert->success('Mount was removed successfully.')->flash();
 

app/Http/Controllers/Admin/UserController.php

@@ -37,7 +37,7 @@ class UserController extends Controller
     /**
      * Display user index page.
      */
-    public function index(): View
+    public function index(Request $request): View
     {
         $users = QueryBuilder::for(
             User::query()->select('users.*')

app/Http/Controllers/Api/Application/Mounts/MountController.php

@@ -1,165 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api\Application\Mounts;
-
-use Ramsey\Uuid\Uuid;
-use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Contracts\Translation\Translator;
-use Spatie\QueryBuilder\QueryBuilder;
-use App\Models\Mount;
-use App\Http\Controllers\Api\Application\ApplicationApiController;
-use App\Transformers\Api\Application\MountTransformer;
-use App\Http\Requests\Api\Application\Mounts\GetMountRequest;
-use App\Http\Requests\Api\Application\Mounts\StoreMountRequest;
-use App\Http\Requests\Api\Application\Mounts\DeleteMountRequest;
-use App\Http\Requests\Api\Application\Mounts\UpdateMountRequest;
-use App\Exceptions\Service\HasActiveServersException;
-
-class MountController extends ApplicationApiController
-{
-    /**
-     * MountController constructor.
-     */
-    public function __construct(
-        protected Translator $translator
-    ) {
-        parent::__construct();
-    }
-
-    /**
-     * Return all the mounts currently available on the Panel.
-     */
-    public function index(GetMountRequest $request): array
-    {
-        $mounts = QueryBuilder::for(Mount::query())
-            ->allowedFilters(['uuid', 'name'])
-            ->allowedSorts(['id', 'uuid'])
-            ->paginate($request->query('per_page') ?? 50);
-
-        return $this->fractal->collection($mounts)
-            ->transformWith($this->getTransformer(MountTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Return data for a single instance of a mount.
-     */
-    public function view(GetMountRequest $request, Mount $mount): array
-    {
-        return $this->fractal->item($mount)
-            ->transformWith($this->getTransformer(MountTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Create a new mount on the Panel. Returns the created mount and an HTTP/201
-     * status response on success.
-     *
-     * @throws \App\Exceptions\Model\DataValidationException
-     */
-    public function store(StoreMountRequest $request): JsonResponse
-    {
-        $model = (new Mount())->fill($request->validated());
-        $model->forceFill(['uuid' => Uuid::uuid4()->toString()]);
-
-        $model->saveOrFail();
-        $mount = $model->fresh();
-
-        return $this->fractal->item($mount)
-            ->transformWith($this->getTransformer(MountTransformer::class))
-            ->addMeta([
-                'resource' => route('api.application.mounts.view', [
-                    'mount' => $mount->id,
-                ]),
-            ])
-            ->respond(201);
-    }
-
-    /**
-     * Update an existing mount on the Panel.
-     *
-     * @throws \Throwable
-     */
-    public function update(UpdateMountRequest $request, Mount $mount): array
-    {
-        $mount->forceFill($request->validated())->save();
-
-        return $this->fractal->item($mount)
-            ->transformWith($this->getTransformer(MountTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Deletes a given mount from the Panel as long as there are no servers
-     * currently attached to it.
-     *
-     * @throws \App\Exceptions\Service\HasActiveServersException
-     */
-    public function delete(DeleteMountRequest $request, Mount $mount): JsonResponse
-    {
-        if ($mount->servers()->count() > 0) {
-            throw new HasActiveServersException($this->translator->get('exceptions.mount.servers_attached'));
-        }
-
-        $mount->delete();
-
-        return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT);
-    }
-
-    /**
-     * Adds eggs to the mount's many-to-many relation.
-     */
-    public function addEggs(Request $request, Mount $mount): array
-    {
-        $validatedData = $request->validate([
-            'eggs' => 'required|exists:eggs,id',
-        ]);
-
-        $eggs = $validatedData['eggs'] ?? [];
-        if (count($eggs) > 0) {
-            $mount->eggs()->attach($eggs);
-        }
-
-        return $this->fractal->item($mount)
-            ->transformWith($this->getTransformer(MountTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Adds nodes to the mount's many-to-many relation.
-     */
-    public function addNodes(Request $request, Mount $mount): array
-    {
-        $data = $request->validate(['nodes' => 'required|exists:nodes,id']);
-
-        $nodes = $data['nodes'] ?? [];
-        if (count($nodes) > 0) {
-            $mount->nodes()->attach($nodes);
-        }
-
-        return $this->fractal->item($mount)
-            ->transformWith($this->getTransformer(MountTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Deletes an egg from the mount's many-to-many relation.
-     */
-    public function deleteEgg(Mount $mount, int $egg_id): JsonResponse
-    {
-        $mount->eggs()->detach($egg_id);
-
-        return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT);
-    }
-
-    /**
-     * Deletes a node from the mount's many-to-many relation.
-     */
-    public function deleteNode(Mount $mount, int $node_id): JsonResponse
-    {
-        $mount->nodes()->detach($node_id);
-
-        return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT);
-    }
-}

app/Http/Controllers/Api/Application/Nodes/NodeController.php

@@ -36,7 +36,7 @@ class NodeController extends ApplicationApiController
     {
         $nodes = QueryBuilder::for(Node::query())
             ->allowedFilters(['uuid', 'name', 'fqdn', 'daemon_token_id'])
-            ->allowedSorts(['id', 'uuid', 'memory', 'disk', 'cpu'])
+            ->allowedSorts(['id', 'uuid', 'memory', 'disk'])
             ->paginate($request->query('per_page') ?? 50);
 
         return $this->fractal->collection($nodes)

app/Http/Controllers/Api/Application/Nodes/NodeDeploymentController.php

@@ -9,6 +9,9 @@ use App\Http\Requests\Api\Application\Nodes\GetDeployableNodesRequest;
 
 class NodeDeploymentController extends ApplicationApiController
 {
+    /**
+     * NodeDeploymentController constructor.
+     */
     public function __construct(private FindViableNodesService $viableNodesService)
     {
         parent::__construct();
@@ -18,17 +21,16 @@ class NodeDeploymentController extends ApplicationApiController
      * Finds any nodes that are available using the given deployment criteria. This works
      * similarly to the server creation process, but allows you to pass the deployment object
      * to this endpoint and get back a list of all Nodes satisfying the requirements.
+     *
+     * @throws \App\Exceptions\Service\Deployment\NoViableNodeException
      */
     public function __invoke(GetDeployableNodesRequest $request): array
     {
         $data = $request->validated();
-
-        $nodes = $this->viableNodesService->handle(
-            $data['memory'] ?? 0,
-            $data['disk'] ?? 0,
-            $data['cpu'] ?? 0,
-            $data['tags'] ?? $data['location_ids'] ?? [],
-        );
+        $nodes = $this->viableNodesService
+            ->setMemory($data['memory'])
+            ->setDisk($data['disk'])
+            ->handle((int) $request->query('per_page'), (int) $request->query('page'));
 
         return $this->fractal->collection($nodes)
             ->transformWith($this->getTransformer(NodeTransformer::class))

app/Http/Controllers/Api/Application/Servers/ServerController.php

@@ -50,6 +50,7 @@ class ServerController extends ApplicationApiController
      * @throws \App\Exceptions\DisplayException
      * @throws \App\Exceptions\Model\DataValidationException
      * @throws \App\Exceptions\Service\Deployment\NoViableAllocationException
+     * @throws \App\Exceptions\Service\Deployment\NoViableNodeException
      */
     public function store(StoreServerRequest $request): JsonResponse
     {

app/Http/Controllers/Auth/LoginCheckpointController.php

@@ -65,7 +65,9 @@ class LoginCheckpointController extends AbstractLoginController
                 return $this->sendLoginResponse($user, $request);
             }
         } else {
-            if ($this->google2FA->verifyKey($user->totp_secret, (string) $request->input('authentication_code'), config('panel.auth.2fa.window'))) {
+            $decrypted = decrypt($user->totp_secret);
+
+            if ($this->google2FA->verifyKey($decrypted, (string) $request->input('authentication_code'), config('panel.auth.2fa.window'))) {
                 Event::dispatch(new ProvidedAuthenticationToken($user));
 
                 return $this->sendLoginResponse($user, $request);

app/Http/Middleware/Api/Daemon/DaemonAuthenticate.php

@@ -41,7 +41,7 @@ class DaemonAuthenticate
         /** @var Node $node */
         $node = Node::query()->where('daemon_token_id', $parts[0])->firstOrFail();
 
-        if (hash_equals((string) $node->daemon_token, $parts[1])) {
+        if (hash_equals((string) decrypt($node->daemon_token), $parts[1])) {
             $request->attributes->set('node', $node);
 
             return $next($request);

app/Http/Requests/Api/Application/Mounts/DeleteMountRequest.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Api\Application\Mounts;
-
-use App\Services\Acl\Api\AdminAcl;
-use App\Http\Requests\Api\Application\ApplicationApiRequest;
-
-class DeleteMountRequest extends ApplicationApiRequest
-{
-    protected ?string $resource = AdminAcl::RESOURCE_MOUNTS;
-
-    protected int $permission = AdminAcl::WRITE;
-}

app/Http/Requests/Api/Application/Mounts/GetMountRequest.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Api\Application\Mounts;
-
-use App\Services\Acl\Api\AdminAcl;
-use App\Http\Requests\Api\Application\ApplicationApiRequest;
-
-class GetMountRequest extends ApplicationApiRequest
-{
-    protected ?string $resource = AdminAcl::RESOURCE_MOUNTS;
-
-    protected int $permission = AdminAcl::READ;
-}

app/Http/Requests/Api/Application/Mounts/StoreMountRequest.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Api\Application\Mounts;
-
-use App\Services\Acl\Api\AdminAcl;
-use App\Http\Requests\Api\Application\ApplicationApiRequest;
-
-class StoreMountRequest extends ApplicationApiRequest
-{
-    protected ?string $resource = AdminAcl::RESOURCE_MOUNTS;
-
-    protected int $permission = AdminAcl::WRITE;
-}

app/Http/Requests/Api/Application/Mounts/UpdateMountRequest.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Api\Application\Mounts;
-
-use App\Models\Mount;
-
-class UpdateMountRequest extends StoreMountRequest
-{
-    /**
-     * Apply validation rules to this request. Uses the parent class rules()
-     * function but passes in the rules for updating rather than creating.
-     */
-    public function rules(array $rules = null): array
-    {
-        /** @var Mount $mount */
-        $mount = $this->route()->parameter('mount');
-
-        return parent::rules(Mount::getRulesForUpdate($mount->id));
-    }
-}

app/Http/Requests/Api/Application/Nodes/GetDeployableNodesRequest.php

@@ -10,11 +10,6 @@ class GetDeployableNodesRequest extends GetNodesRequest
             'page' => 'integer',
             'memory' => 'required|integer|min:0',
             'disk' => 'required|integer|min:0',
-            'cpu' => 'sometimes|integer|min:0',
-            'tags' => 'sometimes|array',
-
-            /** @deprecated use tags instead */
-            'location_ids' => 'sometimes|array',
         ];
     }
 }

app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php

@@ -28,14 +28,13 @@ class StoreNodeRequest extends ApplicationApiRequest
             'memory_overallocate',
             'disk',
             'disk_overallocate',
-            'cpu',
-            'cpu_overallocate',
             'upload_size',
             'daemon_listen',
             'daemon_sftp',
-            'daemon_sftp_alias',
             'daemon_base',
         ])->mapWithKeys(function ($value, $key) {
+            $key = ($key === 'daemon_sftp') ? 'daemon_sftp' : $key;
+
             return [snake_case($key) => $value];
         })->toArray();
     }
@@ -59,8 +58,12 @@ class StoreNodeRequest extends ApplicationApiRequest
     public function validated($key = null, $default = null): array
     {
         $response = parent::validated();
+        $response['daemon_listen'] = $response['daemon_listen'];
+        $response['daemon_sftp'] = $response['daemon_sftp'];
         $response['daemon_base'] = $response['daemon_base'] ?? (new Node())->getAttribute('daemon_base');
 
+        unset($response['daemon_base'], $response['daemon_listen'], $response['daemon_sftp']);
+
         return $response;
     }
 }

app/Http/Requests/Api/Application/Servers/StoreServerRequest.php

@@ -56,10 +56,11 @@ class StoreServerRequest extends ApplicationApiRequest
             // Automatic deployment rules
             'deploy' => 'sometimes|required|array',
             'deploy.locations' => 'array',
-            'deploy.locations.*' => 'required_with:deploy.locations,integer|min:1',
+            'deploy.locations.*' => 'integer|min:1',
             'deploy.dedicated_ip' => 'required_with:deploy,boolean',
             'deploy.port_range' => 'array',
             'deploy.port_range.*' => 'string',
+
             'start_on_completion' => 'sometimes|boolean',
         ];
     }
@@ -122,15 +123,6 @@ class StoreServerRequest extends ApplicationApiRequest
             return !$input->deploy;
         });
 
-        /** @deprecated use tags instead */
-        $validator->sometimes('deploy.locations', 'present', function ($input) {
-            return $input->deploy;
-        });
-
-        $validator->sometimes('deploy.tags', 'present', function ($input) {
-            return $input->deploy;
-        });
-
         $validator->sometimes('deploy.port_range', 'present', function ($input) {
             return $input->deploy;
         });
@@ -147,7 +139,6 @@ class StoreServerRequest extends ApplicationApiRequest
 
         $object = new DeploymentObject();
         $object->setDedicated($this->input('deploy.dedicated_ip', false));
-        $object->setTags($this->input('deploy.tags', $this->input('deploy.locations', [])));
         $object->setPorts($this->input('deploy.port_range', []));
 
         return $object;

app/Models/Allocation.php

@@ -22,6 +22,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  * @property bool $has_alias
  * @property \App\Models\Server|null $server
  * @property \App\Models\Node $node
+ * @property string $hashid
  *
  * @method static \Database\Factories\AllocationFactory factory(...$parameters)
  * @method static \Illuminate\Database\Eloquent\Builder|Allocation newModelQuery()
@@ -87,6 +88,14 @@ class Allocation extends Model
         return $this->getKeyName();
     }
 
+    /**
+     * Return a hashid encoded string to represent the ID of the allocation.
+     */
+    public function getHashidAttribute(): string
+    {
+        return app()->make('hashids')->encode($this->id);
+    }
+
     /**
      * Accessor to automatically provide the IP alias if defined.
      */

app/Models/ApiKey.php

@@ -28,7 +28,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  * @property int $r_eggs
  * @property int $r_database_hosts
  * @property int $r_server_databases
- * @property int $r_mounts
  * @property \App\Models\User $tokenable
  * @property \App\Models\User $user
  *
@@ -84,7 +83,7 @@ class ApiKey extends Model
      */
     public const KEY_LENGTH = 32;
 
-    public const RESOURCES = ['servers', 'nodes', 'allocations', 'users', 'eggs', 'database_hosts', 'server_databases', 'mounts'];
+    public const RESOURCES = ['servers', 'nodes', 'allocations', 'users', 'eggs', 'database_hosts', 'server_databases'];
 
     /**
      * The table associated with the model.
@@ -110,7 +109,6 @@ class ApiKey extends Model
         'r_' . AdminAcl::RESOURCE_EGGS,
         'r_' . AdminAcl::RESOURCE_NODES,
         'r_' . AdminAcl::RESOURCE_SERVERS,
-        'r_' . AdminAcl::RESOURCE_MOUNTS,
     ];
 
     /**
@@ -139,7 +137,6 @@ class ApiKey extends Model
         'r_' . AdminAcl::RESOURCE_EGGS => 'integer|min:0|max:3',
         'r_' . AdminAcl::RESOURCE_NODES => 'integer|min:0|max:3',
         'r_' . AdminAcl::RESOURCE_SERVERS => 'integer|min:0|max:3',
-        'r_' . AdminAcl::RESOURCE_MOUNTS => 'integer|min:0|max:3',
     ];
 
     protected function casts(): array
@@ -149,7 +146,6 @@ class ApiKey extends Model
             'user_id' => 'int',
             'last_used_at' => 'datetime',
             'expires_at' => 'datetime',
-            'token' => 'encrypted',
             self::CREATED_AT => 'datetime',
             self::UPDATED_AT => 'datetime',
             'r_' . AdminAcl::RESOURCE_USERS => 'int',
@@ -159,7 +155,6 @@ class ApiKey extends Model
             'r_' . AdminAcl::RESOURCE_EGGS => 'int',
             'r_' . AdminAcl::RESOURCE_NODES => 'int',
             'r_' . AdminAcl::RESOURCE_SERVERS => 'int',
-            'r_' . AdminAcl::RESOURCE_MOUNTS => 'int',
         ];
     }
 
@@ -189,7 +184,7 @@ class ApiKey extends Model
         $identifier = substr($token, 0, self::IDENTIFIER_LENGTH);
 
         $model = static::where('identifier', $identifier)->first();
-        if (!is_null($model) && $model->token === substr($token, strlen($identifier))) {
+        if (!is_null($model) && decrypt($model->token) === substr($token, strlen($identifier))) {
             return $model;
         }
 

app/Models/Database.php

@@ -2,7 +2,9 @@
 
 namespace App\Models;
 
+use Illuminate\Container\Container;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use App\Contracts\Extensions\HashidsInterface;
 use Illuminate\Support\Facades\DB;
 
 /**
@@ -62,7 +64,6 @@ class Database extends Model
             'server_id' => 'integer',
             'database_host_id' => 'integer',
             'max_connections' => 'integer',
-            'password' => 'encrypted',
         ];
     }
 
@@ -71,6 +72,26 @@ class Database extends Model
         return $this->getKeyName();
     }
 
+    /**
+     * Resolves the database using the ID by checking if the value provided is a HashID
+     * string value, or just the ID to the database itself.
+     *
+     * @param mixed $value
+     * @param string|null $field
+     *
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function resolveRouteBinding($value, $field = null): ?\Illuminate\Database\Eloquent\Model
+    {
+        if (is_scalar($value) && ($field ?? $this->getRouteKeyName()) === 'id') {
+            $value = ctype_digit((string) $value)
+                ? $value
+                : Container::getInstance()->make(HashidsInterface::class)->decodeFirst($value);
+        }
+
+        return $this->where($field ?? $this->getRouteKeyName(), $value)->firstOrFail();
+    }
+
     /**
      * Gets the host database server associated with a database.
      */

app/Models/DatabaseHost.php

@@ -60,7 +60,6 @@ class DatabaseHost extends Model
             'id' => 'integer',
             'max_databases' => 'integer',
             'node_id' => 'integer',
-            'password' => 'encrypted',
             'created_at' => 'immutable_datetime',
             'updated_at' => 'immutable_datetime',
         ];

app/Models/MountServer.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class MountServer extends Model
+{
+    protected $table = 'mount_server';
+
+    public $timestamps = false;
+
+    protected $primaryKey = null;
+
+    public $incrementing = false;
+}

app/Models/Node.php

@@ -26,14 +26,11 @@ use Illuminate\Database\Eloquent\Relations\HasManyThrough;
  * @property int $memory_overallocate
  * @property int $disk
  * @property int $disk_overallocate
- * @property int $cpu
- * @property int $cpu_overallocate
  * @property int $upload_size
  * @property string $daemon_token_id
  * @property string $daemon_token
  * @property int $daemon_listen
  * @property int $daemon_sftp
- * @property string|null $daemon_sftp_alias
  * @property string $daemon_base
  * @property \Carbon\Carbon $created_at
  * @property \Carbon\Carbon $updated_at
@@ -64,6 +61,9 @@ class Node extends Model
      */
     protected $hidden = ['daemon_token_id', 'daemon_token'];
 
+    public int $sum_memory;
+    public int $sum_disk;
+
     /**
      * Fields that are mass assignable.
      */
@@ -71,9 +71,8 @@ class Node extends Model
         'public', 'name',
         'fqdn', 'scheme', 'behind_proxy',
         'memory', 'memory_overallocate', 'disk',
-        'disk_overallocate', 'cpu', 'cpu_overallocate',
-        'upload_size', 'daemon_base',
-        'daemon_sftp', 'daemon_sftp_alias', 'daemon_listen',
+        'disk_overallocate', 'upload_size', 'daemon_base',
+        'daemon_sftp', 'daemon_listen',
         'description', 'maintenance_mode',
     ];
 
@@ -88,11 +87,8 @@ class Node extends Model
         'memory_overallocate' => 'required|numeric|min:-1',
         'disk' => 'required|numeric|min:0',
         'disk_overallocate' => 'required|numeric|min:-1',
-        'cpu' => 'required|numeric|min:0',
-        'cpu_overallocate' => 'required|numeric|min:-1',
         'daemon_base' => 'sometimes|required|regex:/^([\/][\d\w.\-\/]+)$/',
         'daemon_sftp' => 'required|numeric|between:1,65535',
-        'daemon_sftp_alias' => 'nullable|string',
         'daemon_listen' => 'required|numeric|between:1,65535',
         'maintenance_mode' => 'boolean',
         'upload_size' => 'int|between:1,1024',
@@ -108,8 +104,6 @@ class Node extends Model
         'memory_overallocate' => 0,
         'disk' => 0,
         'disk_overallocate' => 0,
-        'cpu' => 0,
-        'cpu_overallocate' => 0,
         'daemon_base' => '/var/lib/pelican/volumes',
         'daemon_sftp' => 2022,
         'daemon_listen' => 8080,
@@ -122,10 +116,8 @@ class Node extends Model
         return [
             'memory' => 'integer',
             'disk' => 'integer',
-            'cpu' => 'integer',
             'daemon_listen' => 'integer',
             'daemon_sftp' => 'integer',
-            'daemon_token' => 'encrypted',
             'behind_proxy' => 'boolean',
             'public' => 'boolean',
             'maintenance_mode' => 'boolean',
@@ -142,7 +134,7 @@ class Node extends Model
     {
         static::creating(function (self $node) {
             $node->uuid = Str::uuid();
-            $node->daemon_token = Str::random(self::DAEMON_TOKEN_LENGTH);
+            $node->daemon_token = encrypt(Str::random(self::DAEMON_TOKEN_LENGTH));
             $node->daemon_token_id = Str::random(self::DAEMON_TOKEN_ID_LENGTH);
 
             return true;
@@ -170,7 +162,7 @@ class Node extends Model
             'debug' => false,
             'uuid' => $this->uuid,
             'token_id' => $this->daemon_token_id,
-            'token' => $this->daemon_token,
+            'token' => decrypt($this->daemon_token),
             'api' => [
                 'host' => '0.0.0.0',
                 'port' => $this->daemon_listen,
@@ -208,6 +200,16 @@ class Node extends Model
         return json_encode($this->getConfiguration(), $pretty ? JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT : JSON_UNESCAPED_SLASHES);
     }
 
+    /**
+     * Helper function to return the decrypted key for a node.
+     */
+    public function getDecryptedKey(): string
+    {
+        return (string) decrypt(
+            $this->daemon_token
+        );
+    }
+
     public function isUnderMaintenance(): bool
     {
         return $this->maintenance_mode;
@@ -237,30 +239,12 @@ class Node extends Model
     /**
      * Returns a boolean if the node is viable for an additional server to be placed on it.
      */
-    public function isViable(int $memory, int $disk, int $cpu): bool
+    public function isViable(int $memory, int $disk): bool
     {
-        if ($this->memory_overallocate >= 0) {
-            $memoryLimit = $this->memory * (1 + ($this->memory_overallocate / 100));
-            if ($this->servers_sum_memory + $memory > $memoryLimit) {
-                return false;
-            }
-        }
+        $memoryLimit = $this->memory * (1 + ($this->memory_overallocate / 100));
+        $diskLimit = $this->disk * (1 + ($this->disk_overallocate / 100));
 
-        if ($this->disk_overallocate >= 0) {
-            $diskLimit = $this->disk * (1 + ($this->disk_overallocate / 100));
-            if ($this->servers_sum_disk + $disk > $diskLimit) {
-                return false;
-            }
-        }
-
-        if ($this->cpu_overallocate >= 0) {
-            $cpuLimit = $this->cpu * (1 + ($this->cpu_overallocate / 100));
-            if ($this->servers_sum_cpu + $cpu > $cpuLimit) {
-                return false;
-            }
-        }
-
-        return true;
+        return ($this->sum_memory + $memory) <= $memoryLimit && ($this->sum_disk + $disk) <= $diskLimit;
     }
 
     public static function getForServerCreation()

app/Models/Objects/DeploymentObject.php

@@ -6,8 +6,6 @@ class DeploymentObject
 {
     private bool $dedicated = false;
 
-    private array $tags = [];
-
     private array $ports = [];
 
     public function isDedicated(): bool
@@ -33,17 +31,4 @@ class DeploymentObject
 
         return $this;
     }
-
-    public function getTags(): array
-    {
-        return $this->tags;
-    }
-
-    public function setTags(array $tags): self
-    {
-        $this->tags = $tags;
-
-        return $this;
-    }
-
 }

app/Models/Schedule.php

@@ -4,8 +4,10 @@ namespace App\Models;
 
 use Cron\CronExpression;
 use Carbon\CarbonImmutable;
+use Illuminate\Container\Container;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use App\Contracts\Extensions\HashidsInterface;
 
 /**
  * @property int $id
@@ -23,6 +25,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  * @property \Carbon\Carbon|null $next_run_at
  * @property \Carbon\Carbon $created_at
  * @property \Carbon\Carbon $updated_at
+ * @property string $hashid
  * @property \App\Models\Server $server
  * @property \App\Models\Task[]|\Illuminate\Support\Collection $tasks
  */
@@ -121,6 +124,14 @@ class Schedule extends Model
         );
     }
 
+    /**
+     * Return a hashid encoded string to represent the ID of the schedule.
+     */
+    public function getHashidAttribute(): string
+    {
+        return Container::getInstance()->make(HashidsInterface::class)->encode($this->id);
+    }
+
     /**
      * Return tasks belonging to a schedule.
      */

app/Models/Server.php

@@ -5,7 +5,6 @@ namespace App\Models;
 use App\Enums\ServerState;
 use App\Exceptions\Http\Connection\DaemonConnectionException;
 use GuzzleHttp\Exception\GuzzleException;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Facades\Http;
@@ -14,6 +13,7 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
+use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use App\Exceptions\Http\Server\ServerStateConflictException;
 
 /**
@@ -184,7 +184,6 @@ class Server extends Model
             self::UPDATED_AT => 'datetime',
             'deleted_at' => 'datetime',
             'installed_at' => 'datetime',
-            'docker_labels' => 'array',
         ];
     }
 
@@ -311,9 +310,12 @@ class Server extends Model
         return $this->hasMany(Backup::class);
     }
 
-    public function mounts(): BelongsToMany
+    /**
+     * Returns all mounts that have this server has mounted.
+     */
+    public function mounts(): HasManyThrough
     {
-        return $this->belongsToMany(Mount::class);
+        return $this->hasManyThrough(Mount::class, MountServer::class, 'server_id', 'id', 'id', 'mount_id');
     }
 
     /**

app/Models/Subuser.php

@@ -52,6 +52,14 @@ class Subuser extends Model
         ];
     }
 
+    /**
+     * Return a hashid encoded string to represent the ID of the subuser.
+     */
+    public function getHashidAttribute(): string
+    {
+        return app()->make('hashids')->encode($this->id);
+    }
+
     /**
      * Gets the server associated with a subuser.
      */

app/Models/Task.php

@@ -2,8 +2,10 @@
 
 namespace App\Models;
 
+use Illuminate\Container\Container;
 use Illuminate\Database\Eloquent\Relations\HasOneThrough;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use App\Contracts\Extensions\HashidsInterface;
 
 /**
  * @property int $id
@@ -16,6 +18,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  * @property bool $continue_on_failure
  * @property \Carbon\Carbon $created_at
  * @property \Carbon\Carbon $updated_at
+ * @property string $hashid
  * @property \App\Models\Schedule $schedule
  * @property \App\Models\Server $server
  */
@@ -93,6 +96,14 @@ class Task extends Model
         return $this->getKeyName();
     }
 
+    /**
+     * Return a hashid encoded string to represent the ID of the task.
+     */
+    public function getHashidAttribute(): string
+    {
+        return Container::getInstance()->make(HashidsInterface::class)->encode($this->id);
+    }
+
     /**
      * Return the schedule that a task belongs to.
      */

app/Models/Traits/HasAccessTokens.php

@@ -31,7 +31,7 @@ trait HasAccessTokens
             'user_id' => $this->id,
             'key_type' => ApiKey::TYPE_ACCOUNT,
             'identifier' => ApiKey::generateTokenIdentifier(ApiKey::TYPE_ACCOUNT),
-            'token' => $plain = Str::random(ApiKey::KEY_LENGTH),
+            'token' => encrypt($plain = Str::random(ApiKey::KEY_LENGTH)),
             'memo' => $memo ?? '',
             'allowed_ips' => $ips ?? [],
         ]);

app/Models/User.php

@@ -171,7 +171,6 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
             'use_totp' => 'boolean',
             'gravatar' => 'boolean',
             'totp_authenticated_at' => 'datetime',
-            'totp_secret' => 'encrypted',
         ];
     }
 

app/Providers/AppServiceProvider.php

@@ -6,14 +6,12 @@ use App\Extensions\Themes\Theme;
 use App\Models;
 use App\Models\ApiKey;
 use App\Models\Node;
-use App\Services\Helpers\SoftwareVersionService;
 use Dedoc\Scramble\Scramble;
 use Dedoc\Scramble\Support\Generator\OpenApi;
 use Dedoc\Scramble\Support\Generator\SecurityScheme;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Facades\Broadcast;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\URL;
@@ -31,9 +29,8 @@ class AppServiceProvider extends ServiceProvider
     {
         Schema::defaultStringLength(191);
 
-        $versionData = app(SoftwareVersionService::class)->versionData();
-        View::share('appVersion', $versionData['version'] ?? 'undefined');
-        View::share('appIsGit', $versionData['is_git'] ?? false);
+        View::share('appVersion', $this->versionData()['version'] ?? 'undefined');
+        View::share('appIsGit', $this->versionData()['is_git'] ?? false);
 
         Paginator::useBootstrap();
 
@@ -62,7 +59,7 @@ class AppServiceProvider extends ServiceProvider
             'daemon',
             fn (Node $node, array $headers = []) => Http::acceptJson()
                 ->asJson()
-                ->withToken($node->daemon_token)
+                ->withToken($node->getDecryptedKey())
                 ->withHeaders($headers)
                 ->withOptions(['verify' => (bool) app()->environment('production')])
                 ->timeout(config('panel.guzzle.timeout'))
@@ -73,11 +70,9 @@ class AppServiceProvider extends ServiceProvider
         $this->bootAuth();
         $this->bootBroadcast();
 
-        $bearerTokens = fn (OpenApi $openApi) => $openApi->secure(SecurityScheme::http('bearer'));
-        Gate::define('viewApiDocs', fn () => true);
         Scramble::registerApi('application', ['api_path' => 'api/application', 'info' => ['version' => '1.0']]);
-        Scramble::registerApi('client', ['api_path' => 'api/client', 'info' => ['version' => '1.0']])->afterOpenApiGenerated($bearerTokens);
-        Scramble::registerApi('remote', ['api_path' => 'api/remote', 'info' => ['version' => '1.0']])->afterOpenApiGenerated($bearerTokens);
+        Scramble::registerApi('client', ['api_path' => 'api/client', 'info' => ['version' => '1.0']]);
+        Scramble::registerApi('remote', ['api_path' => 'api/remote', 'info' => ['version' => '1.0']]);
     }
 
     /**
@@ -98,6 +93,34 @@ class AppServiceProvider extends ServiceProvider
         Scramble::ignoreDefaultRoutes();
     }
 
+    /**
+     * Return version information for the footer.
+     */
+    protected function versionData(): array
+    {
+        return cache()->remember('git-version', 5, function () {
+            if (file_exists(base_path('.git/HEAD'))) {
+                $head = explode(' ', file_get_contents(base_path('.git/HEAD')));
+
+                if (array_key_exists(1, $head)) {
+                    $path = base_path('.git/' . trim($head[1]));
+                }
+            }
+
+            if (isset($path) && file_exists($path)) {
+                return [
+                    'version' => substr(file_get_contents($path), 0, 8),
+                    'is_git' => true,
+                ];
+            }
+
+            return [
+                'version' => config('app.version'),
+                'is_git' => false,
+            ];
+        });
+    }
+
     public function bootAuth(): void
     {
         Sanctum::usePersonalAccessTokenModel(ApiKey::class);

app/Providers/Filament/AdminPanelProvider.php

@@ -35,13 +35,11 @@ class AdminPanelProvider extends PanelProvider
             ->default()
             ->id('admin')
             ->path('admin')
-            ->topNavigation(config('panel.filament.top-navigation', true))
+            ->topNavigation(config('panel.filament.top-navigation', false))
             ->login()
             ->homeUrl('/')
-            ->favicon(config('app.favicon', '/pelican.ico'))
-            ->brandName(config('app.name', 'Pelican'))
-            ->brandLogo(config('app.logo'))
-            ->brandLogoHeight('2rem')
+            ->favicon('/pelican.ico')
+            ->brandName('Pelican')
             ->profile(EditProfile::class, false)
             ->colors([
                 'danger' => Color::Red,

app/Providers/HashidsServiceProvider.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Providers;
+
+use App\Extensions\Hashids;
+use Illuminate\Support\ServiceProvider;
+use App\Contracts\Extensions\HashidsInterface;
+
+class HashidsServiceProvider extends ServiceProvider
+{
+    /**
+     * Register the ability to use Hashids.
+     */
+    public function register(): void
+    {
+        $this->app->singleton(HashidsInterface::class, function () {
+            return new Hashids(
+                config('hashids.salt', ''),
+                config('hashids.length', 0),
+                config('hashids.alphabet', 'abcdefghijkmlnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890')
+            );
+        });
+
+        $this->app->alias(HashidsInterface::class, 'hashids');
+    }
+}

app/Providers/RouteServiceProvider.php

@@ -3,6 +3,7 @@
 namespace App\Providers;
 
 use Illuminate\Http\Request;
+use App\Models\Database;
 use Illuminate\Foundation\Http\Middleware\TrimStrings;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Cache\RateLimiting\Limit;
@@ -28,6 +29,11 @@ class RouteServiceProvider extends ServiceProvider
             return preg_match(self::FILE_PATH_REGEX, $request->getPathInfo()) === 1;
         });
 
+        // This is needed to make use of the "resolveRouteBinding" functionality in the
+        // model. Without it you'll never trigger that logic flow thus resulting in a 404
+        // error because we request databases with a HashID, and not with a normal ID.
+        Route::model('database', Database::class);
+
         $this->routes(function () {
             Route::middleware('web')->group(function () {
                 Route::middleware(['auth.session', RequireTwoFactorAuthentication::class])

app/Rules/Port.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Rules;
-
-use Closure;
-use Illuminate\Contracts\Validation\ValidationRule;
-
-class Port implements ValidationRule
-{
-    /**
-     * Run the validation rule.
-     *
-     * @param  \Closure(string): \Illuminate\Translation\PotentiallyTranslatedString  $fail
-     */
-    public function validate(string $attribute, mixed $value, Closure $fail): void
-    {
-        if (!is_numeric($value)) {
-            $fail('The :attribute must be numeric.');
-        }
-
-        $value = intval($value);
-        if (floatval($value) !== (float) $value) {
-            $fail('The :attribute must be an integer.');
-        }
-
-        if ($value < 0) {
-            $fail('The :attribute must be greater or equal to 0.');
-        }
-
-        if ($value > 65535) {
-            $fail('The :attribute must be less or equal to 65535.');
-        }
-    }
-}

app/Services/Acl/Api/AdminAcl.php

@@ -31,7 +31,6 @@ class AdminAcl
     public const RESOURCE_EGGS = 'eggs';
     public const RESOURCE_DATABASE_HOSTS = 'database_hosts';
     public const RESOURCE_SERVER_DATABASES = 'server_databases';
-    public const RESOURCE_MOUNTS = 'mounts';
 
     /**
      * Determine if an API key has permission to perform a specific read/write operation.

app/Services/Api/KeyCreationService.php

@@ -31,7 +31,7 @@ class KeyCreationService
         $data = array_merge($data, [
             'key_type' => $this->keyType,
             'identifier' => ApiKey::generateTokenIdentifier($this->keyType),
-            'token' => str_random(ApiKey::KEY_LENGTH),
+            'token' => encrypt(str_random(ApiKey::KEY_LENGTH)),
         ]);
 
         if ($this->keyType === ApiKey::TYPE_APPLICATION) {

app/Services/Databases/DatabaseManagementService.php

@@ -86,7 +86,9 @@ class DatabaseManagementService
         $data = array_merge($data, [
             'server_id' => $server->id,
             'username' => sprintf('u%d_%s', $server->id, str_random(10)),
-            'password' => Utilities::randomStringWithSpecialCharacters(24),
+            'password' => encrypt(
+                Utilities::randomStringWithSpecialCharacters(24)
+            ),
         ]);
 
         return $this->connection->transaction(function () use ($data, &$database) {
@@ -98,7 +100,7 @@ class DatabaseManagementService
             $database->createUser(
                 $database->username,
                 $database->remote,
-                $database->password,
+                decrypt($database->password),
                 $database->max_connections
             );
             $database->assignUserToDatabase($database->database, $database->username, $database->remote);

app/Services/Databases/DatabasePasswordService.php

@@ -33,7 +33,7 @@ class DatabasePasswordService
             $this->dynamic->set('dynamic', $database->database_host_id);
 
             $database->update([
-                'password' => $password,
+                'password' => encrypt($password),
             ]);
 
             $database->dropUser($database->username, $database->remote);

app/Services/Databases/Hosts/HostCreationService.php

@@ -28,7 +28,7 @@ class HostCreationService
     {
         return $this->connection->transaction(function () use ($data) {
             $host = DatabaseHost::query()->create([
-                'password' => array_get($data, 'password'),
+                'password' => encrypt(array_get($data, 'password')),
                 'name' => array_get($data, 'name'),
                 'host' => array_get($data, 'host'),
                 'port' => array_get($data, 'port'),

app/Services/Databases/Hosts/HostUpdateService.php

@@ -26,7 +26,9 @@ class HostUpdateService
      */
     public function handle(int $hostId, array $data): DatabaseHost
     {
-        if (empty(array_get($data, 'password'))) {
+        if (!empty(array_get($data, 'password'))) {
+            $data['password'] = encrypt($data['password']);
+        } else {
             unset($data['password']);
         }
 

app/Services/Deployment/AllocationSelectionService.php

@@ -90,9 +90,11 @@ class AllocationSelectionService
      */
     private function getRandomAllocation(array $nodes = [], array $ports = [], bool $dedicated = false): ?Allocation
     {
-        $query = Allocation::query()
-            ->whereNull('server_id')
-            ->whereIn('node_id', $nodes);
+        $query = Allocation::query()->whereNull('server_id');
+
+        if (!empty($nodes)) {
+            $query->whereIn('node_id', $nodes);
+        }
 
         if (!empty($ports)) {
             $query->where(function ($inner) use ($ports) {

app/Services/Deployment/FindViableNodesService.php

@@ -3,31 +3,81 @@
 namespace App\Services\Deployment;
 
 use App\Models\Node;
+use Webmozart\Assert\Assert;
 use Illuminate\Support\Collection;
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use App\Exceptions\Service\Deployment\NoViableNodeException;
 
 class FindViableNodesService
 {
+    protected ?int $disk = null;
+    protected ?int $memory = null;
+
     /**
-     * Returns a collection of nodes that meet the provided requirements and can then
+     * Set the amount of disk that will be used by the server being created. Nodes will be
+     * filtered out if they do not have enough available free disk space for this server
+     * to be placed on.
+     */
+    public function setDisk(int $disk): self
+    {
+        $this->disk = $disk;
+
+        return $this;
+    }
+
+    /**
+     * Set the amount of memory that this server will be using. As with disk space, nodes that
+     * do not have enough free memory will be filtered out.
+     */
+    public function setMemory(int $memory): self
+    {
+        $this->memory = $memory;
+
+        return $this;
+    }
+
+    /**
+     * Returns an array of nodes that meet the provided requirements and can then
      * be passed to the AllocationSelectionService to return a single allocation.
      *
      * This functionality is used for automatic deployments of servers and will
-     * attempt to find all nodes in the defined locations that meet the memory, disk
-     * and cpu availability requirements. Any nodes not meeting those requirements
+     * attempt to find all nodes in the defined locations that meet the disk and
+     * memory availability requirements. Any nodes not meeting those requirements
      * are tossed out, as are any nodes marked as non-public, meaning automatic
      * deployments should not be done against them.
+     *
+     * @param int|null $page If provided the results will be paginated by returning
+     *                       up to 50 nodes at a time starting at the provided page.
+     *                       If "null" is provided as the value no pagination will
+     *                       be used.
+     *
+     * @throws \App\Exceptions\Service\Deployment\NoViableNodeException
      */
-    public function handle(int $memory = 0, int $disk = 0, int $cpu = 0, $tags = []): Collection
+    public function handle(int $perPage = null, int $page = null): LengthAwarePaginator|Collection
     {
-        $nodes = Node::query()
-            ->withSum('servers', 'memory')
-            ->withSum('servers', 'disk')
-            ->withSum('servers', 'cpu')
-            ->where('public', true)
-            ->get();
+        Assert::integer($this->disk, 'Disk space must be an int, got %s');
+        Assert::integer($this->memory, 'Memory usage must be an int, got %s');
 
-        return $nodes
-            ->filter(fn (Node $node) => !$tags || collect($node->tags)->intersect($tags))
-            ->filter(fn (Node $node) => $node->isViable($memory, $disk, $cpu));
+        $query = Node::query()->select('nodes.*')
+            ->selectRaw('IFNULL(SUM(servers.memory), 0) as sum_memory')
+            ->selectRaw('IFNULL(SUM(servers.disk), 0) as sum_disk')
+            ->leftJoin('servers', 'servers.node_id', '=', 'nodes.id')
+            ->where('nodes.public', 1);
+
+        $results = $query->groupBy('nodes.id')
+            ->havingRaw('(IFNULL(SUM(servers.memory), 0) + ?) <= (nodes.memory * (1 + (nodes.memory_overallocate / 100)))', [$this->memory])
+            ->havingRaw('(IFNULL(SUM(servers.disk), 0) + ?) <= (nodes.disk * (1 + (nodes.disk_overallocate / 100)))', [$this->disk]);
+
+        if (!is_null($page)) {
+            $results = $results->paginate($perPage ?? 50, ['*'], 'page', $page);
+        } else {
+            $results = $results->get()->toBase();
+        }
+
+        if ($results->isEmpty()) {
+            throw new NoViableNodeException(trans('exceptions.deployment.no_viable_nodes'));
+        }
+
+        return $results;
     }
 }

app/Services/Eggs/EggConfigurationService.php

@@ -81,7 +81,7 @@ class EggConfigurationService
     {
         // Get the legacy configuration structure for the server so that we
         // can property map the egg placeholders to values.
-        $structure = $this->configurationStructureService->handle($server);
+        $structure = $this->configurationStructureService->handle($server, [], true);
 
         $response = [];
         // Normalize the output of the configuration for the new Daemon to more
@@ -124,6 +124,38 @@ class EggConfigurationService
         return $response;
     }
 
+    /**
+     * Replaces the legacy modifies from eggs with their new counterpart. The legacy Daemon would
+     * set SERVER_MEMORY, SERVER_IP, and SERVER_PORT with their respective values on the Daemon
+     * side. Ensure that anything referencing those properly replaces them with the matching config
+     * value.
+     */
+    protected function replaceLegacyModifiers(string $key, string $value): string
+    {
+        switch ($key) {
+            case 'config.docker.interface':
+                $replace = 'config.docker.network.interface';
+                break;
+            case 'server.build.env.SERVER_MEMORY':
+            case 'env.SERVER_MEMORY':
+                $replace = 'server.build.memory';
+                break;
+            case 'server.build.env.SERVER_IP':
+            case 'env.SERVER_IP':
+                $replace = 'server.build.default.ip';
+                break;
+            case 'server.build.env.SERVER_PORT':
+            case 'env.SERVER_PORT':
+                $replace = 'server.build.default.port';
+                break;
+            default:
+                // By default, we don't need to change anything, only if we ended up matching a specific legacy item.
+                $replace = $key;
+        }
+
+        return str_replace("{{{$key}}}", "{{{$replace}}}", $value);
+    }
+
     protected function matchAndReplaceKeys(mixed $value, array $structure): mixed
     {
         preg_match_all('/{{(?<key>[\w.-]*)}}/', $value, $matches);
@@ -143,6 +175,8 @@ class EggConfigurationService
                 continue;
             }
 
+            $value = $this->replaceLegacyModifiers($key, $value);
+
             // We don't want to do anything with config keys since the Daemon will need to handle
             // that. For example, the Spigot egg uses "config.docker.interface" to identify the Docker
             // interface to proxy through, but the Panel would be unaware of that.
@@ -164,7 +198,7 @@ class EggConfigurationService
             // variable from the server configuration.
             $plucked = Arr::get(
                 $structure,
-                preg_replace('/^env\./', 'build.environment.', $key),
+                preg_replace('/^env\./', 'build.env.', $key),
                 ''
             );
 

app/Services/Eggs/EggParserService.php

@@ -10,17 +10,6 @@ use App\Exceptions\Service\InvalidFileUploadException;
 
 class EggParserService
 {
-    public const UPGRADE_VARIABLES = [
-        'server.build.env.SERVER_IP' => 'server.allocations.default.ip',
-        'server.build.default.ip' => 'server.allocations.default.ip',
-        'server.build.env.SERVER_PORT' => 'server.allocations.default.port',
-        'server.build.default.port' => 'server.allocations.default.port',
-        'server.build.env.SERVER_MEMORY' => 'server.build.memory_limit',
-        'server.build.memory' => 'server.build.memory_limit',
-        'server.build.env.' => 'server.environment.',
-        'server.build.environment.' => 'server.environment.',
-    ];
-
     /**
      * Takes an uploaded file and parses out the egg configuration from within.
      *
@@ -37,20 +26,11 @@ class EggParserService
 
         $version = $parsed['meta']['version'] ?? '';
 
-        $parsed = match ($version) {
+        return match ($version) {
             'PTDL_v1' => $this->convertToV2($parsed),
             'PTDL_v2' => $parsed,
             default => throw new InvalidFileUploadException('The JSON file provided is not in a format that can be recognized.')
         };
-
-        // Make sure we only use recent variable format from now on
-        $parsed['config']['files'] = str_replace(
-            array_keys(self::UPGRADE_VARIABLES),
-            array_values(self::UPGRADE_VARIABLES),
-            $parsed['config']['files'] ?? '',
-        );
-
-        return $parsed;
     }
 
     /**

app/Services/Eggs/Sharing/EggExporterService.php

@@ -25,7 +25,6 @@ class EggExporterService
             'exported_at' => Carbon::now()->toAtomString(),
             'name' => $egg->name,
             'author' => $egg->author,
-            'uuid' => $egg->uuid,
             'description' => $egg->description,
             'features' => $egg->features,
             'docker_images' => $egg->docker_images,

app/Services/Eggs/Sharing/EggImporterService.php

@@ -9,7 +9,6 @@ use Illuminate\Http\UploadedFile;
 use App\Models\EggVariable;
 use Illuminate\Database\ConnectionInterface;
 use App\Services\Eggs\EggParserService;
-use Spatie\TemporaryDirectory\TemporaryDirectory;
 
 class EggImporterService
 {
@@ -22,16 +21,13 @@ class EggImporterService
      *
      * @throws \App\Exceptions\Service\InvalidFileUploadException|\Throwable
      */
-    public function fromFile(UploadedFile $file): Egg
+    public function handle(UploadedFile $file): Egg
     {
         $parsed = $this->parser->handle($file);
 
         return $this->connection->transaction(function () use ($parsed) {
-            $uuid = $parsed['uuid'] ?? Uuid::uuid4()->toString();
-            $egg = Egg::where('uuid', $uuid)->first() ?? new Egg();
-
-            $egg = $egg->forceFill([
-                'uuid' => $uuid,
+            $egg = (new Egg())->forceFill([
+                'uuid' => Uuid::uuid4()->toString(),
                 'author' => Arr::get($parsed, 'author'),
                 'copy_script_from' => null,
             ]);
@@ -46,20 +42,4 @@ class EggImporterService
             return $egg;
         });
     }
-
-    /**
-     * Take an url and parse it into a new egg.
-     *
-     * @throws \App\Exceptions\Service\InvalidFileUploadException|\Throwable
-     */
-    public function fromUrl(string $url): Egg
-    {
-        $info = pathinfo($url);
-        $tmpDir = TemporaryDirectory::make()->deleteWhenDestroyed();
-        $tmpPath = $tmpDir->path($info['basename']);
-
-        file_put_contents($tmpPath, file_get_contents($url));
-
-        return $this->fromFile(new UploadedFile($tmpPath, $info['basename'], 'application/json'));
-    }
 }

app/Services/Eggs/Sharing/EggUpdateImporterService.php

@@ -8,7 +8,6 @@ use Illuminate\Support\Collection;
 use App\Models\EggVariable;
 use Illuminate\Database\ConnectionInterface;
 use App\Services\Eggs\EggParserService;
-use Spatie\TemporaryDirectory\TemporaryDirectory;
 
 class EggUpdateImporterService
 {
@@ -24,7 +23,7 @@ class EggUpdateImporterService
      *
      * @throws \App\Exceptions\Service\InvalidFileUploadException|\Throwable
      */
-    public function fromFile(Egg $egg, UploadedFile $file): Egg
+    public function handle(Egg $egg, UploadedFile $file): Egg
     {
         $parsed = $this->parser->handle($file);
 
@@ -48,20 +47,4 @@ class EggUpdateImporterService
             return $egg->refresh();
         });
     }
-
-    /**
-     * Update an existing Egg using an url.
-     *
-     * @throws \App\Exceptions\Service\InvalidFileUploadException|\Throwable
-     */
-    public function fromUrl(Egg $egg, string $url): Egg
-    {
-        $info = pathinfo($url);
-        $tmpDir = TemporaryDirectory::make()->deleteWhenDestroyed();
-        $tmpPath = $tmpDir->path($info['basename']);
-
-        file_put_contents($tmpPath, file_get_contents($url));
-
-        return $this->fromFile($egg, new UploadedFile($tmpPath, $info['basename'], 'application/json'));
-    }
 }

app/Services/Exceptions/FilamentExceptionHandler.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Services\Exceptions;
-
-use Exception;
-use Filament\Notifications\Notification;
-
-class FilamentExceptionHandler
-{
-    public function handle(Exception $exception, callable $stopPropagation): void
-    {
-        Notification::make()
-            ->title($exception->title ?? null)
-            ->body($exception->body ?? $exception->getMessage())
-            ->color($exception->color ?? 'danger')
-            ->icon($exception->icon ?? 'tabler-x')
-            ->danger()
-            ->send();
-
-        if ($this->stopPropagation ?? true) {
-            $stopPropagation();
-        }
-    }
-}

app/Services/Helpers/SoftwareVersionService.php

@@ -49,14 +49,6 @@ class SoftwareVersionService
         return Arr::get(self::$result, 'discord') ?? 'https://pelican.dev/discord';
     }
 
-    /**
-     * Get the donation URL.
-     */
-    public function getDonations(): string
-    {
-        return Arr::get(self::$result, 'donate') ?? 'https://pelican.dev/donate';
-    }
-
     /**
      * Determine if the current version of the panel is the latest.
      */
@@ -101,28 +93,8 @@ class SoftwareVersionService
         });
     }
 
-    public function versionData(): array
+    public function getDonations(): string
     {
-        return cache()->remember('git-version', 5, function () {
-            if (file_exists(base_path('.git/HEAD'))) {
-                $head = explode(' ', file_get_contents(base_path('.git/HEAD')));
-
-                if (array_key_exists(1, $head)) {
-                    $path = base_path('.git/' . trim($head[1]));
-                }
-            }
-
-            if (isset($path) && file_exists($path)) {
-                return [
-                    'version' => 'canary (' . substr(file_get_contents($path), 0, 8) . ')',
-                    'is_git' => true,
-                ];
-            }
-
-            return [
-                'version' => config('app.version'),
-                'is_git' => false,
-            ];
-        });
+        return 'https://github.com';
     }
 }

app/Services/Nodes/NodeCreationService.php

@@ -16,7 +16,7 @@ class NodeCreationService
     public function handle(array $data): Node
     {
         $data['uuid'] = Uuid::uuid4()->toString();
-        $data['daemon_token'] = Str::random(Node::DAEMON_TOKEN_LENGTH);
+        $data['daemon_token'] = encrypt(Str::random(Node::DAEMON_TOKEN_LENGTH));
         $data['daemon_token_id'] = Str::random(Node::DAEMON_TOKEN_ID_LENGTH);
 
         return Node::query()->create($data);

app/Services/Nodes/NodeJWTService.php

@@ -63,7 +63,7 @@ class NodeJWTService
     public function handle(Node $node, ?string $identifiedBy, string $algo = 'md5'): Plain
     {
         $identifier = hash($algo, $identifiedBy);
-        $config = Configuration::forSymmetricSigner(new Sha256(), InMemory::plainText($node->daemon_token));
+        $config = Configuration::forSymmetricSigner(new Sha256(), InMemory::plainText($node->getDecryptedKey()));
 
         $builder = $config->builder(new TimestampDates())
             ->issuedBy(config('app.url'))

app/Services/Nodes/NodeUpdateService.php

@@ -27,19 +27,23 @@ class NodeUpdateService
      */
     public function handle(Node $node, array $data, bool $resetToken = false): Node
     {
-        $data['id'] = $node->id;
-
         if ($resetToken) {
-            $data['daemon_token'] = Str::random(Node::DAEMON_TOKEN_LENGTH);
+            $data['daemon_token'] = encrypt(Str::random(Node::DAEMON_TOKEN_LENGTH));
             $data['daemon_token_id'] = Str::random(Node::DAEMON_TOKEN_ID_LENGTH);
         }
 
         [$updated, $exception] = $this->connection->transaction(function () use ($data, $node) {
             /** @var \App\Models\Node $updated */
-            $updated = $node->replicate();
-            $updated->exists = true;
-            $updated->forceFill($data)->save();
+            $updated = $node->replicate()->forceFill($data)->save();
+
             try {
+                // If we're changing the FQDN for the node, use the newly provided FQDN for the connection
+                // address. This should alleviate issues where the node gets pointed to a "valid" FQDN that
+                // isn't actually running the daemon software, and therefore you can't actually change it
+                // back.
+                //
+                // This makes more sense anyways, because only the Panel uses the FQDN for connecting, the
+                // node doesn't actually care about this.
                 $node->fqdn = $updated->fqdn;
 
                 $this->configurationRepository->setNode($node)->update($updated);

app/Services/Servers/ServerConfigurationStructureService.php

@@ -20,7 +20,7 @@ class ServerConfigurationStructureService
      * DO NOT MODIFY THIS FUNCTION. This powers legacy code handling for the new daemon
      * daemon, if you modify the structure eggs will break unexpectedly.
      */
-    public function handle(Server $server, array $override = []): array
+    public function handle(Server $server, array $override = [], bool $legacy = false): array
     {
         $clone = $server;
         // If any overrides have been set on this call make sure to update them on the
@@ -32,15 +32,17 @@ class ServerConfigurationStructureService
             }
         }
 
-        return $this->returnFormat($clone);
+        return $legacy
+            ? $this->returnLegacyFormat($clone)
+            : $this->returnCurrentFormat($clone);
     }
 
     /**
-     * Returns the data format used for the daemon.
+     * Returns the new data format used for the daemon.
      */
-    protected function returnFormat(Server $server): array
+    protected function returnCurrentFormat(Server $server): array
     {
-        $response = [
+        return [
             'uuid' => $server->uuid,
             'meta' => [
                 'name' => $server->name,
@@ -57,6 +59,8 @@ class ServerConfigurationStructureService
                 'cpu_limit' => $server->cpu,
                 'threads' => $server->threads,
                 'disk_space' => $server->disk,
+                // This field is deprecated — use "oom_killer".
+                'oom_disabled' => !$server->oom_killer,
                 'oom_killer' => $server->oom_killer,
             ],
             'container' => [
@@ -71,27 +75,54 @@ class ServerConfigurationStructureService
                 ],
                 'mappings' => $server->getAllocationMappings(),
             ],
-            'egg' => [
-                'id' => $server->egg->uuid,
-                'file_denylist' => $server->egg->inherit_file_denylist,
-            ],
-        ];
-
-        if (!empty($server->docker_labels)) {
-            $response['labels'] = $server->docker_labels;
-        }
-
-        if ($server->mounts->isNotEmpty()) {
-            $response['mounts'] = $server->mounts->map(function (Mount $mount) {
+            'mounts' => $server->mounts->map(function (Mount $mount) {
                 return [
                     'source' => $mount->source,
                     'target' => $mount->target,
                     'read_only' => $mount->read_only,
                 ];
-            })->toArray();
-        }
-
-        return $response;
+            }),
+            'egg' => [
+                'id' => $server->egg->uuid,
+                'file_denylist' => $server->egg->inherit_file_denylist,
+            ],
+        ];
     }
 
+    /**
+     * Returns the legacy server data format to continue support for old egg configurations
+     * that have not yet been updated.
+     *
+     * @deprecated
+     */
+    protected function returnLegacyFormat(Server $server): array
+    {
+        return [
+            'uuid' => $server->uuid,
+            'build' => [
+                'default' => [
+                    'ip' => $server->allocation->ip,
+                    'port' => $server->allocation->port,
+                ],
+                'ports' => $server->allocations->groupBy('ip')->map(function ($item) {
+                    return $item->pluck('port');
+                })->toArray(),
+                'env' => $this->environment->handle($server),
+                'oom_disabled' => !$server->oom_killer,
+                'memory' => (int) $server->memory,
+                'swap' => (int) $server->swap,
+                'io' => (int) $server->io,
+                'cpu' => (int) $server->cpu,
+                'threads' => $server->threads,
+                'disk' => (int) $server->disk,
+                'image' => $server->image,
+            ],
+            'service' => [
+                'egg' => $server->egg->uuid,
+                'skip_scripts' => $server->skip_scripts,
+            ],
+            'rebuild' => false,
+            'suspended' => $server->isSuspended() ? 1 : 0,
+        ];
+    }
 }

app/Services/Servers/ServerCreationService.php

@@ -42,6 +42,7 @@ class ServerCreationService
      * @throws \Throwable
      * @throws \App\Exceptions\DisplayException
      * @throws \Illuminate\Validation\ValidationException
+     * @throws \App\Exceptions\Service\Deployment\NoViableNodeException
      * @throws \App\Exceptions\Service\Deployment\NoViableAllocationException
      */
     public function handle(array $data, DeploymentObject $deployment = null): Server
@@ -104,16 +105,15 @@ class ServerCreationService
      *
      * @throws \App\Exceptions\DisplayException
      * @throws \App\Exceptions\Service\Deployment\NoViableAllocationException
+     * @throws \App\Exceptions\Service\Deployment\NoViableNodeException
      */
     private function configureDeployment(array $data, DeploymentObject $deployment): Allocation
     {
-        /** @var Collection<\App\Models\Node> $nodes */
-        $nodes = $this->findViableNodesService->handle(
-            Arr::get($data, 'memory', 0),
-            Arr::get($data, 'disk', 0),
-            Arr::get($data, 'cpu', 0),
-            Arr::get($data, 'tags', []),
-        );
+        /** @var \Illuminate\Support\Collection $nodes */
+        $nodes = $this->findViableNodesService
+            ->setDisk(Arr::get($data, 'disk'))
+            ->setMemory(Arr::get($data, 'memory'))
+            ->handle();
 
         return $this->allocationSelectionService->setDedicated($deployment->isDedicated())
             ->setNodes($nodes->pluck('id')->toArray())
@@ -154,7 +154,6 @@ class ServerCreationService
             'database_limit' => Arr::get($data, 'database_limit') ?? 0,
             'allocation_limit' => Arr::get($data, 'allocation_limit') ?? 0,
             'backup_limit' => Arr::get($data, 'backup_limit') ?? 0,
-            'docker_labels' => Arr::get($data, 'docker_labels'),
         ]);
     }
 

app/Services/Servers/SuspensionService.php

@@ -3,7 +3,6 @@
 namespace App\Services\Servers;
 
 use App\Enums\ServerState;
-use Filament\Notifications\Notification;
 use Webmozart\Assert\Assert;
 use App\Models\Server;
 use App\Repositories\Daemon\DaemonServerRepository;
@@ -27,7 +26,7 @@ class SuspensionService
      *
      * @throws \Throwable
      */
-    public function toggle(Server $server, string $action = self::ACTION_SUSPEND)
+    public function toggle(Server $server, string $action = self::ACTION_SUSPEND): void
     {
         Assert::oneOf($action, [self::ACTION_SUSPEND, self::ACTION_UNSUSPEND]);
 
@@ -36,12 +35,11 @@ class SuspensionService
         // suspended in the database. Additionally, nothing needs to happen if the server
         // is not suspended, and we try to un-suspend the instance.
         if ($isSuspending === $server->isSuspended()) {
-            return Notification::make()->danger()->title('Failed!')->body('Server is already suspended!')->send();
+            return;
         }
 
         // Check if the server is currently being transferred.
         if (!is_null($server->transfer)) {
-            Notification::make()->danger()->title('Failed!')->body('Server is currently being transferred.')->send();
             throw new ConflictHttpException('Cannot toggle suspension status on a server that is currently being transferred.');
         }
 

app/Services/Servers/TransferServerService.php

@@ -53,19 +53,17 @@ class TransferServerService
     {
         $node_id = $data['node_id'];
         $allocation_id = intval($data['allocation_id']);
-        $additional_allocations = array_map(intval(...), $data['allocation_additional'] ?? []);
+        $additional_allocations = array_map('intval', $data['allocation_additional'] ?? []);
 
         // Check if the node is viable for the transfer.
         $node = Node::query()
-            ->select(['nodes.id', 'nodes.fqdn', 'nodes.scheme', 'nodes.daemon_token', 'nodes.daemon_listen', 'nodes.memory', 'nodes.disk', 'nodes.cpu', 'nodes.memory_overallocate', 'nodes.disk_overallocate', 'nodes.cpu_overallocate'])
-            ->withSum('servers', 'disk')
-            ->withSum('servers', 'memory')
-            ->withSum('servers', 'cpu')
+            ->select(['nodes.id', 'nodes.fqdn', 'nodes.scheme', 'nodes.daemon_token', 'nodes.daemon_listen', 'nodes.memory', 'nodes.disk', 'nodes.memory_overallocate', 'nodes.disk_overallocate'])
+            ->selectRaw('IFNULL(SUM(servers.memory), 0) as sum_memory, IFNULL(SUM(servers.disk), 0) as sum_disk')
             ->leftJoin('servers', 'servers.node_id', '=', 'nodes.id')
             ->where('nodes.id', $node_id)
             ->first();
 
-        if (!$node->isViable($server->memory, $server->disk, $server->cpu)) {
+        if (!$node->isViable($server->memory, $server->disk)) {
             return false;
         }
 

app/Services/Users/ToggleTwoFactorService.php

@@ -32,7 +32,9 @@ class ToggleTwoFactorService
      */
     public function handle(User $user, string $token, bool $toggleState = null): array
     {
-        $isValidToken = $this->google2FA->verifyKey($user->totp_secret, $token, config()->get('panel.auth.2fa.window'));
+        $secret = decrypt($user->totp_secret);
+
+        $isValidToken = $this->google2FA->verifyKey($secret, $token, config()->get('panel.auth.2fa.window'));
 
         if (!$isValidToken) {
             throw new TwoFactorAuthenticationTokenInvalid();

app/Services/Users/TwoFactorSetupService.php

@@ -26,7 +26,7 @@ class TwoFactorSetupService
             throw new \RuntimeException($exception->getMessage(), 0, $exception);
         }
 
-        $user->totp_secret = $secret;
+        $user->totp_secret = encrypt($secret);
         $user->save();
 
         $company = urlencode(preg_replace('/\s/', '', config('app.name')));

app/Transformers/Api/Application/EggTransformer.php

@@ -5,6 +5,7 @@ namespace App\Transformers\Api\Application;
 use Illuminate\Support\Arr;
 use App\Models\Egg;
 use App\Models\Server;
+use League\Fractal\Resource\Item;
 use App\Models\EggVariable;
 use League\Fractal\Resource\Collection;
 use League\Fractal\Resource\NullResource;
@@ -38,11 +39,7 @@ class EggTransformer extends BaseTransformer
      */
     public function transform(Egg $model): array
     {
-        $model->loadMissing('configFrom');
-
-        $files = json_decode($model->inherit_config_files, true, 512, JSON_THROW_ON_ERROR);
-
-        $model->loadMissing('scriptFrom');
+        $files = json_decode($model->config_files, true, 512, JSON_THROW_ON_ERROR);
 
         return [
             'id' => $model->id,
@@ -57,18 +54,18 @@ class EggTransformer extends BaseTransformer
             'docker_images' => $model->docker_images,
             'config' => [
                 'files' => $files,
-                'startup' => json_decode($model->inherit_config_startup, true),
-                'stop' => $model->inherit_config_stop,
-                'logs' => json_decode($model->inherit_config_logs, true),
-                'file_denylist' => $model->inherit_file_denylist,
+                'startup' => json_decode($model->config_startup, true),
+                'stop' => $model->config_stop,
+                'logs' => json_decode($model->config_logs, true),
+                'file_denylist' => $model->file_denylist,
                 'extends' => $model->config_from,
             ],
             'startup' => $model->startup,
             'script' => [
                 'privileged' => $model->script_is_privileged,
-                'install' => $model->copy_script_install,
-                'entry' => $model->copy_script_entry,
-                'container' => $model->copy_script_container,
+                'install' => $model->script_install,
+                'entry' => $model->script_entry,
+                'container' => $model->script_container,
                 'extends' => $model->copy_script_from,
             ],
             $model->getCreatedAtColumn() => $this->formatTimestamp($model->created_at),
@@ -92,6 +89,50 @@ class EggTransformer extends BaseTransformer
         return $this->collection($model->getRelation('servers'), $this->makeTransformer(ServerTransformer::class), Server::RESOURCE_NAME);
     }
 
+    /**
+     * Include more detailed information about the configuration if this Egg is
+     * extending another.
+     */
+    public function includeConfig(Egg $model): Item|NullResource
+    {
+        if (is_null($model->config_from)) {
+            return $this->null();
+        }
+
+        $model->loadMissing('configFrom');
+
+        return $this->item($model, function (Egg $model) {
+            return [
+                'files' => json_decode($model->inherit_config_files),
+                'startup' => json_decode($model->inherit_config_startup),
+                'stop' => $model->inherit_config_stop,
+                'logs' => json_decode($model->inherit_config_logs),
+            ];
+        });
+    }
+
+    /**
+     * Include more detailed information about the script configuration if the
+     * Egg is extending another.
+     */
+    public function includeScript(Egg $model): Item|NullResource
+    {
+        if (is_null($model->copy_script_from)) {
+            return $this->null();
+        }
+
+        $model->loadMissing('scriptFrom');
+
+        return $this->item($model, function (Egg $model) {
+            return [
+                'privileged' => $model->script_is_privileged,
+                'install' => $model->copy_script_install,
+                'entry' => $model->copy_script_entry,
+                'container' => $model->copy_script_container,
+            ];
+        });
+    }
+
     /**
      * Include the variables that are defined for this Egg.
      *

app/Transformers/Api/Application/MountTransformer.php

@@ -1,89 +0,0 @@
-<?php
-
-namespace App\Transformers\Api\Application;
-
-use App\Models\Mount;
-use League\Fractal\Resource\Collection;
-use League\Fractal\Resource\NullResource;
-use App\Services\Acl\Api\AdminAcl;
-
-class MountTransformer extends BaseTransformer
-{
-    /**
-     * List of resources that can be included.
-     */
-    protected array $availableIncludes = ['eggs', 'nodes', 'servers'];
-
-    /**
-     * Return the resource name for the JSONAPI output.
-     */
-    public function getResourceName(): string
-    {
-        return Mount::RESOURCE_NAME;
-    }
-
-    public function transform(Mount $model)
-    {
-        return $model->toArray();
-    }
-
-    /**
-     * Return the eggs associated with this mount.
-     *
-     * @throws \App\Exceptions\Transformer\InvalidTransformerLevelException
-     */
-    public function includeEggs(Mount $mount): Collection|NullResource
-    {
-        if (!$this->authorize(AdminAcl::RESOURCE_EGGS)) {
-            return $this->null();
-        }
-
-        $mount->loadMissing('eggs');
-
-        return $this->collection(
-            $mount->getRelation('eggs'),
-            $this->makeTransformer(EggTransformer::class),
-            'egg'
-        );
-    }
-
-    /**
-     * Return the nodes associated with this mount.
-     *
-     * @throws \App\Exceptions\Transformer\InvalidTransformerLevelException
-     */
-    public function includeNodes(Mount $mount): Collection|NullResource
-    {
-        if (!$this->authorize(AdminAcl::RESOURCE_NODES)) {
-            return $this->null();
-        }
-
-        $mount->loadMissing('nodes');
-
-        return $this->collection(
-            $mount->getRelation('nodes'),
-            $this->makeTransformer(NodeTransformer::class),
-            'node'
-        );
-    }
-
-    /**
-     * Return the servers associated with this mount.
-     *
-     * @throws \App\Exceptions\Transformer\InvalidTransformerLevelException
-     */
-    public function includeServers(Mount $mount): Collection|NullResource
-    {
-        if (!$this->authorize(AdminAcl::RESOURCE_SERVERS)) {
-            return $this->null();
-        }
-
-        $mount->loadMissing('servers');
-
-        return $this->collection(
-            $mount->getRelation('servers'),
-            $this->makeTransformer(ServerTransformer::class),
-            'server'
-        );
-    }
-}

app/Transformers/Api/Application/NodeTransformer.php

@@ -23,23 +23,27 @@ class NodeTransformer extends BaseTransformer
     }
 
     /**
-     * Return a node transformed into a format that can be consumed by the external administrative API.
+     * Return a node transformed into a format that can be consumed by the
+     * external administrative API.
      */
     public function transform(Node $node): array
     {
-        $response = collect($node->toArray())
-            ->mapWithKeys(fn ($value, $key) => [snake_case($key) => $value])
-            ->toArray();
+        $response = collect($node->toArray())->mapWithKeys(function ($value, $key) {
+            // I messed up early in 2016 when I named this column as poorly
+            // as I did. This is the tragic result of my mistakes.
+            $key = ($key === 'daemon_sftp') ? 'daemon_sftp' : $key;
+
+            return [snake_case($key) => $value];
+        })->toArray();
 
         $response[$node->getUpdatedAtColumn()] = $this->formatTimestamp($node->updated_at);
         $response[$node->getCreatedAtColumn()] = $this->formatTimestamp($node->created_at);
 
-        $resources = $node->servers()->select(['memory', 'disk', 'cpu'])->get();
+        $resources = $node->servers()->select(['memory', 'disk'])->get();
 
         $response['allocated_resources'] = [
             'memory' => $resources->sum('memory'),
             'disk' => $resources->sum('disk'),
-            'cpu' => $resources->sum('cpu'),
         ];
 
         return $response;