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

#19626: Fixing possible exceptions during Alias route lookup when custom route objects are used (eg. Owin).

Browse Source 
Adding missing property implementations to LookupHttpRequest stub - this fixes problems with Owin.
Switching Select to Invoke when calling route methods to ignore erroneous custom routes.

Work Item: 19626

--HG--
branch : 1.x
This commit is contained in:
Piotr Szmyd
2013-04-20 17:45:39 +02:00
parent eb4c452003
commit 2b32652455
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Orchard.Web/Modules/Orchard.Alias/Implementation/Utils.cs
View File

@@ -4,6 +4,7 @@ using System.Globalization;
using System.Linq;
using System.Web;
using System.Web.Routing;
using Orchard.Logging;
using Orchard.Mvc.Extensions;
using Orchard.Mvc.Routes;
using Orchard.Mvc.Wrappers;
@@ -20,7 +21,7 @@ namespace Orchard.Alias.Implementation {
var lookupContext = new LookupHttpContext(httpContext, routePathNoQueryString);
var matches = routeDescriptors
.Select(routeDescriptor => routeDescriptor.Route.GetRouteData(lookupContext))
.Invoke(routeDescriptor => routeDescriptor.Route.GetRouteData(lookupContext), NullLogger.Instance)
.Where(routeData => routeData != null)
.Select(data => ToRouteValues(data, queryString));
@@ -38,7 +39,7 @@ namespace Orchard.Alias.Implementation {
areaName = Convert.ToString(value, CultureInfo.InvariantCulture);
var virtualPathDatas = routeDescriptors.Where(r2 => r2.Route.GetAreaName() == areaName)
.Select(r2 => r2.Route.GetVirtualPath(httpContext.Request.RequestContext, routeValues))
.Invoke(r2 => r2.Route.GetVirtualPath(httpContext.Request.RequestContext, routeValues), NullLogger.Instance)
.Where(vp => vp != null)
.ToArray();
@@ -53,7 +54,7 @@ namespace Orchard.Alias.Implementation {
var routeValueDictionary = new RouteValueDictionary(routeValues.ToDictionary(kv => RemoveDash(kv.Key), kv => (object)kv.Value));
var virtualPathDatas = routeDescriptors.Where(r2 => r2.Route.GetAreaName() == areaName)
.Select(r2 => r2.Route.GetVirtualPath(httpContext.Request.RequestContext, routeValueDictionary))
.Invoke(r2 => r2.Route.GetVirtualPath(httpContext.Request.RequestContext, routeValueDictionary), NullLogger.Instance)
.Where(vp => vp != null)
.ToArray();
@@ -128,6 +129,25 @@ namespace Orchard.Alias.Implementation {
_path = path;
}
public override string RawUrl {
get { return Path; }
}
public override Uri Url {
get { return new Uri(Path, UriKind.Relative); }
}
public override Uri UrlReferrer {
get { return null; }
}
public override string CurrentExecutionFilePath {
get { return Path; }
}
public override string FilePath {
get { return Path; }
}
public override string AppRelativeCurrentExecutionFilePath {
get { return "~/" + _path; }