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

Merge pull request #1207 from Frezzle/CP-19111

Browse Source 
CP-19111: Added ability to choose Basic or Digest authentication for proxy server
This commit is contained in:
Mihaela Stoica 2016-10-13 15:55:04 +01:00 committed by GitHub
commit fe2d20eb40
16 changed files with 372 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
XenAdmin/Dialogs/OptionsPages/ConnectionOptionsPage.Designer.cs generated
View File

@ -52,12 +52,17 @@ namespace XenAdmin.Dialogs.OptionsPages
this.ProxyAddressTextBox = new System.Windows.Forms.TextBox();
this.ProxyPortTextBox = new System.Windows.Forms.TextBox();
this.ProxyPortLabel = new System.Windows.Forms.Label();
this.AuthenticationMethodLabel = new System.Windows.Forms.Label();
this.AuthenticationMethodPanel = new System.Windows.Forms.Panel();
this.DigestRadioButton = new System.Windows.Forms.RadioButton();
this.BasicRadioButton = new System.Windows.Forms.RadioButton();
this.ConnectionTableLayoutPanel.SuspendLayout();
this.TimeoutGroupBox.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.ConnectionTimeoutNud)).BeginInit();
this.ProxyGroupBox.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.AuthenticationMethodPanel.SuspendLayout();
this.SuspendLayout();
//
// ConnectionTableLayoutPanel
@ -135,18 +140,20 @@ namespace XenAdmin.Dialogs.OptionsPages
//
resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
this.tableLayoutPanel1.Controls.Add(this.BypassForServersCheckbox, 1, 4);
this.tableLayoutPanel1.Controls.Add(this.ProxyPasswordTextBox, 6, 6);
this.tableLayoutPanel1.Controls.Add(this.ProxyPasswordTextBox, 7, 6);
this.tableLayoutPanel1.Controls.Add(this.ProxyUsernameLabel, 2, 6);
this.tableLayoutPanel1.Controls.Add(this.ProxyUsernameTextBox, 4, 6);
this.tableLayoutPanel1.Controls.Add(this.ProxyPasswordLabel, 5, 6);
this.tableLayoutPanel1.Controls.Add(this.ProxyUsernameTextBox, 3, 6);
this.tableLayoutPanel1.Controls.Add(this.ProxyPasswordLabel, 6, 6);
this.tableLayoutPanel1.Controls.Add(this.AuthenticationCheckBox, 1, 5);
this.tableLayoutPanel1.Controls.Add(this.ProxyAddressLabel, 1, 3);
this.tableLayoutPanel1.Controls.Add(this.UseProxyRadioButton, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.DirectConnectionRadioButton, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.UseIERadioButton, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.ProxyAddressTextBox, 3, 3);
this.tableLayoutPanel1.Controls.Add(this.ProxyPortTextBox, 5, 3);
this.tableLayoutPanel1.Controls.Add(this.ProxyPortLabel, 4, 3);
this.tableLayoutPanel1.Controls.Add(this.ProxyPortTextBox, 7, 3);
this.tableLayoutPanel1.Controls.Add(this.ProxyPortLabel, 6, 3);
this.tableLayoutPanel1.Controls.Add(this.AuthenticationMethodLabel, 2, 8);
this.tableLayoutPanel1.Controls.Add(this.AuthenticationMethodPanel, 5, 8);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
//
// BypassForServersCheckbox
@ -155,14 +162,14 @@ namespace XenAdmin.Dialogs.OptionsPages
this.tableLayoutPanel1.SetColumnSpan(this.BypassForServersCheckbox, 6);
this.BypassForServersCheckbox.Name = "BypassForServersCheckbox";
this.BypassForServersCheckbox.UseVisualStyleBackColor = true;
this.BypassForServersCheckbox.CheckedChanged += new System.EventHandler(this.BypassForServersCheckbox_CheckedChanged);
this.BypassForServersCheckbox.CheckedChanged += new System.EventHandler(this.GeneralProxySettingsChanged);
//
// ProxyPasswordTextBox
//
resources.ApplyResources(this.ProxyPasswordTextBox, "ProxyPasswordTextBox");
this.ProxyPasswordTextBox.Name = "ProxyPasswordTextBox";
this.ProxyPasswordTextBox.UseSystemPasswordChar = true;
this.ProxyPasswordTextBox.TextChanged += new System.EventHandler(this.ProxyPasswordTextBox_TextChanged);
this.ProxyPasswordTextBox.TextChanged += new System.EventHandler(this.ProxyAuthenticationSettingsChanged);
//
// ProxyUsernameLabel
//
@ -172,9 +179,10 @@ namespace XenAdmin.Dialogs.OptionsPages
//
// ProxyUsernameTextBox
//
this.tableLayoutPanel1.SetColumnSpan(this.ProxyUsernameTextBox, 2);
resources.ApplyResources(this.ProxyUsernameTextBox, "ProxyUsernameTextBox");
this.ProxyUsernameTextBox.Name = "ProxyUsernameTextBox";
this.ProxyUsernameTextBox.TextChanged += new System.EventHandler(this.ProxyUsernameTextBox_TextChanged);
this.ProxyUsernameTextBox.TextChanged += new System.EventHandler(this.ProxyAuthenticationSettingsChanged);
//
// ProxyPasswordLabel
//
@ -222,22 +230,50 @@ namespace XenAdmin.Dialogs.OptionsPages
//
// ProxyAddressTextBox
//
this.tableLayoutPanel1.SetColumnSpan(this.ProxyAddressTextBox, 2);
this.tableLayoutPanel1.SetColumnSpan(this.ProxyAddressTextBox, 3);
resources.ApplyResources(this.ProxyAddressTextBox, "ProxyAddressTextBox");
this.ProxyAddressTextBox.Name = "ProxyAddressTextBox";
this.ProxyAddressTextBox.TextChanged += new System.EventHandler(this.ProxyAddressTextBox_TextChanged);
this.ProxyAddressTextBox.TextChanged += new System.EventHandler(this.GeneralProxySettingsChanged);
//
// ProxyPortTextBox
//
resources.ApplyResources(this.ProxyPortTextBox, "ProxyPortTextBox");
this.ProxyPortTextBox.Name = "ProxyPortTextBox";
this.ProxyPortTextBox.TextChanged += new System.EventHandler(this.ProxyPortTextBox_TextChanged);
this.ProxyPortTextBox.TextChanged += new System.EventHandler(this.GeneralProxySettingsChanged);
//
// ProxyPortLabel
//
resources.ApplyResources(this.ProxyPortLabel, "ProxyPortLabel");
this.ProxyPortLabel.Name = "ProxyPortLabel";
//
// AuthenticationMethodLabel
//
resources.ApplyResources(this.AuthenticationMethodLabel, "AuthenticationMethodLabel");
this.tableLayoutPanel1.SetColumnSpan(this.AuthenticationMethodLabel, 3);
this.AuthenticationMethodLabel.Name = "AuthenticationMethodLabel";
//
// AuthenticationMethodPanel
//
this.tableLayoutPanel1.SetColumnSpan(this.AuthenticationMethodPanel, 2);
this.AuthenticationMethodPanel.Controls.Add(this.DigestRadioButton);
this.AuthenticationMethodPanel.Controls.Add(this.BasicRadioButton);
resources.ApplyResources(this.AuthenticationMethodPanel, "AuthenticationMethodPanel");
this.AuthenticationMethodPanel.Name = "AuthenticationMethodPanel";
//
// DigestRadioButton
//
resources.ApplyResources(this.DigestRadioButton, "DigestRadioButton");
this.DigestRadioButton.Name = "DigestRadioButton";
this.DigestRadioButton.UseVisualStyleBackColor = true;
this.DigestRadioButton.CheckedChanged += new System.EventHandler(this.ProxyAuthenticationSettingsChanged);
//
// BasicRadioButton
//
resources.ApplyResources(this.BasicRadioButton, "BasicRadioButton");
this.BasicRadioButton.Name = "BasicRadioButton";
this.BasicRadioButton.UseVisualStyleBackColor = true;
this.BasicRadioButton.CheckedChanged += new System.EventHandler(this.ProxyAuthenticationSettingsChanged);
//
// ConnectionOptionsPage
//
resources.ApplyResources(this, "$this");
@ -255,6 +291,8 @@ namespace XenAdmin.Dialogs.OptionsPages
this.ProxyGroupBox.PerformLayout();
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
this.AuthenticationMethodPanel.ResumeLayout(false);
this.AuthenticationMethodPanel.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@ -285,5 +323,9 @@ namespace XenAdmin.Dialogs.OptionsPages
private System.Windows.Forms.Label ProxyUsernameLabel;
private System.Windows.Forms.TextBox ProxyUsernameTextBox;
private System.Windows.Forms.Label ProxyPasswordLabel;
private System.Windows.Forms.RadioButton BasicRadioButton;
private System.Windows.Forms.Label AuthenticationMethodLabel;
private System.Windows.Forms.RadioButton DigestRadioButton;
private System.Windows.Forms.Panel AuthenticationMethodPanel;
}
}

92
XenAdmin/Dialogs/OptionsPages/ConnectionOptionsPage.cs
View File

@ -30,16 +30,11 @@
*/
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Text;
using System.Windows.Forms;
using XenAdmin.Properties;
using XenAdmin.Actions;
using XenAPI;
using System.Text.RegularExpressions;
using XenAdmin.Core;
@ -69,15 +64,15 @@ namespace XenAdmin.Dialogs.OptionsPages
private void build()
{
// Proxy server
switch (Properties.Settings.Default.ProxySetting)
switch ((HTTPHelper.ProxyStyle)Properties.Settings.Default.ProxySetting)
{
case 0:
case HTTPHelper.ProxyStyle.DirectConnection:
DirectConnectionRadioButton.Checked = true;
break;
case 1:
case HTTPHelper.ProxyStyle.SystemProxy:
UseIERadioButton.Checked = true;
break;
case 2:
case HTTPHelper.ProxyStyle.SpecifiedProxy:
UseProxyRadioButton.Checked = true;
break;
default:
@ -92,6 +87,19 @@ namespace XenAdmin.Dialogs.OptionsPages
if (Registry.ProxyAuthenticationEnabled)
{
AuthenticationCheckBox.Checked = Properties.Settings.Default.ProvideProxyAuthentication;
switch ((HTTPHelper.ProxyAuthenticationMethod)Properties.Settings.Default.ProxyAuthenticationMethod)
{
case HTTPHelper.ProxyAuthenticationMethod.Basic:
BasicRadioButton.Checked = true;
break;
case HTTPHelper.ProxyAuthenticationMethod.Digest:
DigestRadioButton.Checked = true;
break;
default:
DigestRadioButton.Checked = true;
break;
}
// checks for empty default username/password which starts out unencrypted
string protectedUsername = Properties.Settings.Default.ProxyUsername;
@ -107,6 +115,8 @@ namespace XenAdmin.Dialogs.OptionsPages
ProxyUsernameTextBox.Visible = false;
ProxyPasswordLabel.Visible = false;
ProxyPasswordTextBox.Visible = false;
AuthenticationMethodPanel.Visible = false;
AuthenticationMethodLabel.Visible = false;
}
ConnectionTimeoutNud.Value = Properties.Settings.Default.ConnectionTimeout / 1000;
@ -141,53 +151,19 @@ namespace XenAdmin.Dialogs.OptionsPages
enableOK();
}
private void ProxyAddressTextBox_TextChanged(object sender, EventArgs e)
private void GeneralProxySettingsChanged(object sender, EventArgs e)
{
if (eventsDisabled)
return;
SelectUseThisProxyServer();
enableOK();
}
private void ProxyPortTextBox_TextChanged(object sender, EventArgs e)
private void ProxyAuthenticationSettingsChanged(object sender, EventArgs e)
{
if (eventsDisabled)
return;
SelectUseThisProxyServer();
enableOK();
}
private void ProxyUsernameTextBox_TextChanged(object sender, EventArgs e)
{
if (eventsDisabled)
return;
SelectProvideCredentials();
enableOK();
}
private void ProxyPasswordTextBox_TextChanged(object sender, EventArgs e)
{
if (eventsDisabled)
return;
SelectProvideCredentials();
enableOK();
}
private void BypassForServersCheckbox_CheckedChanged(object sender, EventArgs e)
{
if (eventsDisabled)
return;
SelectUseThisProxyServer();
enableOK();
}
@ -246,6 +222,7 @@ namespace XenAdmin.Dialogs.OptionsPages
log.Info("=== ProxyPort: " + Properties.Settings.Default.ProxyPort.ToString());
log.Info("=== ByPassProxyForServers: " + Properties.Settings.Default.BypassProxyForServers.ToString());
log.Info("=== ProvideProxyAuthentication: " + Properties.Settings.Default.ProvideProxyAuthentication.ToString());
log.Info("=== ProxyAuthenticationMethod: " + Properties.Settings.Default.ProxyAuthenticationMethod.ToString());
log.Info("=== ConnectionTimeout: " + Properties.Settings.Default.ConnectionTimeout.ToString());
}
@ -270,6 +247,11 @@ namespace XenAdmin.Dialogs.OptionsPages
Properties.Settings.Default.ProxyUsername = EncryptionUtils.Protect(ProxyUsernameTextBox.Text);
Properties.Settings.Default.ProxyPassword = EncryptionUtils.Protect(ProxyPasswordTextBox.Text);
Properties.Settings.Default.ProvideProxyAuthentication = AuthenticationCheckBox.Checked;
HTTPHelper.ProxyAuthenticationMethod new_auth_method = BasicRadioButton.Checked ?
HTTPHelper.ProxyAuthenticationMethod.Basic : HTTPHelper.ProxyAuthenticationMethod.Digest;
if (Properties.Settings.Default.ProxyAuthenticationMethod != (int)new_auth_method)
Properties.Settings.Default.ProxyAuthenticationMethod = (int)new_auth_method;
}
try
@ -294,15 +276,17 @@ namespace XenAdmin.Dialogs.OptionsPages
}
Program.ReconfigureConnectionSettings();
new TransferProxySettingsAction((HTTPHelper.ProxyStyle)Properties.Settings.Default.ProxySetting,
Properties.Settings.Default.ProxyAddress,
Properties.Settings.Default.ProxyPort,
Properties.Settings.Default.ConnectionTimeout,
false,
Properties.Settings.Default.BypassProxyForServers,
Properties.Settings.Default.ProvideProxyAuthentication,
Properties.Settings.Default.ProxyUsername,
Properties.Settings.Default.ProxyPassword).RunAsync();
new TransferProxySettingsAction(
(HTTPHelper.ProxyStyle)Properties.Settings.Default.ProxySetting,
Properties.Settings.Default.ProxyAddress,
Properties.Settings.Default.ProxyPort,
Properties.Settings.Default.ConnectionTimeout,
false,
Properties.Settings.Default.BypassProxyForServers,
Properties.Settings.Default.ProvideProxyAuthentication,
Properties.Settings.Default.ProxyUsername,
Properties.Settings.Default.ProxyPassword,
(HTTPHelper.ProxyAuthenticationMethod)Properties.Settings.Default.ProxyAuthenticationMethod).RunAsync();
}
#endregion

159
XenAdmin/Dialogs/OptionsPages/ConnectionOptionsPage.resx
View File

@ -319,7 +319,7 @@
<value>Tahoma, 8pt</value>
</data>
<data name="TimeoutGroupBox.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 241</value>
<value>3, 267</value>
</data>
<data name="TimeoutGroupBox.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 0</value>
@ -403,13 +403,13 @@
<value>Tahoma, 8pt</value>
</data>
<data name="ProxyPasswordTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>355, 139</value>
<value>365, 139</value>
</data>
<data name="ProxyPasswordTextBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 3, 3, 0</value>
</data>
<data name="ProxyPasswordTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 20</value>
<value>137, 20</value>
</data>
<data name="ProxyPasswordTextBox.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
@ -475,13 +475,13 @@
<value>Tahoma, 8pt</value>
</data>
<data name="ProxyUsernameTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>99, 139</value>
<value>105, 139</value>
</data>
<data name="ProxyUsernameTextBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 3, 3, 0</value>
</data>
<data name="ProxyUsernameTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>193, 20</value>
<value>192, 20</value>
</data>
<data name="ProxyUsernameTextBox.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
@ -511,7 +511,7 @@
<value>NoControl</value>
</data>
<data name="ProxyPasswordLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>298, 136</value>
<value>308, 136</value>
</data>
<data name="ProxyPasswordLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 0, 0, 0</value>
@ -598,7 +598,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="ProxyAddressLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>50, 23</value>
<value>55, 23</value>
</data>
<data name="ProxyAddressLabel.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -727,7 +727,7 @@
<value>Tahoma, 8pt</value>
</data>
<data name="ProxyAddressTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>70, 72</value>
<value>75, 72</value>
</data>
<data name="ProxyAddressTextBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 3, 3, 0</value>
@ -757,7 +757,7 @@
<value>Tahoma, 8pt</value>
</data>
<data name="ProxyPortTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>355, 72</value>
<value>365, 72</value>
</data>
<data name="ProxyPortTextBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 3, 3, 0</value>
@ -766,7 +766,7 @@
<value>5</value>
</data>
<data name="ProxyPortTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 20</value>
<value>137, 20</value>
</data>
<data name="ProxyPortTextBox.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@ -796,7 +796,7 @@
<value>NoControl</value>
</data>
<data name="ProxyPortLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>324, 74</value>
<value>334, 74</value>
</data>
<data name="ProxyPortLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 0, 0, 0</value>
@ -825,14 +825,143 @@
<data name="&gt;&gt;ProxyPortLabel.ZOrder" xml:space="preserve">
<value>12</value>
</data>
<data name="AuthenticationMethodLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="AuthenticationMethodLabel.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8pt</value>
</data>
<data name="AuthenticationMethodLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="AuthenticationMethodLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>40, 159</value>
</data>
<data name="AuthenticationMethodLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="AuthenticationMethodLabel.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 5, 0, 0</value>
</data>
<data name="AuthenticationMethodLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 18</value>
</data>
<data name="AuthenticationMethodLabel.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
</data>
<data name="AuthenticationMethodLabel.Text" xml:space="preserve">
<value>Authentication method:</value>
</data>
<data name="AuthenticationMethodLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="&gt;&gt;AuthenticationMethodLabel.Name" xml:space="preserve">
<value>AuthenticationMethodLabel</value>
</data>
<data name="&gt;&gt;AuthenticationMethodLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;AuthenticationMethodLabel.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;AuthenticationMethodLabel.ZOrder" xml:space="preserve">
<value>13</value>
</data>
<data name="DigestRadioButton.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="DigestRadioButton.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8pt</value>
</data>
<data name="DigestRadioButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="DigestRadioButton.Location" type="System.Drawing.Point, System.Drawing">
<value>60, 0</value>
</data>
<data name="DigestRadioButton.Size" type="System.Drawing.Size, System.Drawing">
<value>55, 17</value>
</data>
<data name="DigestRadioButton.TabIndex" type="System.Int32, mscorlib">
<value>17</value>
</data>
<data name="DigestRadioButton.Text" xml:space="preserve">
<value>Di&amp;gest</value>
</data>
<data name="&gt;&gt;DigestRadioButton.Name" xml:space="preserve">
<value>DigestRadioButton</value>
</data>
<data name="&gt;&gt;DigestRadioButton.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;DigestRadioButton.Parent" xml:space="preserve">
<value>AuthenticationMethodPanel</value>
</data>
<data name="&gt;&gt;DigestRadioButton.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="BasicRadioButton.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="BasicRadioButton.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8pt</value>
</data>
<data name="BasicRadioButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="BasicRadioButton.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="BasicRadioButton.Size" type="System.Drawing.Size, System.Drawing">
<value>49, 17</value>
</data>
<data name="BasicRadioButton.TabIndex" type="System.Int32, mscorlib">
<value>16</value>
</data>
<data name="BasicRadioButton.Text" xml:space="preserve">
<value>Ba&amp;sic</value>
</data>
<data name="&gt;&gt;BasicRadioButton.Name" xml:space="preserve">
<value>BasicRadioButton</value>
</data>
<data name="&gt;&gt;BasicRadioButton.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;BasicRadioButton.Parent" xml:space="preserve">
<value>AuthenticationMethodPanel</value>
</data>
<data name="&gt;&gt;BasicRadioButton.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="AuthenticationMethodPanel.Location" type="System.Drawing.Point, System.Drawing">
<value>183, 162</value>
</data>
<data name="AuthenticationMethodPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>122, 20</value>
</data>
<data name="AuthenticationMethodPanel.TabIndex" type="System.Int32, mscorlib">
<value>15</value>
</data>
<data name="&gt;&gt;AuthenticationMethodPanel.Name" xml:space="preserve">
<value>AuthenticationMethodPanel</value>
</data>
<data name="&gt;&gt;AuthenticationMethodPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;AuthenticationMethodPanel.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;AuthenticationMethodPanel.ZOrder" xml:space="preserve">
<value>14</value>
</data>
<data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 19</value>
</data>
<data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
<value>7</value>
<value>9</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>498, 159</value>
<value>505, 185</value>
</data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
@ -850,7 +979,7 @@
<value>0</value>
</data>
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="BypassForServersCheckbox" Row="4" RowSpan="1" Column="1" ColumnSpan="6" /&gt;&lt;Control Name="ProxyPasswordTextBox" Row="6" RowSpan="1" Column="6" ColumnSpan="1" /&gt;&lt;Control Name="ProxyUsernameLabel" Row="6" RowSpan="1" Column="2" ColumnSpan="2" /&gt;&lt;Control Name="ProxyUsernameTextBox" Row="6" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="ProxyPasswordLabel" Row="6" RowSpan="1" Column="5" ColumnSpan="1" /&gt;&lt;Control Name="AuthenticationCheckBox" Row="5" RowSpan="1" Column="1" ColumnSpan="6" /&gt;&lt;Control Name="ProxyAddressLabel" Row="3" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="UseProxyRadioButton" Row="2" RowSpan="1" Column="0" ColumnSpan="6" /&gt;&lt;Control Name="DirectConnectionRadioButton" Row="0" RowSpan="1" Column="0" ColumnSpan="6" /&gt;&lt;Control Name="UseIERadioButton" Row="1" RowSpan="1" Column="0" ColumnSpan="6" /&gt;&lt;Control Name="ProxyAddressTextBox" Row="3" RowSpan="1" Column="3" ColumnSpan="2" /&gt;&lt;Control Name="ProxyPortTextBox" Row="3" RowSpan="1" Column="5" ColumnSpan="1" /&gt;&lt;Control Name="ProxyPortLabel" Row="3" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Absolute,20,Absolute,20,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="BypassForServersCheckbox" Row="4" RowSpan="1" Column="1" ColumnSpan="6" /&gt;&lt;Control Name="ProxyPasswordTextBox" Row="6" RowSpan="1" Column="7" ColumnSpan="1" /&gt;&lt;Control Name="ProxyUsernameLabel" Row="6" RowSpan="1" Column="2" ColumnSpan="2" /&gt;&lt;Control Name="ProxyUsernameTextBox" Row="6" RowSpan="1" Column="3" ColumnSpan="2" /&gt;&lt;Control Name="ProxyPasswordLabel" Row="6" RowSpan="1" Column="6" ColumnSpan="1" /&gt;&lt;Control Name="AuthenticationCheckBox" Row="5" RowSpan="1" Column="1" ColumnSpan="6" /&gt;&lt;Control Name="ProxyAddressLabel" Row="3" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="UseProxyRadioButton" Row="2" RowSpan="1" Column="0" ColumnSpan="6" /&gt;&lt;Control Name="DirectConnectionRadioButton" Row="0" RowSpan="1" Column="0" ColumnSpan="6" /&gt;&lt;Control Name="UseIERadioButton" Row="1" RowSpan="1" Column="0" ColumnSpan="6" /&gt;&lt;Control Name="ProxyAddressTextBox" Row="3" RowSpan="1" Column="3" ColumnSpan="3" /&gt;&lt;Control Name="ProxyPortTextBox" Row="3" RowSpan="1" Column="7" ColumnSpan="1" /&gt;&lt;Control Name="ProxyPortLabel" Row="3" RowSpan="1" Column="6" ColumnSpan="1" /&gt;&lt;Control Name="AuthenticationMethodLabel" Row="8" RowSpan="1" Column="2" ColumnSpan="3" /&gt;&lt;Control Name="AuthenticationMethodPanel" Row="8" RowSpan="1" Column="5" ColumnSpan="2" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Absolute,20,Absolute,20,Absolute,35,Absolute,30,Absolute,75,Absolute,120,Absolute,65,Absolute,140" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="ProxyGroupBox.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -865,7 +994,7 @@
<value>3, 3, 3, 0</value>
</data>
<data name="ProxyGroupBox.Size" type="System.Drawing.Size, System.Drawing">
<value>584, 194</value>
<value>584, 220</value>
</data>
<data name="ProxyGroupBox.TabIndex" type="System.Int32, mscorlib">
<value>0</value>

20
XenAdmin/MainWindow.cs
View File

@ -503,15 +503,17 @@ namespace XenAdmin
try
{
Settings.RestoreSession();
new TransferProxySettingsAction((HTTPHelper.ProxyStyle)Properties.Settings.Default.ProxySetting,
Properties.Settings.Default.ProxyAddress,
Properties.Settings.Default.ProxyPort,
Properties.Settings.Default.ConnectionTimeout,
true,
Properties.Settings.Default.BypassProxyForServers,
Properties.Settings.Default.ProvideProxyAuthentication,
Properties.Settings.Default.ProxyUsername,
Properties.Settings.Default.ProxyPassword).RunAsync();
new TransferProxySettingsAction(
(HTTPHelper.ProxyStyle)Properties.Settings.Default.ProxySetting,
Properties.Settings.Default.ProxyAddress,
Properties.Settings.Default.ProxyPort,
Properties.Settings.Default.ConnectionTimeout,
true,
Properties.Settings.Default.BypassProxyForServers,
Properties.Settings.Default.ProvideProxyAuthentication,
Properties.Settings.Default.ProxyUsername,
Properties.Settings.Default.ProxyPassword,
(HTTPHelper.ProxyAuthenticationMethod)Properties.Settings.Default.ProxyAuthenticationMethod).RunAsync();
}
catch (ConfigurationErrorsException ex)
{

60
XenAdmin/Program.cs
View File

@ -56,7 +56,14 @@ namespace XenAdmin
{
public const int DEFAULT_WLB_PORT = 8012;
/// <summary>
/// Module for authenticating with proxy server using the Basic authentication scheme.
/// </summary>
private static IAuthenticationModule BasicAuthenticationModule = null;
/// <summary>
/// Module for authenticating with proxy server using the Digest authentication scheme.
/// </summary>
private static IAuthenticationModule DigestAuthenticationModule = null;
/// <summary>
/// A UUID for the current instance of XenCenter. Used to identify our own task instances.
@ -303,6 +310,7 @@ namespace XenAdmin
ServicePointManager.ServerCertificateValidationCallback = SSL.ValidateServerCertificate;
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12;
XenAPI.Session.UserAgent = string.Format("XenCenter/{0}", ClientVersion());
RememberProxyAuthenticationModules();
ReconfigureConnectionSettings();
log.Info("Application started");
@ -990,9 +998,59 @@ namespace XenAdmin
Properties.Settings.Default.ProvideProxyAuthentication = false;
Properties.Settings.Default.Save();
}
else
{
ReconfigureProxyAuthenticationSettings();
}
XenAPI.Session.Proxy = XenAdminConfigManager.Provider.GetProxyFromSettings(null);
}
/// <summary>
/// Stores the Basic and Digest authentication modules, used for proxy server authentication,
/// for later use; this is needed because we cannot create new instances of them and it
/// saves us needing to create our own custom authentication modules.
/// </summary>
private static void RememberProxyAuthenticationModules()
{
var authModules = AuthenticationManager.RegisteredModules;
while (authModules.MoveNext())
{
var module = (IAuthenticationModule)authModules.Current;
if (module.AuthenticationType == "Basic")
BasicAuthenticationModule = module;
else if (module.AuthenticationType == "Digest")
DigestAuthenticationModule = module;
}
}
/// <summary>
/// Configures .NET's AuthenticationManager to only use the authentication module that is
/// specified in the ProxyAuthenticationMethod setting. Also sets XenAPI's HTTP class to
/// use the same authentication method.
/// </summary>
private static void ReconfigureProxyAuthenticationSettings()
{
var authModules = AuthenticationManager.RegisteredModules;
var modulesToUnregister = new List<IAuthenticationModule>();
while (authModules.MoveNext())
{
var module = (IAuthenticationModule)authModules.Current;
modulesToUnregister.Add(module);
}
foreach (var module in modulesToUnregister)
AuthenticationManager.Unregister(module);
var authSetting = (HTTPHelper.ProxyAuthenticationMethod)Properties.Settings.Default.ProxyAuthenticationMethod;
if (authSetting == HTTPHelper.ProxyAuthenticationMethod.Basic)
AuthenticationManager.Register(BasicAuthenticationModule);
else
AuthenticationManager.Register(DigestAuthenticationModule);
XenAPI.HTTP.ProxyAuthenticationMethod = authSetting;
}
private const string SplashWindowClass = "XenCenterSplash0001";
internal static void CloseSplash()

12
XenAdmin/Properties/Settings.Designer.cs generated
View File

@ -743,5 +743,17 @@ namespace XenAdmin.Properties {
this["BypassProxyForServers"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("1")]
public int ProxyAuthenticationMethod {
get {
return ((int)(this["ProxyAuthenticationMethod"]));
}
set {
this["ProxyAuthenticationMethod"] = value;
}
}
}
}

3
XenAdmin/Properties/Settings.settings
View File

@ -173,5 +173,8 @@
<Setting Name="BypassProxyForServers" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="ProxyAuthenticationMethod" Type="System.Int32" Scope="User">
<Value Profile="(Default)">1</Value>
</Setting>
</Settings>
</SettingsFile>

3
XenAdmin/app.config
View File

@ -168,6 +168,9 @@
<setting name="BypassProxyForServers" serializeAs="String">
<value>False</value>
</setting>
<setting name="ProxyAuthenticationMethod" serializeAs="String">
<value>1</value>
</setting>
</XenAdmin.Properties.Settings>
</userSettings>

7
XenModel/Actions/HealthCheck/TransferProxySettingsAction.cs
View File

@ -48,9 +48,10 @@ namespace XenAdmin.Actions
private bool provideProxyCredentials;
private string proxyUsername;
private string proxyPassword;
private HTTPHelper.ProxyAuthenticationMethod proxyAuthenticationMethod;
public TransferProxySettingsAction(HTTPHelper.ProxyStyle style, string address, int port, int timeout,
bool suppressHistory, bool bypassForServer, bool provideCredentials, string username, string password)
bool suppressHistory, bool bypassForServer, bool provideCredentials, string username, string password, HTTPHelper.ProxyAuthenticationMethod proxyAuthMethod)
: base(null, Messages.ACTION_TRANSFER_HEALTHCHECK_SETTINGS, Messages.ACTION_TRANSFER_HEALTHCHECK_SETTINGS, suppressHistory)
{
proxyStyle = style;
@ -61,6 +62,7 @@ namespace XenAdmin.Actions
provideProxyCredentials = provideCredentials;
proxyUsername = username;
proxyPassword = password;
proxyAuthenticationMethod = proxyAuthMethod;
}
private const string HEALTHCHECKSERVICENAME = "XenServerHealthCheck";
@ -81,7 +83,8 @@ namespace XenAdmin.Actions
bypassProxyForServers.ToString(),
provideProxyCredentials.ToString(),
proxyUsername.ToString(),
proxyPassword.ToString()});
proxyPassword.ToString(),
((Int32)proxyAuthenticationMethod).ToString()});
return proxySettings;
case HTTPHelper.ProxyStyle.SystemProxy:

7
XenModel/Network/HTTPHelper.cs
View File

@ -52,6 +52,13 @@ namespace XenAPI
SpecifiedProxy = 2
}
public enum ProxyAuthenticationMethod
{
// Note that these numbers make it into user settings files, so need to be preserved.
Basic = 0,
Digest = 1
}
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);

20
XenModel/XenAPI/HTTP.cs
View File

@ -130,6 +130,12 @@ namespace XenAPI
public const int DEFAULT_HTTPS_PORT = 443;
/// <summary>
/// The authentication scheme to use for authenticating XenCenter to a proxy server.
/// Defaults to Digest.
/// </summary>
public static HTTPHelper.ProxyAuthenticationMethod ProxyAuthenticationMethod = HTTPHelper.ProxyAuthenticationMethod.Digest;
#region Helper functions
private static void WriteLine(String txt, Stream stream)
@ -464,7 +470,7 @@ namespace XenAPI
if (fields.Count > 0)
{
// clean up (if initial server response specifies "Proxy-Connection: Close" then stream cannot be re-used)
string field = initialResponse.Find(str => str.StartsWith("Proxy-Connection: Close"));
string field = initialResponse.Find(str => str.StartsWith("Proxy-Connection: Close", StringComparison.CurrentCultureIgnoreCase));
if (!string.IsNullOrEmpty(field))
{
stream.Close();
@ -478,16 +484,22 @@ namespace XenAPI
string basicField = fields.Find(str => str.StartsWith("Proxy-Authenticate: Basic"));
string digestField = fields.Find(str => str.StartsWith("Proxy-Authenticate: Digest"));
if (!string.IsNullOrEmpty(basicField))
if (ProxyAuthenticationMethod == HTTPHelper.ProxyAuthenticationMethod.Basic)
{
string authenticationFieldReply = String.Format("Proxy-Authorization: Basic {0}",
if (string.IsNullOrEmpty(basicField))
throw new ProxyServerAuthenticationException("Basic authentication scheme is not supported/enabled by the proxy server.");
string authenticationFieldReply = string.Format("Proxy-Authorization: Basic {0}",
Convert.ToBase64String(Encoding.UTF8.GetBytes(credentials.UserName + ":" + credentials.Password)));
WriteLine(header, stream);
WriteLine(authenticationFieldReply, stream);
WriteLine(stream);
}
else if (!string.IsNullOrEmpty(digestField))
else if (ProxyAuthenticationMethod == HTTPHelper.ProxyAuthenticationMethod.Digest)
{
if (string.IsNullOrEmpty(digestField))
throw new ProxyServerAuthenticationException("Digest authentication scheme is not supported/enabled by the proxy server.");
string authenticationFieldReply = string.Format(
"Proxy-Authorization: Digest username=\"{0}\", uri=\"{1}:{2}\"",
credentials.UserName, uri.Host, uri.Port);

12
XenServerHealthCheck/Properties/Settings.Designer.cs generated
View File

@ -163,5 +163,17 @@ namespace XenServerHealthCheck.Properties {
this["ProxyPassword"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("1")]
public int ProxyAuthenticationMethod {
get {
return ((int)(this["ProxyAuthenticationMethod"]));
}
set {
this["ProxyAuthenticationMethod"] = value;
}
}
}
}

3
XenServerHealthCheck/Properties/Settings.settings
View File

@ -36,5 +36,8 @@
<Setting Name="ProxyPassword" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="ProxyAuthenticationMethod" Type="System.Int32" Scope="User">
<Value Profile="(Default)">1</Value>
</Setting>
</Settings>
</SettingsFile>

1
XenServerHealthCheck/ServerListHelper.cs
View File

@ -232,6 +232,7 @@ namespace XenServerHealthCheck
Properties.Settings.Default.ProvideProxyAuthentication = bool.Parse(proxySettings[6]);
Properties.Settings.Default.ProxyUsername = proxySettings[7];
Properties.Settings.Default.ProxyPassword = proxySettings[8];
Properties.Settings.Default.ProxyAuthenticationMethod = Int32.Parse(proxySettings[9]);
break;
case HTTPHelper.ProxyStyle.SystemProxy:

2
XenServerHealthCheck/XenServerHealthCheckService.cs
View File

@ -76,6 +76,8 @@ namespace XenServerHealthCheck
public static void ReconfigureConnectionSettings()
{
XenAPI.Session.Proxy = XenAdminConfigManager.Provider.GetProxyFromSettings(null);
XenAPI.HTTP.ProxyAuthenticationMethod =
(HTTPHelper.ProxyAuthenticationMethod)Properties.Settings.Default.ProxyAuthenticationMethod;
}
protected override void OnStart(string[] args)

3
XenServerHealthCheck/app.config
View File

@ -81,6 +81,9 @@
<setting name="ProxyPassword" serializeAs="String">
<value />
</setting>
<setting name="ProxyAuthenticationMethod" serializeAs="String">
<value>1</value>
</setting>
</XenServerHealthCheck.Properties.Settings>
</userSettings>
</configuration>