mediocregopher/mediocre-blog
1
0
Fork 0
Code Pull Requests Releases Activity

improve logging of ips, to account for xff and x-real-ip

Browse Source
This commit is contained in:
Brian Picciano 2022-08-09 15:23:03 -06:00
parent fa47baffb6
commit 7f6d7366e3
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
srv/src/http/middleware.go
View File

@ -40,15 +40,24 @@ func setLoggerMiddleware(logger *mlog.Logger) middleware {
type logCtxKey string type logCtxKey string
ip, _, _ := net.SplitHostPort(r.RemoteAddr)
ctx := r.Context() ctx := r.Context()
ctx = mctx.Annotate(ctx, ctx = mctx.Annotate(ctx,
logCtxKey("remote_ip"), ip,
logCtxKey("url"), r.URL, logCtxKey("url"), r.URL,
logCtxKey("method"), r.Method, logCtxKey("method"), r.Method,
) )
if xff := r.Header.Get("X-Forwarded-For"); xff != "" {
ctx = mctx.Annotate(ctx, logCtxKey("x_forwarded_for"), xff)
}
if xrip := r.Header.Get("X-Real-IP"); xrip != "" {
ctx = mctx.Annotate(ctx, logCtxKey("x_real_ip"), xrip)
}
if ip, _, _ := net.SplitHostPort(r.RemoteAddr); ip != "" {
ctx = mctx.Annotate(ctx, logCtxKey("remote_ip"), ip)
}
r = r.WithContext(ctx) r = r.WithContext(ctx)
r = apiutil.SetRequestLogger(r, logger) r = apiutil.SetRequestLogger(r, logger)
h.ServeHTTP(rw, r) h.ServeHTTP(rw, r)