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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

馃悰 bug: Case sensitivity for parameters in GetRouteURL #2010

Merged
merged 3 commits into from Aug 24, 2022
Merged

馃悰 bug: Case sensitivity for parameters in GetRouteURL #2010

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a41243
馃悰 bug: Case sensitivity for parameters in GetRouteURL
wangjq4214 Aug 11, 2022
7d0bde3
鉁忥笍 perf: error spell
wangjq4214 Aug 11, 2022
adcc067
Merge branch 'master' into fix-case-sensitivity
wangjq4214 Aug 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 12 additions & 8 deletions ctx.go
View file
Open in desktop
Expand Up @@ -833,7 +833,7 @@ func (c *Ctx) Params(key string, defaultValue ...string) string {
if len(key) != len(c.route.Params[i]) {
continue
}
if c.route.Params[i] == key {
if c.route.Params[i] == key || (!c.app.config.CaseSensitive && utils.EqualFold(c.route.Params[i], key)) {
// in case values are not here
if len(c.values) <= i || len(c.values[i]) == 0 {
break
Expand Down Expand Up @@ -1154,20 +1154,24 @@ func (c *Ctx) Bind(vars Map) error {
func (c *Ctx) getLocationFromRoute(route Route, params Map) (string, error) {
buf := bytebufferpool.Get()
for _, segment := range route.routeParser.segs {
if !segment.IsParam {
_, err := buf.WriteString(segment.Const)
if err != nil {
return "", err
}
continue
}

for key, val := range params {
if segment.IsParam && (key == segment.ParamName || (segment.IsGreedy && len(key) == 1 && isInCharset(key[0], greedyParameters))) {
isSame := key == segment.ParamName || (!c.app.config.CaseSensitive && utils.EqualFold(key, segment.ParamName))
isGreedy := (segment.IsGreedy && len(key) == 1 && isInCharset(key[0], greedyParameters))
if isSame || isGreedy {
_, err := buf.WriteString(utils.ToString(val))
if err != nil {
return "", err
}
}
}
if !segment.IsParam {
_, err := buf.WriteString(segment.Const)
if err != nil {
return "", err
}
}
}
location := buf.String()
// release buffer
Expand Down
72 changes: 63 additions & 9 deletions ctx_test.go
View file
Open in desktop
Expand Up @@ -1350,6 +1350,11 @@ func Test_Ctx_Params(t *testing.T) {
utils.AssertEqual(t, "", c.Params("optional"))
return nil
})
app.Get("/test5/:id/:Id", func(c *Ctx) error {
utils.AssertEqual(t, "first", c.Params("id"))
utils.AssertEqual(t, "first", c.Params("Id"))
return nil
})
resp, err := app.Test(httptest.NewRequest(MethodGet, "/test/john", nil))
utils.AssertEqual(t, nil, err, "app.Test(req)")
utils.AssertEqual(t, StatusOK, resp.StatusCode, "Status code")
Expand All @@ -1365,6 +1370,32 @@ func Test_Ctx_Params(t *testing.T) {
resp, err = app.Test(httptest.NewRequest(MethodGet, "/test4", nil))
utils.AssertEqual(t, nil, err, "app.Test(req)")
utils.AssertEqual(t, StatusOK, resp.StatusCode, "Status code")

resp, err = app.Test(httptest.NewRequest(MethodGet, "/test5/first/second", nil))
utils.AssertEqual(t, nil, err)
utils.AssertEqual(t, StatusOK, resp.StatusCode, "Status code")
}

func Test_Ctx_Params_Case_Sensitive(t *testing.T) {
t.Parallel()
app := New(Config{CaseSensitive: true})
app.Get("/test/:User", func(c *Ctx) error {
utils.AssertEqual(t, "john", c.Params("User"))
utils.AssertEqual(t, "", c.Params("user"))
return nil
})
app.Get("/test2/:id/:Id", func(c *Ctx) error {
utils.AssertEqual(t, "first", c.Params("id"))
utils.AssertEqual(t, "second", c.Params("Id"))
return nil
})
resp, err := app.Test(httptest.NewRequest(MethodGet, "/test/john", nil))
utils.AssertEqual(t, nil, err, "app.Test(req)")
utils.AssertEqual(t, StatusOK, resp.StatusCode, "Status code")

resp, err = app.Test(httptest.NewRequest(MethodGet, "/test2/first/second", nil))
utils.AssertEqual(t, nil, err)
utils.AssertEqual(t, StatusOK, resp.StatusCode, "Status code")
}

// go test -race -run Test_Ctx_AllParams
Expand Down Expand Up @@ -2794,16 +2825,39 @@ func Benchmark_Ctx_Get_Location_From_Route(b *testing.B) {

// go test -run Test_Ctx_Get_Location_From_Route_name
func Test_Ctx_Get_Location_From_Route_name(t *testing.T) {
app := New()
c := app.AcquireCtx(&fasthttp.RequestCtx{})
defer app.ReleaseCtx(c)
app.Get("/user/:name", func(c *Ctx) error {
return c.SendString(c.Params("name"))
}).Name("User")
t.Run("case insensitive", func(t *testing.T) {
app := New()
c := app.AcquireCtx(&fasthttp.RequestCtx{})
defer app.ReleaseCtx(c)
app.Get("/user/:name", func(c *Ctx) error {
return c.SendString(c.Params("name"))
}).Name("User")

location, err := c.GetRouteURL("User", Map{"name": "fiber"})
utils.AssertEqual(t, nil, err)
utils.AssertEqual(t, "/user/fiber", location)
location, err := c.GetRouteURL("User", Map{"name": "fiber"})
utils.AssertEqual(t, nil, err)
utils.AssertEqual(t, "/user/fiber", location)

location, err = c.GetRouteURL("User", Map{"Name": "fiber"})
utils.AssertEqual(t, nil, err)
utils.AssertEqual(t, "/user/fiber", location)
})

t.Run("case sensitive",func(t *testing.T) {
app := New(Config{CaseSensitive: true})
c := app.AcquireCtx(&fasthttp.RequestCtx{})
defer app.ReleaseCtx(c)
app.Get("/user/:name", func(c *Ctx) error {
return c.SendString(c.Params("name"))
}).Name("User")

location, err := c.GetRouteURL("User", Map{"name": "fiber"})
utils.AssertEqual(t, nil, err)
utils.AssertEqual(t, "/user/fiber", location)

location, err = c.GetRouteURL("User", Map{"Name": "fiber"})
utils.AssertEqual(t, nil, err)
utils.AssertEqual(t, "/user/", location)
})
}

// go test -run Test_Ctx_Get_Location_From_Route_name_Optional_greedy
Expand Down