Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reverseproxy: Caddyfile health check headers, host header support #3948

Merged
merged 4 commits into from
Jan 4, 2021
Merged

reverseproxy: Caddyfile health check headers, host header support #3948

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96d1391
reverse_proxy: 1.health check headers can be set through Caddyfile us…
bookiu Dec 31, 2020
2526997
reverse_proxy:
bookiu Dec 31, 2020
5e15f74
bugfix: change caddyfile_adapt testcase file from space to tab
bookiu Dec 31, 2020
6c8c913
reverseproxy: modify health_header value document as optional and add…
bookiu Jan 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions modules/caddyhttp/reverseproxy/caddyfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ func parseCaddyfile(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error)
// health_timeout <duration>
// health_status <status>
// health_body <regexp>
// health_headers {
// Host example.com
// X-Header-Key value
francislavoie marked this conversation as resolved.
Show resolved Hide resolved
// }
//
// # passive health checking
// max_fails <num>
Expand Down Expand Up @@ -312,6 +316,19 @@ func (h *Handler) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
}
h.HealthChecks.Active.Port = portNum

case "health_headers":
healthHeaders, err := parseHealthHeaders(d.NewFromNextSegment())
if err != nil {
return err
}
if h.HealthChecks == nil {
h.HealthChecks = new(HealthChecks)
}
if h.HealthChecks.Active == nil {
h.HealthChecks.Active = new(ActiveHealthChecks)
}
h.HealthChecks.Active.Headers = healthHeaders

case "health_interval":
if !d.NextArg() {
return d.ArgErr()
Expand Down Expand Up @@ -836,6 +853,22 @@ func (h *HTTPTransport) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
return nil
}

// parseHealthHeaders parse health_headers block
func parseHealthHeaders(d *caddyfile.Dispenser) (http.Header, error) {
francislavoie marked this conversation as resolved.
Show resolved Hide resolved
healthHeaders := http.Header{}
for d.Next() {
for d.NextBlock(0) {
key := d.Val()
values := d.RemainingArgs()
if len(values) == 0 {
values = append(values, "")
}
healthHeaders[key] = values
}
}
return healthHeaders, nil
}

// Interface guards
var (
_ caddyfile.Unmarshaler = (*Handler)(nil)
Expand Down
7 changes: 6 additions & 1 deletion modules/caddyhttp/reverseproxy/healthchecks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"regexp"
"runtime/debug"
"strconv"
"strings"
"time"

"github.com/caddyserver/caddy/v2"
Expand Down Expand Up @@ -241,7 +242,11 @@ func (h *Handler) doActiveHealthCheck(dialInfo DialInfo, hostAddr string, host H
return fmt.Errorf("making request: %v", err)
}
for key, hdrs := range h.HealthChecks.Active.Headers {
req.Header[key] = hdrs
if strings.ToLower(key) == "host" {
req.Host = h.HealthChecks.Active.Headers.Get(key)
francislavoie marked this conversation as resolved.
Show resolved Hide resolved
} else {
req.Header[key] = hdrs
}
}

// do the request, being careful to tame the response body
Expand Down