From 14959ffba46282dd7b8ada53db0dfc0e1b26ab2e Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 24 Oct 2021 13:34:06 +0300 Subject: Fix DCat color test. --- internal/ssh/client/authmethods.go | 21 ++++++--------------- internal/ssh/client/knownhostscallback.go | 6 ------ 2 files changed, 6 insertions(+), 21 deletions(-) (limited to 'internal/ssh/client') diff --git a/internal/ssh/client/authmethods.go b/internal/ssh/client/authmethods.go index 37f8382..2ee32ad 100644 --- a/internal/ssh/client/authmethods.go +++ b/internal/ssh/client/authmethods.go @@ -29,19 +29,14 @@ func initKnownHostsAuthMethods(trustAllHosts bool, throttleCh chan struct{}, privateKeyPath string) ([]gossh.AuthMethod, HostKeyCallback) { var sshAuthMethods []gossh.AuthMethod - knownHostsPath := os.Getenv("HOME") + "/.ssh/known_hosts" - knownHostsCallback, err := NewKnownHostsCallback(knownHostsPath, trustAllHosts, + knownHostsFile := config.SSHKnownHostsFile() + knownHostsCallback, err := NewKnownHostsCallback(knownHostsFile, trustAllHosts, throttleCh) if err != nil { - dlog.Client.FatalPanic(knownHostsPath, err) + dlog.Client.FatalPanic(knownHostsFile, err) } - dlog.Client.Debug("initKnownHostsAuthMethods", "Added known hosts file path", knownHostsPath) - /* - if config.Client.ExperimentalFeaturesEnable { - sshAuthMethods = append(sshAuthMethods, gossh.Password("experimental feature test")) - dlog.Client.Debug("initKnownHostsAuthMethods", "Added experimental method to list of auth methods") - } - */ + + dlog.Client.Debug("initKnownHostsAuthMethods", "Added known hosts file path", knownHostsFile) // First try to read custom private key path. if privateKeyPath != "" { @@ -100,11 +95,7 @@ func initKnownHostsAuthMethods(trustAllHosts bool, throttleCh chan struct{}, dlog.Client.Debug("initKnownHostsAuthMethods", "Unable to use private key", privateKeyPath, err) - // This is only a panic when we expect to do something about it. - if !config.Client.SSHDontAddHostsToKnownHostsFile { - dlog.Client.FatalPanic("Unable to find private SSH key information") - } - + dlog.Client.FatalPanic("Unable to find private SSH key information") // Never reach this point. return sshAuthMethods, knownHostsCallback } diff --git a/internal/ssh/client/knownhostscallback.go b/internal/ssh/client/knownhostscallback.go index 2aa0168..dd58925 100644 --- a/internal/ssh/client/knownhostscallback.go +++ b/internal/ssh/client/knownhostscallback.go @@ -10,7 +10,6 @@ import ( "sync" "time" - "github.com/mimecast/dtail/internal/config" "github.com/mimecast/dtail/internal/io/dlog" "github.com/mimecast/dtail/internal/io/prompt" @@ -216,11 +215,6 @@ func (c KnownHostsCallback) promptAddHosts(hosts []unknownHost) { func (c KnownHostsCallback) trustHosts(hosts []unknownHost) { tmpKnownHostsPath := fmt.Sprintf("%s.tmp", c.knownHostsPath) - if config.Client.SSHDontAddHostsToKnownHostsFile { - dlog.Common.Verbose("Not adding hosts to known hosts file, as disabled by config") - return - } - newFd, err := os.OpenFile(tmpKnownHostsPath, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0600) if err != nil { panic(fmt.Sprintf("%s: %s", tmpKnownHostsPath, err.Error())) -- cgit v1.2.3