From da138e4f0b28ed168f36a227de3b36c1d200e932 Mon Sep 17 00:00:00 2001 From: cuisongliu Date: Thu, 19 Mar 2020 11:19:29 +0800 Subject: [PATCH] feature(devlop): fix clean bug / hostname --- .../github.com/cuisongliu/sshcmd/pkg/sshutil/connect.go | 9 +++++++-- vendor/modules.txt | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/vendor/github.com/cuisongliu/sshcmd/pkg/sshutil/connect.go b/vendor/github.com/cuisongliu/sshcmd/pkg/sshutil/connect.go index f2c9b85b8..29d824120 100644 --- a/vendor/github.com/cuisongliu/sshcmd/pkg/sshutil/connect.go +++ b/vendor/github.com/cuisongliu/sshcmd/pkg/sshutil/connect.go @@ -6,6 +6,7 @@ import ( "golang.org/x/crypto/ssh" "io/ioutil" "net" + "os" "strings" "time" ) @@ -59,7 +60,11 @@ func (ss *SSH) sshAuthMethod(passwd, pkFile string) ssh.AuthMethod { am = ssh.Password(passwd) } else { pkData := ss.readFile(pkFile) - pk, _ := ssh.ParsePrivateKey([]byte(pkData)) + pk, err := ssh.ParsePrivateKey([]byte(pkData)) + if err != nil { + logger.Error(err) + os.Exit(1) + } am = ssh.PublicKeys(pk) } return am @@ -69,7 +74,7 @@ func (ss *SSH) readFile(name string) string { content, err := ioutil.ReadFile(name) if err != nil { logger.Error("[globals] read file err is : %s", err) - return "" + os.Exit(1) } return string(content) } diff --git a/vendor/modules.txt b/vendor/modules.txt index ffa01cb0d..b9bf4fd37 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -10,7 +10,7 @@ github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses github.com/aliyun/alibaba-cloud-sdk-go/sdk/utils github.com/aliyun/alibaba-cloud-sdk-go/services/ecs -# github.com/cuisongliu/sshcmd v1.4.2 +# github.com/cuisongliu/sshcmd v1.4.3 github.com/cuisongliu/sshcmd/pkg/filesize github.com/cuisongliu/sshcmd/pkg/md5sum github.com/cuisongliu/sshcmd/pkg/sshutil