mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2024-12-25 07:51:29 +01:00
[feature] Log pubKeyID for http-signed requests (#2501)
This commit is contained in:
parent
022bfda52a
commit
aad3384c98
@ -28,6 +28,7 @@ import (
|
|||||||
"codeberg.org/gruf/go-kv"
|
"codeberg.org/gruf/go-kv"
|
||||||
"codeberg.org/gruf/go-logger/v2/level"
|
"codeberg.org/gruf/go-logger/v2/level"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/gtscontext"
|
||||||
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
|
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
|
||||||
"github.com/superseriousbusiness/gotosocial/internal/log"
|
"github.com/superseriousbusiness/gotosocial/internal/log"
|
||||||
)
|
)
|
||||||
@ -77,15 +78,24 @@ func Logger(logClientIP bool) gin.HandlerFunc {
|
|||||||
fields[2] = kv.Field{"method", c.Request.Method}
|
fields[2] = kv.Field{"method", c.Request.Method}
|
||||||
fields[3] = kv.Field{"statusCode", code}
|
fields[3] = kv.Field{"statusCode", code}
|
||||||
fields[4] = kv.Field{"path", path}
|
fields[4] = kv.Field{"path", path}
|
||||||
|
|
||||||
|
// Set optional request logging fields.
|
||||||
if logClientIP {
|
if logClientIP {
|
||||||
fields = append(fields, kv.Field{
|
fields = append(fields, kv.Field{
|
||||||
"clientIP", c.ClientIP(),
|
"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
|
// Create log entry with fields
|
||||||
l := log.New()
|
l := log.New()
|
||||||
l = l.WithContext(c.Request.Context())
|
l = l.WithContext(ctx)
|
||||||
l = l.WithFields(fields...)
|
l = l.WithFields(fields...)
|
||||||
|
|
||||||
// Default is info
|
// Default is info
|
||||||
|
Loading…
Reference in New Issue
Block a user