MeshCentral/MeshCentralRouter
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentralRouter synced 2025-12-06 00:13:33 +00:00
Code Issues Releases Wiki Activity

Manual proxy was not taken into account in c# websocket code. Also there was some duplicated code with the code in win32api.cs

Browse Source 
proxyUri was undefined in OnConnectSink resulting in crash
This commit is contained in:
jb
2023-01-26 22:49:37 +01:00
parent f332b7a71a
commit 93839da146
1 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/WebSocketClient.cs
View File

@@ -209,30 +209,9 @@ namespace MeshCentralRouter
else else
{ {
// Use C# coded websockets // Use C# coded websockets
Uri proxyUri = null; Uri proxyUri = Win32Api.GetProxy(url);
Log("Websocket Start, URL=" + ((url == null) ? "(NULL)" : url.ToString())); Log("Websocket Start, URL=" + ((url == null) ? "(NULL)" : url.ToString()));
// Check if we need to use a HTTP proxy (Auto-proxy way)
try
{
RegistryKey registryKey = Registry.CurrentUser.OpenSubKey("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", true);
Object x = registryKey.GetValue("AutoConfigURL", null);
if ((x != null) && (x.GetType() == typeof(string)))
{
string proxyStr = GetProxyForUrlUsingPac("http" + ((url.Port == 80) ? "" : "s") + "://" + url.Host + ":" + url.Port, x.ToString());
if (proxyStr != null) { proxyUri = new Uri("http://" + proxyStr); }
}
}
catch (Exception) { proxyUri = null; }
// Check if we need to use a HTTP proxy (Normal way)
if (proxyUri == null)
{
var proxy = System.Net.HttpWebRequest.GetSystemWebProxy();
proxyUri = proxy.GetProxy(url);
if ((url.Host.ToLower() == proxyUri.Host.ToLower()) && (url.Port == proxyUri.Port)) { proxyUri = null; }
}
if (proxyUri != null) if (proxyUri != null)
{ {
// Proxy in use // Proxy in use
@@ -288,7 +267,7 @@ namespace MeshCentralRouter
{ {
// Send proxy connection request // Send proxy connection request
wsrawstream = wsclient.GetStream(); wsrawstream = wsclient.GetStream();
Uri proxyUri = Win32Api.GetProxy(url);
string userCreds = proxyUri.UserInfo; string userCreds = proxyUri.UserInfo;
string basicAuth = ""; string basicAuth = "";
if (userCreds.Length > 0) if (userCreds.Length > 0)