OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: SSH对象序列化属性值不匹配

Browse Source
This commit is contained in:
TsMask
2024-03-06 10:02:54 +08:00
parent 2b4541264f
commit 734b11bce0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/framework/utils/ssh/ssh.go
View File

@@ -18,8 +18,8 @@ type ConnSSH struct {
Port int `json:"port"` // SSH端口 Port int `json:"port"` // SSH端口
AuthMode string `json:"authMode"` // 认证模式（0密码 1主机私钥） AuthMode string `json:"authMode"` // 认证模式（0密码 1主机私钥）
Password string `json:"password"` // 认证密码 Password string `json:"password"` // 认证密码
PrivateKey []byte `json:"privateKey"` // 认证私钥 PrivateKey string `json:"privateKey"` // 认证私钥
PassPhrase []byte `json:"passPhrase"` // 认证私钥密码 PassPhrase string `json:"passPhrase"` // 认证私钥密码
DialTimeOut time.Duration `json:"dialTimeOut"` // 连接超时断开 DialTimeOut time.Duration `json:"dialTimeOut"` // 连接超时断开
@@ -54,9 +54,9 @@ func (c *ConnSSH) NewClient() (*ConnSSH, error) {
var signer gossh.Signer var signer gossh.Signer
var err error var err error
if len(c.PassPhrase) != 0 { if len(c.PassPhrase) != 0 {
signer, err = gossh.ParsePrivateKeyWithPassphrase(c.PrivateKey, c.PassPhrase) signer, err = gossh.ParsePrivateKeyWithPassphrase([]byte(c.PrivateKey), []byte(c.PassPhrase))
} else { } else {
signer, err = gossh.ParsePrivateKey(c.PrivateKey) signer, err = gossh.ParsePrivateKey([]byte(c.PrivateKey))
} }
if err != nil { if err != nil {
return nil, err return nil, err