sync upstream changes

Dockerfile

@@ -22,7 +22,7 @@ RUN composer install --no-dev --no-interaction --no-autoloader --no-scripts
 # ================================
 # Stage 1-2: Yarn Install
 # ================================
-FROM --platform=$TARGETOS/$TARGETARCH node:20-alpine AS yarn
+FROM --platform=$TARGETOS/$TARGETARCH node:22-alpine AS yarn
 
 WORKDIR /build
 

Dockerfile.base

@@ -1,7 +1,7 @@
 # ================================
 # Stage 0: Build PHP Base Image
 # ================================
-FROM --platform=$TARGETOS/$TARGETARCH php:8.4-fpm-alpine
+FROM --platform=$TARGETOS/$TARGETARCH php:8.5-fpm-alpine
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 

Dockerfile.dev

@@ -1,7 +1,7 @@
 # syntax=docker.io/docker/dockerfile:1.13-labs
 # Pelican Development Dockerfile
 
-FROM --platform=$TARGETOS/$TARGETARCH php:8.4-fpm-alpine AS base
+FROM --platform=$TARGETOS/$TARGETARCH php:8.5-fpm-alpine AS base
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
@@ -26,7 +26,7 @@ RUN composer install --no-dev --no-interaction --no-autoloader --no-scripts
 # ================================
 # Stage 1-2: Yarn Install
 # ================================
-FROM --platform=$TARGETOS/$TARGETARCH node:20-alpine AS yarn
+FROM --platform=$TARGETOS/$TARGETARCH node:22-alpine AS yarn
 
 WORKDIR /build
 

app/Console/Commands/Egg/CheckEggUpdatesCommand.php

@@ -35,8 +35,13 @@ private function check(Egg $egg, EggExporterService $exporterService): void
             return;
         }
 
-        $ext = strtolower(pathinfo(parse_url($egg->update_url, PHP_URL_PATH), PATHINFO_EXTENSION));
-        $isYaml = in_array($ext, ['yaml', 'yml']);
+        $extension = strtolower(pathinfo(parse_url($egg->update_url, PHP_URL_PATH), PATHINFO_EXTENSION));
+
+        if (empty($extension)) {
+            throw new Exception('Unsupported file format.');
+        }
+
+        $isYaml = in_array($extension, ['yaml', 'yml']);
 
         $local = $isYaml
             ? Yaml::parse($exporterService->handle($egg->id, EggFormat::YAML))

app/Enums/ResourceLimit.php

@@ -43,12 +43,12 @@ public function middleware(): string
     public function limit(): Limit
     {
         return match ($this) {
-            self::Websocket => Limit::perMinute(5),
-            self::BackupRestore => Limit::perMinutes(15, 3),
-            self::DatabaseCreate => Limit::perMinute(2),
-            self::SubuserCreate => Limit::perMinutes(15, 10),
-            self::FilePull => Limit::perMinutes(10, 5),
-            default => Limit::perMinute(2),
+            self::Websocket => Limit::perMinutes(config('http.rate_limit.websocket_period'), config('http.rate_limit.websocket')),
+            self::BackupRestore => Limit::perMinutes(config('http.rate_limit.backup_restore_period'), config('http.rate_limit.backup_restore')),
+            self::DatabaseCreate => Limit::perMinutes(config('http.rate_limit.database_create_period'), config('http.rate_limit.database_create')),
+            self::SubuserCreate => Limit::perMinutes(config('http.rate_limit.subuser_create_period'), config('http.rate_limit.subuser_create')),
+            self::FilePull => Limit::perMinutes(config('http.rate_limit.file_pull_period'), config('http.rate_limit.file_pull')),
+            default => Limit::perMinutes(config('http.rate_limit.default_period'), config('http.rate_limit.default')),
         };
     }
 

app/Filament/Admin/Pages/Dashboard.php

@@ -25,7 +25,7 @@ public function getColumns(): int|array
 
     public function getHeading(): string
     {
-        return trans('admin/dashboard.heading');
+        return trans('admin/dashboard.heading', ['app' => config('app.name')]);
     }
 
     public function getSubheading(): string

app/Filament/Admin/Pages/Settings.php

@@ -31,11 +31,13 @@
 use Filament\Pages\Page;
 use Filament\Schemas\Components\Actions;
 use Filament\Schemas\Components\Component;
+use Filament\Schemas\Components\Fieldset;
 use Filament\Schemas\Components\Group;
 use Filament\Schemas\Components\Section;
 use Filament\Schemas\Components\StateCasts\BooleanStateCast;
 use Filament\Schemas\Components\Tabs;
 use Filament\Schemas\Components\Tabs\Tab;
+use Filament\Schemas\Components\Text;
 use Filament\Schemas\Components\Utilities\Get;
 use Filament\Schemas\Components\Utilities\Set;
 use Filament\Schemas\Contracts\HasSchemas;
@@ -794,24 +796,172 @@ private function miscSettings(): array
                 ]),
             Section::make(trans('admin/setting.misc.api.title'))
                 ->description(trans('admin/setting.misc.api.helper'))
-                ->columns()
+                ->columns(1)
                 ->collapsible()
                 ->collapsed()
                 ->schema([
-                    TextInput::make('APP_API_CLIENT_RATELIMIT')
-                        ->label(trans('admin/setting.misc.api.client_rate'))
-                        ->required()
-                        ->numeric()
-                        ->minValue(1)
-                        ->suffix(trans('admin/setting.misc.api.rpm'))
-                        ->default(env('APP_API_CLIENT_RATELIMIT', config('http.rate_limit.client'))),
-                    TextInput::make('APP_API_APPLICATION_RATELIMIT')
-                        ->label(trans('admin/setting.misc.api.app_rate'))
-                        ->required()
-                        ->numeric()
-                        ->minValue(1)
-                        ->suffix(trans('admin/setting.misc.api.rpm'))
-                        ->default(env('APP_API_APPLICATION_RATELIMIT', config('http.rate_limit.application'))),
+                    Fieldset::make()
+                        ->label(trans('admin/setting.misc.api.client_title'))
+                        ->schema([
+                            TextInput::make('APP_API_CLIENT_RATELIMIT')
+                                ->label(trans('admin/setting.misc.api.requests_per_period'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_CLIENT_RATELIMIT', config('http.rate_limit.client'))),
+
+                            TextInput::make('APP_API_CLIENT_RATELIMIT_PERIOD')
+                                ->label(trans('admin/setting.misc.api.period_length'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_CLIENT_RATELIMIT_PERIOD', config('http.rate_limit.client_period'))),
+                            Text::make(trans('admin/setting.misc.api.client_helper')),
+                        ]),
+                    Fieldset::make()
+                        ->label(trans('admin/setting.misc.api.application_title'))
+                        ->schema([
+                            TextInput::make('APP_API_APPLICATION_RATELIMIT')
+                                ->label(trans('admin/setting.misc.api.requests_per_period'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_APPLICATION_RATELIMIT', config('http.rate_limit.application'))),
+
+                            TextInput::make('APP_API_APPLICATION_RATELIMIT_PERIOD')
+                                ->label(trans('admin/setting.misc.api.period_length'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_APPLICATION_RATELIMIT_PERIOD', config('http.rate_limit.application_period'))),
+                            Text::make(trans('admin/setting.misc.api.application_helper')),
+                        ]),
+                    Fieldset::make()
+                        ->label(trans('admin/setting.misc.api.password_reset_title'))
+                        ->schema([
+                            TextInput::make('APP_API_PASSWORD_RESET_RATELIMIT')
+                                ->label(trans('admin/setting.misc.api.requests_per_period'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_PASSWORD_RESET_RATELIMIT', config('http.rate_limit.password_reset'))),
+
+                            TextInput::make('APP_API_PASSWORD_RESET_RATELIMIT_PERIOD')
+                                ->label(trans('admin/setting.misc.api.period_length'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_PASSWORD_RESET_RATELIMIT_PERIOD', config('http.rate_limit.password_reset_period'))),
+                            Text::make(trans('admin/setting.misc.api.password_reset_helper')),
+                        ]),
+                    Fieldset::make()
+                        ->label(trans('admin/setting.misc.api.websocket_title'))
+                        ->schema([
+                            TextInput::make('APP_API_WEBSOCKET_RATELIMIT')
+                                ->label(trans('admin/setting.misc.api.requests_per_period'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_WEBSOCKET_RATELIMIT', config('http.rate_limit.websocket'))),
+
+                            TextInput::make('APP_API_WEBSOCKET_RATELIMIT_PERIOD')
+                                ->label(trans('admin/setting.misc.api.period_length'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_WEBSOCKET_RATELIMIT_PERIOD', config('http.rate_limit.websocket_period'))),
+                            Text::make(trans('admin/setting.misc.api.websocket_helper')),
+                        ]),
+                    Fieldset::make()
+                        ->label(trans('admin/setting.misc.api.backup_restore_title'))
+                        ->schema([
+                            TextInput::make('APP_API_BACKUP_RESTORE_RATELIMIT')
+                                ->label(trans('admin/setting.misc.api.requests_per_period'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_BACKUP_RESTORE_RATELIMIT', config('http.rate_limit.backup_restore'))),
+
+                            TextInput::make('APP_API_BACKUP_RESTORE_RATELIMIT_PERIOD')
+                                ->label(trans('admin/setting.misc.api.period_length'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_BACKUP_RESTORE_RATELIMIT_PERIOD', config('http.rate_limit.backup_restore_period'))),
+                            Text::make(trans('admin/setting.misc.api.backup_restore_helper')),
+                        ]),
+                    Fieldset::make()
+                        ->label(trans('admin/setting.misc.api.database_create_title'))
+                        ->schema([
+                            TextInput::make('APP_API_DATABASE_CREATE_RATELIMIT')
+                                ->label(trans('admin/setting.misc.api.requests_per_period'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_DATABASE_CREATE_RATELIMIT', config('http.rate_limit.database_create'))),
+
+                            TextInput::make('APP_API_DATABASE_CREATE_RATELIMIT_PERIOD')
+                                ->label(trans('admin/setting.misc.api.period_length'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_DATABASE_CREATE_RATELIMIT_PERIOD', config('http.rate_limit.database_create_period'))),
+                            Text::make(trans('admin/setting.misc.api.database_create_helper')),
+                        ]),
+                    Fieldset::make()
+                        ->label(trans('admin/setting.misc.api.subuser_create_title'))
+                        ->schema([
+                            TextInput::make('APP_API_SUBUSER_CREATE_RATELIMIT')
+                                ->label(trans('admin/setting.misc.api.requests_per_period'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_SUBUSER_CREATE_RATELIMIT', config('http.rate_limit.subuser_create'))),
+
+                            TextInput::make('APP_API_SUBUSER_CREATE_RATELIMIT_PERIOD')
+                                ->label(trans('admin/setting.misc.api.period_length'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_SUBUSER_CREATE_RATELIMIT_PERIOD', config('http.rate_limit.subuser_create_period'))),
+                            Text::make(trans('admin/setting.misc.api.subuser_create_helper')),
+                        ]),
+                    Fieldset::make()
+                        ->label(trans('admin/setting.misc.api.file_pull_title'))
+                        ->schema([
+                            TextInput::make('APP_API_FILE_PULL_RATELIMIT')
+                                ->label(trans('admin/setting.misc.api.requests_per_period'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_FILE_PULL_RATELIMIT', config('http.rate_limit.file_pull'))),
+
+                            TextInput::make('APP_API_FILE_PULL_RATELIMIT_PERIOD')
+                                ->label(trans('admin/setting.misc.api.period_length'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_FILE_PULL_RATELIMIT_PERIOD', config('http.rate_limit.file_pull_period'))),
+                            Text::make(trans('admin/setting.misc.api.file_pull_helper')),
+                        ]),
+                    Fieldset::make()
+                        ->label(trans('admin/setting.misc.api.default_title'))
+                        ->schema([
+                            TextInput::make('APP_API_DEFAULT_RATELIMIT')
+                                ->label(trans('admin/setting.misc.api.requests_per_period'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_DEFAULT_RATELIMIT', config('http.rate_limit.default'))),
+
+                            TextInput::make('APP_API_DEFAULT_RATELIMIT_PERIOD')
+                                ->label(trans('admin/setting.misc.api.period_length'))
+                                ->required()
+                                ->numeric()
+                                ->minValue(1)
+                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_DEFAULT_RATELIMIT_PERIOD', config('http.rate_limit.default_period'))),
+                            Text::make(trans('admin/setting.misc.api.default_helper')),
+                        ]),
                 ]),
             Section::make(trans('admin/setting.misc.server.title'))
                 ->description(trans('admin/setting.misc.server.helper'))
@@ -830,13 +980,14 @@ private function miscSettings(): array
                         ->formatStateUsing(fn ($state): bool => (bool) $state)
                         ->afterStateUpdated(fn ($state, Set $set) => $set('PANEL_EDITABLE_SERVER_DESCRIPTIONS', (bool) $state))
                         ->default(env('PANEL_EDITABLE_SERVER_DESCRIPTIONS', config('panel.editable_server_descriptions'))),
-                    FileUpload::make('ConsoleFonts')
+                    FileUpload::make('console_font')
                         ->hint(trans('admin/setting.misc.server.console_font_hint'))
                         ->label(trans('admin/setting.misc.server.console_font_upload'))
                         ->directory('fonts')
                         ->disk('public')
                         ->columnSpan(1)
                         ->maxFiles(1)
+                        ->acceptedFileTypes(['font/*'])
                         ->preserveFilenames(),
                 ]),
             Section::make(trans('admin/setting.misc.webhook.title'))
@@ -864,9 +1015,11 @@ protected function getFormStatePath(): ?string
 
     public function save(): void
     {
+        abort_unless(user()?->can('update settings'), 403);
+
         try {
             $data = $this->form->getState();
-            unset($data['ConsoleFonts']);
+            unset($data['console_font']);
 
             $data = array_map(function ($value) {
                 // Convert bools to a string, so they are correctly written to the .env file
@@ -913,6 +1066,5 @@ protected function getDefaultHeaderActions(): array
                 ->authorize(fn () => user()?->can('update settings'))
                 ->keyBindings(['mod+s']),
         ];
-
     }
 }

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

@@ -38,7 +38,9 @@ class ListEggs extends ListRecords
      */
     public function table(Table $table): Table
     {
-        $defaultEggIcon = 'data:image/svg+xml;base64,' . base64_encode(file_get_contents(public_path('pelican.svg')));
+        $defaultEggIcon = config('app.logo');
+        $defaultEggIcon = empty($defaultEggIcon) || !is_file(public_path($defaultEggIcon)) ? 'pelican.svg' : $defaultEggIcon;
+        $defaultEggIcon = 'data:image/svg+xml;base64,' . base64_encode(file_get_contents(public_path($defaultEggIcon)));
 
         return $table
             ->searchable(true)

app/Filament/Admin/Resources/Plugins/PluginResource.php

@@ -261,7 +261,7 @@ public static function table(Table $table): Table
                             /** @var UploadedFile $file */
                             $file = $data['file'];
 
-                            $pluginName = str($file->getClientOriginalName())->before('.zip')->toString();
+                            $pluginName = str($file->getClientOriginalName())->basename()->before('.zip')->toString();
 
                             if (Plugin::where('id', $pluginName)->exists()) {
                                 throw new Exception(trans('admin/plugin.notifications.import_exists'));

app/Filament/Components/Actions/UploadIcon.php

@@ -110,6 +110,10 @@ protected function setUp(): void
 
                 $extension = strtolower(pathinfo(parse_url($data['icon_url'], PHP_URL_PATH), PATHINFO_EXTENSION));
 
+                if (empty($extension)) {
+                    throw new Exception(trans('admin/egg.import.invalid_url'));
+                }
+
                 $record->writeIcon($extension, $content);
 
                 Notification::make()