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

fix: add sAMAccountName for AD search (#1869)

Browse Source
This commit is contained in:
Yaodong Yu
2023-05-19 21:16:59 +08:00
committed by GitHub
parent af79fdedf2
commit 1260354b36
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
object/check.go
View File

@@ -211,7 +211,7 @@ func checkLdapUserPassword(user *User, password string, lang string) string {
} }
searchReq := goldap.NewSearchRequest(ldapServer.BaseDn, goldap.ScopeWholeSubtree, goldap.NeverDerefAliases, searchReq := goldap.NewSearchRequest(ldapServer.BaseDn, goldap.ScopeWholeSubtree, goldap.NeverDerefAliases,
0, 0, false, ldapServer.buildFilterString(user), []string{}, nil) 0, 0, false, ldapServer.buildAuthFilterString(user), []string{}, nil)
searchResult, err := conn.Conn.Search(searchReq) searchResult, err := conn.Conn.Search(searchReq)
if err != nil { if err != nil {

4
object/ldap_conn.go
View File

@@ -367,7 +367,7 @@ func (ldapUser *LdapUser) GetLdapUuid() string {
return ldapUser.Cn return ldapUser.Cn
} }
func (ldap *Ldap) buildFilterString(user *User) string { func (ldap *Ldap) buildAuthFilterString(user *User) string {
if len(ldap.FilterFields) == 0 { if len(ldap.FilterFields) == 0 {
return fmt.Sprintf("(&%s(uid=%s))", ldap.Filter, user.Name) return fmt.Sprintf("(&%s(uid=%s))", ldap.Filter, user.Name)
} }
@@ -385,6 +385,8 @@ func (user *User) getFieldFromLdapAttribute(attribute string) string {
switch attribute { switch attribute {
case "uid": case "uid":
return user.Name return user.Name
case "sAMAccountName":
return user.Name
case "mail": case "mail":
return user.Email return user.Email
case "mobile": case "mobile":

1
web/src/LdapEditPage.js
View File

@@ -185,6 +185,7 @@ class LdapEditPage extends React.Component {
{value: "uid", label: "uid"}, {value: "uid", label: "uid"},
{value: "mail", label: "Email"}, {value: "mail", label: "Email"},
{value: "mobile", label: "mobile"}, {value: "mobile", label: "mobile"},
{value: "sAMAccountName", label: "sAMAccountName"},
].map((item) => Setting.getOption(item.label, item.value))} onChange={value => { ].map((item) => Setting.getOption(item.label, item.value))} onChange={value => {
this.updateLdapField("filterFields", value); this.updateLdapField("filterFields", value);
}} /> }} />