summaryrefslogtreecommitdiff
path: root/modules/caddyhttp/reverseproxy
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2019-10-31 11:34:54 -0600
committerMatthew Holt <mholt@users.noreply.github.com>2019-10-31 11:34:54 -0600
commit8ef0a0b4f8968fd1952449f9068e66486f40964c (patch)
tree1b428853c3a2b445263222a8ac1e858699716d0c /modules/caddyhttp/reverseproxy
parent8d3c64932eddb42f7e5c4549555e9d12a559d552 (diff)
reverse_proxy: Fix panic for some CLI flag values (closes #2848)
Diffstat (limited to 'modules/caddyhttp/reverseproxy')
-rw-r--r--modules/caddyhttp/reverseproxy/command.go24
1 files changed, 15 insertions, 9 deletions
diff --git a/modules/caddyhttp/reverseproxy/command.go b/modules/caddyhttp/reverseproxy/command.go
index 0a664ed..e48b3e8 100644
--- a/modules/caddyhttp/reverseproxy/command.go
+++ b/modules/caddyhttp/reverseproxy/command.go
@@ -17,7 +17,7 @@ package reverseproxy
import (
"encoding/json"
"flag"
- "log"
+ "fmt"
"net/http"
"net/url"
"strings"
@@ -63,18 +63,21 @@ func cmdReverseProxy(fs caddycmd.Flags) (int, error) {
from = "localhost:" + httpcaddyfile.DefaultPort
}
+ // URLs need a scheme in order to parse successfully
if !strings.Contains(from, "://") {
from = "http://" + from
}
+ if !strings.Contains(to, "://") {
+ to = "http://" + to
+ }
fromURL, err := url.Parse(from)
if err != nil {
- fromURL.Host = from
+ return caddy.ExitCodeFailedStartup, fmt.Errorf("parsing 'from' URL: %v", err)
}
-
toURL, err := url.Parse(to)
if err != nil {
- toURL.Host = to
+ return caddy.ExitCodeFailedStartup, fmt.Errorf("parsing 'to' URL: %v", err)
}
ht := HTTPTransport{}
@@ -99,16 +102,19 @@ func cmdReverseProxy(fs caddycmd.Flags) (int, error) {
caddyconfig.JSONModuleObject(handler, "handler", "reverse_proxy", nil),
},
}
- if fromURL.Hostname() != "" {
+ urlHost := fromURL.Hostname()
+ if urlHost != "" {
route.MatcherSetsRaw = []map[string]json.RawMessage{
map[string]json.RawMessage{
- "host": caddyconfig.JSON(caddyhttp.MatchHost{fromURL.Hostname()}, nil),
+ "host": caddyconfig.JSON(caddyhttp.MatchHost{urlHost}, nil),
},
}
}
- listen := ":" + httpcaddyfile.DefaultPort
- if certmagic.HostQualifies(fromURL.Hostname()) {
+ listen := ":80"
+ if urlPort := fromURL.Port(); urlPort != "" {
+ listen = ":" + urlPort
+ } else if certmagic.HostQualifies(urlHost) {
listen = ":443"
}
@@ -132,7 +138,7 @@ func cmdReverseProxy(fs caddycmd.Flags) (int, error) {
return caddy.ExitCodeFailedStartup, err
}
- log.Printf("Caddy 2 proxying from %s to %s", from, to)
+ fmt.Printf("Caddy 2 proxying from %s to %s\n", fromURL, toURL)
select {}
}