Rule parsing error.

This commit is contained in:
Ludovic Fernandez 2018-10-04 10:20:03 +02:00 committed by Traefiker Bot
parent 31f92001e2
commit ec86149b1e
2 changed files with 19 additions and 4 deletions

View file

@ -269,6 +269,9 @@ func (r *Rules) Parse(expression string) (*mux.Route, error) {
if r.err != nil {
return r.err
}
if resultRoute == nil {
return fmt.Errorf("invalid expression: %s", expression)
}
if resultRoute.GetError() != nil {
return resultRoute.GetError()
}

View file

@ -218,11 +218,17 @@ func TestHostRegexp(t *testing.T) {
}
}
type fakeHandler struct {
name string
}
func TestParseInvalidSyntax(t *testing.T) {
router := mux.NewRouter()
router.StrictSlash(true)
func (h *fakeHandler) ServeHTTP(http.ResponseWriter, *http.Request) {}
rules := &Rules{Route: &types.ServerRoute{Route: router.NewRoute()}}
expression01 := "Path: /path1;Query:param_one=true, /path2"
routeFoo, err := rules.Parse(expression01)
require.Error(t, err)
assert.Nil(t, routeFoo)
}
func TestPathPrefix(t *testing.T) {
testCases := []struct {
@ -287,3 +293,9 @@ func TestPathPrefix(t *testing.T) {
})
}
}
type fakeHandler struct {
name string
}
func (h *fakeHandler) ServeHTTP(http.ResponseWriter, *http.Request) {}