Fix the base DN searches
This commit is contained in:
parent
3c5e55b83e
commit
1802a16d8a
|
@ -14,7 +14,7 @@ import (
|
|||
)
|
||||
|
||||
func (s *server) handleSearchDSE(w ldap.ResponseWriter, m *ldap.Message) {
|
||||
nc := strings.Join(s.nc, ", ")
|
||||
nc := strings.Join(s.nc, ",")
|
||||
|
||||
e := ldap.NewSearchResultEntry("")
|
||||
e.AddAttribute("vendorName", "NetAuth")
|
||||
|
@ -29,33 +29,15 @@ func (s *server) handleSearchDSE(w ldap.ResponseWriter, m *ldap.Message) {
|
|||
}
|
||||
|
||||
func (s *server) handleBaseDnSearch(w ldap.ResponseWriter, m *ldap.Message) {
|
||||
ctx := context.Background()
|
||||
s.l.Debug("Base DN search")
|
||||
r := m.GetSearchRequest()
|
||||
nc := strings.Join(s.nc, ",")
|
||||
|
||||
ents, err := s.c.GroupSearch(ctx, "Name:*")
|
||||
if err != nil {
|
||||
res := ldap.NewSearchResultDoneResponse(ldap.LDAPResultOperationsError)
|
||||
res.SetDiagnosticMessage(err.Error())
|
||||
w.Write(res)
|
||||
return
|
||||
}
|
||||
|
||||
for i := range ents {
|
||||
e, err := s.groupSearchResult(ctx, ents[i], r.BaseObject(), r.Attributes())
|
||||
if err != nil {
|
||||
res := ldap.NewSearchResultDoneResponse(ldap.LDAPResultOperationsError)
|
||||
res.SetDiagnosticMessage(err.Error())
|
||||
w.Write(res)
|
||||
return
|
||||
}
|
||||
w.Write(e)
|
||||
}
|
||||
|
||||
s.l.Debug("Entities", "res", ents)
|
||||
|
||||
res := ldap.NewSearchResultDoneResponse(ldap.LDAPResultSuccess)
|
||||
w.Write(res)
|
||||
e := ldap.NewSearchResultEntry(strings.Join(s.nc, ","))
|
||||
e.AddAttribute("vendorName", "NetAuth")
|
||||
e.AddAttribute("vendorVersion", message.AttributeValue(buildinfo.Version))
|
||||
e.AddAttribute("objectClass", "top", "extensibleObject")
|
||||
e.AddAttribute("supportedLDAPVersion", "3")
|
||||
e.AddAttribute("namingContexts", message.AttributeValue(nc))
|
||||
w.Write(e)
|
||||
}
|
||||
|
||||
func (s *server) handleSearchEntities(w ldap.ResponseWriter, m *ldap.Message) {
|
||||
|
|
Loading…
Reference in a new issue