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

Take BaseUrl into account when testing local urls

Browse Source
This commit is contained in:
Sebastien Ros
2014-02-26 17:49:06 -08:00
parent 6b6e89e443
commit 0297b5d76e
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Orchard/Utility/Extensions/HttpRequestExtensions.cs
View File

@@ -88,7 +88,22 @@ namespace Orchard.Utility.Extensions {
// at this point, check for an fully qualified url
try {
var uri = new Uri(url);
return uri.Authority.Equals(request.Headers["Host"], StringComparison.OrdinalIgnoreCase);
if (uri.Authority.Equals(request.Headers["Host"], StringComparison.OrdinalIgnoreCase)) {
return true;
}
// finally, check the base url from the settings
var workContext = request.RequestContext.GetWorkContext();
if (workContext != null) {
var baseUrl = workContext.CurrentSite.BaseUrl;
if (!string.IsNullOrWhiteSpace(baseUrl)) {
if (uri.Authority.Equals(new Uri(baseUrl).Authority, StringComparison.OrdinalIgnoreCase)) {
return true;
}
}
}
return false;
}
catch {
// mall-formed url e.g, "abcdef"