Fix URL encoding in DownloadPrivate

Author: const-cloudinary

CloudinaryDotNet.Tests/AdminApi/RelatedAssetsTest.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Text;
 using CloudinaryDotNet.Actions;
 using NUnit.Framework;
@@ -65,13 +66,13 @@ public void TestAddRelatedResources()
             Assert.Positive(result.Success.Count);
             Assert.AreEqual("success", result.Success[0].Message);
             Assert.AreEqual("success_ids", result.Success[0].Code);
-            Assert.AreEqual(TestIds[1], result.Success[0].Asset);
+            Assert.AreEqual(TestIds?[1], result.Success[0].Asset);
             Assert.AreEqual(200, result.Success[0].Status);
 
             Assert.Positive(result.Failed.Count);
             Assert.AreEqual("resource does not exist", result.Failed[0].Message);
             Assert.AreEqual("non_existing_ids", result.Failed[0].Code);
-            Assert.AreEqual(TestIds[0], result.Failed[0].Asset);
+            Assert.AreEqual(TestIds?[0], result.Failed[0].Asset);
             Assert.AreEqual(404, result.Failed[0].Status);
         }
 
@@ -95,13 +96,13 @@ public void TestAddRelatedResourcesByAssetIds()
             Assert.Positive(result.Success.Count);
             Assert.AreEqual("success", result.Success[0].Message);
             Assert.AreEqual("success_ids", result.Success[0].Code);
-            Assert.AreEqual(TestAssetIds[1], result.Success[0].Asset);
+            Assert.AreEqual(TestAssetIds?[1], result.Success[0].Asset);
             Assert.AreEqual(200, result.Success[0].Status);
 
             Assert.Positive(result.Failed.Count);
             Assert.AreEqual("resource does not exist", result.Failed[0].Message);
             Assert.AreEqual("non_existing_ids", result.Failed[0].Code);
-            Assert.AreEqual(TestAssetIds[0], result.Failed[0].Asset);
+            Assert.AreEqual(TestAssetIds?[0], result.Failed[0].Asset);
             Assert.AreEqual(404, result.Failed[0].Status);
         }
 

CloudinaryDotNet.Tests/Asset/UrlBuilderTest.cs

@@ -536,14 +536,15 @@ public void TestDownloadPrivate()
         {
             var cloudinary = new Cloudinary("cloudinary://a:b@test123");
             var expiresAt = Utils.UnixTimeNowSeconds() + 7200;
-            const string testPublicId = "zihltjwsyczm700kqj1z";
+            const string testPublicId = "test/ecp/ij4fg5zpgsnkezxa3bxq;";
+            const string encodedTestPublicId = "test/ecp/ij4fg5zpgsnkezxa3bxq%3B";
 
             var urlPrivateImage = cloudinary.DownloadPrivate(testPublicId, expiresAt: expiresAt);
-            var rgImage = Regex.IsMatch(urlPrivateImage, @"https://api\.cloudinary\.com/v1_1/[^/]*/image/download\?api_key=a&expires_at=" + expiresAt + @"&public_id=zihltjwsyczm700kqj1z&signature=\w{40}&timestamp=\d{10}");
+            var rgImage = Regex.IsMatch(urlPrivateImage, @"https://api\.cloudinary\.com/v1_1/[^/]*/image/download\?api_key=a&expires_at=" + expiresAt + "&public_id=" + encodedTestPublicId + @"&signature=\w{40}&timestamp=\d{10}");
             Assert.True(rgImage);
 
             var urlPrivateVideo = cloudinary.DownloadPrivate(testPublicId, expiresAt: expiresAt, resourceType: "video");
-            var rgVideo = Regex.IsMatch(urlPrivateVideo, @"https://api\.cloudinary\.com/v1_1/[^/]*/video/download\?api_key=a&expires_at=" + expiresAt + @"&public_id=zihltjwsyczm700kqj1z&signature=\w{40}&timestamp=\d{10}");
+            var rgVideo = Regex.IsMatch(urlPrivateVideo, @"https://api\.cloudinary\.com/v1_1/[^/]*/video/download\?api_key=a&expires_at=" + expiresAt + "&public_id=" + encodedTestPublicId + @"&signature=\w{40}&timestamp=\d{10}");
             Assert.True(rgVideo);
         }
 

CloudinaryDotNet/Cloudinary.UploadApi.cs

@@ -1069,7 +1069,7 @@ private string GetDownloadUrl(UrlBuilder builder, IDictionary<string, object> pa
         {
             m_api.FinalizeUploadParameters(parameters);
             builder.SetParameters(parameters);
-            return builder.ToString();
+            return builder.ToEncodedString();
         }
 
         /// <summary>

CloudinaryDotNet/UrlBuilder.cs

@@ -2,6 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
     /// Provides a custom constructor for uniform resource identifiers (URIs) and modifies URIs
@@ -173,6 +174,17 @@ public void SetParameters(IDictionary<string, object> @params)
             return Uri.AbsoluteUri;
         }
 
+        /// <summary>
+        /// Returns a string that represents the current Url with encoded parameter values.
+        /// </summary>
+        /// <returns>A string that represents the URL with encoded parameter values.</returns>
+        public string ToEncodedString()
+        {
+            BuildQueryString(true);
+
+            return Uri.AbsoluteUri;
+        }
+
         private void PopulateQueryString()
         {
             string query = Query;
@@ -200,7 +212,7 @@ private void PopulateQueryString()
             }
         }
 
-        private void BuildQueryString()
+        private void BuildQueryString(bool encodeValue = false)
         {
             if (queryString == null)
             {
@@ -215,19 +227,7 @@ private void BuildQueryString()
                 return;
             }
 
-            string[] keys = new string[count];
-            string[] values = new string[count];
-            string[] pairs = new string[count];
-
-            queryString.Keys.CopyTo(keys, 0);
-            queryString.Values.CopyTo(values, 0);
-
-            for (int i = 0; i < count; i++)
-            {
-                pairs[i] = string.Concat(keys[i], "=", values[i]);
-            }
-
-            Query = string.Join("&", pairs);
+            Query = string.Join("&", queryString.Select(kvp => $"{kvp.Key}={(encodeValue ? Utils.SmartEscape(kvp.Value) : kvp.Value)}"));
         }
     }
 }

CloudinaryDotNet/Utils.cs

@@ -102,6 +102,23 @@ internal static string EncodeUrlSafe(byte[] bytes)
             return Convert.ToBase64String(bytes).Replace('+', '-').Replace('/', '_');
         }
 
+        /// <summary>
+        /// Escapes characters in the input string based on the specified unsafe pattern.
+        /// </summary>
+        /// <param name="input">The input string to be escaped.</param>
+        /// <param name="unsafePattern">The regular expression pattern for identifying unsafe characters (default: "([^a-zA-Z0-9_.\\-/:]+)").</param>
+        /// <returns>The input string with unsafe characters replaced by their percent-encoded representation.</returns>
+        internal static string SmartEscape(string input, string unsafePattern = "([^a-zA-Z0-9_.\\-/:]+)")
+        {
+            var unsafeRegex = new Regex(unsafePattern);
+            return unsafeRegex.Replace(input, m =>
+            {
+                var bytes = Encoding.UTF8.GetBytes(m.Value);
+                var hex = BitConverter.ToString(bytes).Replace("-", "%");
+                return "%" + hex;
+            });
+        }
+
         /// <summary>
         /// Computes the hash value for the specified string, using default hashing algorithm.
         /// </summary>