fix: fix bug of file transmitter on sftp #392

VShawn · VShawn · commit 0fcfc2f96032 · 2023-05-04T08:25:53.000+08:00
diff --git a/Ui/Model/Protocol/FileTransmit/Transmitters/TransmitterSFtp.cs b/Ui/Model/Protocol/FileTransmit/Transmitters/TransmitterSFtp.cs
@@ -5,6 +5,7 @@
 using System.Text;
 using System.Threading;
 using System.Windows.Media.Imaging;
+using _1RM.Utils;
 using Renci.SshNet;
 using Renci.SshNet.Sftp;
 using Shawn.Utils;
@@ -300,24 +301,21 @@ private void InitClient()
                 if (_sftp?.IsConnected != true)
                 {
                     _sftp?.Dispose();
-                    if (string.IsNullOrEmpty(Password))
+                    if (string.IsNullOrEmpty(Password)
+                        && string.IsNullOrEmpty(SshKeyPath) == false
+                        && File.Exists(SshKeyPath))
                     {
-                        var connectionInfo = new ConnectionInfo(Hostname, Port, Username,
-                            new AuthenticationMethod[]
-                            {
-                                new PrivateKeyAuthenticationMethod(Username, new PrivateKeyFile(SshKeyPath)),
-                            });
-                        _sftp = new SftpClient(connectionInfo);
-                    }
-                    else
-                    {
-                        var connectionInfo = new ConnectionInfo(Hostname, Port, Username,
-                            new AuthenticationMethod[]
-                            {
-                                new PasswordAuthenticationMethod(Username, Password),
-                            });
-                        _sftp = new SftpClient(connectionInfo);
+                        try
+                        {
+                            var connectionInfo = new ConnectionInfo(Hostname, Port, Username, new PrivateKeyAuthenticationMethod(Username, new PrivateKeyFile(SshKeyPath)));
+                            _sftp = new SftpClient(connectionInfo);
+                        }
+                        catch (Exception e)
+                        {
+                            MsAppCenterHelper.Error(e);
+                        }
                     }
+                    _sftp ??= new SftpClient(new ConnectionInfo(Hostname, Port, Username, new PasswordAuthenticationMethod(Username, Password)));
                     //_sftp.KeepAliveInterval = new TimeSpan(0, 0, 10);
                     _sftp.Connect();
                 }
