fix(radix/node): tsr for childs that becomes a final path

fasthttp · Feb 27, 2023 · 91fd40b · 91fd40b
1 parent b5e63c0
commit 91fd40b
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git a/radix/node.go b/radix/node.go
@@ -127,9 +127,14 @@ func (n *node) setHandler(handler fasthttp.RequestHandler, fullPath string) (*no
 	}
 
 	if n.path != "/" && !foundTSR {
-		childTSR := newNode("/")
-		childTSR.tsr = true
-		n.children = append(n.children, childTSR)
+		if strings.HasSuffix(n.path, "/") {
+			n.split(len(n.path) - 1)
+			n.tsr = true
+		} else {
+			childTSR := newNode("/")
+			childTSR.tsr = true
+			n.children = append(n.children, childTSR)
+		}
 	}
 
 	return n, nil

diff --git a/radix/node_test.go b/radix/node_test.go
@@ -366,6 +366,8 @@ func TestTreeTrailingSlashRedirect(t *testing.T) {
 		"/no/a",
 		"/no/b",
 		"/api/hello/{name}",
+		"/foo/data/hello",
+		"/foo/",
 	}
 	for _, route := range routes {
 		recv := catchPanic(func() {
@@ -391,6 +393,8 @@ func TestTreeTrailingSlashRedirect(t *testing.T) {
 		"/admin/config/",
 		"/admin/config/permissions/",
 		"/doc/",
+		"/foo/data/hello/",
+		"/foo",
 	}
 	for _, route := range tsrRoutes {
 		handler, tsr := tree.Get(route, nil)

diff --git a/radix/tree_test.go b/radix/tree_test.go
@@ -154,6 +154,28 @@ func Test_Tree(t *testing.T) {
 				},
 			},
 		},
+		{
+			args: args{
+				path:    "/data/orders",
+				reqPath: "/data/orders/",
+				handler: generateHandler(),
+			},
+			want: want{
+				tsr:    true,
+				params: nil,
+			},
+		},
+		{
+			args: args{
+				path:    "/data/",
+				reqPath: "/data",
+				handler: generateHandler(),
+			},
+			want: want{
+				tsr:    true,
+				params: nil,
+			},
+		},
 	}
 
 	tree := New()