From c003ddff835ee60b849cd02d057c9bee3c2c26b8 Mon Sep 17 00:00:00 2001 From: Sylvie Crowe <107814465+oneirocosm@users.noreply.github.com> Date: Wed, 20 Nov 2024 18:11:47 -0800 Subject: [PATCH] Quick Ssh Fix/Logging (#1328) This adds two things: - prints a log error if the user isn't parsed properly in ssh - ensures that a host isn't reused when sending to the conn list --- pkg/remote/conncontroller/conncontroller.go | 2 +- pkg/remote/connutil.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/remote/conncontroller/conncontroller.go b/pkg/remote/conncontroller/conncontroller.go index b8de2ced0..b03507e2e 100644 --- a/pkg/remote/conncontroller/conncontroller.go +++ b/pkg/remote/conncontroller/conncontroller.go @@ -584,7 +584,7 @@ func resolveSshConfigPatterns(configFiles []string) ([]string, error) { for _, hostPattern := range host.Patterns { hostPatternStr := hostPattern.String() normalized := remote.NormalizeConfigPattern(hostPatternStr) - if (!strings.Contains(hostPatternStr, "*") && !strings.Contains(hostPatternStr, "?") && !strings.Contains(hostPatternStr, "!")) || alreadyUsed[normalized] { + if !strings.Contains(hostPatternStr, "*") && !strings.Contains(hostPatternStr, "?") && !strings.Contains(hostPatternStr, "!") && !alreadyUsed[normalized] { discoveredPatterns = append(discoveredPatterns, normalized) alreadyUsed[normalized] = true break diff --git a/pkg/remote/connutil.go b/pkg/remote/connutil.go index 593cb8e0c..025b78622 100644 --- a/pkg/remote/connutil.go +++ b/pkg/remote/connutil.go @@ -342,6 +342,7 @@ func IsPowershell(shellPath string) bool { func NormalizeConfigPattern(pattern string) string { userName, err := WaveSshConfigUserSettings().GetStrict(pattern, "User") if err != nil { + log.Printf("warning: error parsing username of %s for conn dropdown: %v", pattern, err) localUser, err := user.Current() if err == nil { userName = localUser.Username