From 734b11bce0b80160a8bbb7ce21722962877dfdba Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 6 Mar 2024 10:02:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20SSH=E5=AF=B9=E8=B1=A1=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8C=96=E5=B1=9E=E6=80=A7=E5=80=BC=E4=B8=8D=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/framework/utils/ssh/ssh.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/framework/utils/ssh/ssh.go b/src/framework/utils/ssh/ssh.go index c02dcfc9..f3abda91 100644 --- a/src/framework/utils/ssh/ssh.go +++ b/src/framework/utils/ssh/ssh.go @@ -18,8 +18,8 @@ type ConnSSH struct { Port int `json:"port"` // SSH端口 AuthMode string `json:"authMode"` // 认证模式(0密码 1主机私钥) Password string `json:"password"` // 认证密码 - PrivateKey []byte `json:"privateKey"` // 认证私钥 - PassPhrase []byte `json:"passPhrase"` // 认证私钥密码 + PrivateKey string `json:"privateKey"` // 认证私钥 + PassPhrase string `json:"passPhrase"` // 认证私钥密码 DialTimeOut time.Duration `json:"dialTimeOut"` // 连接超时断开 @@ -54,9 +54,9 @@ func (c *ConnSSH) NewClient() (*ConnSSH, error) { var signer gossh.Signer var err error if len(c.PassPhrase) != 0 { - signer, err = gossh.ParsePrivateKeyWithPassphrase(c.PrivateKey, c.PassPhrase) + signer, err = gossh.ParsePrivateKeyWithPassphrase([]byte(c.PrivateKey), []byte(c.PassPhrase)) } else { - signer, err = gossh.ParsePrivateKey(c.PrivateKey) + signer, err = gossh.ParsePrivateKey([]byte(c.PrivateKey)) } if err != nil { return nil, err