* Updates JSON schema for Umbraco 10 with latest references for Forms and Deploy (#15918) * Ported over #15928 changes for 13.3 RC (#16023) * Ported over #15928 changes for 13.3 RC * Use GetOrAdd() * Lock dictionary initialization --------- Co-authored-by: Jason Elkin <jasonelkin86@gmail.com> * Make the API content response builder extendable (#16056) * Make the API content response builder extendable * DeliveryApiJsonTypeResolver needs to be extendable too * bump rc to regular * Bump to next minor * Add blocks in RTE telemetry (#16104) * Add blocks telemetry * Use constants and update tests * V13: Add property type information to telemetry (#16109) * Add property type counts to telemetry * Use constants and fix tests * Update description * V10: Fix for fallback file upload (#14892) (#15868) * Fix for fallback file upload (#14892) * Added check for file type * Removed unneeded null checks and fixed tabs * Cleaning * Cleanups, cleanups, and removal of unneeded null checks * Reverted removal of relationshipservice * Revert null check removals (too risky) --------- Co-authored-by: Ambert van Unen <AvanUnen@ilionx.com> Co-authored-by: Laura Neto <12862535+lauraneto@users.noreply.github.com> (cherry picked from commit0b5d1f8aa6) * Fix up formatting --------- Co-authored-by: Ambert van Unen <ambertvu@gmail.com> * Implementors using Umbraco.Tests.Integration won't have to override GetLocalizedTextService (cherry picked from commitb0016687eb) (cherry picked from commit2bb56f1b81) * Fix logic for retrieving lastKnownElement (cherry picked from commitcae106bfe8) * bump version * Bump version * Bump version * Since v13 properties can sometimes be of type IRichTextEditorIntermediateValue - this was unexpected in the XPath navigator code (#16121) * Webhook log improvements (#16200) * fix: include all headers in webhook log * feat: return webhook log status from server * feat: make webhook logs deep linkable * feat: add webhook log pagination * feat: improve webhook request/response body preview * V13: Optimize custom MVC routing (#16218) * Introduce EagerMatcherPolicy to conditionally bypass content routing * Ensure that the candidate we disable dynamic routing for is valid * Skip Umbraco endpoints * Simplify logic a bit * Move install logic to matcher * Ensure that dynamic routing is still skipped when in upgrade state * Fixup comments * Reduce nesting a bit * Don't show maintenance page when statically routed controllers are hít * Remove excess check, since installer requests are statically routed * V13: Optimize custom MVC routing (#16218) * Introduce EagerMatcherPolicy to conditionally bypass content routing * Ensure that the candidate we disable dynamic routing for is valid * Skip Umbraco endpoints * Simplify logic a bit * Move install logic to matcher * Ensure that dynamic routing is still skipped when in upgrade state * Fixup comments * Reduce nesting a bit * Don't show maintenance page when statically routed controllers are hít * Remove excess check, since installer requests are statically routed (cherry picked from commitba9ddd11da) * Property source level variation should only be applied when configured (#16270) * Property source level variation should only be applied when configured (#16270) (cherry picked from commitab32bac5d9) * Merge pull request from GHSA-j74q-mv2c-rxmp * Merge pull request from GHSA-j74q-mv2c-rxmp * Merge pull request from GHSA-j74q-mv2c-rxmp * Fix up after merge * Remove obselete test --------- Co-authored-by: Andy Butland <abutland73@gmail.com> Co-authored-by: Kenn Jacobsen <kja@umbraco.dk> Co-authored-by: Jason Elkin <jasonelkin86@gmail.com> Co-authored-by: Sven Geusens <sge@umbraco.dk> Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> Co-authored-by: Ambert van Unen <ambertvu@gmail.com> Co-authored-by: Lars-Erik <lars-erik@aabech.no> Co-authored-by: Joshua Daniel Pratt Nielsen <jdpnielsen@gmail.com> Co-authored-by: Bjarke Berg <mail@bergmania.dk> Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com> Co-authored-by: Rasmus John Pedersen <mail@rjp.dk>
78 lines
1.9 KiB
C#
78 lines
1.9 KiB
C#
using System.Text;
|
|
|
|
namespace Umbraco.Cms.Core.Routing;
|
|
|
|
public class WebPath
|
|
{
|
|
public const char PathSeparator = '/';
|
|
|
|
public static string Combine(params string[]? paths)
|
|
{
|
|
if (paths == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(paths));
|
|
}
|
|
|
|
if (paths.Length == 0)
|
|
{
|
|
return string.Empty;
|
|
}
|
|
|
|
var sb = new StringBuilder();
|
|
|
|
for (var index = 0; index < paths.Length; index++)
|
|
{
|
|
var path = paths[index];
|
|
var start = 0;
|
|
var count = path.Length;
|
|
var isFirst = index == 0;
|
|
var isLast = index == paths.Length - 1;
|
|
|
|
// don't trim start if it's the first
|
|
if (!isFirst && path[0] == PathSeparator)
|
|
{
|
|
start = 1;
|
|
}
|
|
|
|
// always trim end
|
|
if (path[^1] == PathSeparator)
|
|
{
|
|
count = path.Length - 1;
|
|
}
|
|
|
|
sb.Append(path, start, count - start);
|
|
|
|
if (!isLast)
|
|
{
|
|
sb.Append(PathSeparator);
|
|
}
|
|
}
|
|
|
|
return sb.ToString();
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// Determines whether the provided web path is well-formed according to the specified UriKind.
|
|
/// </summary>
|
|
/// <param name="webPath">The web path to check. This can be null.</param>
|
|
/// <param name="uriKind">The kind of Uri (Absolute, Relative, or RelativeOrAbsolute).</param>
|
|
/// <returns>
|
|
/// true if <paramref name="webPath"/> is well-formed; otherwise, false.
|
|
/// </returns>
|
|
public static bool IsWellFormedWebPath(string? webPath, UriKind uriKind)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(webPath))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
if (webPath.StartsWith("//"))
|
|
{
|
|
return uriKind is not UriKind.Relative;
|
|
}
|
|
|
|
return Uri.IsWellFormedUriString(webPath, uriKind);
|
|
}
|
|
}
|