ssh-tui.diff

· erock's pastes · raw

expires: 2025-07-09

 1diff --git a/pkg/pssh/logger.go b/pkg/pssh/logger.go
 2index 10e465f..791f78f 100644
 3--- a/pkg/pssh/logger.go
 4+++ b/pkg/pssh/logger.go
 5@@ -31,18 +31,20 @@ func LogMiddleware(getLogger GetLoggerInterface, db FindUserInterface) SSHServer
 6 				user := GetUser(s)
 7 				if user == nil {
 8 					userID, ok := s.Permissions().Extensions["user_id"]
 9-					if !ok {
10-						return fmt.Errorf("`user_id` not set in permissions")
11-					}
12-					user, err := db.FindUser(userID)
13-					if err == nil && user != nil {
14-						logger = logger.With(
15-							"user", user.Name,
16-							"userId", user.ID,
17-							"ip", s.RemoteAddr().String(),
18-						)
19-						s.SetValue(ctxUserKey{}, user)
20+					if ok {
21+						user, err := db.FindUser(userID)
22+						if err == nil && user != nil {
23+							logger = logger.With(
24+								"user", user.Name,
25+								"userId", user.ID,
26+								"ip", s.RemoteAddr().String(),
27+							)
28+							s.SetValue(ctxUserKey{}, user)
29+						}
30+					} else {
31+						logger.Error("`user_id` not set in permissions")
32 					}
33+
34 				}
35 
36 				s.SetValue(ctxLoggerKey{}, logger)
37@@ -67,6 +69,7 @@ func LogMiddleware(getLogger GetLoggerInterface, db FindUserInterface) SSHServer
38 				"windowHeight", height,
39 			)
40 
41+			fmt.Printf("RUNNING SSH HANDLER")
42 			err := sshHandler(s)
43 			if err != nil {
44 				logger.Error("error", "err", err)
45diff --git a/pkg/pssh/server.go b/pkg/pssh/server.go
46index 238e651..b146b7e 100644
47--- a/pkg/pssh/server.go
48+++ b/pkg/pssh/server.go
49@@ -614,7 +614,8 @@ func NewSSHServerWithConfig(
50 	app, host, port, promPort, hostKey string,
51 	pubKeyAuthHandler PubKeyAuthHandler,
52 	middleware, subsystemMiddleware []SSHServerMiddleware,
53-	channelMiddleware map[string]SSHServerChannelMiddleware) (*SSHServer, error) {
54+	channelMiddleware map[string]SSHServerChannelMiddleware,
55+) (*SSHServer, error) {
56 	server := NewSSHServer(ctx, logger, &SSHServerConfig{
57 		App:        app,
58 		ListenAddr: fmt.Sprintf("%s:%s", host, port),
59diff --git a/pkg/tui/ui.go b/pkg/tui/ui.go
60index 0627e81..9eea450 100644
61--- a/pkg/tui/ui.go
62+++ b/pkg/tui/ui.go
63@@ -320,6 +320,7 @@ func FindFeatureFlag(shrd *SharedModel, name string) (*db.FeatureFlag, error) {
64 }
65 
66 func NewTui(opts vaxis.Options, shrd *SharedModel) error {
67+	fmt.Println("NEW TUI")
68 	err := initData(shrd)
69 	if err != nil {
70 		return err