feat: decoded encoded URLs (#2935)

aws · Jun 25, 2024 · bbf5be8 · bbf5be8
1 parent cec444c
commit bbf5be8
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/.changes/nextrelease/feat-urldecode-location.json b/.changes/nextrelease/feat-urldecode-location.json
@@ -0,0 +1,7 @@
+[
+  {
+    "type": "feature",
+    "category": "",
+    "description": "Decodes URL returned by CompleteMultipartUpload operation so special characters are removed."
+  }
+]
diff --git a/src/S3/PutObjectUrlMiddleware.php b/src/S3/PutObjectUrlMiddleware.php
@@ -49,7 +49,7 @@ function (ResultInterface $result) use ($command) {
                             : null;
                         break;
                     case 'CompleteMultipartUpload':
-                        $result['ObjectURL'] = $result['Location'];
+                        $result['ObjectURL'] = urldecode($result['Location'] ?? '');
                         break;
                 }
                 return $result;

diff --git a/tests/S3/ObjectCopierTest.php b/tests/S3/ObjectCopierTest.php
@@ -400,8 +400,8 @@ public function testS3ObjectCopierDoesTransformUnicodeKeyToEncodedURL()
 
     public function MultipartCopierProvider(){
         return [
-            ["中文", "%E4%B8%AD%E6%96%87"],
-            ["文件夹/文件", "%E6%96%87%E4%BB%B6%E5%A4%B9/%E6%96%87%E4%BB%B6"],
+            ["中文", "文件夹/文件"],
+            ["文件夹/文件", "中文"],
             ["first-folder/second-folder/key", "first-folder/second-folder/key"],
         ];
     }

diff --git a/tests/S3/PutObjectUrlMiddlewareTest.php b/tests/S3/PutObjectUrlMiddlewareTest.php
@@ -46,4 +46,27 @@ public function testAddsObjectUrlToCompleteMultipart()
             $result['ObjectURL']
         );
     }
+
+    public function testDecodesEncodedUrl()
+    {
+        $client = $this->getTestClient('s3');
+        $this->addMockResults($client, [
+            [
+                'Location' => 'https://test.s3.amazonaws.com/testdir%2Ftestfile',
+                '@metadata' => [
+                    'effectiveUri' => 'http://foo.com',
+                ]
+            ]
+        ]);
+        $result = $client->completeMultipartUpload([
+            'Bucket'   => 'test',
+            'Key'      => 'key',
+            'UploadId' => '123'
+        ]);
+
+        $this->assertSame(
+            'https://test.s3.amazonaws.com/testdir/testfile',
+            $result['ObjectURL']
+        );
+    }
 }