pico

created pr with 57.1 on 2025-03-28T16:55:01Z · by c8ef7d19

added 57.2 on 2025-04-06T20:54:25Z · by c8ef7d19


                      1:  b47b145 = 1:  461e887 feat(pgs): admins can impersonate


                      2:  7275c44 = 2:  91dabf9 chore: use `user_id` in log middleware to set the user ctx

cmds

checkout latest patchset:

ssh pr.pico.sh print 57 | git am -3

checkout any patchset in a patch request:

ssh pr.pico.sh print 57.[rev] | git am -3

add changes to patch request:

git format-patch main --stdout | ssh pr.pico.sh pr add 57

Patchset `57.1` on 2025-03-28T16:55:01Z · commit 7275c44

feat(pgs): admins can impersonate

Eric Bower 2025-03-28T15:53:44Z

→ chore: use `user_id` in log middleware to set the user ctx

Eric Bower 2025-03-28T16:54:28Z

chore: use `user_id` in log middleware to set the user ctx

Eric Bower 2025-03-28T16:54:28Z

Semantic diff summary

0 added, 3 modified, 0 signature changed, 0 removed across 1 analyzed file

pkg/pssh/logger.go

chunk lines 1-7 modified
type_declaration FindUserInterface modified
function_declaration LogMiddleware modified

+7 -2 pkg/pssh/logger.go #

......@@ -1,6 +1,7 @@
package pssh

import (
	"fmt"
	"log/slog"
	"time"

......@@ -11,7 +12,7 @@ type ctxLoggerKey struct{}
type ctxUserKey struct{}

type FindUserInterface interface {
	FindUserByPubkey(string) (*db.User, error)
	FindUser(string) (*db.User, error)
}

type GetLoggerInterface interface {

......@@ -29,7 +30,11 @@ func LogMiddleware(getLogger GetLoggerInterface, db FindUserInterface) SSHServer

				user := GetUser(s)
				if user == nil {
					user, err := db.FindUserByPubkey(s.Permissions().Extensions["pubkey"])
					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,

...	...		@@ -1,6 +1,7 @@
1	1		package pssh
2	2
3	3		import (
	4	+	"fmt"
4	5		"log/slog"
5	6		"time"
6	7

...	...		@@ -11,7 +12,7 @@ type ctxLoggerKey struct{}
11	12		type ctxUserKey struct{}
12	13
13	14		type FindUserInterface interface {
14		-	FindUserByPubkey(string) (*db.User, error)
	15	+	FindUser(string) (*db.User, error)
15	16		}
16	17
17	18		type GetLoggerInterface interface {

...	...		@@ -29,7 +30,11 @@ func LogMiddleware(getLogger GetLoggerInterface, db FindUserInterface) SSHServer
29	30
30	31		user := GetUser(s)
31	32		if user == nil {
32		-	user, err := db.FindUserByPubkey(s.Permissions().Extensions["pubkey"])
	33	+	userID, ok := s.Permissions().Extensions["user_id"]
	34	+	if !ok {
	35	+	return fmt.Errorf("`user_id` not set in permissions")
	36	+	}
	37	+	user, err := db.FindUser(userID)
33	38		if err == nil && user != nil {
34	39		logger = logger.With(
35	40		"user", user.Name,

pico

Patchset 57.1 on 2025-03-28T16:55:01Z · commit 7275c44

Patchset `57.1` on 2025-03-28T16:55:01Z · commit 7275c44