Merge pull request #198 from PortableStudios/fix/security-vulnerabili…

…ties Update composer to fix security vulnerabilities
PortableStudios · Nov 28, 2024 · f9a7c0d · f9a7c0d
2 parents a4ddf40 + 79022cb
commit f9a7c0d
Show file tree

Hide file tree

Showing 25 changed files with 2,108 additions and 3,093 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/Commands/AddUserConcerns.php b/src/Commands/AddUserConcerns.php
@@ -99,7 +99,7 @@ public function handle()
             $userContents = $part1 . "\n\n    public function canAccessPanel(\$panel): bool\n    {\n        // This is required on Front and Back end.  Add more specific controls with authenticate middleware.\n        return true;\n    }\n\n" . $part2;
         }
 
-        if(!strpos($userContents, 'canImpersonate')) {
+        if (!strpos($userContents, 'canImpersonate')) {
             $part1End = strrpos($userContents, '}');
             $part1 = substr($userContents, 0, $part1End);
             $part2 = substr($userContents, $part1End);

diff --git a/src/Commands/SyncSearch.php b/src/Commands/SyncSearch.php
@@ -19,7 +19,7 @@ public function handle()
         $this->call('scout:delete-all-indexes');
         $this->call('scout:sync-index-settings');
 
-        foreach(FilaCms::getRawContentModels() as $model => $resource) {
+        foreach (FilaCms::getRawContentModels() as $model => $resource) {
             $this->call('scout:import', ['model' => $model]);
         }
     }

diff --git a/src/Contracts/HasSlug.php b/src/Contracts/HasSlug.php
@@ -14,7 +14,7 @@ protected function slugifyField(): string
     protected function scopeSlugQuery($query, $slug)
     {
         $query = $query->where('slug', $slug);
-        if($this->id) {
+        if ($this->id) {
             $query = $query->where('id', '!=', $this->id);
         }
         return $query;

diff --git a/src/Exceptions/Handler.php b/src/Exceptions/Handler.php
@@ -26,7 +26,7 @@ public function register(): void
     {
         $this->reportable(function (Throwable $e) {
             // Only throw to Sentry if it's been configured
-            if(config('sentry.dsn')) {
+            if (config('sentry.dsn')) {
                 Integration::captureUnhandledException($e);
             }
         });

diff --git a/src/Filament/Actions/LinkAction.php b/src/Filament/Actions/LinkAction.php
@@ -151,7 +151,7 @@ protected function setUp(): void
 
     protected function getHref($data)
     {
-        switch($data['link_type']) {
+        switch ($data['link_type']) {
             case 'index-page':
                 $resourceClass = $data['reference_page'];
                 return route($resourceClass::getFrontendIndexRoute());
@@ -201,7 +201,7 @@ protected static function modelQuery($source)
         $className = FilaCms::getModelFromResource($source);
 
         if (!$className) {
-            if($source === FormResource::class) {
+            if ($source === FormResource::class) {
                 $query = Form::query();
             } else {
                 $query = Media::query()->where('is_folder', 0);
@@ -219,12 +219,12 @@ protected function parseArguments($args)
         // If the URL is a route, we need to parse it to get the correct arguments
         try {
             $route = app('router')->getRoutes()->match(app('request')->create($url), 'GET');
-            if(count($route->parameters) == 0) {
+            if (count($route->parameters) == 0) {
                 $args['link_type'] = 'url';
                 $args['reference_text'] = $url;
                 return $args;
             }
-            if(isset($route->parameters['model'])) {
+            if (isset($route->parameters['model'])) {
                 $model = $route->parameters['model'];
                 $resource = FilaCms::getContentModelResource($model);
             } else {
@@ -233,20 +233,20 @@ protected function parseArguments($args)
             }
             $args['reference_page'] = $resource;
 
-            if(isset($route->parameters['slug'])) {
+            if (isset($route->parameters['slug'])) {
                 $args['link_type'] = 'content';
                 $args['reference_content'] = $model::query()->where('slug', $route->parameters['slug'])->first()?->id;
-            } elseif(isset($route->parameters['media'])) {
+            } elseif (isset($route->parameters['media'])) {
                 $args['reference_media'] = $route->parameters['media'];
-                if(isset($route->parameters['mediaExtension'])) {
+                if (isset($route->parameters['mediaExtension'])) {
                     $args['link_type'] = 'media';
                 } else {
                     $args['link_type'] = 'download';
                 }
             } else {
                 $args['link_type'] = 'index-page';
             }
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $args['link_type'] = 'url';
             $args['reference_text'] = $url;
         }

diff --git a/src/Filament/Exports/FormEntryExporter.php b/src/Filament/Exports/FormEntryExporter.php
@@ -23,7 +23,7 @@ public function __construct(
         protected array $columnMap,
         protected array $options,
     ) {
-        if(isset($options['form'])) {
+        if (isset($options['form'])) {
             static::form($options['form']);
         }
     }

diff --git a/src/Filament/FormBlocks/AbstractFormBlock.php b/src/Filament/FormBlocks/AbstractFormBlock.php
@@ -51,7 +51,7 @@ public static function getField($fieldData, $readOnly = false): Component
             $field->readOnly();
         }
         $field->label($fieldData['field_name'] ?? $fieldData['field_id'] ?? '-');
-        if(!empty($fieldData['field_id'])) {
+        if (!empty($fieldData['field_id'])) {
             $field->statePath($fieldData['field_id']);
         }
 

diff --git a/src/Filament/FormBlocks/FormBuilder.php b/src/Filament/FormBlocks/FormBuilder.php
@@ -54,7 +54,7 @@ public static function getFields($fieldData, $readOnly = false): array
         $fields = [];
         foreach ($fieldData as $key => $field) {
 
-            if($readOnly) {
+            if ($readOnly) {
                 $field['data']['required'] = false;
             }
 
@@ -92,7 +92,7 @@ public static function formFieldId(): TextInput
                 ->readOnly()
                 ->required()
                 ->afterStateHydrated(function (TextInput $component, $state) use ($fieldId) {
-                    if(empty($state)) {
+                    if (empty($state)) {
                         $component->state($fieldId);
                     }
                 });

diff --git a/src/Filament/FormBlocks/InformationBlock.php b/src/Filament/FormBlocks/InformationBlock.php
@@ -31,7 +31,7 @@ public function getSchema(): Closure|array
                 ->readOnly()
                 ->required()
                 ->afterStateHydrated(function (TextInput $component, $state) {
-                    if(empty($state)) {
+                    if (empty($state)) {
                         $component->state('Information');
                     }
                 }),

diff --git a/src/Filament/FormBlocks/RelationshipBlock.php b/src/Filament/FormBlocks/RelationshipBlock.php
@@ -99,7 +99,7 @@ protected static function getOptionsQuery($fieldData, $search = null)
         }
 
         if ($search) {
-            if($titleField == 'display_name') {
+            if ($titleField == 'display_name') {
                 $query = $query->where('first_name', 'LIKE', '%' . $search . '%')->orWhere('last_name', 'LIKE', '%'. $search . '%');
             } else {
                 $query = $query->where($titleField, 'LIKE', '%' . $search . '%');

diff --git a/src/Filament/Pages/EditSettings.php b/src/Filament/Pages/EditSettings.php
@@ -67,7 +67,7 @@ public function save(): void
                     'value' => data_get($formData, $field->getName())
                 ];
                 $cacheKey = 'setting-' . $field->getName();
-                if(Cache::has($cacheKey)) {
+                if (Cache::has($cacheKey)) {
                     Cache::forget($cacheKey);
                 }
             }
@@ -76,7 +76,7 @@ public function save(): void
         Setting::upsert($records, ['key'], ['value']);
 
         // If the stop words have changed, kick off a reindex
-        if($oldStopWords !== Setting::get('search.stop_words')) {
+        if ($oldStopWords !== Setting::get('search.stop_words')) {
             $user = auth()->user();
             ReindexSearch::dispatch($user);
             Notification::make()

diff --git a/src/Filament/Resources/AbstractContentResource.php b/src/Filament/Resources/AbstractContentResource.php
@@ -734,7 +734,7 @@ protected static function getAuthorFilter()
                 }
                 $authors = Author::whereIn('id', $data['values'])->get()->pluck('display_name');
 
-                if(count($authors) === 0) {
+                if (count($authors) === 0) {
                     return null;
                 }
 

diff --git a/src/Filament/Resources/UserResource.php b/src/Filament/Resources/UserResource.php
@@ -78,13 +78,13 @@ public static function table(Table $table): Table
                 })
         ];
 
-        if(auth()->user()->can('impersonate users')) {
+        if (auth()->user()->can('impersonate users')) {
             $actions[] = Action::make('impersonate')
                 ->label('Impersonate')
                 ->icon('heroicon-s-eye')
                 ->action(function (Model $user) {
                     Auth::user()->impersonate($user);
-                    if($user->can('access filacms-backend')) {
+                    if ($user->can('access filacms-backend')) {
                         return redirect(route('filament.admin.pages.dashboard'));
                     } else {
                         return redirect('/');

diff --git a/src/Http/Controllers/SSOController.php b/src/Http/Controllers/SSOController.php
@@ -21,7 +21,7 @@ public function redirectToProvider()
         $driver = preg_match("/login\/(.*)/", Route::current()->uri(), $matches) ? $matches[1] : null;
 
         $socialiteDriver = $driver;
-        if(Str::lower($socialiteDriver) === 'linkedin') {
+        if (Str::lower($socialiteDriver) === 'linkedin') {
             $socialiteDriver = 'linkedin-openid';
         }
 
@@ -39,7 +39,7 @@ public function handleProviderCallback(LoginResponse $loginResponse)
         $driver = preg_match("/login\/(.*)\//", Route::current()->uri(), $matches) ? $matches[1] : null;
 
         $socialiteDriver = $driver;
-        if(Str::lower($socialiteDriver) === 'linkedin') {
+        if (Str::lower($socialiteDriver) === 'linkedin') {
             $socialiteDriver = 'linkedin-openid';
         }
 

diff --git a/src/Listeners/CommandFinishedListener.php b/src/Listeners/CommandFinishedListener.php
@@ -10,18 +10,18 @@ class CommandFinishedListener
     public function handle(CommandFinished $event): void
     {
         $indexCommands = ['scout:sync-index-settings','tinker','fila-cms:sync-search'];
-        if(in_array($event->command, $indexCommands)) {
+        if (in_array($event->command, $indexCommands)) {
             AfterSyncSearchSettings::dispatch();
             // Now update the stop words for all the models
             // that are searchable
             $indexes = config('scout.meilisearch.index-settings');
             $stopWords = json_decode(\Portable\FilaCms\Models\Setting::get('search.stop_words'));
-            if(!is_array($stopWords)) {
+            if (!is_array($stopWords)) {
                 $stopWords = [];
             }
 
             $client = app(\Laravel\Scout\EngineManager::class)->createMeilisearchDriver();
-            foreach($indexes as $indexName => $settings) {
+            foreach ($indexes as $indexName => $settings) {
                 $client->index($indexName)->updateStopWords($stopWords);
             }
         }

diff --git a/src/Listeners/CommandStartingListener.php b/src/Listeners/CommandStartingListener.php
@@ -11,7 +11,7 @@ class CommandStartingListener
     public function handle(CommandStarting $event): void
     {
         $indexCommands = ['scout:sync-index-settings','tinker','fila-cms:sync-search'];
-        if(in_array($event->command, $indexCommands)) {
+        if (in_array($event->command, $indexCommands)) {
             FilaCms::setMeilisearchConfigs();
             BeforeSyncSearchSettings::dispatch();
         }

diff --git a/src/Livewire/MediaLibraryTable.php b/src/Livewire/MediaLibraryTable.php
@@ -71,7 +71,7 @@ public function breadcrumbs()
 
     public function setParent($id)
     {
-        if(!Media::find($id)) {
+        if (!Media::find($id)) {
             $id = null;
         }
 
@@ -240,7 +240,7 @@ protected function getNewFolderAction(): Action
 
     public function removeFormUploadedFile(string $statePath, string $fileKey): void
     {
-        foreach($this->getCachedForms() as $form) {
+        foreach ($this->getCachedForms() as $form) {
             foreach ($form->getComponents() as $component) {
                 if ($component instanceof BaseFileUpload && $component->getStatePath() === $statePath) {
                     $state = $form->getState();
@@ -276,15 +276,15 @@ protected function getUploadAction(): Action
                     ->live()
                     ->afterStateUpdated(function (Get $get, Set $set, $state) {
                         $alts = collect($get('alts'));
-                        foreach($state as $key => $item) {
+                        foreach ($state as $key => $item) {
                             $arrItem = [
                                 'key' => $key,
                                 'tmppath' => $item->getFilename(),
                                 'filename' => $item->getClientOriginalName(),
                                 'alt_text' => $item->getClientOriginalName(),
                             ];
                             $alt = $alts->where('key', $key)->first();
-                            if(!$alt) {
+                            if (!$alt) {
                                 $alts->push($arrItem);
                             }
                         }
@@ -315,9 +315,9 @@ protected function getUploadAction(): Action
                     ->reorderable(false)
             ])
             ->action(function (array $data) {
-                if(count($data['upload_media'])) {
+                if (count($data['upload_media'])) {
                     $alts = collect($data['alts']);
-                    foreach($data['upload_media'] as $item) {
+                    foreach ($data['upload_media'] as $item) {
                         $alt = $alts->where('tmppath', $item->getFilename())->first();
                         $alt = $alt ? $alt['alt_text'] : $item->getClientOriginalName();
                         $this->saveFile($item, $alt);

diff --git a/src/Models/AbstractContentModel.php b/src/Models/AbstractContentModel.php
@@ -224,7 +224,7 @@ public function url(): Attribute
     {
         return new Attribute(function () {
             $resource = static::$resourceName;
-            if($resource::getFrontendRoutePrefix() == '') {
+            if ($resource::getFrontendRoutePrefix() == '') {
                 return '/' . $this->slug;
             } else {
                 return route(static::$resourceName::getFrontendShowRoute(), $this->slug);

diff --git a/src/Models/Media.php b/src/Models/Media.php
@@ -81,7 +81,7 @@ public function displaySize(): Attribute
                     $readableSize = new HumanReadableFileSize();
                     $readableSize->setSpaceBeforeUnit(true);
                     return preg_replace('/\.\d{1,2}(K?B)/', '$1', $readableSize->compute($this->size));
-                } catch(\Exception $e) {
+                } catch (\Exception $e) {
                     // Dealing with nulls
                     return '?';
                 }

diff --git a/src/Models/Traits/ProvidesSearchSettings.php b/src/Models/Traits/ProvidesSearchSettings.php
@@ -35,7 +35,7 @@ public static function getSearchableTaxonomies()
         try {
             $attrs = [];
             $taxes = TaxonomyResource::where('resource_class', static::$resourceName)->get();
-            foreach($taxes as $taxonomyResource) {
+            foreach ($taxes as $taxonomyResource) {
                 $fieldName = Str::slug(Str::plural($taxonomyResource->taxonomy->name), '_');
                 $attrs[] = $fieldName;
             }
@@ -51,7 +51,7 @@ public static function getFilterableTaxonomies()
         try {
             $attrs = [];
             $taxes = TaxonomyResource::where('resource_class', static::$resourceName)->get();
-            foreach($taxes as  $taxonomyResource) {
+            foreach ($taxes as $taxonomyResource) {
                 $fieldName = Str::slug(Str::plural($taxonomyResource->taxonomy->name), '_');
                 $attrs[] = $fieldName . '_ids';
             }

diff --git a/src/Providers/FilaCmsServiceProvider.php b/src/Providers/FilaCmsServiceProvider.php
@@ -108,7 +108,7 @@ function (\Lab404\Impersonate\Events\LeaveImpersonation  $event) {
         Event::listen(CommandFinished::class, CommandFinishedListener::class);
 
         // Force the Scout commands to be registered, in case we're running jobs syncronously
-        if(!$this->app->runningInConsole()) {
+        if (!$this->app->runningInConsole()) {
             $this->commands([
                 FlushCommand::class,
                 ImportCommand::class,
@@ -310,11 +310,11 @@ protected function loadSettings()
             }
         }
 
-        if(config('settings.monitoring.sentry.dsn')) {
+        if (config('settings.monitoring.sentry.dsn')) {
             config(['sentry.dsn' => config('settings.monitoring.sentry.dsn')]);
         }
 
-        if(config('settings.monitoring.ohdear.enabled')) {
+        if (config('settings.monitoring.ohdear.enabled')) {
             config(['schedule-monitor.oh_dear.api_token' => config('settings.monitoring.ohdear.api_token')]);
             config(['schedule-monitor.oh_dear.site_id' => config('settings.monitoring.ohdear.site_id')]);
             config(['schedule-monitor.oh_dear.queue' => env('OH_DEAR_QUEUE', 'default')]);
@@ -480,7 +480,7 @@ function ($app) use ($socialite) {
 
     protected function registerHealthChecks()
     {
-        if(app()->runningUnitTests()) {
+        if (app()->runningUnitTests()) {
             return;
         }
 
@@ -489,7 +489,7 @@ protected function registerHealthChecks()
             DatabaseCheck::new(),
         ];
         $meili = MeiliSearchCheck::new()->url(config('scout.meilisearch.host') . '/health');
-        if(config('scout.meilisearch.key')) {
+        if (config('scout.meilisearch.key')) {
             $meili = $meili->token(config('scout.meilisearch.key'));
         }
         $checks[] = $meili;
@@ -499,7 +499,7 @@ protected function registerHealthChecks()
             $checks[] = RedisCheck::new();
         }
 
-        if(config('queue.default') === 'redis') {
+        if (config('queue.default') === 'redis') {
             $checks[] = HorizonCheck::new();
         }
         Health::checks($checks);

diff --git a/tests/Factories/FormEntryFactory.php b/tests/Factories/FormEntryFactory.php
@@ -20,13 +20,13 @@ public function definition(): array
         $fields = FormFactory::getFields();
         $values = [];
 
-        foreach($fields as $field) {
+        foreach ($fields as $field) {
             $fieldName = data_get($field, 'data.' . FormBuilder::$fieldId);
-            if(!$fieldName) {
+            if (!$fieldName) {
                 continue;
             }
 
-            if($fieldName === 'Text Area') {
+            if ($fieldName === 'Text Area') {
                 $values[$fieldName] = $this->faker->sentence;
 
             } else {

diff --git a/tests/Feature/SearchIndexTest.php b/tests/Feature/SearchIndexTest.php
@@ -8,7 +8,6 @@
 use Portable\FilaCms\Models\Page;
 use Portable\FilaCms\Models\Setting;
 use Portable\FilaCms\Models\Taxonomy;
-
 use Portable\FilaCms\Tests\TestCase;
 
 class SearchIndexTest extends TestCase