Skip to content

Commit

Permalink
updated test with CONST, var clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
@galen0624
galen0624 committed Sep 20, 2018
1 parent 1eb2e36 commit da67268
Show file tree
Hide file tree
Showing 8 changed files with 57 additions and 56 deletions.
1 change: 0 additions & 1 deletion config/default.go
View file
Expand Up @@ -77,5 +77,4 @@ var defaultConfig = &Config{
Color: "light-green",
Access: "rw",
},
DisableGlobMatching: false,
}
2 changes: 1 addition & 1 deletion docs/content/ref/glob.matching.disabled.md
View file
Expand Up @@ -2,7 +2,7 @@
title: "glob.matching.disabled"
---

`glob.matching.disabled` Disables glob matching on route lookups.
`glob.matching.disabled` disables glob matching on route lookups.

Valid options are `true`, `false`

Expand Down
2 changes: 1 addition & 1 deletion fabio.properties
View file
Expand Up @@ -743,7 +743,7 @@
# registry.consul.checksRequired = one


# glob.matching.disabled Disables glob matching on route lookups
# glob.matching.disabled disables glob matching on route lookups
# If glob matching is enabled there is a performance decrease
# for every route lookup. At a large number of services (> 500) this
# can have a significant impact on performance. If glob matching is disabled
Expand Down
3 changes: 1 addition & 2 deletions main.go
View file
Expand Up @@ -137,7 +137,6 @@ func main() {

func newHTTPProxy(cfg *config.Config) http.Handler {
var w io.Writer
globDisabled := cfg.DisableGlobMatching
switch cfg.Log.AccessTarget {
case "":
log.Printf("[INFO] Access logging disabled")
Expand Down Expand Up @@ -184,7 +183,7 @@ func newHTTPProxy(cfg *config.Config) http.Handler {
Transport: newTransport(nil),
InsecureTransport: newTransport(&tls.Config{InsecureSkipVerify: true}),
Lookup: func(r *http.Request) *route.Target {
t := route.GetTable().Lookup(r, r.Header.Get("trace"), pick, match, globDisabled)
t := route.GetTable().Lookup(r, r.Header.Get("trace"), pick, match, cfg.DisableGlobMatching)
if t == nil {
notFound.Inc(1)
log.Print("[WARN] No route for ", r.Host, r.URL)
Expand Down
31 changes: 15 additions & 16 deletions proxy/http_integration_test.go
View file
Expand Up @@ -27,6 +27,13 @@ import (
"github.com/pascaldekloe/goe/verify"
)


const (
// helper constants for the Lookup function
globEnabled = false
globDisabled = true
)

func TestProxyProducesCorrectXForwardedSomethingHeader(t *testing.T) {
var hdr http.Header = make(http.Header)
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
Expand Down Expand Up @@ -175,8 +182,6 @@ func TestProxyNoRouteStatus(t *testing.T) {
}

func TestProxyStripsPath(t *testing.T) {
//Glob Matching True
globDisabled := false
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
switch r.RequestURI {
case "/bar":
Expand All @@ -190,7 +195,7 @@ func TestProxyStripsPath(t *testing.T) {
Transport: http.DefaultTransport,
Lookup: func(r *http.Request) *route.Target {
tbl, _ := route.NewTable("route add mock /foo/bar " + server.URL + ` opts "strip=/foo"`)
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globDisabled)
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globEnabled)
},
})
defer proxy.Close()
Expand All @@ -217,7 +222,6 @@ func TestProxyHost(t *testing.T) {
routes += "route add mock /hostcustom http://b.com/ opts \"host=bar.com\"\n"
routes += "route add mock / http://a.com/"
tbl, _ := route.NewTable(routes)
globDisabled := false

proxy := httptest.NewServer(&HTTPProxy{
Transport: &http.Transport{
Expand All @@ -227,7 +231,7 @@ func TestProxyHost(t *testing.T) {
},
},
Lookup: func(r *http.Request) *route.Target {
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globDisabled)
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globEnabled)
},
})
defer proxy.Close()
Expand Down Expand Up @@ -269,13 +273,12 @@ func TestHostRedirect(t *testing.T) {
routes := "route add https-redir *:80 https://$host$path opts \"redirect=301\"\n"

tbl, _ := route.NewTable(routes)
globDisabled := false

proxy := httptest.NewServer(&HTTPProxy{
Transport: http.DefaultTransport,
Lookup: func(r *http.Request) *route.Target {
r.Host = "c.com"
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globDisabled)
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globEnabled)
},
})
defer proxy.Close()
Expand Down Expand Up @@ -310,12 +313,11 @@ func TestPathRedirect(t *testing.T) {
routes += "route add mock /foo http://a.com/abc opts \"redirect=301\"\n"
routes += "route add mock /bar http://b.com/$path opts \"redirect=302 strip=/bar\"\n"
tbl, _ := route.NewTable(routes)
globDisabled := false

proxy := httptest.NewServer(&HTTPProxy{
Transport: http.DefaultTransport,
Lookup: func(r *http.Request) *route.Target {
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globDisabled)
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globEnabled)
},
})
defer proxy.Close()
Expand Down Expand Up @@ -477,14 +479,13 @@ func TestProxyHTTPSUpstream(t *testing.T) {
server.TLS = tlsServerConfig()
server.StartTLS()
defer server.Close()
globDisabled := false

proxy := httptest.NewServer(&HTTPProxy{
Config: config.Proxy{},
Transport: &http.Transport{TLSClientConfig: tlsClientConfig()},
Lookup: func(r *http.Request) *route.Target {
tbl, _ := route.NewTable("route add srv / " + server.URL + ` opts "proto=https"`)
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globDisabled)
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globEnabled)
},
})
defer proxy.Close()
Expand All @@ -503,8 +504,6 @@ func TestProxyHTTPSUpstreamSkipVerify(t *testing.T) {
server.TLS = &tls.Config{}
server.StartTLS()
defer server.Close()
globDisabled := false

proxy := httptest.NewServer(&HTTPProxy{
Config: config.Proxy{},
Transport: http.DefaultTransport,
Expand All @@ -513,7 +512,7 @@ func TestProxyHTTPSUpstreamSkipVerify(t *testing.T) {
},
Lookup: func(r *http.Request) *route.Target {
tbl, _ := route.NewTable("route add srv / " + server.URL + ` opts "proto=https tlsskipverify=true"`)
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globDisabled)
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globEnabled)
},
})
defer proxy.Close()
Expand Down Expand Up @@ -706,7 +705,7 @@ func BenchmarkProxyLogger(b *testing.B) {
b.Fatal("logger.NewHTTPLogger:", err)
}

globDisabled := false


proxy := &HTTPProxy{
Config: config.Proxy{
Expand All @@ -716,7 +715,7 @@ func BenchmarkProxyLogger(b *testing.B) {
Transport: http.DefaultTransport,
Lookup: func(r *http.Request) *route.Target {
tbl, _ := route.NewTable("route add mock / " + server.URL)
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globDisabled)
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globEnabled)
},
Logger: l,
}
Expand Down
3 changes: 1 addition & 2 deletions route/issue57_test.go
View file
Expand Up @@ -24,7 +24,6 @@ func TestIssue57(t *testing.T) {
route del svcb`,
}

globDisabled := false

req := &http.Request{URL: mustParse("/foo")}
want := "http://foo.com:800"
Expand All @@ -34,7 +33,7 @@ func TestIssue57(t *testing.T) {
if err != nil {
t.Fatalf("%d: got %v want nil", i, err)
}
target := tbl.Lookup(req, "", rrPicker, prefixMatcher, globDisabled)
target := tbl.Lookup(req, "", rrPicker, prefixMatcher, globEnabled)
if target == nil {
t.Fatalf("%d: got %v want %v", i, target, want)
}
Expand Down
3 changes: 1 addition & 2 deletions route/route_bench_test.go
View file
Expand Up @@ -124,9 +124,8 @@ func benchmarkGet(t Table, match matcher, pick picker, pb *testing.PB) {
reqs := makeRequests(t)
k, n := len(reqs), 0
//Glob Matching True
globDisabled := false
for pb.Next() {
t.Lookup(reqs[n%k], "", pick, match, globDisabled)
t.Lookup(reqs[n%k], "", pick, match, globEnabled)
n++
}
}
68 changes: 37 additions & 31 deletions route/table_test.go
View file
Expand Up @@ -11,6 +11,12 @@ import (
"testing"
)

const (
// helper constants for the Lookup function
globEnabled = false
globDisabled = true
)

func TestTableParse(t *testing.T) {
genRoutes := func(n int, format string) (a []string) {
for i := 0; i < n; i++ {
Expand Down Expand Up @@ -501,7 +507,7 @@ func TestTableLookupIssue448(t *testing.T) {
var tests = []struct {
req *http.Request
dst string
globDisabled bool
globEnabled bool
}{
{
req: &http.Request{
Expand Down Expand Up @@ -552,7 +558,7 @@ func TestTableLookupIssue448(t *testing.T) {
}

for i, tt := range tests {
if got, want := tbl.Lookup(tt.req, "", rndPicker, prefixMatcher, tt.globDisabled).URL.String(), tt.dst; got != want {
if got, want := tbl.Lookup(tt.req, "", rndPicker, prefixMatcher, globEnabled).URL.String(), tt.dst; got != want {
t.Errorf("%d: got %v want %v", i, got, want)
}
}
Expand Down Expand Up @@ -583,52 +589,52 @@ func TestTableLookup(t *testing.T) {
var tests = []struct {
req *http.Request
dst string
globDisabled bool
globEnabled bool
}{
// match on host and path with and without trailing slash
{&http.Request{Host: "abc.com", URL: mustParse("/")}, "http://foo.com:1000", false},
{&http.Request{Host: "abc.com", URL: mustParse("/bar")}, "http://foo.com:1000", false},
{&http.Request{Host: "abc.com", URL: mustParse("/foo")}, "http://foo.com:1500", false},
{&http.Request{Host: "abc.com", URL: mustParse("/foo/")}, "http://foo.com:2000", false},
{&http.Request{Host: "abc.com", URL: mustParse("/foo/bar")}, "http://foo.com:2500", false},
{&http.Request{Host: "abc.com", URL: mustParse("/foo/bar/")}, "http://foo.com:3000", false},
{&http.Request{Host: "abc.com", URL: mustParse("/")}, "http://foo.com:1000", globEnabled},
{&http.Request{Host: "abc.com", URL: mustParse("/bar")}, "http://foo.com:1000", globEnabled},
{&http.Request{Host: "abc.com", URL: mustParse("/foo")}, "http://foo.com:1500", globEnabled},
{&http.Request{Host: "abc.com", URL: mustParse("/foo/")}, "http://foo.com:2000", globEnabled},
{&http.Request{Host: "abc.com", URL: mustParse("/foo/bar")}, "http://foo.com:2500", globEnabled},
{&http.Request{Host: "abc.com", URL: mustParse("/foo/bar/")}, "http://foo.com:3000", globEnabled},

// do not match on host but maybe on path
{&http.Request{Host: "def.com", URL: mustParse("/")}, "http://foo.com:800", false},
{&http.Request{Host: "def.com", URL: mustParse("/bar")}, "http://foo.com:800", false},
{&http.Request{Host: "def.com", URL: mustParse("/foo")}, "http://foo.com:900", false},
{&http.Request{Host: "def.com", URL: mustParse("/")}, "http://foo.com:800", globEnabled},
{&http.Request{Host: "def.com", URL: mustParse("/bar")}, "http://foo.com:800", globEnabled},
{&http.Request{Host: "def.com", URL: mustParse("/foo")}, "http://foo.com:900", globEnabled},

// strip default port
{&http.Request{Host: "abc.com:80", URL: mustParse("/")}, "http://foo.com:1000", false},
{&http.Request{Host: "abc.com:443", URL: mustParse("/"), TLS: &tls.ConnectionState{}}, "http://foo.com:1000", false},
{&http.Request{Host: "abc.com:80", URL: mustParse("/")}, "http://foo.com:1000", globEnabled},
{&http.Request{Host: "abc.com:443", URL: mustParse("/"), TLS: &tls.ConnectionState{}}, "http://foo.com:1000", globEnabled},

// not using default port
{&http.Request{Host: "abc.com:443", URL: mustParse("/")}, "http://foo.com:800", false},
{&http.Request{Host: "abc.com:80", URL: mustParse("/"), TLS: &tls.ConnectionState{}}, "http://foo.com:800", false},
{&http.Request{Host: "abc.com:443", URL: mustParse("/")}, "http://foo.com:800", globEnabled},
{&http.Request{Host: "abc.com:80", URL: mustParse("/"), TLS: &tls.ConnectionState{}}, "http://foo.com:800", globEnabled},

// glob match the host
{&http.Request{Host: "x.abc.com", URL: mustParse("/")}, "http://foo.com:4000", false},
{&http.Request{Host: "y.abc.com", URL: mustParse("/abc")}, "http://foo.com:4000", false},
{&http.Request{Host: "x.abc.com", URL: mustParse("/foo/")}, "http://foo.com:5000", false},
{&http.Request{Host: "y.abc.com", URL: mustParse("/foo/")}, "http://foo.com:5000", false},
{&http.Request{Host: ".abc.com", URL: mustParse("/foo/")}, "http://foo.com:5000", false},
{&http.Request{Host: "x.y.abc.com", URL: mustParse("/foo/")}, "http://foo.com:5000", false},
{&http.Request{Host: "y.abc.com:80", URL: mustParse("/foo/")}, "http://foo.com:5000", false},
{&http.Request{Host: "x.aaa.abc.com", URL: mustParse("/")}, "http://foo.com:6000", false},
{&http.Request{Host: "x.aaa.abc.com", URL: mustParse("/foo")}, "http://foo.com:6000", false},
{&http.Request{Host: "x.bbb.abc.com", URL: mustParse("/")}, "http://foo.com:6100", false},
{&http.Request{Host: "x.bbb.abc.com", URL: mustParse("/foo")}, "http://foo.com:6100", false},
{&http.Request{Host: "y.abc.com:443", URL: mustParse("/foo/"), TLS: &tls.ConnectionState{}}, "http://foo.com:5000", false},
{&http.Request{Host: "x.abc.com", URL: mustParse("/")}, "http://foo.com:4000", globEnabled},
{&http.Request{Host: "y.abc.com", URL: mustParse("/abc")}, "http://foo.com:4000", globEnabled},
{&http.Request{Host: "x.abc.com", URL: mustParse("/foo/")}, "http://foo.com:5000", globEnabled},
{&http.Request{Host: "y.abc.com", URL: mustParse("/foo/")}, "http://foo.com:5000", globEnabled},
{&http.Request{Host: ".abc.com", URL: mustParse("/foo/")}, "http://foo.com:5000", globEnabled},
{&http.Request{Host: "x.y.abc.com", URL: mustParse("/foo/")}, "http://foo.com:5000", globEnabled},
{&http.Request{Host: "y.abc.com:80", URL: mustParse("/foo/")}, "http://foo.com:5000", globEnabled},
{&http.Request{Host: "x.aaa.abc.com", URL: mustParse("/")}, "http://foo.com:6000", globEnabled},
{&http.Request{Host: "x.aaa.abc.com", URL: mustParse("/foo")}, "http://foo.com:6000", globEnabled},
{&http.Request{Host: "x.bbb.abc.com", URL: mustParse("/")}, "http://foo.com:6100", globEnabled},
{&http.Request{Host: "x.bbb.abc.com", URL: mustParse("/foo")}, "http://foo.com:6100", globEnabled},
{&http.Request{Host: "y.abc.com:443", URL: mustParse("/foo/"), TLS: &tls.ConnectionState{}}, "http://foo.com:5000", globEnabled},

// exact match has precedence over glob match
{&http.Request{Host: "z.abc.com", URL: mustParse("/foo/")}, "http://foo.com:3100", false},
{&http.Request{Host: "z.abc.com", URL: mustParse("/foo/")}, "http://foo.com:3100", globEnabled},

// explicit port on route
{&http.Request{Host: "xyz.com", URL: mustParse("/")}, "https://xyz.com", false},
{&http.Request{Host: "xyz.com", URL: mustParse("/")}, "https://xyz.com", globEnabled},
}

for i, tt := range tests {
if got, want := tbl.Lookup(tt.req, "", rndPicker, prefixMatcher, tt.globDisabled).URL.String(), tt.dst; got != want {
if got, want := tbl.Lookup(tt.req, "", rndPicker, prefixMatcher, tt.globEnabled).URL.String(), tt.dst; got != want {
t.Errorf("%d: got %v want %v", i, got, want)
}
}
Expand Down

0 comments on commit da67268

Please sign in to comment.