Merge pull request #715 from code16/cwe-22

Improve FileUtil

Author: aguingand

src/Utils/FileUtil.php

@@ -23,12 +23,12 @@ public function findAvailableName(string $fileName, string $path = '', string $d
 
     public function explodeExtension(string $fileName): array
     {
-        if (($pos = strrpos($fileName, '.')) !== false) {
-            $ext = substr($fileName, $pos);
-            $fileName = substr($fileName, 0, $pos);
-        }
+        $pathinfo = pathinfo($fileName);
 
-        return [$fileName, $ext ?? ''];
+        return [
+            $pathinfo['filename'] ?? '',
+            isset($pathinfo['extension']) ? '.'.$pathinfo['extension'] : '',
+        ];
     }
 
     private function normalizeName(string $fileName): array|string|null

tests/Unit/Utils/FileUtilTest.php

@@ -47,3 +47,12 @@
         $fileUtil->findAvailableName('ôéàtest*.txt', 'tmp', 'local'),
     );
 });
+
+it('doesn’t care about relative path', function () {
+    $fileUtil = new FileUtil();
+
+    $this->assertEquals(
+        'test.txt',
+        $fileUtil->findAvailableName('../../../test.txt', 'tmp', 'local'),
+    );
+});