chris2fr/guichet
1
0
Fork 0
Code Issues 3 Pull requests Activity

Fixed Change Password Bug

Browse source
This commit is contained in:
Chris Mann 2023-07-25 09:03:55 +02:00
parent a291232fd8
commit 53a92e2f5c
1 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gpas.go
View file

@ -69,21 +69,33 @@ func passwordLost(user User, config *ConfigFile, ldapConn *ldap.Conn) error {
user.CN = searchRes.Entries[0].GetAttributeValue("cn") user.CN = searchRes.Entries[0].GetAttributeValue("cn")
user.Mail = searchRes.Entries[0].GetAttributeValue("mail") user.Mail = searchRes.Entries[0].GetAttributeValue("mail")
user.OtherMailbox = searchRes.Entries[0].GetAttributeValue("carLicense") user.OtherMailbox = searchRes.Entries[0].GetAttributeValue("carLicense")
/* Add the invitation */ /* Check for outstanding invitation */
addReq := ldap.NewAddRequest( searchReq = ldap.NewSearchRequest(user.DN, ldap.ScopeBaseObject,
user.DN, ldap.NeverDerefAliases, 0, 0, false, "(uid="+user.UID+")", []string{"seeAlso"}, nil)
nil) searchRes, err = ldapConn.Search(searchReq)
addReq.Attribute("objectClass", []string{"top", "account", "simpleSecurityObject"})
addReq.Attribute("uid", []string{user.UID})
addReq.Attribute("userPassword", []string{"absdefghi"})
addReq.Attribute("seeAlso", []string{config.UserNameAttr + "=" + user.UID + "," + config.UserBaseDN})
err = ldapConn.Add(addReq)
if err != nil { if err != nil {
log.Printf(fmt.Sprintf("passwordLost 83 : %v", err)) log.Printf(fmt.Sprintf("passwordLost (Check existing invitation) : %v", err))
log.Printf(fmt.Sprintf("passwordLost 84 : %v", user)) log.Printf(fmt.Sprintf("passwordLost (Check existing invitation) : %v", user))
log.Printf(fmt.Sprintf("passwordLost 85 : %v", searchRes.Entries[0])) log.Printf(fmt.Sprintf("passwordLost (Check existing invitation) : %v", searchRes.Entries[0]))
return err return err
} }
if len(searchRes.Entries == 0) {
/* Add the invitation */
addReq := ldap.NewAddRequest(
user.DN,
nil)
addReq.Attribute("objectClass", []string{"top", "account", "simpleSecurityObject"})
addReq.Attribute("uid", []string{user.UID})
addReq.Attribute("userPassword", []string{"absdefghi"})
addReq.Attribute("seeAlso", []string{config.UserNameAttr + "=" + user.UID + "," + config.UserBaseDN})
err = ldapConn.Add(addReq)
if err != nil {
log.Printf(fmt.Sprintf("passwordLost 83 : %v", err))
log.Printf(fmt.Sprintf("passwordLost 84 : %v", user))
log.Printf(fmt.Sprintf("passwordLost 85 : %v", searchRes.Entries[0]))
return err
}
}
err = passwd(user, config, ldapConn) err = passwd(user, config, ldapConn)
if err != nil { if err != nil {
log.Printf(fmt.Sprintf("passwordLost 90 : %v", err)) log.Printf(fmt.Sprintf("passwordLost 90 : %v", err))