mirror of
https://github.com/opentofu/opentofu.git
synced 2025-02-25 18:45:20 -06:00
Add SSH Agent support
This commit is contained in:
parent
55a51b194a
commit
164f303da4
@ -178,10 +178,13 @@ func (p *ResourceProvisioner) runScripts(
|
|||||||
" Host: %s\n"+
|
" Host: %s\n"+
|
||||||
" User: %s\n"+
|
" User: %s\n"+
|
||||||
" Password: %v\n"+
|
" Password: %v\n"+
|
||||||
" Private key: %v",
|
" Private key: %v"+
|
||||||
|
" SSH Agent: %v",
|
||||||
conf.Host, conf.User,
|
conf.Host, conf.User,
|
||||||
conf.Password != "",
|
conf.Password != "",
|
||||||
conf.KeyFile != ""))
|
conf.KeyFile != "",
|
||||||
|
conf.Agent,
|
||||||
|
))
|
||||||
|
|
||||||
// Wait and retry until we establish the SSH connection
|
// Wait and retry until we establish the SSH connection
|
||||||
var comm *helper.SSHCommunicator
|
var comm *helper.SSHCommunicator
|
||||||
|
@ -5,12 +5,15 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"log"
|
"log"
|
||||||
|
"net"
|
||||||
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"golang.org/x/crypto/ssh"
|
|
||||||
"github.com/hashicorp/terraform/terraform"
|
"github.com/hashicorp/terraform/terraform"
|
||||||
"github.com/mitchellh/go-homedir"
|
"github.com/mitchellh/go-homedir"
|
||||||
"github.com/mitchellh/mapstructure"
|
"github.com/mitchellh/mapstructure"
|
||||||
|
"golang.org/x/crypto/ssh"
|
||||||
|
"golang.org/x/crypto/ssh/agent"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -37,6 +40,7 @@ type SSHConfig struct {
|
|||||||
KeyFile string `mapstructure:"key_file"`
|
KeyFile string `mapstructure:"key_file"`
|
||||||
Host string
|
Host string
|
||||||
Port int
|
Port int
|
||||||
|
Agent bool
|
||||||
Timeout string
|
Timeout string
|
||||||
ScriptPath string `mapstructure:"script_path"`
|
ScriptPath string `mapstructure:"script_path"`
|
||||||
TimeoutVal time.Duration `mapstructure:"-"`
|
TimeoutVal time.Duration `mapstructure:"-"`
|
||||||
@ -102,6 +106,26 @@ func PrepareConfig(conf *SSHConfig) (*Config, error) {
|
|||||||
sshConf := &ssh.ClientConfig{
|
sshConf := &ssh.ClientConfig{
|
||||||
User: conf.User,
|
User: conf.User,
|
||||||
}
|
}
|
||||||
|
if conf.Agent {
|
||||||
|
sshAuthSock := os.Getenv("SSH_AUTH_SOCK")
|
||||||
|
|
||||||
|
if sshAuthSock == "" {
|
||||||
|
return nil, fmt.Errorf("SSH Requested but SSH_AUTH_SOCK not-specified")
|
||||||
|
}
|
||||||
|
|
||||||
|
conn, err := net.Dial("unix", sshAuthSock)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("Error connecting to SSH_AUTH_SOCK: %v", err)
|
||||||
|
}
|
||||||
|
// I need to close this but, later after all connections have been made
|
||||||
|
// defer conn.Close()
|
||||||
|
signers, err := agent.NewClient(conn).Signers()
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("Error getting keys from ssh agent: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
sshConf.Auth = append(sshConf.Auth, ssh.PublicKeys(signers...))
|
||||||
|
}
|
||||||
if conf.KeyFile != "" {
|
if conf.KeyFile != "" {
|
||||||
fullPath, err := homedir.Expand(conf.KeyFile)
|
fullPath, err := homedir.Expand(conf.KeyFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
Loading…
Reference in New Issue
Block a user