Merge pull request #54 from craftcms/bugfix/special-chars-in-path

Handle special characters that have been encoded from the presigned URL

src/controllers/AssetsController.php

@@ -166,7 +166,9 @@ public function actionCreateAsset(): Response
 
         // Setting these so that Asset::_relocateFile doesn't try to download
         $asset->folderId = $folder->id;
-        $asset->folderPath = $folder->path;
+
+        // Handle special characters that have been encoded from the presigned URL
+        $asset->folderPath = Fs::urlEncodePathSegments($folder->path);
 
         if (!$selectionCondition) {
             $asset->newFilename = $targetFilename;

src/fs/Fs.php

@@ -16,6 +16,7 @@
 use DateTime;
 use DateTimeInterface;
 use Generator;
+use Illuminate\Support\Collection;
 use League\Flysystem\AwsS3V3\AwsS3V3Adapter;
 use League\Flysystem\FilesystemException;
 use League\Flysystem\UnableToCopyFile;
@@ -542,4 +543,14 @@ public function replaceMetadata(string $path, array $config = []): void
             throw new FsException($exception->getMessage(), 0, $exception);
         }
     }
+
+    /**
+     * S3 encodes path segments when generating presigned PUT urls, so we need to do the same.
+     */
+    public static function urlEncodePathSegments(string $path): string
+    {
+        return Collection::make(explode('/', $path))
+            ->map(fn($segment) => rawurlencode($segment))
+            ->implode('/');
+    }
 }