lingling
/
tiny-rdm
mirror of https://github.com/tiny-craft/tiny-rdm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added 新增ssh登陆

This commit is contained in:
zhaoxiang 2023-09-27 18:03:49 +08:00
parent ca1e1e5ffe
commit 3090d596e9
9 changed files with 240 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
backend/services/connection_service.go
View File

@ -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, ":")

8
backend/storage/connections.go
View File

@ -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: "",
}
}

8
backend/types/connection.go
View File

@ -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 {

108
frontend/src/components/dialogs/ConnectionDialog.vue
View File

@ -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 = () => {
<template>
<n-modal
style="width:580px"
v-model:show="dialogStore.connDialogVisible"
:closable="false"
:close-on-esc="false"
@ -176,7 +194,7 @@ const onClose = () => {
:min="1"
style="width: 200px" />
</n-form-item>
<n-form-item :label="$t('dialogue.connection.pwd')" path="password">
<n-form-item :label="$t('dialogue.connection.pwd')" path="password" required>
<n-input
v-model:value="generalForm.password"
:placeholder="$t('dialogue.connection.pwd_tip')"
@ -189,6 +207,90 @@ const onClose = () => {
</n-form>
</n-tab-pane>
<n-tab-pane :tab="$t('dialogue.connection.safe')" display-directive="show" name="safe">
<n-form
ref="safeFormRef"
:model="generalForm"
:rules="generalFormRules()"
:show-require-mark="false"
label-placement="top">
<n-form-item :label="$t('dialogue.connection.safe_link')" path="safeLink" required>
<n-radio-group v-model:value="generalForm.safeLink" name="safeLink">
<n-space>
<n-radio :value="1" name="no">
地址直连
</n-radio>
<n-radio :value="2" name="ssh">
SSH隧道
</n-radio>
</n-space>
</n-radio-group>
</n-form-item>
<n-collapse-transition :show="generalForm.safeLink === 2">
<n-form-item :label="$t('dialogue.connection.ssh_user')" path="ssh_user">
<n-input v-model:value="generalForm.sshUser" :placeholder="$t('dialogue.connection.ssh_user_tip')" />
</n-form-item>
<n-form-item :label="$t('dialogue.connection.addr')" path="ssh_addr" required>
<n-input
v-model:value="generalForm.sshAddr"
:placeholder="$t('dialogue.connection.ssh_addr_tip')" />
<n-text style="width: 40px; text-align: center">:</n-text>
<n-input-number
v-model:value="generalForm.sshPort"
:max="65535"
:min="1"
style="width: 200px" />
</n-form-item>
<n-form-item :label="$t('dialogue.connection.ssh_auth')" path="ssh_auth" required>
<n-radio-group v-model:value="generalForm.sshAuth" name="sshAuth">
<n-space>
<n-radio :value="1" name="pwd">
密码
</n-radio>
<n-radio :value="2" name="key_file">
秘钥
</n-radio>
</n-space>
</n-radio-group>
</n-form-item>
<n-collapse-transition :show="generalForm.sshAuth === 1">
<n-form-item :label="$t('dialogue.connection.pwd')" path="ssh_password">
<n-input
v-model:value="generalForm.sshPassword"
show-password-on="click"
type="password" />
</n-form-item>
</n-collapse-transition>
<n-collapse-transition :show="generalForm.sshAuth === 2">
<n-form-item :label="$t('dialogue.connection.ssh_key_path')" path="ssh_key_path">
<input ref="fileRef" v-show="false" type="file" @change="fileChange($event)" />
<n-button type="primary" ghost @click="choose_file">
{{ $t('dialogue.connection.choose_file') }}
</n-button>
</n-form-item>
<n-form-item style="margin-top: -30px">
<n-input
type="textarea"
size="small"
:placeholder="generalForm.sshKeyPath"
disabled
round
:rows="6"
/>
</n-form-item>
<n-form-item :label="$t('dialogue.connection.ssh_key_pwd')" path="ssh_key_pwd">
<n-input
v-model:value="generalForm.sshKeyPwd"
show-password-on="click"
type="password"
:placeholder="$t('dialogue.connection.ssh_key_pwd_tip')"
/>
</n-form-item>
</n-collapse-transition>
</n-collapse-transition>
</n-form>
</n-tab-pane>
<n-tab-pane :tab="$t('dialogue.connection.advanced')" display-directive="show" name="advanced">
<n-form
ref="advanceFormRef"

14
frontend/src/langs/zh-cn.json
View File

@ -112,6 +112,7 @@
"new_title": "新建连接",
"edit_title": "编辑连接",
"general": "常规配置",
"safe": "安全链接",
"advanced": "高级配置",
"no_group": "无分组",
"group": "分组",
@ -132,7 +133,18 @@
"advn_separator_tip": "键名路径分隔符",
"advn_conn_timeout": "连接超时",
"advn_exec_timeout": "执行超时",
"advn_mark_color": "标记颜色"
"advn_mark_color": "标记颜色",
"safe_link": "链接方式",
"ssh_auth": "授权方式",
"ssh_tunnel": "SSH隧道",
"ssh_user": "SSH用户",
"ssh_user_tip": "SSH用户名",
"ssh_addr_tip": "SSH远程服务器",
"ssh_key_path": "私钥",
"ssh_key_pwd": "密钥",
"ssh_key_pwd_tip": "提供的私钥密码",
"choose_file": "选择文件",
"choose_file_tip": "请选择秘钥文件"
},
"group": {
"name": "分组名",

8
frontend/src/stores/connections.js
View File

@ -209,6 +209,14 @@ const useConnectionStore = defineStore('connections', {
connTimeout: 60,
execTimeout: 60,
markColor: '',
safeLink: 1,
sshAddr: '',
sshPort: 22,
sshUser: '',
sshAuth: 1,
sshKeyPath: '',
sshKeyPwd: '',
sshPassword: '',
}
},

2
go.mod
View File

@ -7,6 +7,7 @@ require (
github.com/redis/go-redis/v9 v9.2.0
github.com/vrischmann/userdir v0.0.0-20151206171402-20f291cebd68
github.com/wailsapp/wails/v2 v2.6.0
golang.org/x/crypto v0.12.0
gopkg.in/yaml.v3 v3.0.1
)
@ -37,7 +38,6 @@ require (
github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/wailsapp/go-webview2 v1.0.5 // indirect
github.com/wailsapp/mimetype v1.4.1 // indirect
golang.org/x/crypto v0.12.0 // indirect
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
golang.org/x/net v0.14.0 // indirect
golang.org/x/sys v0.11.0 // indirect

2
go.sum
View File

@ -107,6 +107,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0=
golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=

2
main.go
View File

@ -20,7 +20,7 @@ var assets embed.FS
//go:embed build/appicon.png
var icon []byte
var version = "0.0.0"
var version = "1.0.1"
func main() {
// Create an instance of the app structure