Fixed an issue with proxy loading...

...causing all proxies to be marked as invalid
Laiteux · May 31, 2020 · c7acae6 · c7acae6
1 parent f247adb
commit c7acae6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/src/Milky/Models/Combo.cs b/src/Milky/Models/Combo.cs
@@ -8,6 +8,8 @@ public class Combo
 
         public Combo(string combo, string separator = ":")
         {
+            Separator = separator;
+
             string[] split = combo.Split(separator, _splitCount, StringSplitOptions.RemoveEmptyEntries);
 
             if (split.Length != _splitCount)
@@ -17,7 +19,7 @@ public Combo(string combo, string separator = ":")
 
             Username = split[0];
             Password = split[1];
-            Separator = separator;
+
             IsValid = true;
         }
 

diff --git a/src/Milky/Models/Proxy.cs b/src/Milky/Models/Proxy.cs
@@ -10,13 +10,15 @@ public class Proxy
     {
         public Proxy(string proxy, ProxySettings settings)
         {
+            Settings = settings;
+
             string[] split = proxy.Split(':');
 
-            if (split.Length >= 2)
+            if (split.Length == 2 || split.Length == 4)
             {
                 Host = split[0];
 
-                if (!int.TryParse(split[1], out int port))
+                if (!int.TryParse(split[1], out int port) || port > 65535)
                 {
                     return;
                 }
@@ -27,14 +29,9 @@ public Proxy(string proxy, ProxySettings settings)
                 {
                     Credentials = new NetworkCredential(split[2], split[3]);
                 }
-                else
-                {
-                    return;
-                }
-            }
 
-            Settings = settings;
-            IsValid = true;
+                IsValid = true;
+            }
         }
 
         internal bool IsValid { get; }