Merge pull request #279 from jrunestone/278-special-characters

Url decode path before fetching from file system, fixes #278

Author: JimBobSquarePants

src/ImageSharp.Web/CaseHandlingUriBuilder.cs

@@ -66,10 +66,10 @@ public static string BuildAbsolute(
             PathString path = default,
             QueryString query = default)
         {
-            string hostText = host.ToString();
-            string pathBaseText = pathBase.ToString();
-            string pathText = path.ToString();
-            string queryText = query.ToString();
+            string hostText = host.ToUriComponent();
+            string pathBaseText = pathBase.ToUriComponent();
+            string pathText = path.ToUriComponent();
+            string queryText = query.ToUriComponent();
 
             // PERF: Calculate string length to allocate correct buffer size for string.Create.
             int length =
@@ -97,6 +97,46 @@ public static string BuildAbsolute(
             return string.Create(length, (handling == CaseHandling.LowerInvariant, hostText, pathBaseText, pathText, queryText), InitializeAbsoluteUriStringSpanAction);
         }
 
+        /// <summary>
+        /// Generates a string from the given absolute or relative Uri that is appropriately encoded for use in
+        /// HTTP headers. Note that a unicode host name will be encoded as punycode.
+        /// </summary>
+        /// <param name="handling">Determines case handling for the result.</param>
+        /// <param name="uri">The Uri to encode.</param>
+        /// <returns>The encoded string version of <paramref name="uri"/>.</returns>
+        public static string Encode(CaseHandling handling, string uri)
+            => Encode(handling, new Uri(uri, UriKind.RelativeOrAbsolute));
+
+        /// <summary>
+        /// Generates a string from the given absolute or relative Uri that is appropriately encoded for use in
+        /// HTTP headers. Note that a unicode host name will be encoded as punycode.
+        /// </summary>
+        /// <param name="handling">Determines case handling for the result.</param>
+        /// <param name="uri">The Uri to encode.</param>
+        /// <returns>The encoded string version of <paramref name="uri"/>.</returns>
+        public static string Encode(CaseHandling handling, Uri uri)
+        {
+            Guard.NotNull(uri, nameof(uri));
+            if (uri.IsAbsoluteUri)
+            {
+                return BuildAbsolute(
+                    handling,
+                    host: HostString.FromUriComponent(uri),
+                    pathBase: PathString.FromUriComponent(uri),
+                    query: QueryString.FromUriComponent(uri));
+            }
+            else
+            {
+                string components = uri.GetComponents(UriComponents.SerializationInfoString, UriFormat.UriEscaped);
+                if (handling == CaseHandling.LowerInvariant)
+                {
+                    return components.ToLowerInvariant();
+                }
+
+                return components;
+            }
+        }
+
         /// <summary>
         /// Copies the specified <paramref name="text"/> to the specified <paramref name="buffer"/> starting at the specified <paramref name="index"/>.
         /// </summary>

src/ImageSharp.Web/Providers/FileProviderImageProvider.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
@@ -54,7 +55,7 @@ public virtual bool IsValidRequest(HttpContext context)
         /// <inheritdoc/>
         public Task<IImageResolver> GetAsync(HttpContext context)
         {
-            IFileInfo fileInfo = this.fileProvider.GetFileInfo(context.Request.Path);
+            IFileInfo fileInfo = this.fileProvider.GetFileInfo(context.Request.Path.Value);
             if (!fileInfo.Exists)
             {
                 return Task.FromResult<IImageResolver>(null);

tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj

@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="SubFolder\sixlabors.imagesharp.web.png">
+    <None Update="SubFolder\sîxläbörs.îmägéshärp.wéb.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="xunit.runner.json">

…s/SubFolder/sixlabors.imagesharp.web.png …s/SubFolder/sîxläbörs.îmägéshärp.wéb.pngtests/ImageSharp.Web.Tests/SubFolder/sixlabors.imagesharp.web.png renamed to tests/ImageSharp.Web.Tests/SubFolder/sîxläbörs.îmägéshärp.wéb.png tests/ImageSharp.Web.Tests/SubFolder/sixlabors.imagesharp.web.png renamed to tests/ImageSharp.Web.Tests/SubFolder/sîxläbörs.îmägéshärp.wéb.png

@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -38,7 +39,9 @@ public async Task CanRejectUnauthorizedRequestAsync()
         protected override string AugmentCommand(string command)
         {
             // Mimic the lowecase relative url format used by the token and default options.
-            string uri = (this.ImageSource + command).Replace("http://localhost", string.Empty).ToLowerInvariant();
+            string uri = (this.ImageSource + command).Replace("http://localhost", string.Empty);
+            uri = CaseHandlingUriBuilder.Encode(CaseHandlingUriBuilder.CaseHandling.LowerInvariant, uri);
+
             string token = HMACUtilities.ComputeHMACSHA256(uri, AuthenticatedTestServerFixture.HMACSecretKey);
             return command + "&" + HMACUtilities.TokenCommand + "=" + token;
         }

tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs

@@ -14,7 +14,7 @@ public static class TestConstants
         public const string AWSCacheBucketName = "aws-cache";
         public const string AWSAccessKey = "";
         public const string AWSAccessSecret = "";
-        public const string ImagePath = "SubFolder/sixlabors.imagesharp.web.png";
+        public const string ImagePath = "SubFolder/sîxläbörs.îmägéshärp.wéb.png";
         public const string PhysicalTestImage = "http://localhost/" + ImagePath;
         public const string AzureTestImage = "http://localhost/" + AzureContainerName + "/" + ImagePath;
         public const string AWSTestImage = "http://localhost/" + AWSBucketName + "/" + ImagePath;