🐛 FIX: multiple router group chaining bug

Author: AnikHasibul

router.go

@@ -91,6 +91,7 @@ var (
 // Router is a http.Handler which can be used to dispatch requests to different
 // handler functions via configurable routes
 type Router struct {
+	parent    *Router
 	beginPath string
 	trees     map[string]*node
 
@@ -159,13 +160,13 @@ func New() *Router {
 // Path auto-correction, including trailing slashes, is enabled by default.
 func (r *Router) Group(path string) *Router {
 	g := &Router{
+		parent:                 r,
 		beginPath:              path,
 		RedirectTrailingSlash:  true,
 		RedirectFixedPath:      true,
 		HandleMethodNotAllowed: true,
 		HandleOPTIONS:          true,
 	}
-	r.NotFound = g.Handler
 	return g
 }
 
@@ -219,14 +220,20 @@ func (r *Router) Handle(method, path string, handle fasthttp.RequestHandler) {
 	if r.beginPath != "/" {
 		path = r.beginPath + path
 	}
-	if r.trees == nil {
-		r.trees = make(map[string]*node)
+	var route *Router
+	if r.parent != nil {
+		route = r.parent
+	} else {
+		route = r
+	}
+	if route.trees == nil {
+		route.trees = make(map[string]*node)
 	}
 
-	root := r.trees[method]
+	root := route.trees[method]
 	if root == nil {
 		root = new(node)
-		r.trees[method] = root
+		route.trees[method] = root
 	}
 
 	root.addRoute(path, handle)

router_test.go

@@ -312,6 +312,8 @@ func TestRouterChaining(t *testing.T) {
 func TestRouterGroup(t *testing.T) {
 	r1 := New()
 	r2 := r1.Group("/boo")
+	r3 := r1.Group("/goo")
+	r4 := r1.Group("/moo")
 	fooHit := false
 	r1.POST("/foo", func(ctx *fasthttp.RequestCtx) {
 		fooHit = true
@@ -323,7 +325,14 @@ func TestRouterGroup(t *testing.T) {
 		barHit = true
 		ctx.SetStatusCode(fasthttp.StatusOK)
 	})
-
+	r3.POST("/bar", func(ctx *fasthttp.RequestCtx) {
+		barHit = true
+		ctx.SetStatusCode(fasthttp.StatusOK)
+	})
+	r4.POST("/bar", func(ctx *fasthttp.RequestCtx) {
+		barHit = true
+		ctx.SetStatusCode(fasthttp.StatusOK)
+	})
 	s := &fasthttp.Server{
 		Handler: r1.Handler,
 	}
@@ -369,7 +378,47 @@ func TestRouterGroup(t *testing.T) {
 		t.Fatalf("Unexpected error when reading response: %s", err)
 	}
 	if !(resp.Header.StatusCode() == fasthttp.StatusOK && barHit) {
-		t.Errorf("Chained routing failed with router chaining.")
+		t.Errorf("Chained routing failed with router grouping.")
+		t.FailNow()
+	}
+
+	rw.r.WriteString("POST /goo/bar HTTP/1.1\r\n\r\n")
+	go func() {
+		ch <- s.ServeConn(rw)
+	}()
+	select {
+	case err := <-ch:
+		if err != nil {
+			t.Fatalf("return error %s", err)
+		}
+	case <-time.After(100 * time.Millisecond):
+		t.Fatalf("timeout")
+	}
+	if err := resp.Read(br); err != nil {
+		t.Fatalf("Unexpected error when reading response: %s", err)
+	}
+	if !(resp.Header.StatusCode() == fasthttp.StatusOK && barHit) {
+		t.Errorf("Chained routing failed with router grouping.")
+		t.FailNow()
+	}
+
+	rw.r.WriteString("POST /moo/bar HTTP/1.1\r\n\r\n")
+	go func() {
+		ch <- s.ServeConn(rw)
+	}()
+	select {
+	case err := <-ch:
+		if err != nil {
+			t.Fatalf("return error %s", err)
+		}
+	case <-time.After(100 * time.Millisecond):
+		t.Fatalf("timeout")
+	}
+	if err := resp.Read(br); err != nil {
+		t.Fatalf("Unexpected error when reading response: %s", err)
+	}
+	if !(resp.Header.StatusCode() == fasthttp.StatusOK && barHit) {
+		t.Errorf("Chained routing failed with router grouping.")
 		t.FailNow()
 	}