Add encoding tests

Author: JimBobSquarePants

src/ImageSharp.Web/Caching/UriAbsoluteCacheKey.cs

@@ -13,6 +13,11 @@ public class UriAbsoluteCacheKey : ICacheKey
     {
         /// <inheritdoc/>
         public string Create(HttpContext context, CommandCollection commands)
-            => CaseHandlingUriBuilder.BuildAbsolute(CaseHandlingUriBuilder.CaseHandling.None, context.Request.Host, context.Request.PathBase, context.Request.Path, QueryString.Create(commands));
+            => CaseHandlingUriBuilder.BuildAbsolute(
+                CaseHandlingUriBuilder.CaseHandling.None,
+                context.Request.Host,
+                context.Request.PathBase,
+                context.Request.Path,
+                QueryString.Create(commands));
     }
 }

src/ImageSharp.Web/Caching/UriAbsoluteLowerInvariantCacheKey.cs

@@ -13,6 +13,11 @@ public class UriAbsoluteLowerInvariantCacheKey : ICacheKey
     {
         /// <inheritdoc/>
         public string Create(HttpContext context, CommandCollection commands)
-            => CaseHandlingUriBuilder.BuildAbsolute(CaseHandlingUriBuilder.CaseHandling.LowerInvariant, context.Request.Host, context.Request.PathBase, context.Request.Path, QueryString.Create(commands));
+            => CaseHandlingUriBuilder.BuildAbsolute(
+                CaseHandlingUriBuilder.CaseHandling.LowerInvariant,
+                context.Request.Host,
+                context.Request.PathBase,
+                context.Request.Path,
+                QueryString.Create(commands));
     }
 }

src/ImageSharp.Web/CaseHandlingUriBuilder.cs

@@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.Web
     public static class CaseHandlingUriBuilder
     {
         private static readonly Uri FallbackBaseUri = new("http://localhost/");
-        private static readonly SpanAction<char, (bool LowerInvariant, string Host, string PathBase, string Path, string Query)> InitializeAbsoluteUriStringSpanAction = new(InitializeAbsoluteUriString);
+        private static readonly SpanAction<char, (bool LowerInvariant, string Scheme, string Host, string PathBase, string Path, string Query)> InitializeAbsoluteUriStringSpanAction = new(InitializeAbsoluteUriString);
 
         /// <summary>
         /// Provides Uri case handling options.
@@ -50,30 +50,54 @@ public static string BuildRelative(
             // Take any potential performance hit vs concatination for code reading sanity.
             => BuildAbsolute(handling, default, pathBase, path, query);
 
+        /// <summary>
+        /// Combines the given URI components into a string that is properly encoded for use in HTTP headers.
+        /// Note that unicode in the HostString will be encoded as punycode and the scheme is not included
+        /// in the result.
+        /// </summary>
+        /// <param name="handling">Determines case handling for the result. <paramref name="query"/> is always converted to invariant lowercase.</param>
+        /// <param name="host">The host portion of the uri normally included in the Host header. This may include the port.</param>
+        /// <param name="pathBase">The first portion of the request path associated with application root.</param>
+        /// <param name="path">The portion of the request path that identifies the requested resource.</param>
+        /// <param name="query">The query, if any.</param>
+        /// <returns>The combined URI components, properly encoded for use in HTTP headers.</returns>
+        public static string BuildAbsolute(
+            CaseHandling handling,
+            HostString host,
+            PathString pathBase = default,
+            PathString path = default,
+            QueryString query = default)
+            => BuildAbsolute(handling, string.Empty, host, pathBase, path, query);
+
         /// <summary>
         /// Combines the given URI components into a string that is properly encoded for use in HTTP headers.
         /// Note that unicode in the HostString will be encoded as punycode.
         /// </summary>
         /// <param name="handling">Determines case handling for the result. <paramref name="query"/> is always converted to invariant lowercase.</param>
+        /// <param name="scheme">http, https, etc.</param>
         /// <param name="host">The host portion of the uri normally included in the Host header. This may include the port.</param>
         /// <param name="pathBase">The first portion of the request path associated with application root.</param>
         /// <param name="path">The portion of the request path that identifies the requested resource.</param>
         /// <param name="query">The query, if any.</param>
         /// <returns>The combined URI components, properly encoded for use in HTTP headers.</returns>
         public static string BuildAbsolute(
             CaseHandling handling,
+            string scheme,
             HostString host,
             PathString pathBase = default,
             PathString path = default,
             QueryString query = default)
         {
+            Guard.NotNull(scheme, nameof(scheme));
+
             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 =
+                (scheme.Length > 0 ? scheme.Length + Uri.SchemeDelimiter.Length : 0) +
                 hostText.Length +
                 pathBaseText.Length +
                 pathText.Length +
@@ -95,7 +119,10 @@ public static string BuildAbsolute(
                 length--;
             }
 
-            return string.Create(length, (handling == CaseHandling.LowerInvariant, hostText, pathBaseText, pathText, queryText), InitializeAbsoluteUriStringSpanAction);
+            return string.Create(
+                length,
+                (handling == CaseHandling.LowerInvariant, scheme, hostText, pathBaseText, pathText, queryText),
+                InitializeAbsoluteUriStringSpanAction);
         }
 
         /// <summary>
@@ -122,6 +149,7 @@ public static string Encode(CaseHandling handling, Uri uri)
             {
                 return BuildAbsolute(
                     handling,
+                    scheme: uri.Scheme,
                     host: HostString.FromUriComponent(uri),
                     pathBase: PathString.FromUriComponent(uri),
                     query: QueryString.FromUriComponent(uri));
@@ -167,7 +195,7 @@ private static int CopyTextToBufferLowerInvariant(Span<char> buffer, int index,
         /// </summary>
         /// <param name="buffer">The URI <see cref="string"/>'s <see cref="char"/> buffer.</param>
         /// <param name="uriParts">The URI parts.</param>
-        private static void InitializeAbsoluteUriString(Span<char> buffer, (bool Lower, string Host, string PathBase, string Path, string Query) uriParts)
+        private static void InitializeAbsoluteUriString(Span<char> buffer, (bool Lower, string Scheme, string Host, string PathBase, string Path, string Query) uriParts)
         {
             int index = 0;
             ReadOnlySpan<char> pathBaseSpan = uriParts.PathBase.AsSpan();
@@ -180,6 +208,12 @@ private static void InitializeAbsoluteUriString(Span<char> buffer, (bool Lower,
                 pathBaseSpan = pathBaseSpan.Slice(0, pathBaseSpan.Length - 1);
             }
 
+            if (uriParts.Scheme.Length > 0)
+            {
+                index = CopyTextToBuffer(buffer, index, uriParts.Scheme.AsSpan());
+                index = CopyTextToBuffer(buffer, index, Uri.SchemeDelimiter.AsSpan());
+            }
+
             if (uriParts.Lower)
             {
                 index = CopyTextToBufferLowerInvariant(buffer, index, uriParts.Host.AsSpan());

tests/ImageSharp.Web.Tests/Helpers/CaseHandlingUriBuilderTests.cs

@@ -0,0 +1,30 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+using Xunit;
+
+namespace SixLabors.ImageSharp.Web.Tests.Helpers
+{
+    public class CaseHandlingUriBuilderTests
+    {
+        [Theory]
+        [InlineData(CaseHandlingUriBuilder.CaseHandling.None, "https://sixlabors.com:443/Path/?query=1")]
+        [InlineData(CaseHandlingUriBuilder.CaseHandling.LowerInvariant, "https://sixlabors.com:443/path/?query=1")]
+        public void CanEncodeAbsoluteUri(CaseHandlingUriBuilder.CaseHandling value, string expected)
+        {
+            const string input = "https://sixlabors.com/Path/?Query=1";
+            string actual = CaseHandlingUriBuilder.Encode(value, input);
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(CaseHandlingUriBuilder.CaseHandling.None, "/Path/?query=1")]
+        [InlineData(CaseHandlingUriBuilder.CaseHandling.LowerInvariant, "/path/?query=1")]
+        public void CanEncodeRelativeUri(CaseHandlingUriBuilder.CaseHandling value, string expected)
+        {
+            const string input = "/Path/?Query=1";
+            string actual = CaseHandlingUriBuilder.Encode(value, input);
+            Assert.Equal(expected, actual);
+        }
+    }
+}