diff --git a/model-passwd.go b/model-passwd.go index 08d7de3..7b58347 100644 --- a/model-passwd.go +++ b/model-passwd.go @@ -46,9 +46,10 @@ func passwordLost(user User, config *ConfigFile, ldapConn *ldap.Conn) error { searchReq := ldap.NewSearchRequest(config.UserBaseDN, ldap.ScopeSingleLevel, ldap.NeverDerefAliases, 0, 0, false, searchFilter, []string{"cn", "uid", "mail", "carLicense", "sn", "displayName", "givenName"}, nil) searchRes, err := ldapConn.Search(searchReq) if err != nil { - log.Printf(fmt.Sprintf("passwordLost 49 : %v %v", err, ldapConn)) - log.Printf(fmt.Sprintf("passwordLost 50 : %v", searchReq)) - log.Printf(fmt.Sprintf("passwordLost 51: %v", user)) + log.Printf(fmt.Sprintf("passwordLost search : %v %v", err, ldapConn)) + log.Printf(fmt.Sprintf("passwordLost search : %v", searchReq)) + log.Printf(fmt.Sprintf("passwordLost search : %v", searchRes)) + log.Printf(fmt.Sprintf("passwordLost search: %v", user)) return err } if len(searchRes.Entries) == 0 { diff --git a/view-passwd.go b/view-passwd.go index ffcc7ff..a573e77 100644 --- a/view-passwd.go +++ b/view-passwd.go @@ -7,6 +7,7 @@ import ( "net/http" "strings" + "github.com/go-ldap/ldap/v3" "github.com/gorilla/mux" ) @@ -33,23 +34,24 @@ func handleLostPassword(w http.ResponseWriter, r *http.Request) { Mail: strings.TrimSpace(strings.Join(r.Form["mail"], "")), OtherMailbox: strings.TrimSpace(strings.Join(r.Form["othermailbox"], "")), } - ldapConn, err := openNewUserLdap(config) + ldapNewConn, err := openNewUserLdap(config) if err != nil { - log.Printf(fmt.Sprintf("handleLostPassword 99 : %v %v", err, ldapConn)) + log.Printf(fmt.Sprintf("handleLostPassword 99 : %v %v", err, ldapNewConn)) data.Common.ErrorMessage = err.Error() } if err != nil { - log.Printf(fmt.Sprintf("handleLostPassword 104 : %v %v", err, ldapConn)) + log.Printf(fmt.Sprintf("handleLostPassword 104 : %v %v", err, ldapNewConn)) data.Common.ErrorMessage = err.Error() } else { - err = ldapConn.Bind(config.NewUserDN, config.NewUserPassword) + // err = ldapConn.Bind(config.NewUserDN, config.NewUserPassword) if err != nil { - log.Printf(fmt.Sprintf("handleLostPassword 109 : %v %v", err, ldapConn)) + log.Printf(fmt.Sprintf("handleLostPassword 109 : %v %v", err, ldapNewConn)) data.Common.ErrorMessage = err.Error() } else { data.Common.Success = true } } + err = passwordLost(user, config, ldapNewConn) } data.Common.CanAdmin = false templateLostPasswordPage.Execute(w, data)