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

feat: fix bug in "*" users and roles in permission edit page.

Browse Source
This commit is contained in:
Yang Luo 2023-12-22 14:16:00 +08:00
parent b9d3e2184c
commit 02329d342a
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
object/permission.go
View File

@ -470,6 +470,10 @@ func (p *Permission) GetModelAndAdapter() string {
func (p *Permission) isUserHit(name string) bool { func (p *Permission) isUserHit(name string) bool {
targetOrg, targetName := util.GetOwnerAndNameFromId(name) targetOrg, targetName := util.GetOwnerAndNameFromId(name)
for _, user := range p.Users { for _, user := range p.Users {
if user == "*" {
return true
}
userOrg, userName := util.GetOwnerAndNameFromId(user) userOrg, userName := util.GetOwnerAndNameFromId(user)
if userOrg == targetOrg && (userName == "*" || userName == targetName) { if userOrg == targetOrg && (userName == "*" || userName == targetName) {
return true return true
@ -483,9 +487,14 @@ func (p *Permission) isRoleHit(userId string) bool {
if err != nil { if err != nil {
return false return false
} }
for _, role := range p.Roles { for _, role := range p.Roles {
if role == "*" {
return true
}
for _, targetRole := range targetRoles { for _, targetRole := range targetRoles {
if targetRole.GetId() == role { if role == targetRole.GetId() {
return true return true
} }
} }