Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-03-02 04:02:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Quick Ssh Fix/Logging (#1328)

Browse Source 
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
This commit is contained in:
Sylvie Crowe 2024-11-20 18:11:47 -08:00 committed by GitHub
parent 360964d4ba
commit c003ddff83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/remote/conncontroller/conncontroller.go
View File

@ -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

1
pkg/remote/connutil.go
View File

@ -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