opensource/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-08-26 03:11:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

logging: Fix cookie filter (#4943)

Browse Source
This commit is contained in:
Francis Lavoie
2022-08-08 21:11:02 -04:00
committed by GitHub
parent 7f6a328b47
commit fe61209df2
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/logging/filters.go
View File

@ -26,6 +26,7 @@ import (
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"go.uber.org/zap/zapcore"
)
@ -456,7 +457,13 @@ func (m *CookieFilter) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
// Filter filters the input field.
func (m CookieFilter) Filter(in zapcore.Field) zapcore.Field {
originRequest := http.Request{Header: http.Header{"Cookie": []string{in.String}}}
cookiesSlice, ok := in.Interface.(caddyhttp.LoggableStringArray)
if !ok {
return in
}
// using a dummy Request to make use of the Cookies() function to parse it
originRequest := http.Request{Header: http.Header{"Cookie": cookiesSlice}}
cookies := originRequest.Cookies()
transformedRequest := http.Request{Header: make(http.Header)}
@ -486,7 +493,7 @@ OUTER:
transformedRequest.AddCookie(c)
}
in.String = transformedRequest.Header.Get("Cookie")
in.Interface = caddyhttp.LoggableStringArray(transformedRequest.Header["Cookie"])
return in
}