logger refactor and initial logging method

ibetitsmike · ibetitsmike · commit eb6cb059eadb · 2025-04-10T13:24:09.000Z
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -25,6 +25,7 @@ import (
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/httpapi/httpapiconstraints"
+	loggermw "github.com/coder/coder/v2/coderd/httpmw/logger"
 	"github.com/coder/coder/v2/coderd/rbac"
 	"github.com/coder/coder/v2/coderd/util/slice"
 	"github.com/coder/coder/v2/provisionersdk"
@@ -462,12 +463,9 @@ func As(ctx context.Context, actor rbac.Subject) context.Context {
 }
 
 func InjectActorToContext(ctx context.Context, actor rbac.Subject) context.Context {
-	// if rlogger := httpmw.RequestLoggerFromContext(ctx); rlogger != nil {
-	// 	rlogger.WithFields(
-	// 		slog.F("requestor_id", actor.ID),
-	// 		slog.F("requestor_email", actor.Email),
-	// 	)
-	// }
+	if rlogger := loggermw.RequestLoggerFromContext(ctx); rlogger != nil {
+		rlogger.WithAuthContext(actor.ID, actor.FriendlyName, actor.Email)
+	}
 	return context.WithValue(ctx, authContextKey{}, actor)
 }
 
diff --git a/coderd/httpmw/logger/logger.go b/coderd/httpmw/logger/logger.go
@@ -62,30 +62,50 @@ func Logger(log slog.Logger) func(next http.Handler) http.Handler {
 type RequestLogger interface {
 	WithFields(fields ...slog.Field)
 	WriteLog(ctx context.Context, status int)
+	WithAuthContext(id string, name string, email string)
 }
 
 type SlogRequestLogger struct {
-	log     slog.Logger
-	written bool
-	message string
-	start   time.Time
+	log            slog.Logger
+	written        bool
+	message        string
+	authCtxPresent bool
+	start          time.Time
 }
 
 var _ RequestLogger = &SlogRequestLogger{}
 
 func NewRequestLogger(log slog.Logger, message string, start time.Time) RequestLogger {
 	return &SlogRequestLogger{
-		log:     log,
-		written: false,
-		message: message,
-		start:   start,
+		log:            log,
+		written:        false,
+		message:        message,
+		start:          start,
+		authCtxPresent: false,
 	}
 }
 
 func (c *SlogRequestLogger) WithFields(fields ...slog.Field) {
 	c.log = c.log.With(fields...)
 }
 
+func (c *SlogRequestLogger) WithAuthContext(id string, name string, email string) {
+	// If the email is empty, we don't want to log the requestor context,
+	// because it's an elevated privilege.
+	if email == "" || id == "" {
+		return
+	}
+	if c.authCtxPresent {
+		return
+	}
+	c.authCtxPresent = true
+	c.log = c.log.With(
+		slog.F("requestor_id", id),
+		slog.F("requestor_name", name),
+		slog.F("requestor_email", email),
+	)
+}
+
 func (c *SlogRequestLogger) WriteLog(ctx context.Context, status int) {
 	if c.written {
 		return
diff --git a/coderd/httpmw/logger/loggermock/loggermock.go b/coderd/httpmw/logger/loggermock/loggermock.go
