Skip to content

Commit

Permalink
[feature] Log pubKeyID for http-signed requests (#2501)
Browse files Browse the repository at this point in the history
  • Loading branch information
tsmethurst committed Jan 10, 2024
1 parent f33d05c commit 1c56192
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion internal/middleware/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"codeberg.org/gruf/go-kv"
"codeberg.org/gruf/go-logger/v2/level"
"github.com/gin-gonic/gin"
"github.com/superseriousbusiness/gotosocial/internal/gtscontext"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/log"
)
Expand Down Expand Up @@ -77,15 +78,24 @@ func Logger(logClientIP bool) gin.HandlerFunc {
fields[2] = kv.Field{"method", c.Request.Method}
fields[3] = kv.Field{"statusCode", code}
fields[4] = kv.Field{"path", path}

// Set optional request logging fields.
if logClientIP {
fields = append(fields, kv.Field{
"clientIP", c.ClientIP(),
})
}

ctx := c.Request.Context()
if pubKeyID := gtscontext.HTTPSignaturePubKeyID(ctx); pubKeyID != nil {
fields = append(fields, kv.Field{
"pubKeyID", pubKeyID.String(),
})
}

// Create log entry with fields
l := log.New()
l = l.WithContext(c.Request.Context())
l = l.WithContext(ctx)
l = l.WithFields(fields...)

// Default is info
Expand Down

0 comments on commit 1c56192

Please sign in to comment.