httpsec: handle client ip with multiple http headers #1796
Merged
+136
−103
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Hellzy
approved these changes
Mar 27, 2023
| // none is present, it returns the first valid IP address present, possibly | ||
| // being a local IP address. The remote address, when valid, is used as fallback | ||
| // when no IP address has been found at all. | ||
| func ClientIP(hdrs map[string][]string, hasCanonicalMIMEHeaderKeys bool, remoteAddr string) (remoteIP, clientIP instrumentation.NetaddrIP) { |
There was a problem hiding this comment.
Minor nit: maybe we can rename hasCanonicalMIMEHeaderKeys to something a bit shorter?
Something like hasCanonicalHeaders or even just canonicalHeaders?
No strong opinion there so I'm also fine leaving it as is.
There was a problem hiding this comment.
agreed, but now this is validated I won't change it 😅
let's do this when we move it into go-appsec-internals
ahmed-mez
approved these changes
Mar 27, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Update the client IP algorithm to now handle the presence of multiple IP-related HTTP headers. To do so, the IP-related HTTP headers we want to handle are now ordered and the first client IP found among them is the one returned.
Motivation
The former implementation was a temporary version to gather data and feedback on how users use those IP-related HTTP headers. We found that:
Read more about this at https://datadoghq.atlassian.net/wiki/spaces/APS/pages/2118779066/Client+IP+addresses+resolution
Describe how to test/QA your changes
Reviewer's Checklist
Triagemilestone is set.