Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix conflict between param and exact path #2706

Merged
merged 7 commits into from
May 19, 2021
Merged

Fix conflict between param and exact path #2706

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
801d7b3
Fix conflict between param and exact path
g1eny0ung Apr 25, 2021
39fa5a3
Add test
g1eny0ung Apr 25, 2021
7c9e3b0
Fix prefix conflict in exact paths
g1eny0ung Apr 28, 2021
3bb5308
Use backtracking
g1eny0ung Apr 29, 2021
e75fe4a
Fix panic
g1eny0ung Apr 29, 2021
47b1ea4
Merge branch 'master' into fix/issue#2682
g1eny0ung Apr 29, 2021
808f903
Merge branch 'master' into fix/issue#2682
g1eny0ung May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions tree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,14 @@ walk: // Outer loop for walking the tree
idxc := path[0]
for i, c := range []byte(n.indices) {
if c == idxc {
n = n.children[i]
continue walk
childWillWalkTo := n.children[i]

if strings.Split(childWillWalkTo.path, "/")[0] != strings.Split(path, "/")[0] && strings.HasPrefix(n.children[len(n.children)-1].path, ":") {
g1eny0ung marked this conversation as resolved.
Show resolved Hide resolved
continue
} else {
n = childWillWalkTo
continue walk
}
}
}

Expand Down
2 changes: 2 additions & 0 deletions tree_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ func TestTreeWildcard(t *testing.T) {
"/src/*filepath",
"/search/",
"/search/:query",
"/search/gin-gonic",
"/user_:name",
"/user_:name/about",
"/files/:dir/*filepath",
Expand Down Expand Up @@ -169,6 +170,7 @@ func TestTreeWildcard(t *testing.T) {
{"/search/", false, "/search/", nil},
{"/search/someth!ng+in+ünìcodé", false, "/search/:query", Params{Param{Key: "query", Value: "someth!ng+in+ünìcodé"}}},
{"/search/someth!ng+in+ünìcodé/", true, "", Params{Param{Key: "query", Value: "someth!ng+in+ünìcodé"}}},
{"/search/gin", false, "/search/:query", Params{Param{"query", "gin"}}},
g1eny0ung marked this conversation as resolved.
Show resolved Hide resolved
{"/user_gopher", false, "/user_:name", Params{Param{Key: "name", Value: "gopher"}}},
{"/user_gopher/about", false, "/user_:name/about", Params{Param{Key: "name", Value: "gopher"}}},
{"/files/js/inc/framework.js", false, "/files/:dir/*filepath", Params{Param{Key: "dir", Value: "js"}, Param{Key: "filepath", Value: "/inc/framework.js"}}},
Expand Down