diff options
| -rw-r--r-- | modules/caddyhttp/matchers.go | 19 | ||||
| -rw-r--r-- | modules/caddyhttp/matchers_test.go | 32 |
2 files changed, 45 insertions, 6 deletions
diff --git a/modules/caddyhttp/matchers.go b/modules/caddyhttp/matchers.go index 23b13dd..bddb214 100644 --- a/modules/caddyhttp/matchers.go +++ b/modules/caddyhttp/matchers.go @@ -33,10 +33,10 @@ import ( ) type ( - // MatchHost matches requests by the Host value. + // MatchHost matches requests by the Host value (case-insensitive). MatchHost []string - // MatchPath matches requests by the URI's path. + // MatchPath matches requests by the URI's path (case-insensitive). MatchPath []string // MatchPathRE matches requests by a regular expression on the URI's path. @@ -154,20 +154,29 @@ func (MatchPath) CaddyModule() caddy.ModuleInfo { } } +// Provision lower-cases the paths in m to ensure case-insensitive matching. +func (m MatchPath) Provision(_ caddy.Context) error { + for i := range m { + m[i] = strings.ToLower(m[i]) + } + return nil +} + // Match returns true if r matches m. func (m MatchPath) Match(r *http.Request) bool { + lowerPath := strings.ToLower(r.URL.Path) for _, matchPath := range m { // as a special case, if the first character is a // wildcard, treat it as a quick suffix match if strings.HasPrefix(matchPath, "*") { - return strings.HasSuffix(r.URL.Path, matchPath[1:]) + return strings.HasSuffix(lowerPath, matchPath[1:]) } // can ignore error here because we can't handle it anyway - matches, _ := filepath.Match(matchPath, r.URL.Path) + matches, _ := filepath.Match(matchPath, lowerPath) if matches { return true } - if strings.HasPrefix(r.URL.Path, matchPath) { + if strings.HasPrefix(lowerPath, matchPath) { return true } } diff --git a/modules/caddyhttp/matchers_test.go b/modules/caddyhttp/matchers_test.go index 81cb1d0..4569425 100644 --- a/modules/caddyhttp/matchers_test.go +++ b/modules/caddyhttp/matchers_test.go @@ -48,6 +48,16 @@ func TestHostMatcher(t *testing.T) { expect: true, }, { + match: MatchHost{"EXAMPLE.COM"}, + input: "example.com", + expect: true, + }, + { + match: MatchHost{"example.com"}, + input: "EXAMPLE.COM", + expect: true, + }, + { match: MatchHost{"example.com"}, input: "foo.example.com", expect: false, @@ -74,6 +84,11 @@ func TestHostMatcher(t *testing.T) { }, { match: MatchHost{"*.example.com"}, + input: "SUB.EXAMPLE.COM", + expect: true, + }, + { + match: MatchHost{"*.example.com"}, input: "foo.example.com", expect: true, }, @@ -174,7 +189,12 @@ func TestPathMatcher(t *testing.T) { }, { match: MatchPath{"*.ext"}, - input: "foo.ext", + input: "/foo.ext", + expect: true, + }, + { + match: MatchPath{"*.php"}, + input: "/index.PHP", expect: true, }, { @@ -192,6 +212,16 @@ func TestPathMatcher(t *testing.T) { input: "/foo/bar/bam", expect: false, }, + { + match: MatchPath{"/foo"}, + input: "/FOO", + expect: true, + }, + { + match: MatchPath{"/foo/bar.txt"}, + input: "/foo/BAR.txt", + expect: true, + }, } { req := &http.Request{URL: &url.URL{Path: tc.input}} actual := tc.match.Match(req) |