Deuxfleurs/bottin
23
4
Fork 2
Code Issues 7 Pull requests 1 Releases Activity

Basic code cleanup

Browse source
This commit is contained in:
Alex 2020-01-19 21:26:44 +01:00
parent 19854a1ef4
commit 3decb94271
1 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
main.go
View file

@ -294,7 +294,6 @@ func (server *Server) handleBind(s ldap.UserState, w ldap.ResponseWriter, m *lda
} }
func (server *Server) handleBindInternal(state *State, r *message.BindRequest) (int, error) { func (server *Server) handleBindInternal(state *State, r *message.BindRequest) (int, error) {
passwd, err := server.getAttribute(string(r.Name()), "userpassword") passwd, err := server.getAttribute(string(r.Name()), "userpassword")
if err != nil { if err != nil {
return ldap.LDAPResultOperationsError, err return ldap.LDAPResultOperationsError, err
@ -328,7 +327,6 @@ func (server *Server) handleSearch(s ldap.UserState, w ldap.ResponseWriter, m *l
} }
func (server *Server) handleSearchInternal(state *State, w ldap.ResponseWriter, r *message.SearchRequest) (int, error) { func (server *Server) handleSearchInternal(state *State, w ldap.ResponseWriter, r *message.SearchRequest) (int, error) {
log.Printf("-- SEARCH REQUEST: --") log.Printf("-- SEARCH REQUEST: --")
log.Printf("Request BaseDn=%s", r.BaseObject()) log.Printf("Request BaseDn=%s", r.BaseObject())
log.Printf("Request Filter=%s", r.Filter()) log.Printf("Request Filter=%s", r.Filter())
@ -481,19 +479,23 @@ func (server *Server) handleAddInternal(state *State, r *message.AddRequest) (in
} }
// TODO check permissions // TODO check permissions
var members []string = nil var members []string = nil
entry := Entry{} entry := Entry{}
for _, attribute := range r.Attributes() { for _, attribute := range r.Attributes() {
key := string(attribute.Type_()) key := string(attribute.Type_())
if strings.EqualFold(key, "memberOf") {
return ldap.LDAPResultObjectClassViolation, fmt.Errorf(
"memberOf cannot be defined directly, membership must be specified in the group itself")
}
vals_str := []string{} vals_str := []string{}
for _, val := range attribute.Vals() { for _, val := range attribute.Vals() {
vals_str = append(vals_str, string(val)) vals_str = append(vals_str, string(val))
} }
// Fail if they are trying to write memberOf, we manage this ourselves
if strings.EqualFold(key, "memberOf") {
return ldap.LDAPResultObjectClassViolation, fmt.Errorf(
"memberOf cannot be defined directly, membership must be specified in the group itself")
}
// If they are writing a member key, we have to check they are adding valid members
if strings.EqualFold(key, "member") { if strings.EqualFold(key, "member") {
members = vals_str members = vals_str
for _, member := range members { for _, member := range members {
@ -530,6 +532,17 @@ func (server *Server) handleAddInternal(state *State, r *message.AddRequest) (in
memberGroups = []string{} memberGroups = []string{}
} }
alreadyMember := false
for _, mb := range memberGroups {
if mb == dn {
alreadyMember = true
log.Printf("Warning: inconsistency detected, %s was memberOf %s at a time when it didn't exist!",
member, dn)
break
}
}
if !alreadyMember {
memberGroups = append(memberGroups, dn) memberGroups = append(memberGroups, dn)
err = server.addElements(member, Entry{ err = server.addElements(member, Entry{
"memberOf": memberGroups, "memberOf": memberGroups,
@ -539,6 +552,7 @@ func (server *Server) handleAddInternal(state *State, r *message.AddRequest) (in
} }
} }
} }
}
return ldap.LDAPResultSuccess, nil return ldap.LDAPResultSuccess, nil
} }