Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-22 16:39:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 121

Added support to logging X-Forward-For header (#2133) (#2193)

Browse source 
Allows Fleet to log the actual client address and not just the proxy address when communicating with the osquery endpoints.
This commit is contained in:
Jean M 2020-02-11 17:16:12 +00:00 committed by GitHub
parent bc7c5704d4
commit 877cd7e39a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
server/service/logging_osquery.go
View file

@ -20,6 +20,7 @@ func (mw loggingMiddleware) EnrollAgent(ctx context.Context, enrollSecret string
_ = mw.logger.Log(
"method", "EnrollAgent",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"x_for_ip_addr", ctx.Value(kithttp.ContextKeyRequestXForwardedFor).(string),
"err", err,
"took", time.Since(begin),
)
@ -39,6 +40,7 @@ func (mw loggingMiddleware) AuthenticateHost(ctx context.Context, nodeKey string
_ = mw.logger.Log(
"method", "AuthenticateHost",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"x_for_ip_addr", ctx.Value(kithttp.ContextKeyRequestXForwardedFor).(string),
"err", err,
"took", time.Since(begin),
)
@ -58,6 +60,7 @@ func (mw loggingMiddleware) GetClientConfig(ctx context.Context) (map[string]int
_ = mw.logger.Log(
"method", "GetClientConfig",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"x_for_ip_addr", ctx.Value(kithttp.ContextKeyRequestXForwardedFor).(string),
"err", err,
"took", time.Since(begin),
)
@ -78,6 +81,7 @@ func (mw loggingMiddleware) GetDistributedQueries(ctx context.Context) (map[stri
_ = mw.logger.Log(
"method", "GetDistributedQueries",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"x_for_ip_addr", ctx.Value(kithttp.ContextKeyRequestXForwardedFor).(string),
"err", err,
"took", time.Since(begin),
)
@ -96,6 +100,7 @@ func (mw loggingMiddleware) SubmitDistributedQueryResults(ctx context.Context, r
_ = mw.logger.Log(
"method", "SubmitDistributedQueryResults",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"x_for_ip_addr", ctx.Value(kithttp.ContextKeyRequestXForwardedFor).(string),
"err", err,
"took", time.Since(begin),
)
@ -114,6 +119,7 @@ func (mw loggingMiddleware) SubmitStatusLogs(ctx context.Context, logs []json.Ra
_ = mw.logger.Log(
"method", "SubmitStatusLogs",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"x_for_ip_addr", ctx.Value(kithttp.ContextKeyRequestXForwardedFor).(string),
"err", err,
"took", time.Since(begin),
)
@ -132,6 +138,7 @@ func (mw loggingMiddleware) SubmitResultLogs(ctx context.Context, logs []json.Ra
_ = mw.logger.Log(
"method", "SubmitResultLogs",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"x_for_ip_addr", ctx.Value(kithttp.ContextKeyRequestXForwardedFor).(string),
"err", err,
"took", time.Since(begin),
)