Ensure KeyMarker is URL decoded before sending to AWS

Fixes issue #66

Author: Genbox

Src/ProviderTests/Issues/AmazonIssues.cs

@@ -0,0 +1,49 @@
+using Genbox.ProviderTests.Misc;
+using Genbox.SimpleS3.Core.Abstracts;
+using Genbox.SimpleS3.Core.Enums;
+using Genbox.SimpleS3.Core.Extensions;
+using Genbox.SimpleS3.Core.Network.Responses.S3Types;
+using Genbox.SimpleS3.Utility.Shared;
+
+namespace Genbox.ProviderTests.Issues;
+
+public class AmazonIssues : TestBase
+{
+    /// <summary>https://github.com/Genbox/SimpleS3/issues/66</summary>
+    [Theory]
+    [MultipleProviders(S3Provider.AmazonS3)]
+    public async Task Issue66(S3Provider provider, string bucket, ISimpleClient client)
+    {
+        //Issue: When setting EncodingType to Url, it creates an infinite loop
+        //Investigation: TODO
+        //Resolution: TODO
+
+        string[] names = ["a%20.txt", "a&1.txt", "a(1).exe", "folder1/a%20.txt"];
+
+        await CreateTempBucketAsync(provider, client, async tempBucket =>
+        {
+            //Create objects
+            foreach (string name in names)
+                await client.PutObjectStringAsync(tempBucket, name, "");
+
+            //List them while forcing pagination
+            List<S3Version> objects = await ToListAsync(client.ListAllObjectVersionsAsync(tempBucket, r =>
+            {
+                r.MaxKeys = 2;
+                r.EncodingType = EncodingType.Url;
+            }));
+
+            Assert.Equal(4, objects.Count);
+        });
+    }
+
+    private static async Task<List<T>> ToListAsync<T>(IAsyncEnumerable<T> list)
+    {
+        List<T> res = new List<T>();
+
+        await foreach (var item in list)
+            res.Add(item);
+
+        return res;
+    }
+}

Src/SimpleS3.Core/Extensions/ObjectClientExtensions.cs

@@ -1,10 +1,12 @@
 using System.Runtime.CompilerServices;
 using System.Text;
+using System.Web;
 using Genbox.SimpleS3.Core.Abstracts.Clients;
 using Genbox.SimpleS3.Core.Builders;
 using Genbox.SimpleS3.Core.Common.Exceptions;
 using Genbox.SimpleS3.Core.Common.Misc;
 using Genbox.SimpleS3.Core.Common.Validation;
+using Genbox.SimpleS3.Core.Enums;
 using Genbox.SimpleS3.Core.Internals.Pools;
 using Genbox.SimpleS3.Core.Network.Requests.Objects;
 using Genbox.SimpleS3.Core.Network.Requests.S3Types;
@@ -98,10 +100,14 @@ public static async IAsyncEnumerable<S3DeleteError> DeleteAllObjectsAsync(this I
 
             if (response.IsTruncated)
             {
-                string localToken = response.NextContinuationToken;
+                string cToken = response.NextContinuationToken;
+
+                if (response.EncodingType == EncodingType.Url)
+                    cToken = HttpUtility.UrlDecode(cToken);
+
                 responseTask = client.ListObjectsAsync(bucketName, req =>
                 {
-                    req.ContinuationToken = localToken;
+                    req.ContinuationToken = cToken;
                     configure?.Invoke(req);
                 }, token);
             }
@@ -163,6 +169,10 @@ public static async IAsyncEnumerable<S3DeleteError> DeleteAllObjectVersionsAsync
             if (response.IsTruncated)
             {
                 string keyMarker = response.NextKeyMarker;
+
+                if (response.EncodingType == EncodingType.Url)
+                    keyMarker = HttpUtility.UrlDecode(keyMarker);
+
                 responseTask = client.ListObjectVersionsAsync(bucketName, req =>
                 {
                     req.KeyMarker = keyMarker;
@@ -264,6 +274,10 @@ public static async IAsyncEnumerable<S3Object> ListAllObjectsAsync(this IObjectC
             if (response.IsTruncated)
             {
                 string cToken = response.NextContinuationToken;
+
+                if (response.EncodingType == EncodingType.Url)
+                    cToken = HttpUtility.UrlDecode(cToken);
+
                 responseTask = client.ListObjectsAsync(bucketName, req =>
                 {
                     req.ContinuationToken = cToken;
@@ -315,6 +329,10 @@ public static async IAsyncEnumerable<S3Version> ListAllObjectVersionsAsync(this
             if (response.IsTruncated)
             {
                 string keyMarker = response.NextKeyMarker;
+
+                if (response.EncodingType == EncodingType.Url)
+                    keyMarker = HttpUtility.UrlDecode(keyMarker);
+
                 responseTask = client.ListObjectVersionsAsync(bucketName, req =>
                 {
                     req.KeyMarker = keyMarker;