From df182d05c031259025a3d46db5839ac3809f7511 Mon Sep 17 00:00:00 2001 From: Stephen Turner Date: Wed, 19 Aug 2015 08:53:15 +0100 Subject: [PATCH] CP-13374 XenCenter can now turn on and off ssl-legacy: last check-in was incomplete. --- .../OptionsPages/SecurityOptionsPage.cs | 2 +- XenAdmin/Dialogs/PropertiesDialog.cs | 4 ++ .../Images/005_SSLRelayConfig_h32bit_16.png | Bin 624 -> 0 bytes XenAdmin/Properties/Resources.Designer.cs | 20 ++++----- XenAdmin/Properties/Resources.ja.resx | 3 -- XenAdmin/Properties/Resources.resx | 10 ++--- XenAdmin/Properties/Resources.zh-CN.resx | 3 -- XenAdmin/XenAdmin.csproj | 16 +++++++- XenModel/Messages.Designer.cs | 38 +++++++++++++++++- XenModel/Messages.resx | 12 ++++++ XenModel/XenAPI-Extensions/Pool.cs | 8 ++++ XenModel/XenModel.csproj | 1 + 12 files changed, 92 insertions(+), 25 deletions(-) delete mode 100644 XenAdmin/Images/005_SSLRelayConfig_h32bit_16.png diff --git a/XenAdmin/Dialogs/OptionsPages/SecurityOptionsPage.cs b/XenAdmin/Dialogs/OptionsPages/SecurityOptionsPage.cs index 2ccd71622..803d390d0 100644 --- a/XenAdmin/Dialogs/OptionsPages/SecurityOptionsPage.cs +++ b/XenAdmin/Dialogs/OptionsPages/SecurityOptionsPage.cs @@ -98,7 +98,7 @@ namespace XenAdmin.Dialogs.OptionsPages public Image Image { - get { return Resources._005_SSLRelayConfig_h32bit_16; } + get { return Resources.padlock; } } #endregion diff --git a/XenAdmin/Dialogs/PropertiesDialog.cs b/XenAdmin/Dialogs/PropertiesDialog.cs index 277954bc3..5f72e9a1c 100644 --- a/XenAdmin/Dialogs/PropertiesDialog.cs +++ b/XenAdmin/Dialogs/PropertiesDialog.cs @@ -80,6 +80,7 @@ namespace XenAdmin.Dialogs private PoolGpuEditPage PoolGpuEditPage; private VMEnlightenmentEditPage VMEnlightenmentEditPage; private Page_CloudConfigParameters CloudConfigParametersPage; + private SecurityEditPage SecurityEditPage; #endregion private IXenObject xenObject, xenObjectBefore, xenObjectCopy; @@ -214,6 +215,9 @@ namespace XenAdmin.Dialogs ShowTab(PoolGpuEditPage = new PoolGpuEditPage()); } + if (is_pool_or_standalone && Helpers.DundeeOrGreater(xenObject.Connection)) + ShowTab(SecurityEditPage = new SecurityEditPage()); + if (is_network) ShowTab(editNetworkPage = new EditNetworkPage()); diff --git a/XenAdmin/Images/005_SSLRelayConfig_h32bit_16.png b/XenAdmin/Images/005_SSLRelayConfig_h32bit_16.png deleted file mode 100644 index 3afdc6216e953b532b83949f01c9d562f8f3a663..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 624 zcmV-$0+0QPP)p)quwC4G%ghYK*|h{LvM=riycS!8B13bs45d!bMAJx3jmYJRFS+PK_%Sv1hr~i z4OKcFX&HHav$yjofEf1?eUTlpqOEGJUvF6$fYCH)?2x7 z{w(#1e*eZHYFQ8o;`3<&K^Fkcdzt`9FGJg@GsV_gLrv)~%z~x|F-Lq}Pax=Gr_F-X zVJAElBc70$O$rvXvO1-qXT+na;qnA4Y1HLBfuM_%Ct6U9b-e%Z4YNtX>9BKea1^64 z!BVOk;F{mxIq+X#c^1?N%+&&vku7Eg@BOD#2|0SJudA)pQ;hqF0@h-PLLF}l!LkJJ zUQM!Z#}h914sTeDO*iFg@8E5V&2|GV$M0E*5NiLxozA|^djA6KK<#Hz$fK120000< KMNUMnLSTa9C?Z7w diff --git a/XenAdmin/Properties/Resources.Designer.cs b/XenAdmin/Properties/Resources.Designer.cs index 9fe1f9606..6073c0177 100644 --- a/XenAdmin/Properties/Resources.Designer.cs +++ b/XenAdmin/Properties/Resources.Designer.cs @@ -1670,16 +1670,6 @@ namespace XenAdmin.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap _005_SSLRelayConfig_h32bit_16 { - get { - object obj = ResourceManager.GetObject("_005_SSLRelayConfig_h32bit_16", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -2650,6 +2640,16 @@ namespace XenAdmin.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap padlock { + get { + object obj = ResourceManager.GetObject("padlock", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/XenAdmin/Properties/Resources.ja.resx b/XenAdmin/Properties/Resources.ja.resx index bface604f..cae0e3fd6 100644 --- a/XenAdmin/Properties/Resources.ja.resx +++ b/XenAdmin/Properties/Resources.ja.resx @@ -844,9 +844,6 @@ ..\Images\002_Configure_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Images\005_SSLRelayConfig_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Images\000_NewNetwork_h32bit_32.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/XenAdmin/Properties/Resources.resx b/XenAdmin/Properties/Resources.resx index 76a1d1e74..fd0b91bf3 100644 --- a/XenAdmin/Properties/Resources.resx +++ b/XenAdmin/Properties/Resources.resx @@ -367,9 +367,6 @@ ..\Images\000_ServerWlb_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Images\005_SSLRelayConfig_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Images\001_ForceReboot_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1101,11 +1098,14 @@ ..\Images\scilinux_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Images\000_MigrateStoppedVM_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Images\000_MigrateSuspendedVM_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + + ..\Images\padlock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file diff --git a/XenAdmin/Properties/Resources.zh-CN.resx b/XenAdmin/Properties/Resources.zh-CN.resx index b2915d6e7..7fa974b4e 100644 --- a/XenAdmin/Properties/Resources.zh-CN.resx +++ b/XenAdmin/Properties/Resources.zh-CN.resx @@ -373,9 +373,6 @@ ..\Images\000_ServerWlb_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Images\005_SSLRelayConfig_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Images\000_BackupMetadata_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj index 22b6252f3..3afc84521 100644 --- a/XenAdmin/XenAdmin.csproj +++ b/XenAdmin/XenAdmin.csproj @@ -262,6 +262,12 @@ True Resources.resx + + UserControl + + + SecurityEditPage.cs + UserControl @@ -1672,6 +1678,9 @@ EditNetworkPage.cs Designer + + SecurityEditPage.cs + Designer StorageLinkEditPage.cs @@ -4180,6 +4189,7 @@ + @@ -5571,7 +5581,9 @@ Designer - + + Designer + BootOptionsEditPage.cs @@ -6798,4 +6810,4 @@ copy "$(ProjectDir)\..\putty\putty.exe" "$(TargetDir)" - + \ No newline at end of file diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index 1e987668e..b7cb68bc7 100644 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -28826,6 +28826,33 @@ namespace XenAdmin { } } + /// + /// Looks up a localized string similar to Select the security protocols that can be used for communicating with this server.. + /// + public static string SECURITYEDITPAGE_RUBRIC_HOST { + get { + return ResourceManager.GetString("SECURITYEDITPAGE_RUBRIC_HOST", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SSL & TLS. + /// + public static string SECURITYEDITPAGE_SUBTEXT_SSL { + get { + return ResourceManager.GetString("SECURITYEDITPAGE_SUBTEXT_SSL", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TLS 1.2 only. + /// + public static string SECURITYEDITPAGE_SUBTEXT_TLS { + get { + return ResourceManager.GetString("SECURITYEDITPAGE_SUBTEXT_TLS", resourceCulture); + } + } + /// /// Looks up a localized string similar to Select a filter.... /// @@ -29231,6 +29258,15 @@ namespace XenAdmin { } } + /// + /// Looks up a localized string similar to Setting security settings. + /// + public static string SETTING_SECURITY_SETTINGS { + get { + return ResourceManager.GetString("SETTING_SECURITY_SETTINGS", resourceCulture); + } + } + /// /// Looks up a localized string similar to Setting VM properties. /// diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index ac9c03a62..f387a4ce4 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -10011,6 +10011,15 @@ Upgrading VMs using StorageLink Gateway to XenServer 6.0 is only supported if th Security + + Select the security protocols that can be used for communicating with this server. + + + SSL & TLS + + + TLS 1.2 only + Security Checks @@ -10110,6 +10119,9 @@ Upgrading VMs using StorageLink Gateway to XenServer 6.0 is only supported if th Settings + + Setting security settings + Setting VM properties diff --git a/XenModel/XenAPI-Extensions/Pool.cs b/XenModel/XenAPI-Extensions/Pool.cs index 7a7e5425c..bca2a8a1a 100644 --- a/XenModel/XenAPI-Extensions/Pool.cs +++ b/XenModel/XenAPI-Extensions/Pool.cs @@ -402,6 +402,14 @@ namespace XenAPI get { return HasGpu && Connection.Cache.PGPUs.Any(pGpu => pGpu.HasVGpu); } } + /// + /// ssl_legacy is true if any host in the pool is in legacy mode + /// + public bool ssl_legacy + { + get { return Connection.Cache.Hosts.Any(h => h.ssl_legacy); } + } + #region Health Check settings public HealthCheckSettings HealthCheckSettings { diff --git a/XenModel/XenModel.csproj b/XenModel/XenModel.csproj index 9347f1fd6..494a6b76e 100644 --- a/XenModel/XenModel.csproj +++ b/XenModel/XenModel.csproj @@ -96,6 +96,7 @@ +