Commit 9f793dad authored by Matthew Holt's avatar Matthew Holt

Proxy destination may include scheme

parent f2f5d498
...@@ -6,6 +6,7 @@ import ( ...@@ -6,6 +6,7 @@ import (
"net/http" "net/http"
"net/http/httputil" "net/http/httputil"
"net/url" "net/url"
"strings"
"github.com/mholt/caddy/middleware" "github.com/mholt/caddy/middleware"
) )
...@@ -29,14 +30,23 @@ func New(c middleware.Controller) (middleware.Middleware, error) { ...@@ -29,14 +30,23 @@ func New(c middleware.Controller) (middleware.Middleware, error) {
for _, rule := range rules { for _, rule := range rules {
if middleware.Path(r.URL.Path).Matches(rule.from) { if middleware.Path(r.URL.Path).Matches(rule.from) {
var scheme string var base string
if r.TLS == nil {
scheme = "http" if strings.HasPrefix(rule.to, "http") { // includes https
// destination includes a scheme! no need to guess
base = rule.to
} else { } else {
scheme = "https" // no scheme specified; assume same as request
var scheme string
if r.TLS == nil {
scheme = "http"
} else {
scheme = "https"
}
base = scheme + "://" + rule.to
} }
baseUrl, err := url.Parse(scheme + "://" + rule.to) baseUrl, err := url.Parse(base)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment