mirror of
https://github.com/labstack/echo.git
synced 2024-12-24 20:14:31 +02:00
Merge branch 'bugfix/1412-route-matchany-multilevel' of https://github.com/neotel-at/echo into neotel-at-bugfix/1412-route-matchany-multilevel
This commit is contained in:
Vishal Rana
commit
8f69b47891
@ -65,3 +65,42 @@ func TestGroupRouteMiddleware(t *testing.T) {
|
||||
c, _ = request(http.MethodGet, "/group/405", e)
|
||||
assert.Equal(t, 405, c)
|
||||
}
|
||||
|
||||
func TestGroupRouteMiddlewareWithMatchAny(t *testing.T) {
|
||||
// Ensure middleware and match any routes do not conflict
|
||||
e := New()
|
||||
g := e.Group("/group")
|
||||
m1 := func(next HandlerFunc) HandlerFunc {
|
||||
return func(c Context) error {
|
||||
return next(c)
|
||||
}
|
||||
}
|
||||
m2 := func(next HandlerFunc) HandlerFunc {
|
||||
return func(c Context) error {
|
||||
return c.String(http.StatusOK, c.Path())
|
||||
}
|
||||
}
|
||||
h := func(c Context) error {
|
||||
return c.String(http.StatusOK, c.Path())
|
||||
}
|
||||
g.Use(m1)
|
||||
g.GET("/help", h, m2)
|
||||
g.GET("/*", h, m2)
|
||||
g.GET("", h, m2)
|
||||
e.GET("unrelated", h, m2)
|
||||
e.GET("*", h, m2)
|
||||
|
||||
_, m := request(http.MethodGet, "/group/help", e)
|
||||
assert.Equal(t, "/group/help", m)
|
||||
_, m = request(http.MethodGet, "/group/help/other", e)
|
||||
assert.Equal(t, "/group/*", m)
|
||||
_, m = request(http.MethodGet, "/group/404", e)
|
||||
assert.Equal(t, "/group/*", m)
|
||||
_, m = request(http.MethodGet, "/group", e)
|
||||
assert.Equal(t, "/group", m)
|
||||
_, m = request(http.MethodGet, "/other", e)
|
||||
assert.Equal(t, "/*", m)
|
||||
_, m = request(http.MethodGet, "/", e)
|
||||
assert.Equal(t, "/*", m)
|
||||
|
||||
}
|
||||
|
||||
49
router.go
49
router.go
@ -1,6 +1,9 @@
|
||||
package echo
|
||||
|
||||
import "net/http"
|
||||
import (
|
||||
"net/http"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type (
|
||||
// Router is the registry of all registered routes for an `Echo` instance for
|
||||
@ -20,8 +23,8 @@ type (
|
||||
pnames []string
|
||||
methodHandler *methodHandler
|
||||
}
|
||||
kind uint8
|
||||
children []*node
|
||||
kind uint8
|
||||
children []*node
|
||||
methodHandler struct {
|
||||
connect HandlerFunc
|
||||
delete HandlerFunc
|
||||
@ -133,6 +136,11 @@ func (r *Router) insert(method, path string, h HandlerFunc, t kind, ppath string
|
||||
// Split node
|
||||
n := newNode(cn.kind, cn.prefix[l:], cn, cn.children, cn.methodHandler, cn.ppath, cn.pnames)
|
||||
|
||||
// Update parent path for all children to new node
|
||||
for _, child := range cn.children {
|
||||
child.parent = n
|
||||
}
|
||||
|
||||
// Reset parent node
|
||||
cn.kind = skind
|
||||
cn.label = cn.prefix[0]
|
||||
@ -336,7 +344,6 @@ func (r *Router) Find(method, path string, c Context) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if l == pl {
|
||||
// Continue search
|
||||
search = search[l:]
|
||||
@ -398,16 +405,32 @@ func (r *Router) Find(method, path string, c Context) {
|
||||
Any:
|
||||
if cn = cn.findChildByKind(akind); cn == nil {
|
||||
if nn != nil {
|
||||
cn = nn
|
||||
nn = cn.parent // Next (Issue #954)
|
||||
if nn != nil {
|
||||
nk = nn.kind
|
||||
}
|
||||
// No next node to go down in routing (issue #954)
|
||||
// Find nearest "any" route going up the routing tree
|
||||
search = ns
|
||||
if nk == pkind {
|
||||
goto Param
|
||||
} else if nk == akind {
|
||||
goto Any
|
||||
np := nn.parent
|
||||
// Consider param route one level up only
|
||||
// if no slash is remaining in search string
|
||||
if cn = nn.findChildByKind(pkind); cn != nil && strings.IndexByte(ns, '/') == -1 {
|
||||
break
|
||||
}
|
||||
for {
|
||||
np = nn.parent
|
||||
if cn = nn.findChildByKind(akind); cn != nil {
|
||||
break
|
||||
}
|
||||
if np == nil {
|
||||
break // no further parent nodes in tree, abort
|
||||
}
|
||||
var str strings.Builder
|
||||
str.WriteString(nn.prefix)
|
||||
str.WriteString(search)
|
||||
search = str.String()
|
||||
nn = np
|
||||
}
|
||||
if cn != nil { // use the found "any" route and update path
|
||||
pvalues[len(cn.pnames)-1] = search
|
||||
break
|
||||
}
|
||||
}
|
||||
return // Not found
|
||||
|
||||
243
router_test.go
243
router_test.go
@ -499,6 +499,15 @@ var (
|
||||
{"GET", "/people/:userId/moments/:collection", ""},
|
||||
{"DELETE", "/moments/:id", ""},
|
||||
}
|
||||
|
||||
// handlerHelper created a function that will set a context key for assertion
|
||||
handlerHelper = func(key string, value int) func(c Context) error {
|
||||
return func(c Context) error {
|
||||
c.Set(key, value)
|
||||
c.Set("path", c.Path())
|
||||
return nil
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
func TestRouterStatic(t *testing.T) {
|
||||
@ -595,20 +604,91 @@ func TestRouterMatchAnyMultiLevel(t *testing.T) {
|
||||
// Routes
|
||||
r.Add(http.MethodGet, "/api/users/jack", handler)
|
||||
r.Add(http.MethodGet, "/api/users/jill", handler)
|
||||
r.Add(http.MethodGet, "/api/users/*", handler)
|
||||
r.Add(http.MethodGet, "/api/*", handler)
|
||||
r.Add(http.MethodGet, "/other/*", handler)
|
||||
r.Add(http.MethodGet, "/*", handler)
|
||||
|
||||
c := e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodGet, "/api/users/jack", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, "/api/users/jack", c.Get("path"))
|
||||
assert.Equal(t, "", c.Param("*"))
|
||||
|
||||
r.Find(http.MethodGet, "/api/users/jill", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, "/api/users/jill", c.Get("path"))
|
||||
assert.Equal(t, "", c.Param("*"))
|
||||
|
||||
r.Find(http.MethodGet, "/api/users/joe", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, "/api/users/*", c.Get("path"))
|
||||
assert.Equal(t, "joe", c.Param("*"))
|
||||
|
||||
r.Find(http.MethodGet, "/api/nousers/joe", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, "/api/*", c.Get("path"))
|
||||
assert.Equal(t, "nousers/joe", c.Param("*"))
|
||||
|
||||
r.Find(http.MethodGet, "/api/none", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, "/api/*", c.Get("path"))
|
||||
assert.Equal(t, "none", c.Param("*"))
|
||||
|
||||
r.Find(http.MethodGet, "/noapi/users/jim", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, "/*", c.Get("path"))
|
||||
assert.Equal(t, "noapi/users/jim", c.Param("*"))
|
||||
}
|
||||
func TestRouterMatchAnyMultiLevelWithPost(t *testing.T) {
|
||||
e := New()
|
||||
r := e.router
|
||||
handler := func(c Context) error {
|
||||
c.Set("path", c.Path())
|
||||
return nil
|
||||
}
|
||||
|
||||
// Routes
|
||||
e.POST("/api/auth/login", handler)
|
||||
e.POST("/api/auth/forgotPassword", handler)
|
||||
e.Any("/api/*", handler)
|
||||
e.Any("/*", handler)
|
||||
|
||||
// POST /api/auth/login shall choose login method
|
||||
c := e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodPost, "/api/auth/login", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, "/api/auth/login", c.Get("path"))
|
||||
assert.Equal(t, "", c.Param("*"))
|
||||
|
||||
// GET /api/auth/login shall choose any route
|
||||
// c = e.NewContext(nil, nil).(*context)
|
||||
// r.Find(http.MethodGet, "/api/auth/login", c)
|
||||
// c.handler(c)
|
||||
// assert.Equal(t, "/api/*", c.Get("path"))
|
||||
// assert.Equal(t, "auth/login", c.Param("*"))
|
||||
|
||||
// POST /api/auth/logout shall choose nearest any route
|
||||
c = e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodPost, "/api/auth/logout", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, "/api/*", c.Get("path"))
|
||||
assert.Equal(t, "auth/logout", c.Param("*"))
|
||||
|
||||
// POST to /api/other/test shall choose nearest any route
|
||||
c = e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodPost, "/api/other/test", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, "/api/*", c.Get("path"))
|
||||
assert.Equal(t, "other/test", c.Param("*"))
|
||||
|
||||
// GET to /api/other/test shall choose nearest any route
|
||||
c = e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodGet, "/api/other/test", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, "/api/*", c.Get("path"))
|
||||
assert.Equal(t, "other/test", c.Param("*"))
|
||||
|
||||
}
|
||||
|
||||
func TestRouterMicroParam(t *testing.T) {
|
||||
@ -674,71 +754,123 @@ func TestRouterPriority(t *testing.T) {
|
||||
r := e.router
|
||||
|
||||
// Routes
|
||||
r.Add(http.MethodGet, "/users", func(c Context) error {
|
||||
c.Set("a", 1)
|
||||
return nil
|
||||
})
|
||||
r.Add(http.MethodGet, "/users/new", func(c Context) error {
|
||||
c.Set("b", 2)
|
||||
return nil
|
||||
})
|
||||
r.Add(http.MethodGet, "/users/:id", func(c Context) error {
|
||||
c.Set("c", 3)
|
||||
return nil
|
||||
})
|
||||
r.Add(http.MethodGet, "/users/dew", func(c Context) error {
|
||||
c.Set("d", 4)
|
||||
return nil
|
||||
})
|
||||
r.Add(http.MethodGet, "/users/:id/files", func(c Context) error {
|
||||
c.Set("e", 5)
|
||||
return nil
|
||||
})
|
||||
r.Add(http.MethodGet, "/users/newsee", func(c Context) error {
|
||||
c.Set("f", 6)
|
||||
return nil
|
||||
})
|
||||
r.Add(http.MethodGet, "/users/*", func(c Context) error {
|
||||
c.Set("g", 7)
|
||||
return nil
|
||||
})
|
||||
c := e.NewContext(nil, nil).(*context)
|
||||
r.Add(http.MethodGet, "/users", handlerHelper("a", 1))
|
||||
r.Add(http.MethodGet, "/users/new", handlerHelper("b", 2))
|
||||
r.Add(http.MethodGet, "/users/:id", handlerHelper("c", 3))
|
||||
r.Add(http.MethodGet, "/users/dew", handlerHelper("d", 4))
|
||||
r.Add(http.MethodGet, "/users/:id/files", handlerHelper("e", 5))
|
||||
r.Add(http.MethodGet, "/users/newsee", handlerHelper("f", 6))
|
||||
r.Add(http.MethodGet, "/users/*", handlerHelper("g", 7))
|
||||
r.Add(http.MethodGet, "/users/new/*", handlerHelper("h", 8))
|
||||
r.Add(http.MethodGet, "/*", handlerHelper("i", 9))
|
||||
|
||||
// Route > /users
|
||||
c := e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodGet, "/users", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, 1, c.Get("a"))
|
||||
assert.Equal(t, "/users", c.Get("path"))
|
||||
|
||||
// Route > /users/new
|
||||
c = e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodGet, "/users/new", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, 2, c.Get("b"))
|
||||
assert.Equal(t, "/users/new", c.Get("path"))
|
||||
|
||||
// Route > /users/:id
|
||||
c = e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodGet, "/users/1", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, 3, c.Get("c"))
|
||||
assert.Equal(t, "/users/:id", c.Get("path"))
|
||||
|
||||
// Route > /users/dew
|
||||
c = e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodGet, "/users/dew", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, 4, c.Get("d"))
|
||||
assert.Equal(t, "/users/dew", c.Get("path"))
|
||||
|
||||
// Route > /users/:id/files
|
||||
c = e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodGet, "/users/1/files", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, 5, c.Get("e"))
|
||||
assert.Equal(t, "/users/:id/files", c.Get("path"))
|
||||
|
||||
// Route > /users/:id
|
||||
c = e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodGet, "/users/news", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, 3, c.Get("c"))
|
||||
assert.Equal(t, "/users/:id", c.Get("path"))
|
||||
|
||||
// Route > /users/newsee
|
||||
c = e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodGet, "/users/newsee", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, 6, c.Get("f"))
|
||||
assert.Equal(t, "/users/newsee", c.Get("path"))
|
||||
|
||||
// Route > /users/newsee
|
||||
r.Find(http.MethodGet, "/users/newsee", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, 6, c.Get("f"))
|
||||
|
||||
// Route > /users/newsee
|
||||
r.Find(http.MethodGet, "/users/newsee", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, 6, c.Get("f"))
|
||||
|
||||
// Route > /users/*
|
||||
c = e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodGet, "/users/joe/books", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, 7, c.Get("g"))
|
||||
assert.Equal(t, "/users/*", c.Get("path"))
|
||||
assert.Equal(t, "joe/books", c.Param("*"))
|
||||
|
||||
// Route > /users/new/* should be matched
|
||||
c = e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodGet, "/users/new/someone", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, 8, c.Get("h"))
|
||||
assert.Equal(t, "/users/new/*", c.Get("path"))
|
||||
assert.Equal(t, "someone", c.Param("*"))
|
||||
|
||||
// Route > /users/* should be matched although /users/dew exists
|
||||
c = e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodGet, "/users/dew/someone", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, 7, c.Get("g"))
|
||||
assert.Equal(t, "/users/*", c.Get("path"))
|
||||
|
||||
assert.Equal(t, "dew/someone", c.Param("*"))
|
||||
|
||||
// Route > /users/* should be matched although /users/dew exists
|
||||
c = e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodGet, "/users/notexists/someone", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, 7, c.Get("g"))
|
||||
assert.Equal(t, "/users/*", c.Get("path"))
|
||||
assert.Equal(t, "notexists/someone", c.Param("*"))
|
||||
|
||||
// Route > *
|
||||
c = e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodGet, "/nousers", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, 9, c.Get("i"))
|
||||
assert.Equal(t, "/*", c.Get("path"))
|
||||
assert.Equal(t, "nousers", c.Param("*"))
|
||||
|
||||
// Route > *
|
||||
c = e.NewContext(nil, nil).(*context)
|
||||
r.Find(http.MethodGet, "/nousers/new", c)
|
||||
c.handler(c)
|
||||
assert.Equal(t, 9, c.Get("i"))
|
||||
assert.Equal(t, "/*", c.Get("path"))
|
||||
assert.Equal(t, "nousers/new", c.Param("*"))
|
||||
}
|
||||
|
||||
func TestRouterIssue1348(t *testing.T) {
|
||||
@ -819,36 +951,59 @@ func TestRouterParamNames(t *testing.T) {
|
||||
assert.Equal(t, "1", c.Param("fid"))
|
||||
}
|
||||
|
||||
// Issue #623
|
||||
// Issue #623 and #1406
|
||||
func TestRouterStaticDynamicConflict(t *testing.T) {
|
||||
e := New()
|
||||
r := e.router
|
||||
|
||||
r.Add(http.MethodGet, "/dictionary/skills", handlerHelper("a", 1))
|
||||
r.Add(http.MethodGet, "/dictionary/:name", handlerHelper("b", 2))
|
||||
r.Add(http.MethodGet, "/users/new", handlerHelper("d", 4))
|
||||
r.Add(http.MethodGet, "/users/:name", handlerHelper("e", 5))
|
||||
r.Add(http.MethodGet, "/server", handlerHelper("c", 3))
|
||||
r.Add(http.MethodGet, "/", handlerHelper("f", 6))
|
||||
|
||||
c := e.NewContext(nil, nil)
|
||||
|
||||
r.Add(http.MethodGet, "/dictionary/skills", func(c Context) error {
|
||||
c.Set("a", 1)
|
||||
return nil
|
||||
})
|
||||
r.Add(http.MethodGet, "/dictionary/:name", func(c Context) error {
|
||||
c.Set("b", 2)
|
||||
return nil
|
||||
})
|
||||
r.Add(http.MethodGet, "/server", func(c Context) error {
|
||||
c.Set("c", 3)
|
||||
return nil
|
||||
})
|
||||
|
||||
r.Find(http.MethodGet, "/dictionary/skills", c)
|
||||
c.Handler()(c)
|
||||
assert.Equal(t, 1, c.Get("a"))
|
||||
assert.Equal(t, "/dictionary/skills", c.Get("path"))
|
||||
|
||||
c = e.NewContext(nil, nil)
|
||||
r.Find(http.MethodGet, "/dictionary/skillsnot", c)
|
||||
c.Handler()(c)
|
||||
assert.Equal(t, 2, c.Get("b"))
|
||||
assert.Equal(t, "/dictionary/:name", c.Get("path"))
|
||||
|
||||
c = e.NewContext(nil, nil)
|
||||
r.Find(http.MethodGet, "/dictionary/type", c)
|
||||
c.Handler()(c)
|
||||
assert.Equal(t, 2, c.Get("b"))
|
||||
assert.Equal(t, "/dictionary/:name", c.Get("path"))
|
||||
|
||||
c = e.NewContext(nil, nil)
|
||||
r.Find(http.MethodGet, "/server", c)
|
||||
c.Handler()(c)
|
||||
assert.Equal(t, 3, c.Get("c"))
|
||||
assert.Equal(t, "/server", c.Get("path"))
|
||||
|
||||
c = e.NewContext(nil, nil)
|
||||
r.Find(http.MethodGet, "/users/new", c)
|
||||
c.Handler()(c)
|
||||
assert.Equal(t, 4, c.Get("d"))
|
||||
assert.Equal(t, "/users/new", c.Get("path"))
|
||||
|
||||
c = e.NewContext(nil, nil)
|
||||
r.Find(http.MethodGet, "/users/new2", c)
|
||||
c.Handler()(c)
|
||||
assert.Equal(t, 5, c.Get("e"))
|
||||
assert.Equal(t, "/users/:name", c.Get("path"))
|
||||
|
||||
c = e.NewContext(nil, nil)
|
||||
r.Find(http.MethodGet, "/", c)
|
||||
c.Handler()(c)
|
||||
assert.Equal(t, 6, c.Get("f"))
|
||||
assert.Equal(t, "/", c.Get("path"))
|
||||
}
|
||||
|
||||
// Issue #1348
|
||||
|
||||
Loading…
Reference in New Issue
Block a user