yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix UriUtilityCore's handling of anchors and querystrings, also optimized with Span (#15678)

Browse Source
This commit is contained in:
Matthew-Wise
2024-02-05 07:03:42 +00:00
committed by GitHub
parent ec26e5eabf
commit 3ce438399a
2 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Umbraco.Core/UriUtilityCore.cs
View File

@@ -4,8 +4,6 @@ namespace Umbraco.Cms.Core;
public static class UriUtilityCore
{
#region Uri string utilities
public static bool HasScheme(string uri) => uri.IndexOf("://", StringComparison.InvariantCulture) > 0;
public static string StartWithScheme(string uri) => StartWithScheme(uri, null);
@@ -15,16 +13,15 @@ public static class UriUtilityCore
public static string EndPathWithSlash(string uri)
{
var pos1 = Math.Max(0, uri.IndexOf('?'));
var pos2 = Math.Max(0, uri.IndexOf('#'));
var pos = Math.Min(pos1, pos2);
ReadOnlySpan<char> uriSpan = uri.AsSpan();
var pos = IndexOfPathEnd(uriSpan);
var path = pos > 0 ? uri.Substring(0, pos) : uri;
var path = (pos > 0 ? uriSpan[..pos] : uriSpan).ToString();
path = path.EnsureEndsWith('/');
if (pos > 0)
{
path += uri.Substring(pos);
return string.Concat(path, uriSpan[pos..]);
}
return path;
@@ -32,20 +29,27 @@ public static class UriUtilityCore
public static string TrimPathEndSlash(string uri)
{
var pos1 = Math.Max(0, uri.IndexOf('?'));
var pos2 = Math.Max(0, uri.IndexOf('#'));
var pos = Math.Min(pos1, pos2);
ReadOnlySpan<char> uriSpan = uri.AsSpan();
var pos = IndexOfPathEnd(uriSpan);
var path = pos > 0 ? uri[..pos] : uri;
var path = (pos > 0 ? uriSpan[..pos] : uriSpan).ToString();
path = path.TrimEnd(Constants.CharArrays.ForwardSlash);
if (pos > 0)
{
path += uri.Substring(pos);
return string.Concat(path, uriSpan[pos..]);
}
return path;
}
#endregion
private static int IndexOfPathEnd(ReadOnlySpan<char> uri)
{
var pos1 = Math.Max(0, uri.IndexOf('?'));
var pos2 = Math.Max(0, uri.IndexOf('#'));
return pos1 == 0 && pos2 == 0 ? 0
: pos1 == 0 ? pos2
: pos2 == 0 ? pos1
: Math.Min(pos1, pos2);
}
}

33
tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UriUtilityCoreTests.cs Normal file
View File

@@ -0,0 +1,33 @@
using NUnit.Framework;
using Umbraco.Cms.Core;
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreThings;
[TestFixture]
public class UriUtilityCoreTests
{
[TestCase("/en", "/en")]
[TestCase("/en#anchor", "/en#anchor")]
[TestCase("/en/", "/en")]
[TestCase("/en/#anchor", "/en#anchor")]
[TestCase("/en/?abc=123", "/en?abc=123")]
[TestCase("/en/#abc?abc=123", "/en#abc?abc=123")]
public void TrimPathEndSlash(string uri, string expected)
{
var result = UriUtilityCore.TrimPathEndSlash(uri);
Assert.AreEqual(expected, result);
}
[TestCase("/en/", "/en/")]
[TestCase("/en#anchor", "/en/#anchor")]
[TestCase("/en", "/en/")]
[TestCase("/en/#anchor", "/en/#anchor")]
[TestCase("/en?abc=123", "/en/?abc=123")]
[TestCase("/en#abc?abc=123", "/en/#abc?abc=123")]
public void EndPathWithSlash(string uri, string expected)
{
var result = UriUtilityCore.EndPathWithSlash(uri);
Assert.AreEqual(expected, result);
}
}