zishuo/1Panel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 解决主机密钥连接失败的问题

Browse Source
This commit is contained in:
ssongliu
2023-03-14 00:15:51 +08:00
committed by ssongliu
parent 2dec0bfb3c
commit 4994cc39f1
4 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/app/api/v1/host.go
View File

@@ -57,15 +57,14 @@ func (b *BaseApi) TestByInfo(c *gin.Context) {
} }
var connInfo ssh.ConnInfo var connInfo ssh.ConnInfo
if err := copier.Copy(&connInfo, &req); err != nil { _ = copier.Copy(&connInfo, &req)
helper.SuccessWithData(c, false) connInfo.PrivateKey = []byte(req.PrivateKey)
}
client, err := connInfo.NewClient() client, err := connInfo.NewClient()
if err != nil { if err != nil {
helper.SuccessWithData(c, false) helper.SuccessWithData(c, false)
return
} }
defer client.Close() defer client.Close()
helper.SuccessWithData(c, true) helper.SuccessWithData(c, true)
} }

6
backend/app/api/v1/terminal.go
View File

@@ -40,10 +40,8 @@ func (b *BaseApi) WsSsh(c *gin.Context) {
return return
} }
var connInfo ssh.ConnInfo var connInfo ssh.ConnInfo
if err := copier.Copy(&connInfo, &host); err != nil { _ = copier.Copy(&connInfo, &host)
helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, constant.ErrStructTransform) connInfo.PrivateKey = []byte(host.PrivateKey)
return
}
wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil) wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
if err != nil { if err != nil {

4
backend/app/dto/host.go
View File

@@ -8,7 +8,7 @@ type HostOperate struct {
ID uint `json:"id"` ID uint `json:"id"`
GroupID uint `json:"groupID"` GroupID uint `json:"groupID"`
Name string `json:"name"` Name string `json:"name"`
Addr string `json:"addr" validate:"required,ip"` Addr string `json:"addr" validate:"required"`
Port uint `json:"port" validate:"required,number,max=65535,min=1"` Port uint `json:"port" validate:"required,number,max=65535,min=1"`
User string `json:"user" validate:"required"` User string `json:"user" validate:"required"`
AuthMode string `json:"authMode" validate:"oneof=password key"` AuthMode string `json:"authMode" validate:"oneof=password key"`
@@ -19,7 +19,7 @@ type HostOperate struct {
} }
type HostConnTest struct { type HostConnTest struct {
Addr string `json:"addr" validate:"required,ip"` Addr string `json:"addr" validate:"required"`
Port uint `json:"port" validate:"required,number,max=65535,min=1"` Port uint `json:"port" validate:"required,number,max=65535,min=1"`
User string `json:"user" validate:"required"` User string `json:"user" validate:"required"`
AuthMode string `json:"authMode" validate:"oneof=password key"` AuthMode string `json:"authMode" validate:"oneof=password key"`

8
backend/utils/ssh/ssh.go
View File

@@ -4,11 +4,9 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"io" "io"
"net"
"sync" "sync"
"time" "time"
"github.com/1Panel-dev/1Panel/backend/global"
gossh "golang.org/x/crypto/ssh" gossh "golang.org/x/crypto/ssh"
) )
@@ -46,7 +44,7 @@ func (c *ConnInfo) NewClient() (*ConnInfo, error) {
} }
config.Timeout = c.DialTimeOut config.Timeout = c.DialTimeOut
config.HostKeyCallback = func(hostname string, remote net.Addr, key gossh.PublicKey) error { return nil } config.HostKeyCallback = gossh.InsecureIgnoreHostKey()
client, err := gossh.Dial("tcp", addr, config) client, err := gossh.Dial("tcp", addr, config)
if nil != err { if nil != err {
return c, err return c, err
@@ -73,9 +71,7 @@ func (c *ConnInfo) Run(shell string) (string, error) {
} }
func (c *ConnInfo) Close() { func (c *ConnInfo) Close() {
if err := c.Client.Close(); err != nil { _ = c.Client.Close()
global.LOG.Errorf("close ssh client failed, err: %v", err)
}
} }
type SshConn struct { type SshConn struct {