summaryrefslogtreecommitdiff
path: root/modules/caddyhttp/reverseproxy
diff options
context:
space:
mode:
authorMohammed Al Sahaf <msaa1990@gmail.com>2020-10-01 23:05:39 +0300
committerGitHub <noreply@github.com>2020-10-01 14:05:39 -0600
commit6722426f1a9e6c8a5fb0bbcafd4b5f99cad2b070 (patch)
tree43e61820ec2a8593297941a108a5430983232353 /modules/caddyhttp/reverseproxy
parent3b9eae70c9cc680792cdc86513f74f7cc49f43b1 (diff)
reverseproxy: allow no port for SRV; fix regression in d55d50b (#3756)
* reverseproxy: fix breakage in handling SRV lookup introduced by 3695 * reverseproxy: validate against incompatible config options with lookup_srv * reverseproxy: add integration test cases for validations involving lookup_srv * reverseproxy: clarify the reason for skipping an iteration * grammar.. Oxford comma Co-authored-by: Francis Lavoie <lavofr@gmail.com> Co-authored-by: Francis Lavoie <lavofr@gmail.com> Fixes #3753
Diffstat (limited to 'modules/caddyhttp/reverseproxy')
-rw-r--r--modules/caddyhttp/reverseproxy/reverseproxy.go34
1 files changed, 25 insertions, 9 deletions
diff --git a/modules/caddyhttp/reverseproxy/reverseproxy.go b/modules/caddyhttp/reverseproxy/reverseproxy.go
index 0f93df0..eac02b6 100644
--- a/modules/caddyhttp/reverseproxy/reverseproxy.go
+++ b/modules/caddyhttp/reverseproxy/reverseproxy.go
@@ -129,6 +129,21 @@ func (h *Handler) Provision(ctx caddy.Context) error {
h.ctx = ctx
h.logger = ctx.Logger(h)
+ // get validation out of the way
+ for i, v := range h.Upstreams {
+ // Having LookupSRV non-empty conflicts with 2 other config parameters: active health checks, and upstream dial address.
+ // Therefore if LookupSRV is empty, then there are no immediately apparent config conflicts, and the iteration can be skipped.
+ if v.LookupSRV == "" {
+ continue
+ }
+ if h.HealthChecks != nil && h.HealthChecks.Active != nil {
+ return fmt.Errorf(`upstream: lookup_srv is incompatible with active health checks: %d: {"dial": %q, "lookup_srv": %q}`, i, v.Dial, v.LookupSRV)
+ }
+ if v.Dial != "" {
+ return fmt.Errorf(`upstream: specifying dial address is incompatible with lookup_srv: %d: {"dial": %q, "lookup_srv": %q}`, i, v.Dial, v.LookupSRV)
+ }
+ }
+
// start by loading modules
if h.TransportRaw != nil {
mod, err := ctx.LoadModule(h, "TransportRaw")
@@ -204,17 +219,18 @@ func (h *Handler) Provision(ctx caddy.Context) error {
// set up upstreams
for _, upstream := range h.Upstreams {
- addr, err := caddy.ParseNetworkAddress(upstream.Dial)
- if err != nil {
- return err
- }
-
- if addr.PortRangeSize() != 1 {
- return fmt.Errorf("multiple addresses (upstream must map to only one address): %v", addr)
- }
+ if upstream.LookupSRV == "" {
+ addr, err := caddy.ParseNetworkAddress(upstream.Dial)
+ if err != nil {
+ return err
+ }
- upstream.networkAddress = addr
+ if addr.PortRangeSize() != 1 {
+ return fmt.Errorf("multiple addresses (upstream must map to only one address): %v", addr)
+ }
+ upstream.networkAddress = addr
+ }
// create or get the host representation for this upstream
var host Host = new(upstreamHost)
existingHost, loaded := hosts.LoadOrStore(upstream.String(), host)