Merge pull request #57 from fornax-a/master

Better handle missing system proxy/credentials
Ylianst · Oct 7, 2023 · a245e1f · a245e1f
2 parents fde77c0 + d6a63fc
commit a245e1f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/WebSocketClient.cs b/src/WebSocketClient.cs
@@ -289,12 +289,11 @@ private void OnConnectSink(IAsyncResult ar)
  // Send proxy connection request
  wsrawstream = wsclient.GetStream();
 
- string userCreds = proxyUri.UserInfo;
  string basicAuth = "";
- if (userCreds.Length > 0)
+ if (proxyUri?.UserInfo != null)
  {
  // Base64 encode for basic authentication
- userCreds = System.Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(userCreds));
+ string userCreds = System.Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(proxyUri.UserInfo));
  basicAuth = "\r\nProxy-Authorization: Basic " + userCreds;
  }