iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

communicator/ssh: expand user path for private key 

Signed-off-by: Mikhail Ushanov <gm.mephisto@gmail.com>
This commit is contained in:
Mikhail Ushanov 2018-11-01 00:47:50 +03:00
parent da0bad8441
commit 6d2a0ab0df
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
helper/communicator/config.go
View File

@ -13,6 +13,7 @@ import (
helperssh "github.com/hashicorp/packer/helper/ssh" helperssh "github.com/hashicorp/packer/helper/ssh"
"github.com/hashicorp/packer/template/interpolate" "github.com/hashicorp/packer/template/interpolate"
"github.com/masterzen/winrm" "github.com/masterzen/winrm"
"github.com/mitchellh/go-homedir"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
"golang.org/x/crypto/ssh/agent" "golang.org/x/crypto/ssh/agent"
) )
@ -109,12 +110,11 @@ func (c *Config) SSHConfigFunc() func(multistep.StateBag) (*ssh.ClientConfig, er
var privateKeys [][]byte var privateKeys [][]byte
if c.SSHPrivateKeyFile != "" { if c.SSHPrivateKeyFile != "" {
// key based auth privateKey, err := c.ReadSSHPrivateKeyFile()
bytes, err := ioutil.ReadFile(c.SSHPrivateKeyFile)
if err != nil { if err != nil {
return nil, fmt.Errorf("Error setting up SSH config: %s", err) return nil, err
} }
privateKeys = append(privateKeys, bytes) privateKeys = append(privateKeys, privateKey)
} }
// aws,alicloud,cloudstack,digitalOcean,oneAndOne,openstack,oracle & profitbricks key // aws,alicloud,cloudstack,digitalOcean,oneAndOne,openstack,oracle & profitbricks key
@ -260,10 +260,14 @@ func (c *Config) prepareSSH(ctx *interpolate.Context) []error {
} }
if c.SSHPrivateKeyFile != "" { if c.SSHPrivateKeyFile != "" {
if _, err := os.Stat(c.SSHPrivateKeyFile); err != nil { path, err := homedir.Expand(c.SSHPrivateKeyFile)
if err != nil {
errs = append(errs, fmt.Errorf( errs = append(errs, fmt.Errorf(
"ssh_private_key_file is invalid: %s", err)) "ssh_private_key_file is invalid: %s", err))
} else if _, err := helperssh.FileSigner(c.SSHPrivateKeyFile); err != nil { } else if _, err := os.Stat(path); err != nil {
errs = append(errs, fmt.Errorf(
"ssh_private_key_file is invalid: %s", err))
} else if _, err := helperssh.FileSigner(path); err != nil {
errs = append(errs, fmt.Errorf( errs = append(errs, fmt.Errorf(
"ssh_private_key_file is invalid: %s", err)) "ssh_private_key_file is invalid: %s", err))
} }