1
0
Fork 0
mirror of https://github.com/Eggbertx/gochan.git synced 2025-09-04 05:56:23 -07:00

Make zerolog error Event usage more consistent (Caller on the same line as Err)

This commit is contained in:
Eggbertx 2024-03-18 12:41:03 -07:00
parent c2d834c712
commit bd6992cb87
13 changed files with 129 additions and 163 deletions

View file

@ -7,19 +7,21 @@ import (
"github.com/gochan-org/gochan/pkg/config"
"github.com/gochan-org/gochan/pkg/gcutil"
"github.com/rs/zerolog"
)
// ValidReferer checks to make sure that the incoming request is from the same domain (or if debug mode is enabled)
func ValidReferer(request *http.Request) bool {
if config.VerboseMode() {
return true
}
func ValidReferer(request *http.Request, errEv ...*zerolog.Event) bool {
referer := request.Referer()
rURL, err := url.ParseRequestURI(referer)
if err != nil {
gcutil.Logger().Err(err).
Str("referer", referer).
Msg("Error parsing referer URL")
var ev *zerolog.Event
if len(errEv) == 1 {
ev = gcutil.LogError(err).Caller()
} else {
ev = errEv[0].Err(err).Caller()
}
ev.Str("referer", referer).Msg("Error parsing referer URL")
return false
}
return strings.Index(rURL.Path, config.GetSystemCriticalConfig().WebRoot) == 0