zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wsp-10212 fixed: option set deatiled error mode on web site

Browse source
This commit is contained in:
Ruslan Keba 2013-11-08 12:34:33 +02:00
parent 0a16e252c9
commit aa4db51dd5
7 changed files with 133 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

19
WebsitePanel/Sources/WebsitePanel.Providers.Base/Web/HttpError.cs
View file

@ -34,8 +34,25 @@ using System.ComponentModel;
namespace WebsitePanel.Providers.Web
{
public class HttpError
public enum HttpErrorsMode
{
DetailedLocalOnly = 0,
Custom = 1,
Detailed = 2
}
public enum HttpErrorsExistingResponse
{
Auto = 0,
Replace = 1,
PassThrough = 2
}
public class HttpError
{
public const HttpErrorsMode DefaultHttpErrorsMode = HttpErrorsMode.DetailedLocalOnly;
public const HttpErrorsExistingResponse DefaultHttpErrorsExistingResponse = HttpErrorsExistingResponse.Auto;
private string errorCode;
private string errorSubcode;
private string handlerType;

14
WebsitePanel/Sources/WebsitePanel.Providers.Base/Web/WebVirtualDirectory.cs
View file

@ -61,6 +61,8 @@ namespace WebsitePanel.Providers.Web
private string defaultDocs;
private string httpRedirect;
private HttpError[] httpErrors;
private HttpErrorsMode errorMode;
private HttpErrorsExistingResponse existingResponse;
private MimeMap[] mimeMaps;
private HttpHeader[] httpHeaders;
private bool aspInstalled;
@ -122,6 +124,18 @@ namespace WebsitePanel.Providers.Web
set { httpErrors = value; }
}
public HttpErrorsMode ErrorMode
{
get { return errorMode; }
set { errorMode = value; }
}
public HttpErrorsExistingResponse ExistingResponse
{
get { return existingResponse; }
set { existingResponse = value; }
}
public string ApplicationPool
{
get { return this.applicationPool; }

71
WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebObjects/CustomHttpErrorsModuleService.cs
View file

@ -54,6 +54,9 @@ namespace WebsitePanel.Providers.Web.Iis.WebObjects
var config = srvman.GetWebConfiguration(virtualDir.FullQualifiedPath);
//
var httpErrorsSection = config.GetSection(Constants.HttpErrorsSection);
virtualDir.ErrorMode = (HttpErrorsMode)httpErrorsSection.GetAttributeValue("errorMode");
virtualDir.ExistingResponse = (HttpErrorsExistingResponse)httpErrorsSection.GetAttributeValue("existingResponse");
//
var errorsCollection = httpErrorsSection.GetCollection();
//
@ -87,10 +90,6 @@ namespace WebsitePanel.Providers.Web.Iis.WebObjects
}
#endregion
// Http errors list is either empty or not set so defaults to the parent
if (virtualDir.HttpErrors == null || virtualDir.HttpErrors.Length == 0)
return;
#region Put the change in effect
using (var srvman = GetServerManager())
{
@ -98,33 +97,45 @@ namespace WebsitePanel.Providers.Web.Iis.WebObjects
//
var section = config.GetSection(Constants.HttpErrorsSection);
// enable custom errors
section.SetAttributeValue("errorMode", "Custom");
// set error mode
section.SetAttributeValue("errorMode", virtualDir.ErrorMode);
if (virtualDir.ErrorMode == HttpErrorsMode.Detailed)
{
section.SetAttributeValue("existingResponse", HttpErrorsExistingResponse.PassThrough);
}
else
{
section.SetAttributeValue("existingResponse", HttpErrorsExistingResponse.Auto);
}
//
var errorsCollection = section.GetCollection();
//
foreach (var item in virtualDir.HttpErrors)
{
int indexOf = FindHttpError(errorsCollection, item);
// Just update the element attributes - IIS 7 API will do the rest
if (indexOf > -1)
{
var item2Renew = errorsCollection[indexOf];
//
FillConfigurationElementWithData(item2Renew, item, virtualDir);
//
continue;
}
//
var item2Add = CreateHttpError(errorsCollection, item, virtualDir);
//
if (item2Add == null)
continue;
//
errorsCollection.Add(item2Add);
}
//
// save custom errors
if (virtualDir.HttpErrors != null && virtualDir.HttpErrors.Length > 0)
{
var errorsCollection = section.GetCollection();
//
foreach (var item in virtualDir.HttpErrors)
{
int indexOf = FindHttpError(errorsCollection, item);
// Just update the element attributes - IIS 7 API will do the rest
if (indexOf > -1)
{
var item2Renew = errorsCollection[indexOf];
//
FillConfigurationElementWithData(item2Renew, item, virtualDir);
//
continue;
}
//
var item2Add = CreateHttpError(errorsCollection, item, virtualDir);
//
if (item2Add == null)
continue;
//
errorsCollection.Add(item2Add);
}
}
//
srvman.CommitChanges();
}
#endregion

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/WebSitesCustomErrorsControl.ascx.resx
View file

@ -156,4 +156,7 @@
<data name="IIS7.Redirect" xml:space="preserve">
<value>Redirect</value>
</data>
<data name="lblErrorMode.Text">
<value xml:space="preserve">Error Mode</value>
</data>
</root>

15
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesCustomErrorsControl.ascx
View file

@ -1,4 +1,19 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="WebSitesCustomErrorsControl.ascx.cs" Inherits="WebsitePanel.Portal.WebSitesCustomErrorsControl" %>
<div style="padding: 20; margin-bottom: 10px;">
<table cellpadding="4">
<tr id="rowAspNet" runat="server">
<td class="SubHead">
<asp:Label ID="lblErrorMode" runat="server" meta:resourcekey="lblErrorMode"></asp:Label>:
</td>
<td class="Normal">
<asp:DropDownList ID="ddlErrorMode" runat="server" CssClass="NormalTextBox"></asp:DropDownList>
</td>
</tr>
</table>
</div>
<div class="FormButtonsBar">
<asp:Button id="btnAdd" runat="server" meta:resourcekey="btnAddError" Text="Add Custom Error" CssClass="Button3" OnClick="btnAdd_Click" CausesValidation="False"></asp:Button>
</div>

15
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesCustomErrorsControl.ascx.cs
View file

@ -63,16 +63,29 @@ namespace WebsitePanel.Portal
{
IIs7 = item.IIs7;
// bind data
// bind error mode
ddlErrorMode.Items.Add(HttpErrorsMode.DetailedLocalOnly.ToString());
ddlErrorMode.Items.Add(HttpErrorsMode.Custom.ToString());
ddlErrorMode.Items.Add(HttpErrorsMode.Detailed.ToString());
ddlErrorMode.SelectedValue = item.ErrorMode.ToString();
// bind errors list
gvErrorPages.DataSource = item.HttpErrors;
gvErrorPages.DataBind();
}
public void SaveWebItem(WebVirtualDirectory item)
{
item.ErrorMode = GetSelectedErrorMode();
item.HttpErrors = CollectFormData(false).ToArray();
}
private HttpErrorsMode GetSelectedErrorMode()
{
return (HttpErrorsMode)Enum.Parse(typeof (HttpErrorsMode), ddlErrorMode.SelectedValue);
}
public List<HttpError> CollectFormData(bool includeEmpty)
{
List<HttpError> errors = new List<HttpError>();

30
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesCustomErrorsControl.ascx.designer.cs generated
View file

@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3074
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
@ -13,6 +12,33 @@ namespace WebsitePanel.Portal {
public partial class WebSitesCustomErrorsControl {
/// <summary>
/// rowAspNet control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTableRow rowAspNet;
/// <summary>
/// lblErrorMode control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblErrorMode;
/// <summary>
/// ddlErrorMode control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlErrorMode;
/// <summary>
/// btnAdd control.
/// </summary>