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

[CA-213410] XenCenter ignores proxy settings in some places

Browse Source 
Assigned Proxy property in all WebClient, WebRequest and HttpWebRequest instances.
Removed "proxy not supported" message from Download Appliance dialog, since the download does work with a proxy.

Signed-off-by: Frezzle <frederico.mazzone@citrix.com>
This commit is contained in:
Frezzle 2016-06-27 17:59:02 +01:00
parent 7ec3442f40
commit be94dc2f45
7 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
XenAdmin/Core/WebBrowser2.cs
View File

@ -181,7 +181,8 @@ namespace XenAdmin.Core
// test each url with a WebClient to see if it works.
_webClients.Clear();
_webClients.AddRange(uriList.ConvertAll(u => new WebClient()));
var proxy = XenAdminConfigManager.Provider.GetProxyFromSettings(null, false);
_webClients.AddRange(uriList.ConvertAll(u => new WebClient() { Proxy = proxy }));
// start all urls downloading in parallel.
for (int i = 0; i < _webClients.Count; i++)

11
XenAdmin/Dialogs/DownloadApplianceDialog.cs
View File

@ -60,6 +60,7 @@ namespace XenAdmin.Dialogs
m_uri = new Uri(uri);
m_webClient = new WebClient();
m_webClient.Proxy = XenAdminConfigManager.Provider.GetProxyFromSettings(null, false);
m_webClient.DownloadFileCompleted += webclient_DownloadFileCompleted;
m_webClient.DownloadProgressChanged += webclient_DownloadProgressChanged;
}
@ -205,16 +206,6 @@ namespace XenAdmin.Dialogs
m_progressBar.Value = 0;
m_buttonDownload.Enabled = false;
Uri proxyUri = m_webClient.Proxy.GetProxy(m_uri);
if (proxyUri != m_uri)
{
DownloadedPath = null;
m_tlpProgress.Visible = false;
ShowDownloadError(Messages.PROXY_SERVERS_NOT_SUPPORTED);
return;
}
DownloadedPath = Path.Combine(m_textBoxWorkspace.Text, Path.GetFileName(m_uri.AbsolutePath));
//CA-41747

1
XenAdmin/Plugins/Features/TabPageFeature.cs
View File

@ -961,6 +961,7 @@ namespace XenAdmin.Plugins
request.ContentType = "xml";
request.ContentLength = Encoding.UTF8.GetBytes(jsCallbackAndData[1]).Length;
request.UserAgent = Branding.BRAND_CONSOLE + "\\Plugin";
request.Proxy = XenAdminConfigManager.Provider.GetProxyFromSettings(connection, false);
using (StreamWriter xmlstream = new StreamWriter(request.GetRequestStream()))
{

2
XenModel/Actions/HealthCheck/GetHealthCheckAnalysisResultAction.cs
View File

@ -153,6 +153,7 @@ namespace XenAdmin.Actions
var httpWebRequest = (HttpWebRequest)WebRequest.Create(urlString);
httpWebRequest.Headers.Add("Authorization", authorizationHeader);
httpWebRequest.Method = "GET";
httpWebRequest.Proxy = XenAdminConfigManager.Provider.GetProxyFromSettings(null, false);
string result;
var httpResponse = (HttpWebResponse)httpWebRequest.GetResponse();
@ -201,6 +202,7 @@ namespace XenAdmin.Actions
var httpWebRequest = (HttpWebRequest)WebRequest.Create(urlString);
httpWebRequest.Headers.Add("Authorization", authorizationHeader);
httpWebRequest.Method = "GET";
httpWebRequest.Proxy = XenAdminConfigManager.Provider.GetProxyFromSettings(null, false);
string result;
var httpResponse = (HttpWebResponse)httpWebRequest.GetResponse();

1
XenModel/Actions/HealthCheck/HealthCheckAuthenticationAction.cs
View File

@ -219,6 +219,7 @@ namespace XenAdmin.Actions
}
httpWebRequest.ContentType = "application/json";
httpWebRequest.Method = "POST";
httpWebRequest.Proxy = XenAdminConfigManager.Provider.GetProxyFromSettings(null, false);
using (var streamWriter = new StreamWriter(httpWebRequest.GetRequestStream()))
{

1
XenModel/Actions/Updates/DownloadAndUnzipXenServerPatchAction.cs
View File

@ -74,6 +74,7 @@ namespace XenAdmin.Actions
private void DownloadFile()
{
WebClient client = new WebClient();
client.Proxy = XenAdminConfigManager.Provider.GetProxyFromSettings(null, false);
//register download events
client.DownloadProgressChanged += client_DownloadProgressChanged;
client.DownloadFileCompleted += client_DownloadFileCompleted;

1
XenOvfTransport/Import.cs
View File

@ -2584,6 +2584,7 @@ namespace XenOvfTransport
_downloadexception = null;
OnUpdate(new XenOvfTranportEventArgs(XenOvfTranportEventType.FileStart, "Web Download Start", downloadupdatemsg, 0, _filedownloadsize));
WebClient wc = new WebClient();
wc.Proxy = XenAdmin.XenAdminConfigManager.Provider.GetProxyFromSettings(null, false);
wc.DownloadFileCompleted += new System.ComponentModel.AsyncCompletedEventHandler(wc_DownloadFileCompleted);
wc.DownloadProgressChanged += new DownloadProgressChangedEventHandler(wc_DownloadProgressChanged);
wc.DownloadFileAsync(filetodownload, tmpfilename);