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 LDAP filter condition will return nil if error happened (#3604)

Browse Source
This commit is contained in:
DacongDA 2025-02-21 13:09:39 +08:00 committed by GitHub
parent d61f9a1856
commit d78e8e9776
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ldap/util.go
View File

@ -185,12 +185,9 @@ func buildUserFilterCondition(filter interface{}) (builder.Cond, error) {
attr := string(f.AttributeDesc()) attr := string(f.AttributeDesc())
if attr == ldapMemberOfAttr { if attr == ldapMemberOfAttr {
groupId := string(f.AssertionValue())
users, err := object.GetGroupUsers(groupId)
if err != nil {
return nil, err
}
var names []string var names []string
groupId := string(f.AssertionValue())
users := object.GetGroupUsersWithoutError(groupId)
for _, user := range users { for _, user := range users {
names = append(names, user.Name) names = append(names, user.Name)
} }
@ -249,7 +246,7 @@ func buildSafeCondition(filter interface{}) builder.Cond {
condition, err := buildUserFilterCondition(filter) condition, err := buildUserFilterCondition(filter)
if err != nil { if err != nil {
log.Printf("err = %v", err.Error()) log.Printf("err = %v", err.Error())
return nil return builder.And(builder.Expr("1 != 1"))
} }
return condition return condition
} }

10
object/group.go
View File

@ -302,7 +302,10 @@ func GetPaginationGroupUsers(groupId string, offset, limit int, field, value, so
func GetGroupUsers(groupId string) ([]*User, error) { func GetGroupUsers(groupId string) ([]*User, error) {
users := []*User{} users := []*User{}
owner, _ := util.GetOwnerAndNameFromId(groupId) owner, _, err := util.GetOwnerAndNameFromIdWithError(groupId)
if err != nil {
return nil, err
}
names, err := userEnforcer.GetUserNamesByGroupName(groupId) names, err := userEnforcer.GetUserNamesByGroupName(groupId)
if err != nil { if err != nil {
return nil, err return nil, err
@ -314,6 +317,11 @@ func GetGroupUsers(groupId string) ([]*User, error) {
return users, nil return users, nil
} }
func GetGroupUsersWithoutError(groupId string) []*User {
users, _ := GetGroupUsers(groupId)
return users
}
func ExtendGroupWithUsers(group *Group) error { func ExtendGroupWithUsers(group *Group) error {
if group == nil { if group == nil {
return nil return nil