acepanel/panel
2
0
Fork 0
mirror of https://github.com/acepanel/panel.git synced 2026-02-04 09:13:49 +08:00
Code Issues Packages Releases Activity

feat: 初始化ssh模型

Browse Source
This commit is contained in:
耗子
2024-10-22 02:59:53 +08:00
parent 0786451c79
commit f2d2bad52f
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/ssh/ssh.go
View File

@@ -1,7 +1,6 @@
package ssh
import (
"os"
"time"
"golang.org/x/crypto/ssh"
@@ -19,7 +18,7 @@ type ClientConfig struct {
HostAddr string
User string
Password string
KeyPath string
Key string
Timeout time.Duration
}
@@ -33,13 +32,13 @@ func ClientConfigPassword(hostAddr, user, Password string) *ClientConfig {
}
}
func ClientConfigPublicKey(hostAddr, user, keyPath string) *ClientConfig {
func ClientConfigPublicKey(hostAddr, user, key string) *ClientConfig {
return &ClientConfig{
Timeout: time.Second * 5,
AuthMethod: PUBLICKEY,
HostAddr: hostAddr,
User: user,
KeyPath: keyPath,
Key: key,
}
}
@@ -54,7 +53,7 @@ func NewSSHClient(conf *ClientConfig) (*ssh.Client, error) {
case PASSWORD:
config.Auth = []ssh.AuthMethod{ssh.Password(conf.Password)}
case PUBLICKEY:
signer, err := getKey(conf.KeyPath)
signer, err := parseKey(conf.Key)
if err != nil {
return nil, err
}
@@ -68,11 +67,6 @@ func NewSSHClient(conf *ClientConfig) (*ssh.Client, error) {
return c, nil
}
func getKey(keyPath string) (ssh.Signer, error) {
key, err := os.ReadFile(keyPath)
if err != nil {
return nil, err
}
return ssh.ParsePrivateKey(key)
func parseKey(key string) (ssh.Signer, error) {
return ssh.ParsePrivateKey([]byte(key))
}