Merge pull request #550 from galen0624/issue-548-select-glob-or-strin…

…g-comp

Issue #548 added enable/disable glob matching

config/config.go

@@ -7,16 +7,17 @@ import (
 )
 
 type Config struct {
-	Proxy       Proxy
-	Registry    Registry
-	Listen      []Listen
-	Log         Log
-	Metrics     Metrics
-	UI          UI
-	Runtime     Runtime
-	ProfileMode string
-	ProfilePath string
-	Insecure    bool
+	Proxy               Proxy
+	Registry            Registry
+	Listen              []Listen
+	Log                 Log
+	Metrics             Metrics
+	UI                  UI
+	Runtime             Runtime
+	ProfileMode         string
+	ProfilePath         string
+	Insecure            bool
+	DisableGlobMatching bool
 }
 
 type CertSource struct {

config/load.go

@@ -187,6 +187,7 @@ func load(cmdline, environ, envprefix []string, props *properties.Properties) (c
 	f.StringVar(&cfg.UI.Title, "ui.title", defaultConfig.UI.Title, "optional title for the UI")
 	f.StringVar(&cfg.ProfileMode, "profile.mode", defaultConfig.ProfileMode, "enable profiling mode, one of [cpu, mem, mutex, block]")
 	f.StringVar(&cfg.ProfilePath, "profile.path", defaultConfig.ProfilePath, "path to profile dump file")
+	f.BoolVar(&cfg.DisableGlobMatching, "glob.matching.disabled", defaultConfig.DisableGlobMatching, "Disable Glob Matching on routes, one of [true, false]")
 
 	// deprecated flags
 	var proxyLogRoutes string

docs/content/ref/glob.matching.disabled.md

@@ -0,0 +1,11 @@
+---
+title: "glob.matching.disabled"
+---
+
+`glob.matching.disabled` disables glob matching on route lookups.
+
+Valid options are `true`, `false`
+
+The default is
+
+	glob.matching.disabled = false

fabio.properties

@@ -749,6 +749,17 @@
 # registry.consul.checksRequired = one
 
 
+# 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
+# Fabio performs a static string compare for route lookups.
+#
+# The default is
+#
+# glob.matching.disabled = false
+
+
 # metrics.target configures the backend the metrics values are
 # sent to.
 #

main.go

@@ -183,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)
+			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)

proxy/http_integration_test.go

@@ -27,6 +27,12 @@ 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) {
@@ -188,7 +194,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"])
+			return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globEnabled)
 		},
 	})
 	defer proxy.Close()
@@ -224,7 +230,7 @@ func TestProxyHost(t *testing.T) {
 			},
 		},
 		Lookup: func(r *http.Request) *route.Target {
-			return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"])
+			return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globEnabled)
 		},
 	})
 	defer proxy.Close()
@@ -271,7 +277,7 @@ func TestHostRedirect(t *testing.T) {
 		Transport: http.DefaultTransport,
 		Lookup: func(r *http.Request) *route.Target {
 			r.Host = "c.com"
-			return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"])
+			return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globEnabled)
 		},
 	})
 	defer proxy.Close()
@@ -310,7 +316,7 @@ func TestPathRedirect(t *testing.T) {
 	proxy := httptest.NewServer(&HTTPProxy{
 		Transport: http.DefaultTransport,
 		Lookup: func(r *http.Request) *route.Target {
-			return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"])
+			return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globEnabled)
 		},
 	})
 	defer proxy.Close()
@@ -478,7 +484,7 @@ func TestProxyHTTPSUpstream(t *testing.T) {
 		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"])
+			return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globEnabled)
 		},
 	})
 	defer proxy.Close()
@@ -497,7 +503,6 @@ func TestProxyHTTPSUpstreamSkipVerify(t *testing.T) {
 	server.TLS = &tls.Config{}
 	server.StartTLS()
 	defer server.Close()
-
 	proxy := httptest.NewServer(&HTTPProxy{
 		Config:    config.Proxy{},
 		Transport: http.DefaultTransport,
@@ -506,7 +511,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"])
+			return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globEnabled)
 		},
 	})
 	defer proxy.Close()
@@ -707,7 +712,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"])
+			return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globEnabled)
 		},
 		Logger: l,
 	}

proxy/listen_test.go

@@ -22,6 +22,8 @@ func TestGracefulShutdown(t *testing.T) {
 	}))
 	defer srv.Close()
 
+	globDisabled := false
+
 	// start proxy
 	addr := "127.0.0.1:57777"
 	var wg sync.WaitGroup
@@ -32,7 +34,7 @@ func TestGracefulShutdown(t *testing.T) {
 			Transport: http.DefaultTransport,
 			Lookup: func(r *http.Request) *route.Target {
 				tbl, _ := route.NewTable("route add svc / " + srv.URL)
-				return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"])
+				return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globDisabled)
 			},
 		}
 		l := config.Listen{Addr: addr}

proxy/ws_integration_test.go

@@ -33,6 +33,8 @@ func TestProxyWSUpstream(t *testing.T) {
 	defer wssServer.Close()
 	t.Log("Started WSS server: ", wssServer.URL)
 
+	globDisabled := false
+
 	routes := "route add ws /ws  " + wsServer.URL + "\n"
 	routes += "route add ws /wss " + wssServer.URL + ` opts "proto=https"` + "\n"
 	routes += "route add ws /insecure " + wssServer.URL + ` opts "proto=https tlsskipverify=true"` + "\n"
@@ -44,7 +46,7 @@ func TestProxyWSUpstream(t *testing.T) {
 		InsecureTransport: &http.Transport{TLSClientConfig: tlsInsecureConfig()},
 		Lookup: func(r *http.Request) *route.Target {
 			tbl, _ := route.NewTable(routes)
-			return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"])
+			return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globDisabled)
 		},
 	})
 	defer httpProxy.Close()
@@ -56,7 +58,7 @@ func TestProxyWSUpstream(t *testing.T) {
 		InsecureTransport: &http.Transport{TLSClientConfig: tlsInsecureConfig()},
 		Lookup: func(r *http.Request) *route.Target {
 			tbl, _ := route.NewTable(routes)
-			return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"])
+			return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globDisabled)
 		},
 	})
 	httpsProxy.TLS = tlsServerConfig()

route/issue57_test.go

@@ -32,7 +32,7 @@ func TestIssue57(t *testing.T) {
 		if err != nil {
 			t.Fatalf("%d: got %v want nil", i, err)
 		}
-		target := tbl.Lookup(req, "", rrPicker, prefixMatcher)
+		target := tbl.Lookup(req, "", rrPicker, prefixMatcher, globEnabled)
 		if target == nil {
 			t.Fatalf("%d: got %v want %v", i, target, want)
 		}

route/route_bench_test.go

@@ -123,8 +123,9 @@ func makeRequests(t Table) []*http.Request {
 func benchmarkGet(t Table, match matcher, pick picker, pb *testing.PB) {
 	reqs := makeRequests(t)
 	k, n := len(reqs), 0
+	//Glob Matching True
 	for pb.Next() {
-		t.Lookup(reqs[n%k], "", pick, match)
+		t.Lookup(reqs[n%k], "", pick, match, globEnabled)
 		n++
 	}
 }

route/table.go

@@ -299,6 +299,8 @@ func (t Table) matchingHosts(req *http.Request) (hosts []string) {
 	host := normalizeHost(req.Host, req.TLS != nil)
 	for pattern := range t {
 		normpat := normalizeHost(pattern, req.TLS != nil)
+		// TODO setup compiled GLOBs in a separate MAP
+		// TODO Issue #548
 		g := glob.MustCompile(normpat)
 		if g.Match(host) {
 			hosts = append(hosts, pattern)
@@ -327,6 +329,24 @@ func (t Table) matchingHosts(req *http.Request) (hosts []string) {
 	return
 }
 
+// Issue 548 - Added separate func
+//
+// matchingHostNoGlob returns the route from the
+// routing table which matches the normalized request hostname.
+func (t Table) matchingHostNoGlob(req *http.Request) (hosts []string) {
+	host := normalizeHost(req.Host, req.TLS != nil)
+
+	for pattern := range t {
+		normpat := normalizeHost(pattern, req.TLS != nil)
+		if normpat == host {
+			//log.Printf("DEBUG Matched %s and %s", normpat, host)
+			hosts = append(hosts, pattern)
+			return
+		}
+	}
+	return
+}
+
 // Reverse returns its argument string reversed rune-wise left to right.
 //
 // taken from https://github.com/golang/example/blob/master/stringutil/reverse.go
@@ -342,7 +362,9 @@ func Reverse(s string) string {
 // or nil if there is none. It first checks the routes for the host
 // and if none matches then it falls back to generic routes without
 // a host. This is useful for a catch-all '/' rule.
-func (t Table) Lookup(req *http.Request, trace string, pick picker, match matcher) (target *Target) {
+func (t Table) Lookup(req *http.Request, trace string, pick picker, match matcher, globDisabled bool) (target *Target) {
+
+	var hosts []string
 	if trace != "" {
 		if len(trace) > 16 {
 			trace = trace[:15]
@@ -352,7 +374,14 @@ func (t Table) Lookup(req *http.Request, trace string, pick picker, match matche
 
 	// find matching hosts for the request
 	// and add "no host" as the fallback option
-	hosts := t.matchingHosts(req)
+	// if globDisabled then match without Glob
+	// Issue 548
+	if globDisabled {
+		hosts = t.matchingHostNoGlob(req)
+	} else {
+		hosts = t.matchingHosts(req)
+	}
+
 	if trace != "" {
 		log.Printf("[TRACE] %s Matching hosts: %v", trace, hosts)
 	}