From 59d75277c29fbdc35483a29c523166f4e969d4a4 Mon Sep 17 00:00:00 2001 From: Claus Date: Fri, 12 Jan 2018 09:52:52 +0100 Subject: [PATCH] fixing up helpers to match exact strings as this is what people will be using. If they need more advanced regex matches they should register by a regex instead. --- src/Umbraco.Web/TourFilterResolver.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web/TourFilterResolver.cs b/src/Umbraco.Web/TourFilterResolver.cs index 85c3363b6e..79112f7097 100644 --- a/src/Umbraco.Web/TourFilterResolver.cs +++ b/src/Umbraco.Web/TourFilterResolver.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; +using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.ObjectResolution; using Umbraco.Web.Models; @@ -35,31 +36,34 @@ namespace Umbraco.Web } /// - /// Helper method for adding a filter by plugin name + /// Helper method for adding a filter by exact plugin name /// - /// + /// Regex string used for matching public void AddFilterByPlugin(string pluginName) { + pluginName = pluginName.EnsureStartsWith("^").EnsureEndsWith("$"); using (Resolution.Configuration) _instances.Add(BackOfficeTourFilter.FilterPlugin(new Regex(pluginName, RegexOptions.IgnoreCase))); } /// - /// Helper method for adding a filter by file name + /// Helper method for adding a filter by exact file name /// /// public void AddFilterByFile(string file) { + file = file.EnsureStartsWith("^").EnsureEndsWith("$"); using (Resolution.Configuration) _instances.Add(BackOfficeTourFilter.FilterFile(new Regex(file, RegexOptions.IgnoreCase))); } /// - /// Helper method for adding a filter by tour alias + /// Helper method for adding a filter by exact tour alias /// /// public void AddFilterByAlias(string alias) { + alias = alias.EnsureStartsWith("^").EnsureEndsWith("$"); using (Resolution.Configuration) _instances.Add(BackOfficeTourFilter.FilterAlias(new Regex(alias, RegexOptions.IgnoreCase))); }