lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Updating the UrlRuleProvider to clean up trailing slashes priour to running the comparison

Browse Source 
work item: 16798

--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-11-22 22:56:57 -08:00
parent 15310bca8b
commit 4773247719
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Tests.Modules/Widgets/RuleEngine/UrlRuleProviderTest.cs
View File

@@ -61,5 +61,13 @@ namespace Orchard.Tests.Modules.Widgets.RuleEngine {
_urlRuleProvider.Process(context); _urlRuleProvider.Process(context);
Assert.That(context.Result, Is.True); Assert.That(context.Result, Is.True);
} }
[Test]
public void UrlForAboutPageWithEndingSlashMatchesAboutPagePath() {
_stubContextAccessor.StubContext = new StubHttpContext("~/About/");
var context = new RuleContext { FunctionName = "url", Arguments = new[] { "~/about" } };
_urlRuleProvider.Process(context);
Assert.That(context.Result, Is.True);
}
} }
} }

12
src/Orchard.Web/Modules/Orchard.Widgets/RuleEngine/UrlRuleProvider.cs
View File

@@ -23,11 +23,17 @@ namespace Orchard.Widgets.RuleEngine {
appPath = ""; appPath = "";
url = string.Format("{0}/{1}", appPath, url); url = string.Format("{0}/{1}", appPath, url);
} }
if (url != "/" && !url.Contains("?") && url.EndsWith("/"))
if (!url.Contains("?"))
url = url.TrimEnd('/'); url = url.TrimEnd('/');
var requestPath = context.Request.Path;
if (!requestPath.Contains("?"))
requestPath = requestPath.TrimEnd('/');
ruleContext.Result = url.EndsWith("*") ruleContext.Result = url.EndsWith("*")
? context.Request.Path.ToUpperInvariant().StartsWith(url.TrimEnd('*').ToUpperInvariant()) ? requestPath.StartsWith(url.TrimEnd('*'), StringComparison.OrdinalIgnoreCase)
: context.Request.Path.ToUpperInvariant() == url.ToUpperInvariant(); : string.Equals(requestPath, url, StringComparison.OrdinalIgnoreCase);
} }
} }
} }