philipp/uncloud
1
0
Fork 0
mirror of https://github.com/psviderski/uncloud.git synced 2026-08-26 11:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

update init command to send RPC calls over SSH tunnel

Browse Source
This commit is contained in:
Pavel Sviderski
2024-09-10 13:45:49 +10:00
parent 86d949ae48
commit 2514c804dc
5 changed files with 50 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/sshexec/ssh.go
+4 -8
View File
@@ -1,4 +1,4 @@
package cmdexec
package sshexec
import (
"fmt"
@@ -10,7 +10,7 @@ import (
"time"
)
func Connect(user, host string, port int, sshKeyPath string) (*Remote, error) {
func Connect(user, host string, port int, sshKeyPath string) (*ssh.Client, error) {
addr := net.JoinHostPort(host, strconv.Itoa(port))
// Try to connect using SSH agent only.
agentAuth, agentClose, agentErr := sshAgentAuth()
@@ -24,9 +24,7 @@ func Connect(user, host string, port int, sshKeyPath string) (*Remote, error) {
}
var client *ssh.Client
if client, agentErr = ssh.Dial("tcp", addr, config); agentErr == nil {
return &Remote{
client: client,
}, nil
return client, nil
}
}
// Fall back to using private key as the connection attempt using SSH agent failed.
@@ -47,9 +45,7 @@ func Connect(user, host string, port int, sshKeyPath string) (*Remote, error) {
return nil, fmt.Errorf("connect using private key %q: %w", sshKeyPath, err)
}
return &Remote{
client: client,
}, nil
return client, nil
}
func sshAgentAuth() (ssh.AuthMethod, func(), error) {