Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-27 02:56:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-208707: [SCTX-2316] XenCenter Incorrect pop-up error message displayed if SSL secure channel cannot be created

Browse Source 
My commit fixes the error message so the dialog will show "Could not create SSL/TLS secure channel." instead of "An unknown error occurred". This text is localised.
Unfortunately we see only a WebException with Status=SecureChannelFailure with no other details - couldn't provide an improved error message

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
This commit is contained in:
Gabor Apati-Nagy 2016-05-23 12:48:01 +01:00
parent f2e1f166ec
commit 9d2a204bb7
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
XenAdmin/Network/XenConnectionUI.cs
View File

@ -206,6 +206,9 @@ namespace XenAdmin.Network
case WebExceptionStatus.SendFailure:
AddError(owner, connection, string.Format(Messages.ERROR_NO_XENSERVER, ((XenConnection)connection).Hostname), string.Format(Messages.SOLUTION_CHECK_XENSERVER, ((XenConnection)connection).Hostname));
break;
case WebExceptionStatus.SecureChannelFailure:
AddError(owner, connection, string.Format(Messages.ERROR_SECURE_CHANNEL_FAILURE, ((XenConnection)connection).Hostname), Messages.SOLUTION_UNKNOWN);
break;
default:
AddError(owner, connection, Messages.ERROR_UNKNOWN, Messages.SOLUTION_UNKNOWN);
break;

11
XenModel/Messages.Designer.cs generated
View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -13706,6 +13706,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Could not create SSL/TLS secure channel..
/// </summary>
public static string ERROR_SECURE_CHANNEL_FAILURE {
get {
return ResourceManager.GetString("ERROR_SECURE_CHANNEL_FAILURE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to An unknown error occurred..
/// </summary>

3
XenModel/Messages.resx
View File

@ -4828,6 +4828,9 @@ Would you like to eject these ISOs before continuing?</value>
<data name="ERROR_PUTTY_LAUNCHING" xml:space="preserve">
<value>[XenCenter] has encountered a problem launching PuTTY.</value>
</data>
<data name="ERROR_SECURE_CHANNEL_FAILURE" xml:space="preserve">
<value>Could not create SSL/TLS secure channel.</value>
</data>
<data name="ERROR_UNKNOWN" xml:space="preserve">
<value>An unknown error occurred.</value>
</data>

4
XenModel/Network/XenConnection.cs
View File

@ -921,6 +921,10 @@ namespace XenAdmin.Network
{
return string.Format(Messages.CONNECT_NO_XAPI_FAILURE, this.Hostname);
}
else if (w.Status == WebExceptionStatus.SecureChannelFailure)
{
return string.Format(Messages.ERROR_SECURE_CHANNEL_FAILURE, this.Hostname);
}
else
{
return w.Message;