Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
V15: Rich Text Editor links do not work with query strings and anchors (
#17288) * fix: anchors and query strings do not work Since the change from UDIs to localLinks in href, the pattern matched a little too much in the href section completely ignoring any "extras" such as querystrings and anchors after the locallink, which meant that the locallink did not get replaced at all if they were present. This is fixed by limiting the regexp a bit. * fix: legacy links do not follow the same regexp as new links Because we are no longer matching the whole `href` attribute but only some of its contents, we need to fix up the old pattern. It has been extended with matching groups that follow the same pattern as the new links. * feat: allow a-tags to be multiline example: ```html <a type="document" href="/{localLink:<GUID>}"> Test </a> ``` * fix: split regex into two parts: first a tokenizer for a-tags and then a type-finder * fix: ensure only "document" and "media" are matching to speed up the pattern * feat: allow a-tags to be multiline (cherry picked from commit 35e8f2e)
- Loading branch information
1 parent
2b3a917
commit 1581eb6
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,11 +14,15 @@ public sealed class HtmlLocalLinkParser | |
| // <a type="media" href="/{localLink:7e21a725-b905-4c5f-86dc-8c41ec116e39}" title="media">media</a> | ||
| // <a type="document" href="/{localLink:eed5fc6b-96fd-45a5-a0f1-b1adfb483c2f}" title="other page">other page</a> | ||
| internal static readonly Regex LocalLinkTagPattern = new( | ||
| @"<a.+?href=['""](?<locallink>\/?{localLink:(?<guid>[a-fA-F0-9-]+)})[^>]*?>", | ||
| RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace | RegexOptions.Singleline); | ||
|
|
||
| internal static readonly Regex TypePattern = new( | ||
| """type=['"](?<type>(?:media|document))['"]""", | ||
| RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace); | ||
|
|
||
| internal static readonly Regex LocalLinkPattern = new( | ||
| @"href=['""](?<locallink>\/?(?:\{|\%7B)localLink:(?<guid>[a-zA-Z0-9-://]+)(?:\}|\%7D))", | ||
| RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace); | ||
|
|
||
| private readonly IPublishedUrlProvider _publishedUrlProvider; | ||
|
|
@@ -84,32 +88,28 @@ public string EnsureInternalLinks(string text) | |
| { | ||
| if (tagData.Udi is not null) | ||
| { | ||
| var newLink = tagData.Udi?.EntityType switch | ||
| { | ||
| Constants.UdiEntityType.Document => _publishedUrlProvider.GetUrl(tagData.Udi.Guid), | ||
| Constants.UdiEntityType.Media => _publishedUrlProvider.GetMediaUrl(tagData.Udi.Guid), | ||
| _ => "" | ||
|
Check failure on line 95 in src/Umbraco.Core/Templates/HtmlLocalLinkParser.cs
|
||
| }; | ||
|
|
||
| text = StripTypeAttributeFromTag(text, tagData.Udi!.EntityType); | ||
| text = text.Replace(tagData.TagHref, newLink); | ||
| } | ||
| else if (tagData.IntId.HasValue) | ||
| { | ||
| var newLink = _publishedUrlProvider.GetUrl(tagData.IntId.Value); | ||
| text = text.Replace(tagData.TagHref, newLink); | ||
| } | ||
| } | ||
|
|
||
| return text; | ||
| } | ||
|
|
||
| // under normal circumstances, the type attribute is preceded by a space | ||
| // to cover the rare occasion where it isn't, we first replace with a space and then without. | ||
| private string StripTypeAttributeFromTag(string tag, string type) => | ||
| tag.Replace($" type=\"{type}\"", string.Empty) | ||
| .Replace($"type=\"{type}\"", string.Empty); | ||
|
|
@@ -119,21 +119,22 @@ private IEnumerable<LocalLinkTag> FindLocalLinkIds(string text) | |
| MatchCollection localLinkTagMatches = LocalLinkTagPattern.Matches(text); | ||
| foreach (Match linkTag in localLinkTagMatches) | ||
| { | ||
| if (Guid.TryParse(linkTag.Groups["guid"].Value, out Guid guid) is false) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| // Find the type attribute | ||
| Match typeMatch = TypePattern.Match(linkTag.Value); | ||
| if (typeMatch.Success is false) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| yield return new LocalLinkTag( | ||
| null, | ||
| new GuidUdi(typeMatch.Groups["type"].Value, guid), | ||
| linkTag.Groups["locallink"].Value); | ||
| } | ||
|
|
||
| // also return legacy results for values that have not been migrated | ||
|
|
@@ -150,25 +151,26 @@ private IEnumerable<LocalLinkTag> FindLegacyLocalLinkIds(string text) | |
| MatchCollection tags = LocalLinkPattern.Matches(text); | ||
| foreach (Match tag in tags) | ||
| { | ||
| if (tag.Groups.Count <= 0) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| var id = tag.Groups["guid"].Value; | ||
|
|
||
| // The id could be an int or a UDI | ||
| if (UdiParser.TryParse(id, out Udi? udi)) | ||
| { | ||
| if (udi is GuidUdi guidUdi) | ||
| { | ||
| yield return new LocalLinkTag(null, guidUdi, tag.Groups["locallink"].Value); | ||
| } | ||
| } | ||
|
|
||
| if (int.TryParse(id, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intId)) | ||
| { | ||
| yield return new LocalLinkTag (intId, null, tag.Groups["locallink"].Value); | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -181,20 +183,10 @@ public LocalLinkTag(int? intId, GuidUdi? udi, string tagHref) | |
| TagHref = tagHref; | ||
| } | ||
|
|
||
| public int? IntId { get; } | ||
|
|
||
| public GuidUdi? Udi { get; } | ||
|
|
||
| public string TagHref { get; } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters