Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 07:19:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CP-13374 XenCenter can now turn on and off ssl-legacy: last check-in was incomplete.

Browse Source
This commit is contained in:
Stephen Turner 2015-08-19 08:53:15 +01:00
parent 227ee84da7
commit df182d05c0
12 changed files with 92 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/Dialogs/OptionsPages/SecurityOptionsPage.cs
View File

@ -98,7 +98,7 @@ namespace XenAdmin.Dialogs.OptionsPages
public Image Image
{
get { return Resources._005_SSLRelayConfig_h32bit_16; }
get { return Resources.padlock; }
}
#endregion

4
XenAdmin/Dialogs/PropertiesDialog.cs
View File

@ -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());

BIN
XenAdmin/Images/005_SSLRelayConfig_h32bit_16.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 624 B

20
XenAdmin/Properties/Resources.Designer.cs generated
View File

@ -1670,16 +1670,6 @@ namespace XenAdmin.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _005_SSLRelayConfig_h32bit_16 {
get {
object obj = ResourceManager.GetObject("_005_SSLRelayConfig_h32bit_16", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -2650,6 +2640,16 @@ namespace XenAdmin.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap padlock {
get {
object obj = ResourceManager.GetObject("padlock", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

3
XenAdmin/Properties/Resources.ja.resx
View File

@ -844,9 +844,6 @@
<data name="_002_Configure_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\002_Configure_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_005_SSLRelayConfig_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\005_SSLRelayConfig_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_000_NewNetwork_h32bit_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\000_NewNetwork_h32bit_32.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

10
XenAdmin/Properties/Resources.resx
View File

@ -367,9 +367,6 @@
<data name="_000_ServerWlb_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\000_ServerWlb_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_005_SSLRelayConfig_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\005_SSLRelayConfig_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_001_ForceReboot_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\001_ForceReboot_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -1101,11 +1098,14 @@
</data>
<data name="scilinux_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\scilinux_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</data>
<data name="_000_MigrateStoppedVM_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\000_MigrateStoppedVM_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_000_MigrateSuspendedVM_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\000_MigrateSuspendedVM_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
<data name="padlock" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\padlock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

3
XenAdmin/Properties/Resources.zh-CN.resx
View File

@ -373,9 +373,6 @@
<data name="_000_ServerWlb_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\000_ServerWlb_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_005_SSLRelayConfig_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\005_SSLRelayConfig_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_000_BackupMetadata_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\000_BackupMetadata_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

16
XenAdmin/XenAdmin.csproj
View File

@ -262,6 +262,12 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="SettingsPanels\SecurityEditPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="SettingsPanels\SecurityEditPage.Designer.cs">
<DependentUpon>SecurityEditPage.cs</DependentUpon>
</Compile>
<Compile Include="SettingsPanels\VMEnlightenmentEditPage.cs">
<SubType>UserControl</SubType>
</Compile>
@ -1672,6 +1678,9 @@
<DependentUpon>EditNetworkPage.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SettingsPanels\SecurityEditPage.resx">
<DependentUpon>SecurityEditPage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SettingsPanels\StorageLinkEditPage.resx">
<SubType>Designer</SubType>
<DependentUpon>StorageLinkEditPage.cs</DependentUpon>
@ -4180,6 +4189,7 @@
<None Include="Images\pool_up_32.png" />
<None Include="Images\objects_16_textured.png" />
<None Include="Images\PausedDC_16.png" />
<None Include="Images\padlock.png" />
<Content Include="Images\Refresh16.png" />
<None Include="Images\saved_searches_16.png" />
<None Include="Images\server_up_16.png" />
@ -5571,7 +5581,9 @@
<EmbeddedResource Include="Properties\Resources.ja.resx">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.zh-CN.resx" />
<EmbeddedResource Include="Properties\Resources.zh-CN.resx">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SettingsPanels\BootOptionsEditPage.zh-CN.resx">
<DependentUpon>BootOptionsEditPage.cs</DependentUpon>
</EmbeddedResource>
@ -6798,4 +6810,4 @@
copy "$(ProjectDir)\..\putty\putty.exe" "$(TargetDir)"</PostBuildEvent>
</PropertyGroup>
</Project>
</Project>

38
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.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 {
}
}
/// <summary>
/// Looks up a localized string similar to Select the security protocols that can be used for communicating with this server..
/// </summary>
public static string SECURITYEDITPAGE_RUBRIC_HOST {
get {
return ResourceManager.GetString("SECURITYEDITPAGE_RUBRIC_HOST", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to SSL &amp; TLS.
/// </summary>
public static string SECURITYEDITPAGE_SUBTEXT_SSL {
get {
return ResourceManager.GetString("SECURITYEDITPAGE_SUBTEXT_SSL", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to TLS 1.2 only.
/// </summary>
public static string SECURITYEDITPAGE_SUBTEXT_TLS {
get {
return ResourceManager.GetString("SECURITYEDITPAGE_SUBTEXT_TLS", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Select a filter....
/// </summary>
@ -29231,6 +29258,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Setting security settings.
/// </summary>
public static string SETTING_SECURITY_SETTINGS {
get {
return ResourceManager.GetString("SETTING_SECURITY_SETTINGS", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Setting VM properties.
/// </summary>

12
XenModel/Messages.resx
View File

@ -10011,6 +10011,15 @@ Upgrading VMs using StorageLink Gateway to XenServer 6.0 is only supported if th
<data name="SECURITY" xml:space="preserve">
<value>Security</value>
</data>
<data name="SECURITYEDITPAGE_RUBRIC_HOST" xml:space="preserve">
<value>Select the security protocols that can be used for communicating with this server.</value>
</data>
<data name="SECURITYEDITPAGE_SUBTEXT_SSL" xml:space="preserve">
<value>SSL &amp; TLS</value>
</data>
<data name="SECURITYEDITPAGE_SUBTEXT_TLS" xml:space="preserve">
<value>TLS 1.2 only</value>
</data>
<data name="SECURITY_CHECKS" xml:space="preserve">
<value>Security Checks</value>
</data>
@ -10110,6 +10119,9 @@ Upgrading VMs using StorageLink Gateway to XenServer 6.0 is only supported if th
<data name="SETTINGS" xml:space="preserve">
<value>Settings</value>
</data>
<data name="SETTING_SECURITY_SETTINGS" xml:space="preserve">
<value>Setting security settings</value>
</data>
<data name="SETTING_VM_PROPERTIES" xml:space="preserve">
<value>Setting VM properties</value>
</data>

8
XenModel/XenAPI-Extensions/Pool.cs
View File

@ -402,6 +402,14 @@ namespace XenAPI
get { return HasGpu && Connection.Cache.PGPUs.Any(pGpu => pGpu.HasVGpu); }
}
/// <summary>
/// ssl_legacy is true if any host in the pool is in legacy mode
/// </summary>
public bool ssl_legacy
{
get { return Connection.Cache.Hosts.Any(h => h.ssl_legacy); }
}
#region Health Check settings
public HealthCheckSettings HealthCheckSettings
{

1
XenModel/XenModel.csproj
View File

@ -96,6 +96,7 @@
<Compile Include="Actions\Pool\CreatePoolAction.cs" />
<Compile Include="Actions\Pool\PoolAction.cs" />
<Compile Include="Actions\Pool\SetGpuPlacementPolicyAction.cs" />
<Compile Include="Actions\Pool\SetSslLegacyAction.cs" />
<Compile Include="Actions\Pool_Patch\CheckDiskSpaceForPatchUploadAction.cs" />
<Compile Include="Actions\Pool_Patch\CleanupDiskSpaceAction.cs" />
<Compile Include="Actions\Pool_Patch\GetDiskSpaceRequirementsAction.cs" />