llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-03 12:30:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix LDAP server bugs

Browse Source
This commit is contained in:
Yang Luo
2023-05-06 23:31:46 +08:00
parent eb39e9e044
commit 9201992140
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ldap/server.go
View File

@ -53,7 +53,7 @@ func handleBind(w ldap.ResponseWriter, m *ldap.Message) {
} }
bindPassword := string(r.AuthenticationSimple()) bindPassword := string(r.AuthenticationSimple())
bindUser, err := object.CheckUserPassword(object.CasdoorOrganization, bindUsername, bindPassword, "en") bindUser, err := object.CheckUserPassword(bindOrg, bindUsername, bindPassword, "en")
if err != "" { if err != "" {
log.Printf("Bind failed User=%s, Pass=%#v, ErrMsg=%s", string(r.Name()), r.Authentication(), err) log.Printf("Bind failed User=%s, Pass=%#v, ErrMsg=%s", string(r.Name()), r.Authentication(), err)
res.SetResultCode(ldap.LDAPResultInvalidCredentials) res.SetResultCode(ldap.LDAPResultInvalidCredentials)

11
ldap/util.go
View File

@ -56,12 +56,19 @@ func getNameAndOrgFromFilter(baseDN, filter string) (string, string, int) {
func getUsername(filter string) string { func getUsername(filter string) string {
nameIndex := strings.Index(filter, "cn=") nameIndex := strings.Index(filter, "cn=")
if nameIndex == -1 {
nameIndex = strings.Index(filter, "uid=")
if nameIndex == -1 { if nameIndex == -1 {
return "*" return "*"
} else {
nameIndex += 4
}
} else {
nameIndex += 3
} }
var name string var name string
for i := nameIndex + 3; filter[i] != ')'; i++ { for i := nameIndex; filter[i] != ')'; i++ {
name = name + string(filter[i]) name = name + string(filter[i])
} }
return name return name
@ -125,6 +132,8 @@ func getAttribute(attributeName string, user *object.User) message.AttributeValu
return message.AttributeValue(user.Name) return message.AttributeValue(user.Name)
case "email": case "email":
return message.AttributeValue(user.Email) return message.AttributeValue(user.Email)
case "mail":
return message.AttributeValue(user.Email)
case "mobile": case "mobile":
return message.AttributeValue(user.Phone) return message.AttributeValue(user.Phone)
case "userPassword": case "userPassword":