Correctly forward Host header in healthcheck #3203
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
kamaradclimber
force-pushed
the
hostheader
branch
2 times, most recently
from
f4bf066
to
af42c1c
Compare
magiconair
reviewed
Jun 28, 2017
agent/check_test.go
Outdated
| @@ -213,6 +213,7 @@ func TestCheckHTTP(t *testing.T) { | |||
|
|
|||
| // custom header | |||
| {desc: "custom header", code: 200, header: http.Header{"A": []string{"b", "c"}}, status: api.HealthPassing}, | |||
| {desc: "host header", code: 200, header: http.Header{"Host": []string{"customhost"}}, status: api.HealthPassing}, | |||
agent/check.go
Outdated
| @@ -386,6 +386,10 @@ func (c *CheckHTTP) check() { | |||
| req.Header = make(http.Header) | |||
| } | |||
|
|
|||
| if host, ok := c.Header["Host"]; ok && len(host) > 0 { | |||
There was a problem hiding this comment.
if host := c.Header.Get("Host"); host != "" {
req.Host = host
}
agent/check_test.go
Outdated
| @@ -234,7 +235,9 @@ func TestCheckHTTP(t *testing.T) { | |||
| "User-Agent": []string{"Consul Health Check"}, | |||
| } | |||
| for k, v := range tt.header { | |||
| expectedHeader[k] = v | |||
| if k != "Host" { | |||
There was a problem hiding this comment.
This only tests that the Host header is not part of the Header object but it does not test whether the custom value was actually set. I think for this you have to compare the r.Host with the custom host header. Maybe like this:
for k, v := range tt.header {
expectedHeader[k] = v
}
// the Host header is in r.Host and not in the headers
host := expectedHeaders.Get("Host")
if host != "" && host != r.Host {
w.WriteHeader(999)
return
}
expectedHeaders.Del("Host")
kamaradclimber
force-pushed
the
hostheader
branch
from
9a1f3d6
to
c7dd22e
Compare
|
thanks @magiconair for your comments (you've simply rewritten my patch :) ) |
magiconair
reviewed
Jun 29, 2017
agent/check_test.go
Outdated
| @@ -234,8 +235,17 @@ func TestCheckHTTP(t *testing.T) { | |||
| "User-Agent": []string{"Consul Health Check"}, | |||
| } | |||
| for k, v := range tt.header { | |||
| expectedHeader[k] = v | |||
| expectedHeader[k] = v | |||
There was a problem hiding this comment.
pls run gofmt. This doesn't look right.
Host header must be set explicitely on http requests Change-Id: I91a32f0fb1ec3fbc713adf0e10869797e91172c7 Signed-off-by: Grégoire Seux <g.seux@criteo.com>
kamaradclimber
force-pushed
the
hostheader
branch
from
c7dd22e
to
074b4a9
Compare
|
This LGTM. @slackpad do you want to have a quick peek? |
|
Looks good - thanks! |
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.
Host header must be set explicitely on http requests
I'll write test a bit later