Packetbeat: Handle ports and IPv6 in Host header #14215
Merged
Conversation
This file contains 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
adriansr
commented
Oct 24, 2019
| @@ -95,6 +96,8 @@ func synthesizeFullURL(u *ecs.Url, port int64) string { | |||
| host := u.Domain | |||
| if port != 80 { | |||
| host = net.JoinHostPort(u.Domain, strconv.Itoa(int(u.Port))) | |||
| } else if strings.IndexByte(u.Domain, ':') != -1 { | |||
| host = "[" + u.Domain + "]" | |||
There was a problem hiding this comment.
This is necessary because Golang's net/url package expects u.Domain already surrounded with square brackets when it's an IPv6, but surrounds it for you when you use net.JoinHostPort above.
Also checking for a : character to determine if the host its an IPv6 address is what the url package does internally.
| @@ -701,6 +707,24 @@ func parseCookieValue(raw string) string { | |||
| return raw | |||
| } | |||
|
|
|||
| func extractHostHeader(header string) (host string, port int) { | |||
There was a problem hiding this comment.
This whole function can be replaced by url.Hostname() and url.Port() but those don't handles the case where an IPv6 address is not surrounded by brackets.
|
jenkins, test this |
When an IPv6 address is used as host for a connection to port 80 the address in the URL won't be surrounded by square brackets which is against RFC3986.
The HTTP parser in Packetbeat wasn't properly handling the hostname and port from "Host:" header, generating wrong "destination.domain" and "url.full" fields.
30e470f to
129aaa0
Compare
andrewkroh
approved these changes
Oct 25, 2019
adriansr
added a commit
to adriansr/beats
that referenced
this pull request
Oct 25, 2019
The HTTP parser in Packetbeat wasn't properly handling the hostname and port from "Host:" header, generating wrong "destination.domain" and "url.full" fields. (cherry picked from commit 6acde25)
adriansr
added a commit
that referenced
this pull request
Oct 30, 2019
jorgemarey
pushed a commit
to jorgemarey/beats
that referenced
this pull request
Jun 8, 2020
The HTTP parser in Packetbeat wasn't properly handling the hostname and port from "Host:" header, generating wrong "destination.domain" and "url.full" fields.
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
…elastic#14232) The HTTP parser in Packetbeat wasn't properly handling the hostname and port from "Host:" header, generating wrong "destination.domain" and "url.full" fields. (cherry picked from commit e4bcff8)
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.
The http parser in Packetbeat is not correctly populating events when the host header contains a port number and/or an IPv6 address:
For "Host: elasticsearch:9200":
For "Host: [::1]":
- "destination.domain": "[::1]" "url.full": "http://[::1]/"For "Host: [::1]:9200":