llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 02:35:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix add/update salted password.

Browse Source
This commit is contained in:
Yang Luo 2021-05-16 21:04:26 +08:00
parent 18806f07a8
commit 4b9ce5f401
5 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
authz/authz.go
View File

@ -85,6 +85,7 @@ p, *, *, GET, /api/get-default-application, *, *
p, *, *, GET, /api/get-default-providers, *, *
p, *, *, POST, /api/upload-avatar, *, *
p, *, *, POST, /api/unlink, *, *
p, *, *, POST, /api/set-password, *, *
`
sa := stringadapter.NewAdapter(ruleText)

5
controllers/user.go
View File

@ -153,8 +153,9 @@ func (c *ApiController) SetPassword() {
return
}
if oldPassword != targetUser.Password {
c.ResponseError("Old password wrong.")
msg := object.CheckPassword(targetUser, oldPassword)
if msg != "" {
c.ResponseError(msg)
return
}

4
object/check.go
View File

@ -57,7 +57,7 @@ func CheckUserSignup(organizationName string, username string, password string,
}
}
func checkPassword(user *User, password string) string {
func CheckPassword(user *User, password string) string {
organization := getOrganization("admin", user.Owner)
if organization.PasswordType == "plain" {
@ -87,7 +87,7 @@ func CheckUserLogin(organization string, username string, password string) (*Use
return nil, "the user is forbidden to sign in, please contact the administrator"
}
msg := checkPassword(user, password)
msg := CheckPassword(user, password)
if msg != "" {
return nil, msg
}

4
object/organization.go
View File

@ -105,3 +105,7 @@ func GetOrganizationByName(name string) *Organization {
}
return &ret
}
func getOrganizationByUser(user *User) *Organization {
return getOrganization("admin", user.Owner)
}

20
object/user.go
View File

@ -117,6 +117,8 @@ func AddUser(user *User) bool {
user.Id = util.GenerateId()
user.UpdateUserHash()
user.PreHash = user.Hash
organization := getOrganizationByUser(user)
user.UpdateUserPassword(organization)
affected, err := adapter.Engine.Insert(user)
if err != nil {
@ -127,9 +129,15 @@ func AddUser(user *User) bool {
}
func AddUsers(users []*User) bool {
if len(users) == 0 {
return false
}
organization := getOrganizationByUser(users[0])
for _, user := range users {
user.UpdateUserHash()
user.PreHash = user.Hash
user.UpdateUserPassword(organization)
}
affected, err := adapter.Engine.Insert(users)
@ -215,6 +223,12 @@ func GetUserByFields(organization string, field string) *User {
}
func SetUserField(user *User, field string, value string) bool {
if field == "password" {
organization := getOrganizationByUser(user)
user.UpdateUserPassword(organization)
value = user.Password
}
affected, err := adapter.Engine.Table(user).ID(core.PK{user.Owner, user.Name}).Update(map[string]interface{}{field: value})
if err != nil {
panic(err)
@ -258,6 +272,12 @@ func (user *User) UpdateUserHash() {
user.Hash = hash
}
func (user *User) UpdateUserPassword(organization *Organization) {
if organization.PasswordType == "salt" {
user.Password = getSaltedPassword(user.Password, organization.PasswordSalt)
}
}
func (user *User) GetId() string {
return fmt.Sprintf("%s/%s", user.Owner, user.Name)
}