remove restricted characters from filenames

Author: MayMeow

src/Controller/Component/UploadComponent.php

@@ -25,7 +25,7 @@ class UploadComponent extends Component
     ];
 
     /**
-     * Allowed storage types
+     * Allowed stoage types
      *
      * @var string[]
      */

src/File/PathUtils.php

@@ -0,0 +1,19 @@
+<?php
+declare(strict_types=1);
+
+namespace FileUpload\File;
+
+use Cake\Utility\Text;
+
+class PathUtils
+{
+    public static function fileNameSanitize(string $filename): string
+    {
+        // get extension even if filename has multiple dots
+        $ext = pathinfo($filename, PATHINFO_EXTENSION);
+        $filename = pathinfo($filename, PATHINFO_FILENAME);
+        $filename = Text::slug($filename);
+
+        return $filename . '.' . $ext;
+    }
+}

src/File/UploadedFileDecorator.php

@@ -28,4 +28,13 @@ public function get(string $key): string
     {
         return $this->options[$key] ?? "";
     }
+
+    public function getFileName(): string
+    {
+        if (isset($this->options['fileName'])) {
+            return $this->options['fileName'];
+        }
+
+        return $this->originalData->getClientFilename();
+    }
 }

src/Storage/BunnyStorageManager.php

@@ -3,6 +3,7 @@
 
 namespace FileUpload\Storage;
 
+use FileUpload\File\PathUtils;
 use FileUpload\File\StoredFile;
 use FileUpload\File\StoredFileInterface;
 use FileUpload\File\UploadedFileDecorator;
@@ -22,7 +23,10 @@ public function put(UploadedFileInterface $fileObject): UploadedFileDecorator
     {
         $accessKey = $this->getConfig('accessKey');
         $hostname = (!empty($this->getConfig('region'))) ? $this->getConfig('region') . '.' . $this->getConfig('baseHostName') : $this->getConfig('baseHostName');
-        $url = $this->composeUrl($hostname, $this->getConfig('storageZone'), $this->getConfig('storageZonePath'), $fileObject->getClientFilename());
+
+        $fileName = PathUtils::fileNameSanitize($fileObject->getClientFilename());
+
+        $url = $this->composeUrl($hostname, $this->getConfig('storageZone'), $this->getConfig('storageZonePath'), $fileName);
 
         $ch = curl_init();
 
@@ -49,7 +53,8 @@ public function put(UploadedFileInterface $fileObject): UploadedFileDecorator
         }
 
         $file = new UploadedFileDecorator($fileObject, self::STORAGE_TYPE, [
-            'storagePath' => $this->composeUrl($this->getConfig('cdnDomain'))
+            'storagePath' => $this->composeUrl($this->getConfig('cdnDomain'), $this->getConfig('storageZonePath')),
+            'fileName' => $fileName,
         ]);
 
         return $file;

src/Storage/LocalStorageManager.php

@@ -3,6 +3,7 @@
 
 namespace FileUpload\Storage;
 
+use FileUpload\File\PathUtils;
 use FileUpload\File\StoredFile;
 use FileUpload\File\StoredFileInterface;
 use FileUpload\File\UploadedFileDecorator;
@@ -19,10 +20,12 @@ class LocalStorageManager extends StorageManager
      */
     public function put(UploadedFileInterface $fileObject): UploadedFileDecorator
     {   
-        $fileObject->moveTo($this->getConfig('storagePath') . $fileObject->getClientFilename());
+        $fileName = PathUtils::fileNameSanitize($fileObject->getClientFilename());
+        $fileObject->moveTo($this->getConfig('storagePath') . $fileName);
 
         $uploadedFile = new UploadedFileDecorator($fileObject, self::STORAGE_TYPE, options: [
             'storagePath' => $this->getConfig('storagePath'),
+            'fileName' => $fileName,
         ]);
 
         return $uploadedFile;