Fix Proxy Auth always results invalid password

Author: neon-nyan

CollapseLauncher/Classes/Helper/HttpClientBuilder.cs

@@ -6,6 +6,7 @@
 using System.Net.Http;
 using System.Net.Security;
 using System.Runtime.InteropServices;
+using System.Security;
 // ReSharper disable StringLiteralTypo
 // ReSharper disable UnusedMember.Global
 
@@ -53,7 +54,7 @@ private static string GetDefaultUserAgent()
                 + $"WinAppSDK/{LauncherConfig.WindowsAppSdkVersion}";
         }
 
-        public HttpClientBuilder<THandler> UseExternalProxy(string host, string? username = null, string? password = null)
+        public HttpClientBuilder<THandler> UseExternalProxy(string host, string? username = null, SecureString? password = null)
         {
             // Try to create the Uri
             if (Uri.TryCreate(host, UriKind.Absolute, out Uri? hostUri))
@@ -65,17 +66,16 @@ public HttpClientBuilder<THandler> UseExternalProxy(string host, string? usernam
             IsUseSystemProxy = false;
             ExternalProxy    = null;
             return this;
-
         }
 
-        public HttpClientBuilder<THandler> UseExternalProxy(Uri hostUri, string? username = null, string? password = null)
+        public HttpClientBuilder<THandler> UseExternalProxy(Uri hostUri, string? username = null, SecureString? password = null)
         {
             IsUseSystemProxy = false;
 
             // Initialize the proxy host
             ExternalProxy =
                 !string.IsNullOrEmpty(username)
-             && !string.IsNullOrEmpty(password) ?
+             && password != null ?
                   new WebProxy(hostUri, true, null, new NetworkCredential(username, password))
                 : new WebProxy(hostUri, true);
 
@@ -100,7 +100,10 @@ public HttpClientBuilder<THandler> UseLauncherConfig(int maxConnections = MaxCon
             UseProxy();
 
             if (lIsUseProxy && isHttpProxyUrlValid && lProxyUri != null)
-                UseExternalProxy(lProxyUri, lHttpProxyUsername, lHttpProxyPassword);
+            {
+                using SecureString? proxyPassword = SimpleProtectData.UnprotectStringAsSecureString(lHttpProxyPassword);
+                UseExternalProxy(lProxyUri, lHttpProxyUsername, proxyPassword);
+            }
 
             AllowUntrustedCert(lIsAllowUntrustedCert);
             AllowCookies(lIsAllowHttpCookies);

CollapseLauncher/Classes/Helper/SimpleProtectData.cs

@@ -1,6 +1,7 @@
 using Hi3Helper;
 using System;
 using System.Buffers.Text;
+using System.Security;
 using System.Security.Cryptography;
 using System.Text;
 using Hi3Helper.SentryHelper;
@@ -106,5 +107,28 @@ internal static class SimpleProtectData
                     Array.Clear(unprotectedData);
             }
         }
+
+        internal static unsafe SecureString? UnprotectStringAsSecureString(string? input)
+        {
+            string? rawString = UnprotectString(input);
+
+            if (string.IsNullOrEmpty(rawString))
+                return null;
+
+            int len = rawString.Length;
+            fixed (char* charB = rawString)
+            {
+                try
+                {
+                    SecureString secureString = new SecureString(charB, rawString.Length);
+                    return secureString;
+                }
+                finally
+                {
+                    for (int i = 0; i < len; i++)
+                        *(charB + i) = '\0';
+                }
+            }
+        }
     }
 }