Fix RawPath handling in addPrefix

This commit is contained in:
Kevin Risden 2017-12-14 20:50:07 -06:00 committed by Traefiker
parent 799136a714
commit bddad57a7b
2 changed files with 51 additions and 13 deletions

View file

@ -12,6 +12,9 @@ type AddPrefix struct {
func (s *AddPrefix) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (s *AddPrefix) ServeHTTP(w http.ResponseWriter, r *http.Request) {
r.URL.Path = s.Prefix + r.URL.Path r.URL.Path = s.Prefix + r.URL.Path
if r.URL.RawPath != "" {
r.URL.RawPath = s.Prefix + r.URL.RawPath
}
r.RequestURI = r.URL.RequestURI() r.RequestURI = r.URL.RequestURI()
s.Handler.ServeHTTP(w, r) s.Handler.ServeHTTP(w, r)
} }

View file

@ -9,21 +9,56 @@ import (
) )
func TestAddPrefix(t *testing.T) { func TestAddPrefix(t *testing.T) {
tests := []struct {
desc string
prefix string
path string
expectedPath string
expectedRawPath string
}{
{
desc: "regular path",
prefix: "/a",
path: "/b",
expectedPath: "/a/b",
},
{
desc: "raw path is supported",
prefix: "/a",
path: "/b%2Fc",
expectedPath: "/a/b/c",
expectedRawPath: "/a/b%2Fc",
},
}
path := "/bar" for _, test := range tests {
prefix := "/foo" test := test
t.Run(test.desc, func(t *testing.T) {
t.Parallel()
var expectedPath string var actualPath, actualRawPath, requestURI string
handler := &AddPrefix{ handler := &AddPrefix{
Prefix: prefix, Prefix: test.prefix,
Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
expectedPath = r.URL.Path actualPath = r.URL.Path
actualRawPath = r.URL.RawPath
requestURI = r.RequestURI
}), }),
} }
req := testhelpers.MustNewRequest(http.MethodGet, "http://localhost"+path, nil) req := testhelpers.MustNewRequest(http.MethodGet, "http://localhost"+test.path, nil)
handler.ServeHTTP(nil, req) handler.ServeHTTP(nil, req)
assert.Equal(t, expectedPath, "/foo/bar", "Unexpected path.") assert.Equal(t, test.expectedPath, actualPath, "Unexpected path.")
assert.Equal(t, test.expectedRawPath, actualRawPath, "Unexpected raw path.")
expectedURI := test.expectedPath
if test.expectedRawPath != "" {
// go HTTP uses the raw path when existent in the RequestURI
expectedURI = test.expectedRawPath
}
assert.Equal(t, expectedURI, requestURI, "Unexpected request URI.")
})
}
} }