to support empty passwd by issue shadowsocksr-backup#3

shadowsocksrr/shadowsocksr-csharp#3
cg3s · Jan 26, 2019 · 705a459 · 705a459
1 parent d70cc73
commit 705a459
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 6 deletions.
diff --git a/shadowsocks-csharp/Data/cn.txt b/shadowsocks-csharp/Data/cn.txt
@@ -216,6 +216,7 @@ Illegal port number format=非法端口格式
 Please add at least one server=请添加至少一个服务器
 Server IP can not be blank=服务器 IP 不能为空
 Password can not be blank=密码不能为空
+Password are blank=密码为空
 Port out of range=端口超出范围
 {0} {1} Update Found={0} {1} 更新
 Click menu to download=点击菜单项下载

diff --git a/shadowsocks-csharp/Data/zh-tw.txt b/shadowsocks-csharp/Data/zh-tw.txt
@@ -204,6 +204,7 @@ Illegal port number format=非法連接埠格式
 Please add at least one server=請添加至少一個伺服器
 Server IP can not be blank=伺服器 IP 不能為空
 Password can not be blank=密碼不能為空
+Password are blank=密碼為空
 Port out of range=連接埠超出範圍
 {0} {1} Update Found={0} {1} 更新
 Click menu to download=點擊菜單項下載

diff --git a/shadowsocks-csharp/Model/Configuration.cs b/shadowsocks-csharp/Model/Configuration.cs
@@ -78,6 +78,27 @@ public class GlobalConfiguration
         public static string config_password = "";
     }
 
+    [Serializable()]
+    class ConfigurationException : System.Exception
+    {
+        public ConfigurationException() : base() { }
+        public ConfigurationException(string message) : base(message) { }
+        public ConfigurationException(string message, System.Exception inner) : base(message, inner) { }
+        protected ConfigurationException(System.Runtime.Serialization.SerializationInfo info,
+            System.Runtime.Serialization.StreamingContext context)
+        { }
+    }
+    [Serializable()]
+    class ConfigurationWarning : System.Exception
+    {
+        public ConfigurationWarning() : base() { }
+        public ConfigurationWarning(string message) : base(message) { }
+        public ConfigurationWarning(string message, System.Exception inner) : base(message, inner) { }
+        protected ConfigurationWarning(System.Runtime.Serialization.SerializationInfo info,
+            System.Runtime.Serialization.StreamingContext context)
+        { }
+    }
+
     [Serializable]
     public class Configuration
     {
@@ -219,7 +240,7 @@ public Server GetCurrentServer(int localPort, ServerSelectStrategy.FilterFunc fi
                             if (selServer != null)
                                 return selServer.group == server.group;
                             return false;
-                        } , true);
+                        }, true);
                     }
                     else
                     {
@@ -370,7 +391,15 @@ public static void CheckServer(Server server)
             CheckPort(server.server_port);
             if (server.server_udp_port != 0)
                 CheckPort(server.server_udp_port);
-            CheckPassword(server.password);
+            try
+            {
+                CheckPassword(server.password);
+            }
+            catch (ConfigurationWarning cw)
+            {
+                server.password = "";
+                MessageBox.Show(cw.Message, cw.Message, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+            }
             CheckServer(server.server);
         }
 
@@ -619,23 +648,23 @@ public static void CheckPort(int port)
         {
             if (port <= 0 || port > 65535)
             {
-                throw new ArgumentException(I18N.GetString("Port out of range"));
+                throw new ConfigurationException(I18N.GetString("Port out of range"));
             }
         }
 
         private static void CheckPassword(string password)
         {
             if (string.IsNullOrEmpty(password))
             {
-                throw new ArgumentException(I18N.GetString("Password can not be blank"));
+                throw new ConfigurationWarning(I18N.GetString("Password are blank"));
             }
         }
 
         private static void CheckServer(string server)
         {
             if (string.IsNullOrEmpty(server))
             {
-                throw new ArgumentException(I18N.GetString("Server IP can not be blank"));
+                throw new ConfigurationException(I18N.GetString("Server IP can not be blank"));
             }
         }
 
@@ -798,7 +827,7 @@ public void AddDownload(string server, Int64 size)
             if (--saveCounter <= 0)
             {
                 saveCounter = 256;
-                if ((DateTime.Now - saveTime).TotalMinutes > 10 )
+                if ((DateTime.Now - saveTime).TotalMinutes > 10)
                 {
                     lock (servers)
                     {