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

Few cosmetic fixes on SSL (certificate choice) and selecting of active tab

Browse source 
after completion task
This commit is contained in:
robvde 2012-10-07 08:13:34 +04:00
parent 5f148a9534
commit 0c0b342f69
6 changed files with 47 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -265,4 +265,7 @@
<data name="valtxtPFXPassConfirm.ErrorMessage" xml:space="preserve"> <data name="valtxtPFXPassConfirm.ErrorMessage" xml:space="preserve">
<value>Passwords do not match</value> <value>Passwords do not match</value>
</data> </data>
<data name="SelectCertType.Text" xml:space="preserve">
<value>Select Certificate Type:</value>
</data>
</root> </root>

27
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx
View file

@ -1,26 +1,17 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="WebSitesEditSite.ascx.cs" <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="WebSitesEditSite.ascx.cs"
Inherits="WebsitePanel.Portal.WebSitesEditSite" %> Inherits="WebsitePanel.Portal.WebSitesEditSite" %>
<%@ Import Namespace="WebsitePanel.Portal" %> <%@ Import Namespace="WebsitePanel.Portal" %>
<%@ Register Src="WebSitesExtensionsControl.ascx" TagName="WebSitesExtensionsControl" <%@ Register Src="WebSitesExtensionsControl.ascx" TagName="WebSitesExtensionsControl" TagPrefix="uc6" %>
TagPrefix="uc6" %> <%@ Register Src="WebSitesCustomErrorsControl.ascx" TagName="WebSitesCustomErrorsControl" TagPrefix="uc4" %>
<%@ Register Src="WebSitesCustomErrorsControl.ascx" TagName="WebSitesCustomErrorsControl" <%@ Register Src="WebSitesMimeTypesControl.ascx" TagName="WebSitesMimeTypesControl" TagPrefix="uc5" %>
TagPrefix="uc4" %> <%@ Register Src="WebSitesHomeFolderControl.ascx" TagName="WebSitesHomeFolderControl" TagPrefix="uc1" %>
<%@ Register Src="WebSitesMimeTypesControl.ascx" TagName="WebSitesMimeTypesControl" <%@ Register Src="WebSitesCustomHeadersControl.ascx" TagName="WebSitesCustomHeadersControl" TagPrefix="uc6" %>
TagPrefix="uc5" %> <%@ Register Src="WebSitesSecuredFoldersControl.ascx" TagName="WebSitesSecuredFoldersControl" TagPrefix="wsp" %>
<%@ Register Src="WebSitesHomeFolderControl.ascx" TagName="WebSitesHomeFolderControl" <%@ Register Src="WebSitesHeliconApeControl.ascx" TagName="WebSitesHeliconApeControl" TagPrefix="wsp" %>
TagPrefix="uc1" %>
<%@ Register Src="WebSitesCustomHeadersControl.ascx" TagName="WebSitesCustomHeadersControl"
TagPrefix="uc6" %>
<%@ Register Src="WebSitesSecuredFoldersControl.ascx" TagName="WebSitesSecuredFoldersControl"
TagPrefix="wsp" %>
<%@ Register Src="WebSitesHeliconApeControl.ascx" TagName="WebSitesHeliconApeControl"
TagPrefix="wsp" %>
<%@ Register Src="UserControls/PasswordControl.ascx" TagName="PasswordControl" TagPrefix="wsp" %> <%@ Register Src="UserControls/PasswordControl.ascx" TagName="PasswordControl" TagPrefix="wsp" %>
<%@ Register Src="UserControls/UsernameControl.ascx" TagName="UsernameControl" TagPrefix="wsp" %> <%@ Register Src="UserControls/UsernameControl.ascx" TagName="UsernameControl" TagPrefix="wsp" %>
<%@ Register Src="UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" <%@ Register Src="UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
TagPrefix="wsp" %> <%@ Register Src="UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
<%@ Register Src="UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"
TagPrefix="wsp" %>
<%@ Register Src="UserControls/PopupHeader.ascx" TagName="PopupHeader" TagPrefix="wsp" %> <%@ Register Src="UserControls/PopupHeader.ascx" TagName="PopupHeader" TagPrefix="wsp" %>
<%@ Register TagPrefix="wsp" Namespace="WebsitePanel.Portal" %> <%@ Register TagPrefix="wsp" Namespace="WebsitePanel.Portal" %>
<%@ Register Src="WebsitesSSL.ascx" TagName="WebsitesSSL" TagPrefix="uc2" %> <%@ Register Src="WebsitesSSL.ascx" TagName="WebsitesSSL" TagPrefix="uc2" %>

5
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs
View file

@ -133,7 +133,7 @@ namespace WebsitePanel.Portal
else else
{ {
// Select "Home Folder" tab by default // Select "Home Folder" tab by default
dlTabs.SelectedIndex = 0; dlTabs.SelectedIndex = 0;
} }
} }
@ -1042,6 +1042,9 @@ namespace WebsitePanel.Portal
} }
ShowSuccessMessage("WEB_SWITCH_TO_SHARED_IP"); ShowSuccessMessage("WEB_SWITCH_TO_SHARED_IP");
dlTabs.SelectedIndex = 0;
} }
catch (Exception ex) catch (Exception ex)
{ {

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

@ -148,13 +148,16 @@
<h2> <h2>
<asp:Localize runat="server" meta:resourcekey="GenerateCSR" /></h2> <asp:Localize runat="server" meta:resourcekey="GenerateCSR" /></h2>
<table style="width: 100%;"> <table style="width: 100%;">
<tr> <tr>
<td class="SubHead"> <td class="SubHead">
<asp:Localize ID="sslDomain" runat="server" meta:resourcekey="sslDomain" /></td> <asp:Localize ID="SelectCertType" runat="server" meta:resourcekey="SelectCertType" /></td>
<td class="Normal"> <td class="NormalBold" ><asp:radiobutton id="rbSiteCertificate" GroupName="Content" Runat="server" Checked="True"></asp:radiobutton></td>
<asp:DropDownList ID="lstDomains" runat="server" /> </tr>
<asp:CheckBox ID="chkWild" runat="server" meta:resourcekey="sslWildcard" /></td> <tr>
</tr> <td></td>
<td class="NormalBold" ><asp:radiobutton id="rbDomainCertificate" GroupName="Content" Runat="server" ></asp:radiobutton></td>
</tr>
<tr> <tr>
<td class="SubHead"> <td class="SubHead">
<asp:Localize ID="sslBitLength" runat="server" meta:resourcekey="sslBitLength" /></td> <asp:Localize ID="sslBitLength" runat="server" meta:resourcekey="sslBitLength" /></td>

52
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.cs
View file

@ -109,9 +109,8 @@ namespace WebsitePanel.Portal
private void BindListOfAvailableSslDomains(string websiteName, string domainName) private void BindListOfAvailableSslDomains(string websiteName, string domainName)
{ {
lstDomains.Items.Clear(); rbSiteCertificate.Text = websiteName;
lstDomains.Items.Add(new ListItem(websiteName, websiteName)); rbDomainCertificate.Text = "*." + domainName;
lstDomains.Items.Add(new ListItem(domainName, domainName));
} }
public void BindWebItem(WebVirtualDirectory item) public void BindWebItem(WebVirtualDirectory item)
@ -237,25 +236,22 @@ namespace WebsitePanel.Portal
protected void btnCSR_Click(object sender, EventArgs e) protected void btnCSR_Click(object sender, EventArgs e)
{ {
string domain = lstDomains.SelectedValue;
// Ensure wildcard certificate request is correct
if (chkWild.Checked)
domain = "*." + domain;
// //
string distinguishedName = string.Format(@"CN={0}, string distinguishedName = string.Format(@"CN={0},
O={1}, O={1},
OU={2}, OU={2},
L={3}, L={3},
S={4}, S={4},
C={5}", domain, C={5}",
txtCompany.Text, rbSiteCertificate.Checked ? rbSiteCertificate.Text : rbDomainCertificate.Text,
txtOU.Text, txtCompany.Text,
txtCity.Text, txtOU.Text,
State, txtCity.Text,
lstCountries.SelectedValue); State,
lstCountries.SelectedValue);
SSLCertificate certificate = new SSLCertificate(); SSLCertificate certificate = new SSLCertificate();
certificate.Hostname = domain; certificate.Hostname = rbSiteCertificate.Checked ? rbSiteCertificate.Text : rbDomainCertificate.Text;
certificate.DistinguishedName = distinguishedName; certificate.DistinguishedName = distinguishedName;
certificate.CSRLength = Convert.ToInt32(lstBits.SelectedValue); certificate.CSRLength = Convert.ToInt32(lstBits.SelectedValue);
certificate.Organisation = txtCompany.Text; certificate.Organisation = txtCompany.Text;
@ -307,18 +303,12 @@ namespace WebsitePanel.Portal
protected void btnRenCSR_Click(object sender, EventArgs e) protected void btnRenCSR_Click(object sender, EventArgs e)
{ {
//
string domain = lstDomains.SelectedValue;
//
if (chkWild.Checked)
domain = "*." + domain;
//
string distinguishedName = string.Format(@"CN={0}, string distinguishedName = string.Format(@"CN={0},
O={1}, O={1},
OU={2}, OU={2},
L={3}, L={3},
S={4}, S={4},
C={5}", domain, C={5}", rbSiteCertificate.Checked ? rbSiteCertificate.Text : rbDomainCertificate.Text,
txtCompany.Text, txtCompany.Text,
txtOU.Text, txtOU.Text,
txtCity.Text, txtCity.Text,
@ -326,7 +316,7 @@ namespace WebsitePanel.Portal
lstCountries.SelectedValue); lstCountries.SelectedValue);
SSLCertificate certificate = new SSLCertificate(); SSLCertificate certificate = new SSLCertificate();
certificate.Hostname = domain; certificate.Hostname = rbSiteCertificate.Checked ? rbSiteCertificate.Text : rbDomainCertificate.Text;
certificate.DistinguishedName = distinguishedName; certificate.DistinguishedName = distinguishedName;
certificate.CSRLength = Convert.ToInt32(lstBits.SelectedValue); certificate.CSRLength = Convert.ToInt32(lstBits.SelectedValue);
certificate.Organisation = txtCompany.Text; certificate.Organisation = txtCompany.Text;
@ -382,6 +372,8 @@ namespace WebsitePanel.Portal
pnlInstallCertificate.Visible = false; pnlInstallCertificate.Visible = false;
SSLNotInstalled.Visible = true; SSLNotInstalled.Visible = true;
// //
TabContainer1.ActiveTab = tabInstalled;
RefreshControlLayout(webSiteId); RefreshControlLayout(webSiteId);
} }
@ -508,12 +500,7 @@ namespace WebsitePanel.Portal
tabCSR.HeaderText = GetLocalizedString("SSLGenereateRenewal.HeaderText"); tabCSR.HeaderText = GetLocalizedString("SSLGenereateRenewal.HeaderText");
string hostname = cert.Hostname; string hostname = cert.Hostname;
// Check if it is a wildcard certificate
if (!String.IsNullOrEmpty(cert.Hostname) && cert.Hostname.StartsWith("*"))
{
chkWild.Checked = true;
hostname = hostname.Remove(0, 2);
}
// Assign hostname // Assign hostname
SetCertHostnameSelection(hostname); SetCertHostnameSelection(hostname);
// Assign state // Assign state
@ -653,14 +640,7 @@ namespace WebsitePanel.Portal
protected void SetCertHostnameSelection(string hostname) protected void SetCertHostnameSelection(string hostname)
{ {
//Bind new CSR with current certificate details rbSiteCertificate.Checked = (rbSiteCertificate.Text == hostname);
var li = lstDomains.Items.FindByValue(hostname);
// Select domain name from the existing certificate
if (li != null)
{
lstDomains.ClearSelection();
li.Selected = true;
}
} }
protected void SetCertCountrySelection(string country) protected void SetCertCountrySelection(string country)

12
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.designer.cs generated
View file

@ -337,31 +337,31 @@ namespace WebsitePanel.Portal {
protected global::System.Web.UI.WebControls.Panel pnlCSR; protected global::System.Web.UI.WebControls.Panel pnlCSR;
/// <summary> /// <summary>
/// sslDomain control. /// SelectCertType control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Auto-generated field. /// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Localize sslDomain; protected global::System.Web.UI.WebControls.Localize SelectCertType;
/// <summary> /// <summary>
/// lstDomains control. /// rbSiteCertificate control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Auto-generated field. /// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.DropDownList lstDomains; protected global::System.Web.UI.WebControls.RadioButton rbSiteCertificate;
/// <summary> /// <summary>
/// chkWild control. /// rbDomainCertificate control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Auto-generated field. /// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkWild; protected global::System.Web.UI.WebControls.RadioButton rbDomainCertificate;
/// <summary> /// <summary>
/// sslBitLength control. /// sslBitLength control.