diff --git a/config/load.go b/config/load.go index 098d0c2c1..72b2b70e4 100644 --- a/config/load.go +++ b/config/load.go @@ -247,7 +247,7 @@ func load(cmdline, environ, envprefix []string, props *properties.Properties) (c return nil, fmt.Errorf("invalid proxy.strategy: %s", cfg.Proxy.Strategy) } - if cfg.Proxy.Matcher != "prefix" && cfg.Proxy.Matcher != "glob" { + if cfg.Proxy.Matcher != "prefix" && cfg.Proxy.Matcher != "glob" && cfg.Proxy.Matcher != "iprefix" { return nil, fmt.Errorf("invalid proxy.matcher: %s", cfg.Proxy.Matcher) } diff --git a/config/load_test.go b/config/load_test.go index fc17f186d..29fb9682a 100644 --- a/config/load_test.go +++ b/config/load_test.go @@ -306,6 +306,13 @@ func TestLoad(t *testing.T) { return cfg }, }, + { + args: []string{"-proxy.matcher", "iprefix"}, + cfg: func(cfg *Config) *Config { + cfg.Proxy.Matcher = "iprefix" + return cfg + }, + }, { args: []string{"-proxy.noroutestatus", "555"}, cfg: func(cfg *Config) *Config { diff --git a/docs/content/ref/proxy.matcher.md b/docs/content/ref/proxy.matcher.md index f029f29ef..dea344fef 100644 --- a/docs/content/ref/proxy.matcher.md +++ b/docs/content/ref/proxy.matcher.md @@ -8,8 +8,8 @@ title: "proxy.matcher" * `prefix`: prefix matching * `glob`: glob matching -When `prefix` matching is enabled then the route path must be a -prefix of the request URI, e.g. `/foo` matches `/foo`, `/foot` but +When `prefix` matching is enabled then the route path must be a +prefix of the request URI, e.g. `/foo` matches `/foo`, `/foot` but not `/fo`. When `glob` matching is enabled the route is evaluated according to @@ -19,6 +19,8 @@ function. For example, `/foo*` matches `/foo`, `/fool` and `/fools`. Also, `/foo/*/bar` matches `/foo/x/bar`. +`iprefix` matching is similar to `prefix`, except it uses a case insensitive comparison + The default is proxy.matcher = prefix diff --git a/fabio.properties b/fabio.properties index 703027d3d..42177a9fc 100644 --- a/fabio.properties +++ b/fabio.properties @@ -297,6 +297,7 @@ # # prefix: prefix matching # glob: glob matching +# iprefix: case-insensitive prefix matching # # The default is # diff --git a/route/matcher.go b/route/matcher.go index 3a7274c66..4cdbbbbe2 100644 --- a/route/matcher.go +++ b/route/matcher.go @@ -10,8 +10,9 @@ type matcher func(uri string, r *Route) bool // Matcher contains the available matcher functions. // Update config/load.go#load after updating. var Matcher = map[string]matcher{ - "prefix": prefixMatcher, - "glob": globMatcher, + "prefix": prefixMatcher, + "glob": globMatcher, + "iprefix": iPrefixMatcher, } // prefixMatcher matches path to the routes' path. @@ -23,3 +24,12 @@ func prefixMatcher(uri string, r *Route) bool { func globMatcher(uri string, r *Route) bool { return r.Glob.Match(uri) } + +// iPrefixMatcher matches path to the routes' path ignoring case +func iPrefixMatcher(uri string, r *Route) bool { + // todo(fs): if this turns out to be a performance issue we should cache + // todo(fs): strings.ToLower(r.Path) in r.PathLower + lowerURI := strings.ToLower(uri) + lowerPath := strings.ToLower(r.Path) + return strings.HasPrefix(lowerURI, lowerPath) +} diff --git a/route/matcher_test.go b/route/matcher_test.go index 59a068c90..163be120d 100644 --- a/route/matcher_test.go +++ b/route/matcher_test.go @@ -60,3 +60,24 @@ func TestGlobMatcher(t *testing.T) { }) } } + +func TestIPrefixMatcher(t *testing.T) { + tests := []struct { + uri string + matches bool + route *Route + }{ + {uri: "/foo", matches: false, route: &Route{Path: "/fool"}}, + {uri: "/foo", matches: true, route: &Route{Path: "/foo"}}, + {uri: "/Fool", matches: true, route: &Route{Path: "/foo"}}, + {uri: "/foo", matches: true, route: &Route{Path: "/Foo"}}, + } + + for _, tt := range tests { + t.Run(tt.uri, func(t *testing.T) { + if got, want := iPrefixMatcher(tt.uri, tt.route), tt.matches; got != want { + t.Fatalf("got %v want %v", got, want) + } + }) + } +}