Skip to content

fix: nil dereference in nowsh error messages #1673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oneirocosm merged 1 commit into from
Jan 3, 2025
Merged

fix: nil dereference in nowsh error messages #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ require (
github.com/ubuntu/gowsl v0.0.0-20240906163211-049fd49bd93b
github.com/wavetermdev/htmltoken v0.2.0
golang.org/x/crypto v0.31.0
golang.org/x/mod v0.22.0
golang.org/x/sys v0.28.0
golang.org/x/term v0.27.0
google.golang.org/api v0.214.0
Expand Down Expand Up @@ -63,7 +64,6 @@ require (
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sync v0.10.0 // indirect
Expand Down
10 changes: 9 additions & 1 deletion pkg/remote/conncontroller/conncontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,8 +553,16 @@ func (conn *SSHConn) connectInternal(ctx context.Context, connFlags *wshrpc.Conn
}
if dsErr != nil || csErr != nil {
log.Print("attempting to run with nowsh instead")
var errmsgs []string
if dsErr != nil {
errmsgs = append(errmsgs, fmt.Sprintf("domain socket error: %s", dsErr.Error()))
}
if csErr != nil {
errmsgs = append(errmsgs, fmt.Sprintf("conn server error: %s", csErr.Error()))
}
combinedErr := fmt.Errorf("%s", strings.Join(errmsgs, " | "))
conn.WithLock(func() {
conn.WshError = csErr.Error()
conn.WshError = combinedErr.Error()
})
conn.WshEnabled.Store(false)
}
Expand Down