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

#18663: Custom errors should not shorcut HandleErrorAttribute

Browse Source 
Work Item: 18663

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-07-02 14:52:29 -07:00
parent 455171699a
commit 4ec7cb38ff
1 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/Orchard/Exceptions/Filters/UnhandledExceptionFilter.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Web;
using System.Web.Mvc;
@@ -30,34 +31,38 @@ namespace Orchard.Exceptions.Filters {
}
public void OnActionExecuted(ActionExecutedContext filterContext) {
if (!filterContext.ExceptionHandled && filterContext.Exception != null) {
if (_exceptionPolicy.HandleException(this, filterContext.Exception)) {
var shape = _orchardServices.New.ErrorPage();
shape.Message = filterContext.Exception.Message;
shape.Exception = filterContext.Exception;
filterContext.ExceptionHandled = true;
// don't provide custom errors if the action has some custom code to handle exceptions
if(!filterContext.ActionDescriptor.GetCustomAttributes(typeof(HandleErrorAttribute), false).Any()) {
if (!filterContext.ExceptionHandled && filterContext.Exception != null) {
if (_exceptionPolicy.HandleException(this, filterContext.Exception)) {
var shape = _orchardServices.New.ErrorPage();
shape.Message = filterContext.Exception.Message;
shape.Exception = filterContext.Exception;
// inform exception filters of the exception that was suppressed
var filterInfo = new FilterInfo();
foreach (var filterProvider in _filterProviders.Value) {
filterProvider.AddFilters(filterInfo);
}
filterContext.ExceptionHandled = true;
var exceptionContext = new ExceptionContext(filterContext.Controller.ControllerContext, filterContext.Exception);
foreach (var exceptionFilter in filterInfo.ExceptionFilters) {
exceptionFilter.OnException(exceptionContext);
}
// inform exception filters of the exception that was suppressed
var filterInfo = new FilterInfo();
foreach (var filterProvider in _filterProviders.Value) {
filterProvider.AddFilters(filterInfo);
}
if (exceptionContext.ExceptionHandled) {
filterContext.Result = exceptionContext.Result;
}
else {
filterContext.Result = new ShapeResult(filterContext.Controller, shape);
filterContext.RequestContext.HttpContext.Response.StatusCode = 500;
var exceptionContext = new ExceptionContext(filterContext.Controller.ControllerContext, filterContext.Exception);
foreach (var exceptionFilter in filterInfo.ExceptionFilters) {
exceptionFilter.OnException(exceptionContext);
}
// prevent IIS 7.0 classic mode from handling the 404/500 itself
filterContext.RequestContext.HttpContext.Response.TrySkipIisCustomErrors = true;
if (exceptionContext.ExceptionHandled) {
filterContext.Result = exceptionContext.Result;
}
else {
filterContext.Result = new ShapeResult(filterContext.Controller, shape);
filterContext.RequestContext.HttpContext.Response.StatusCode = 500;
// prevent IIS 7.0 classic mode from handling the 404/500 itself
filterContext.RequestContext.HttpContext.Response.TrySkipIisCustomErrors = true;
}
}
}
}