diff --git a/pkg/pssh/logger.go b/pkg/pssh/logger.go index 10e465f..791f78f 100644 --- a/pkg/pssh/logger.go +++ b/pkg/pssh/logger.go @@ -31,18 +31,20 @@ func LogMiddleware(getLogger GetLoggerInterface, db FindUserInterface) SSHServer user := GetUser(s) if user == nil { userID, ok := s.Permissions().Extensions["user_id"] - if !ok { - return fmt.Errorf("`user_id` not set in permissions") - } - user, err := db.FindUser(userID) - if err == nil && user != nil { - logger = logger.With( - "user", user.Name, - "userId", user.ID, - "ip", s.RemoteAddr().String(), - ) - s.SetValue(ctxUserKey{}, user) + if ok { + user, err := db.FindUser(userID) + if err == nil && user != nil { + logger = logger.With( + "user", user.Name, + "userId", user.ID, + "ip", s.RemoteAddr().String(), + ) + s.SetValue(ctxUserKey{}, user) + } + } else { + logger.Error("`user_id` not set in permissions") } + } s.SetValue(ctxLoggerKey{}, logger) @@ -67,6 +69,7 @@ func LogMiddleware(getLogger GetLoggerInterface, db FindUserInterface) SSHServer "windowHeight", height, ) + fmt.Printf("RUNNING SSH HANDLER") err := sshHandler(s) if err != nil { logger.Error("error", "err", err) diff --git a/pkg/pssh/server.go b/pkg/pssh/server.go index 238e651..b146b7e 100644 --- a/pkg/pssh/server.go +++ b/pkg/pssh/server.go @@ -614,7 +614,8 @@ func NewSSHServerWithConfig( app, host, port, promPort, hostKey string, pubKeyAuthHandler PubKeyAuthHandler, middleware, subsystemMiddleware []SSHServerMiddleware, - channelMiddleware map[string]SSHServerChannelMiddleware) (*SSHServer, error) { + channelMiddleware map[string]SSHServerChannelMiddleware, +) (*SSHServer, error) { server := NewSSHServer(ctx, logger, &SSHServerConfig{ App: app, ListenAddr: fmt.Sprintf("%s:%s", host, port), diff --git a/pkg/tui/ui.go b/pkg/tui/ui.go index 0627e81..9eea450 100644 --- a/pkg/tui/ui.go +++ b/pkg/tui/ui.go @@ -320,6 +320,7 @@ func FindFeatureFlag(shrd *SharedModel, name string) (*db.FeatureFlag, error) { } func NewTui(opts vaxis.Options, shrd *SharedModel) error { + fmt.Println("NEW TUI") err := initData(shrd) if err != nil { return err