From 3090d596e9f4862b50bf1b4226f27f480c6ee84b Mon Sep 17 00:00:00 2001 From: zhaoxiang <756958008@qq.com> Date: Wed, 27 Sep 2023 18:03:49 +0800 Subject: [PATCH] =?UTF-8?q?added=20=E6=96=B0=E5=A2=9Essh=E7=99=BB=E9=99=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/services/connection_service.go | 108 +++++++++++++++--- backend/storage/connections.go | 8 ++ backend/types/connection.go | 8 ++ .../components/dialogs/ConnectionDialog.vue | 108 +++++++++++++++++- frontend/src/langs/zh-cn.json | 14 ++- frontend/src/stores/connections.js | 8 ++ go.mod | 2 +- go.sum | 2 + main.go | 2 +- 9 files changed, 240 insertions(+), 20 deletions(-) diff --git a/backend/services/connection_service.go b/backend/services/connection_service.go index e283249..a5963f8 100644 --- a/backend/services/connection_service.go +++ b/backend/services/connection_service.go @@ -2,9 +2,12 @@ package services import ( "context" + "encoding/json" "errors" "fmt" "github.com/redis/go-redis/v9" + "golang.org/x/crypto/ssh" + "net" "strconv" "strings" "sync" @@ -68,12 +71,38 @@ func (c *connectionService) Stop(ctx context.Context) { c.connMap = map[string]connectionItem{} } -func (c *connectionService) TestConnection(host string, port int, username, password string) (resp types.JSResp) { - rdb := redis.NewClient(&redis.Options{ - Addr: fmt.Sprintf("%s:%d", host, port), - Username: username, - Password: password, - }) +func (c *connectionService) TestConnection(optJson string) (resp types.JSResp) { + var opt types.ConnectionConfig + _ = json.Unmarshal([]byte(optJson), &opt) + + var rdb *redis.Client + if opt.SafeLink == 2 { + sshClient, err := c.getSshClient(&types.Connection{ + ConnectionConfig: opt, + }) + if err != nil { + resp.Msg = err.Error() + return + } + + rdb = redis.NewClient(&redis.Options{ + Addr: fmt.Sprintf("%s:%d", opt.Addr, opt.Port), + Dialer: func(ctx context.Context, network, addr string) (net.Conn, error) { + return sshClient.Dial(network, addr) + }, + Username: opt.Username, + Password: opt.Password, + ReadTimeout: -2, + WriteTimeout: -2, + }) + } else { + rdb = redis.NewClient(&redis.Options{ + Addr: fmt.Sprintf("%s:%d", opt.Addr, opt.Port), + Username: opt.Username, + Password: opt.Password, + }) + } + defer rdb.Close() if _, err := rdb.Ping(c.ctx).Result(); err != nil && err != redis.Nil { resp.Msg = err.Error() @@ -238,6 +267,38 @@ func (c *connectionService) CloseConnection(name string) (resp types.JSResp) { return } +func (c *connectionService) getSshClient(selConn *types.Connection) (*ssh.Client, error) { + var authMethod ssh.AuthMethod + + if selConn.SshAuth == 2 { + content := []byte(selConn.SshKeyPath) + if len(selConn.SshKeyPwd) <= 0 { + signer, err := ssh.ParsePrivateKey(content) + if err != nil { + return nil, err + } + authMethod = ssh.PublicKeys(signer) + } else { + signer, err := ssh.ParsePrivateKeyWithPassphrase(content, []byte(selConn.SshKeyPwd)) + if err != nil { + return nil, err + } + authMethod = ssh.PublicKeys(signer) + } + } else { + authMethod = ssh.Password(selConn.SshPassword) + } + + sshConfig := &ssh.ClientConfig{ + User: selConn.SshUser, + Auth: []ssh.AuthMethod{authMethod}, + HostKeyCallback: ssh.InsecureIgnoreHostKey(), + Timeout: 15 * time.Second, + } + + return ssh.Dial("tcp", selConn.SshAddr+":"+strconv.Itoa(selConn.SshPort), sshConfig) +} + // get redis client from local cache or create a new open // if db >= 0, will also switch to db index func (c *connectionService) getRedisClient(connName string, db int) (*redis.Client, context.Context, error) { @@ -252,14 +313,33 @@ func (c *connectionService) getRedisClient(connName string, db int) (*redis.Clie return nil, nil, fmt.Errorf("no match connection \"%s\"", connName) } - rdb = redis.NewClient(&redis.Options{ - Addr: fmt.Sprintf("%s:%d", selConn.Addr, selConn.Port), - Username: selConn.Username, - Password: selConn.Password, - DialTimeout: time.Duration(selConn.ConnTimeout) * time.Second, - ReadTimeout: time.Duration(selConn.ExecTimeout) * time.Second, - WriteTimeout: time.Duration(selConn.ExecTimeout) * time.Second, - }) + if selConn.SafeLink == 2 { + sshClient, err := c.getSshClient(selConn) + if err != nil { + return nil, nil, errors.New("can not connect to redis server:" + err.Error()) + } + + rdb = redis.NewClient(&redis.Options{ + Addr: fmt.Sprintf("%s:%d", selConn.Addr, selConn.Port), + Dialer: func(ctx context.Context, network, addr string) (net.Conn, error) { + return sshClient.Dial(network, addr) + }, + Username: selConn.Username, + Password: selConn.Password, + ReadTimeout: -2, + WriteTimeout: -2, + }) + } else { + rdb = redis.NewClient(&redis.Options{ + Addr: fmt.Sprintf("%s:%d", selConn.Addr, selConn.Port), + Username: selConn.Username, + Password: selConn.Password, + DialTimeout: time.Duration(selConn.ConnTimeout) * time.Second, + ReadTimeout: time.Duration(selConn.ExecTimeout) * time.Second, + WriteTimeout: time.Duration(selConn.ExecTimeout) * time.Second, + }) + } + rdb.AddHook(redis2.NewHook(connName, func(cmd string, cost int64) { now := time.Now() //last := strings.LastIndex(cmd, ":") diff --git a/backend/storage/connections.go b/backend/storage/connections.go index 7b31b1f..b301356 100644 --- a/backend/storage/connections.go +++ b/backend/storage/connections.go @@ -35,6 +35,14 @@ func (c *ConnectionsStorage) defaultConnectionItem() types.ConnectionConfig { ConnTimeout: 60, ExecTimeout: 60, MarkColor: "", + SafeLink: 1, + SshAddr: "", + SshPort: 22, + SshUser: "", + SshAuth: 1, + SshKeyPath: "", + SshKeyPwd: "", + SshPassword: "", } } diff --git a/backend/types/connection.go b/backend/types/connection.go index 2999629..70fd6cd 100644 --- a/backend/types/connection.go +++ b/backend/types/connection.go @@ -14,6 +14,14 @@ type ConnectionConfig struct { ConnTimeout int `json:"connTimeout,omitempty" yaml:"conn_timeout,omitempty"` ExecTimeout int `json:"execTimeout,omitempty" yaml:"exec_timeout,omitempty"` MarkColor string `json:"markColor,omitempty" yaml:"mark_color,omitempty"` + SafeLink int `json:"safeLink,omitempty" yaml:"safe_link,omitempty"` + SshAddr string `json:"sshAddr,omitempty" yaml:"ssh_addr,omitempty"` + SshPort int `json:"sshPort,omitempty" yaml:"ssh_port,omitempty"` + SshUser string `json:"sshUser,omitempty" yaml:"ssh_user,omitempty"` + SshAuth int `json:"sshAuth,omitempty" yaml:"ssh_auth,omitempty"` + SshKeyPath string `json:"sshKeyPath,omitempty" yaml:"ssh_key_path,omitempty"` + SshKeyPwd string `json:"sshKeyPwd,omitempty" yaml:"ssh_key_pwd,omitempty"` + SshPassword string `json:"sshPassword,omitempty" yaml:"ssh_password,omitempty"` } type Connection struct { diff --git a/frontend/src/components/dialogs/ConnectionDialog.vue b/frontend/src/components/dialogs/ConnectionDialog.vue index cb8fb81..d36755d 100644 --- a/frontend/src/components/dialogs/ConnectionDialog.vue +++ b/frontend/src/components/dialogs/ConnectionDialog.vue @@ -62,7 +62,9 @@ const showTestResult = ref(false) const testResult = ref('') const predefineColors = ref(['', '#F75B52', '#F7A234', '#F7CE33', '#4ECF60', '#348CF7', '#B270D3']) const generalFormRef = ref(null) +const safeFormRef = ref(null) const advanceFormRef = ref(null) +const fileRef = ref(null) const onSaveConnection = async () => { // validate general form @@ -98,6 +100,21 @@ const resetForm = () => { tab.value = 'general' } +const choose_file = () => { + //弹出选择本地文件 + fileRef.value.click() +} +const fileChange = (e) => { + const file = e.target.files ? e.target.files[0] : null + if (file) { + const reader = new FileReader(); + reader.onload = (event) => { + generalForm.value.sshKeyPath = event.target.result + }; + reader.readAsText(e.target.files[0]); + } +} + watch( () => dialogStore.connDialogVisible, (visible) => { @@ -113,8 +130,8 @@ const onTestConnection = async () => { testing.value = true let result = '' try { - const { addr, port, username, password } = generalForm.value - const { success = false, msg } = await TestConnection(addr, port, username, password) + const opt = JSON.stringify(generalForm.value) + const { success = false, msg } = await TestConnection(opt) if (!success) { result = msg } @@ -139,6 +156,7 @@ const onClose = () => {