Commit d8e7adcd authored by Matthew Holt's avatar Matthew Holt

Refactored proxy middleware

parent 113b175d
......@@ -2,7 +2,6 @@
package proxy
import (
"log"
"net/http"
"net/http/httputil"
"net/url"
......@@ -11,30 +10,22 @@ import (
"github.com/mholt/caddy/middleware"
)
// New creates a new instance of proxy middleware.
func New(c middleware.Controller) (middleware.Middleware, error) {
var rules []proxyRule
for c.Next() {
rule := proxyRule{}
if !c.Args(&rule.from, &rule.to) {
return nil, c.ArgErr()
}
rules = append(rules, rule)
}
// Proxy represents a middleware instance that can proxy requests.
type Proxy struct {
Next middleware.Handler
Rules []Rule
}
return func(next middleware.Handler) middleware.Handler {
return middleware.HandlerFunc(func(w http.ResponseWriter, r *http.Request) (int, error) {
// ServeHTTP satisfies the middleware.Handler interface.
func (p Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) {
for _, rule := range rules {
if middleware.Path(r.URL.Path).Matches(rule.from) {
for _, rule := range p.Rules {
if middleware.Path(r.URL.Path).Matches(rule.From) {
var base string
if strings.HasPrefix(rule.to, "http") { // includes https
if strings.HasPrefix(rule.To, "http") { // includes https
// destination includes a scheme! no need to guess
base = rule.to
base = rule.To
} else {
// no scheme specified; assume same as request
var scheme string
......@@ -43,12 +34,12 @@ func New(c middleware.Controller) (middleware.Middleware, error) {
} else {
scheme = "https"
}
base = scheme + "://" + rule.to
base = scheme + "://" + rule.To
}
baseUrl, err := url.Parse(base)
if err != nil {
log.Fatal(err)
return http.StatusInternalServerError, err
}
r.Host = baseUrl.Host
......@@ -59,12 +50,35 @@ func New(c middleware.Controller) (middleware.Middleware, error) {
}
}
return next.ServeHTTP(w, r)
})
return p.Next.ServeHTTP(w, r)
}
// New creates a new instance of proxy middleware.
func New(c middleware.Controller) (middleware.Middleware, error) {
rules, err := parse(c)
if err != nil {
return nil, err
}
return func(next middleware.Handler) middleware.Handler {
return Proxy{Next: next, Rules: rules}
}, nil
}
type proxyRule struct {
from string
to string
func parse(c middleware.Controller) ([]Rule, error) {
var rules []Rule
for c.Next() {
var rule Rule
if !c.Args(&rule.From, &rule.To) {
return rules, c.ArgErr()
}
rules = append(rules, rule)
}
return rules, nil
}
type Rule struct {
From, To string
}
......@@ -108,7 +108,7 @@ func New(c middleware.Controller) (middleware.Middleware, error) {
Path: path,
Command: cmd,
Arguments: args,
Respawn: respawn,
Respawn: respawn, // TODO: This isn't used currently
})
}
......
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