feat: use lowercase username when isUsernameLowered is enabled (#2952)

* feat: auto trim username during login and lowercase when isUsernameLowered enabled in conf

* fix: fix linter error

* fix: fix linter error

* fix: fix linter error
This commit is contained in:
DacongDA
2024-05-17 11:43:19 +08:00
committed by GitHub
parent 21c151bcf8
commit 2daf26aa88
3 changed files with 16 additions and 3 deletions

View File

@ -20,6 +20,7 @@ import (
"strings"
"github.com/beego/beego/utils/pagination"
"github.com/casdoor/casdoor/conf"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
@ -293,6 +294,11 @@ func (c *ApiController) UpdateUser() {
return
}
isUsernameLowered := conf.GetConfigBool("isUsernameLowered")
if isUsernameLowered {
user.Name = strings.ToLower(user.Name)
}
isAdmin := c.IsAdmin()
if pass, err := object.CheckPermissionForUpdateUser(oldUser, &user, isAdmin, c.GetAcceptLanguage()); !pass {
c.ResponseError(err)

View File

@ -877,6 +877,7 @@ func AddUsers(users []*User) (bool, error) {
}
}
user.Name = strings.TrimSpace(user.Name)
if isUsernameLowered {
user.Name = strings.ToLower(user.Name)
}

View File

@ -21,12 +21,11 @@ import (
"regexp"
"strings"
"github.com/casdoor/casdoor/conf"
"github.com/casdoor/casdoor/i18n"
jsoniter "github.com/json-iterator/go"
"github.com/casdoor/casdoor/idp"
"github.com/casdoor/casdoor/util"
jsoniter "github.com/json-iterator/go"
"github.com/xorm-io/core"
)
@ -57,6 +56,13 @@ func HasUserByField(organizationName string, field string, value string) bool {
}
func GetUserByFields(organization string, field string) (*User, error) {
isUsernameLowered := conf.GetConfigBool("isUsernameLowered")
if isUsernameLowered {
field = strings.ToLower(field)
}
field = strings.TrimSpace(field)
// check username
user, err := GetUserByField(organization, "name", field)
if err != nil || user != nil {