[HotFix]: Fix double encoding (#10417)

Author: erdembayar

src/Catalog/Persistence/Storage.cs

@@ -182,19 +182,33 @@ public virtual Task<bool> AreSynchronized(Uri firstResourceUri, Uri secondResour
 
         protected string GetName(Uri uri)
         {
-            var address = Uri.UnescapeDataString(BaseAddress.GetLeftPart(UriPartial.Path));
+            if (uri is null)
+            { 
+                throw new ArgumentNullException(nameof(uri));
+            }
+
+            if (BaseAddress is null)
+            {
+                throw new InvalidOperationException("BaseAddress must be set.");
+            }
+
+            string address = Uri.UnescapeDataString(BaseAddress.GetLeftPart(UriPartial.Path));
             if (!address.EndsWith("/"))
             {
                 address += "/";
             }
-            var uriString = uri.GetLeftPart(UriPartial.Path);
 
-            int baseAddressLength = address.Length;
+            // This method does encoding under the hood, could be a problem if it contains Unicode characters.
+            string fullPath = uri.GetLeftPart(UriPartial.Path); // Remove potential SAS token from the URI
 
             // handle mismatched scheme (http vs https)
-            var schemeLengthDifference = uri.Scheme.Length - BaseAddress.Scheme.Length;
+            int schemeLengthDifference = uri.Scheme.Length - BaseAddress.Scheme.Length;
+
+            string encodedName = fullPath.Substring(address.Length + schemeLengthDifference);
+
+            // decode back previous encoding in case of Unicode characters, otherwise it will be double encoded later
+            string name = Uri.UnescapeDataString(encodedName);
 
-            var name = uriString.Substring(baseAddressLength + schemeLengthDifference);
             if (name.Contains("#"))
             {
                 name = name.Substring(0, name.IndexOf("#"));

tests/CatalogTests/Persistence/StorageTests.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Moq;
+using NuGet.Services.Metadata.Catalog.Persistence;
+using Xunit;
+
+namespace CatalogTests.Persistence
+{
+    public class StorageTests
+    {
+        [Theory]
+        [InlineData("http://contoso.blob.core.windows.net/packages/package.1.0.0.nupkg", "package.1.0.0.nupkg")]
+        [InlineData("http://contoso.blob.core.windows.net/packages/another-package123.2.0.0.nupkg", "another-package123.2.0.0.nupkg")]
+        public void GetName_NonUnicodeUri_ReturnsCorrectName(string uriString, string expectedName)
+        {
+            // Arrange
+            Uri baseAddress = new Uri("http://contoso.blob.core.windows.net/packages/");
+            var storage = new Mock<Storage>(baseAddress) { CallBase = true };
+            var uri = new Uri(uriString);
+
+            // Act
+            var name = storage.Object.GetUri(expectedName).ToString();
+
+            // Assert
+            Assert.EndsWith(expectedName, name);
+        }
+
+        [Theory]
+        [InlineData("http://contoso.blob.core.windows.net/packages/邮件.1.0.0.nupkg", "邮件.1.0.0.nupkg")]
+        [InlineData("http://contoso.blob.core.windows.net/packages/пакет.2.0.0.nupkg", "пакет.2.0.0.nupkg")]
+        [InlineData("http://contoso.blob.core.windows.net/packages/パッケージ.3.0.0.nupkg", "パッケージ.3.0.0.nupkg")]
+        public void GetName_UnicodeUri_ReturnsCorrectName(string uriString, string expectedName)
+        {
+            // Arrange
+            Uri baseAddress = new Uri("http://contoso.blob.core.windows.net/packages/");
+            var storage = new Mock<Storage>(baseAddress) { CallBase = true };
+            var uri = new Uri(uriString);
+
+            // Act
+            var name = storage.Object.GetUri(expectedName).ToString();
+
+            // Assert
+            Assert.EndsWith(expectedName, name);
+        }
+    }
+}