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

Bug Fixing

Browse source
This commit is contained in:
Chris Mann 2023-07-27 11:12:48 +02:00
parent 22603452cf
commit 382bafbc9f
1 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
view-invite.go
View file

@ -41,16 +41,16 @@ func checkInviterLogin(w http.ResponseWriter, r *http.Request) *LoginStatus {
func openNewUserLdap(config *ConfigFile) (*ldap.Conn, error) { func openNewUserLdap(config *ConfigFile) (*ldap.Conn, error) {
l, err := openLdap(config) l, err := openLdap(config)
if err != nil { if err != nil {
log.Printf(fmt.Sprintf("openNewUserLdap 1 : %v %v", err, l)) log.Printf("openNewUserLdap 1 : %v %v", err, l)
log.Printf(fmt.Sprintf("openNewUserLdap 1 : %v", config)) log.Printf("openNewUserLdap 1 : %v", config)
// data.Common.ErrorMessage = err.Error() // data.Common.ErrorMessage = err.Error()
} }
err = l.Bind(config.NewUserDN, config.NewUserPassword) err = l.Bind(config.NewUserDN, config.NewUserPassword)
if err != nil { if err != nil {
log.Printf(fmt.Sprintf("openNewUserLdap Bind : %v", err)) log.Printf("openNewUserLdap Bind : %v", err)
log.Printf(fmt.Sprintf("openNewUserLdap Bind : %v", config.NewUserDN)) log.Printf("openNewUserLdap Bind : %v", config.NewUserDN)
// log.Printf(fmt.Sprintf("openNewUserLdap Bind : %v", config.NewUserPassword)) // log.Printf("openNewUserLdap Bind : %v", config.NewUserPassword)
// log.Printf(fmt.Sprintf("openNewUserLdap Bind : %v", config)) // log.Printf("openNewUserLdap Bind : %v", config)
// data.Common.ErrorMessage = err.Error() // data.Common.ErrorMessage = err.Error()
} }
return l, err return l, err
@ -59,7 +59,8 @@ func openNewUserLdap(config *ConfigFile) (*ldap.Conn, error) {
func handleInviteNewAccount(w http.ResponseWriter, r *http.Request) { func handleInviteNewAccount(w http.ResponseWriter, r *http.Request) {
l, err := ldapOpen(w) l, err := ldapOpen(w)
if err != nil { if err != nil {
log.Printf(fmt.Sprintf("58: %v %v", err, l)) log.Printf("view-invite.go - handleInviteNewAccount - ldapOpen : %v", err)
log.Printf("view-invite.go - handleInviteNewAccount - ldapOpen: %v", l)
} }
// l.Bind(config.NewUserDN, config.NewUserPassword) // l.Bind(config.NewUserDN, config.NewUserPassword)
@ -73,7 +74,7 @@ func handleInviteNewAccount(w http.ResponseWriter, r *http.Request) {
// loginInfo, err := doLogin(w, r, "testuser", config.NewUserDN, config.NewUserPassword) // loginInfo, err := doLogin(w, r, "testuser", config.NewUserDN, config.NewUserPassword)
// if err != nil { // if err != nil {
// log.Printf(fmt.Sprintf("58: %v %v", err, l)) // log.Printf("58: %v %v", err, l)
// } // }
// l := ldapOpen(w) // l := ldapOpen(w)
@ -83,7 +84,9 @@ func handleInviteNewAccount(w http.ResponseWriter, r *http.Request) {
err = l.Bind(config.NewUserDN, config.NewUserPassword) err = l.Bind(config.NewUserDN, config.NewUserPassword)
if err != nil { if err != nil {
log.Printf(fmt.Sprintf("58: %v %v", err, l)) log.Printf("view-invite.go - handleInviteNewAccount - l.Bind : %v", err)
log.Printf("view-invite.go - handleInviteNewAccount - l.Bind: %v", l)
panic(fmt.Sprintf("view-invite.go - handleInviteNewAccount - l.Bind : %v", err))
} }
handleNewAccount(w, r, l, config.NewUserDN) handleNewAccount(w, r, l, config.NewUserDN)
} }
@ -304,7 +307,7 @@ func handleInviteSendCode(w http.ResponseWriter, r *http.Request) {
// // choice := strings.Join(r.Form["choice"], "") // // choice := strings.Join(r.Form["choice"], "")
// // sendto := strings.Join(r.Form["sendto"], "") // // sendto := strings.Join(r.Form["sendto"], "")
code, code_id, code_pw := genCode() code, code_id, code_pw := genCode()
log.Printf(fmt.Sprintf("272: %v %v %v", code, code_id, code_pw)) log.Printf("272: %v %v %v", code, code_id, code_pw)
// // Create invitation object in database // // Create invitation object in database
// modify_request.Add("carLicense", []string{fmt.Sprintf("%s,%s,%s",code, code_id, code_pw)}) // modify_request.Add("carLicense", []string{fmt.Sprintf("%s,%s,%s",code, code_id, code_pw)})
// err := login.conn.Modify(modify_request) // err := login.conn.Modify(modify_request)
@ -315,14 +318,14 @@ func handleInviteSendCode(w http.ResponseWriter, r *http.Request) {
// data.Common.Success = true // data.Common.Success = true
// data.CodeDisplay = code // data.CodeDisplay = code
// } // }
log.Printf(fmt.Sprintf("279: %v %v %v", code, code_id, code_pw)) log.Printf("279: %v %v %v", code, code_id, code_pw)
addReq := ldap.NewAddRequest("documentIdentifier="+code_id+","+config.InvitationBaseDN, nil) addReq := ldap.NewAddRequest("documentIdentifier="+code_id+","+config.InvitationBaseDN, nil)
addReq.Attribute("objectClass", []string{"top", "document", "simpleSecurityObject"}) addReq.Attribute("objectClass", []string{"top", "document", "simpleSecurityObject"})
addReq.Attribute("cn", []string{code}) addReq.Attribute("cn", []string{code})
addReq.Attribute("userPassword", []string{code_pw}) addReq.Attribute("userPassword", []string{code_pw})
addReq.Attribute("documentIdentifier", []string{code_id}) addReq.Attribute("documentIdentifier", []string{code_id})
log.Printf(fmt.Sprintf("285: %v %v %v", code, code_id, code_pw)) log.Printf("285: %v %v %v", code, code_id, code_pw)
log.Printf(fmt.Sprintf("286: %v", addReq)) log.Printf("286: %v", addReq)
err := login.conn.Add(addReq) err := login.conn.Add(addReq)
if err != nil { if err != nil {
data.Common.ErrorMessage = err.Error() data.Common.ErrorMessage = err.Error()
@ -336,7 +339,7 @@ func handleInviteSendCode(w http.ResponseWriter, r *http.Request) {
templateInviteSendCode.Execute(w, data) templateInviteSendCode.Execute(w, data)
// if choice == "display" || choice == "send" { // if choice == "display" || choice == "send" {
// log.Printf(fmt.Sprintf("260: %v %v %v %v", login, choice, sendto, data)) // log.Printf("260: %v %v %v %v", login, choice, sendto, data)
// trySendCode(login, choice, sendto, data) // trySendCode(login, choice, sendto, data)
// } // }
} }
@ -344,10 +347,10 @@ func handleInviteSendCode(w http.ResponseWriter, r *http.Request) {
} }
func trySendCode(login *LoginStatus, choice string, sendto string, data *SendCodeData) { func trySendCode(login *LoginStatus, choice string, sendto string, data *SendCodeData) {
log.Printf(fmt.Sprintf("269: %v %v %v %v", login, choice, sendto, data)) log.Printf("269: %v %v %v %v", login, choice, sendto, data)
// Generate code // Generate code
code, code_id, code_pw := genCode() code, code_id, code_pw := genCode()
log.Printf(fmt.Sprintf("272: %v %v %v", code, code_id, code_pw)) log.Printf("272: %v %v %v", code, code_id, code_pw)
// Create invitation object in database // Create invitation object in database
// len_base_dn := len(strings.Split(config.BaseDN, ",")) // len_base_dn := len(strings.Split(config.BaseDN, ","))
@ -411,9 +414,9 @@ func trySendCode(login *LoginStatus, choice string, sendto string, data *SendCod
// req.Attribute("description", []string{data.Description}) // req.Attribute("description", []string{data.Description})
// } // }
// err := login.conn.Add(req) // err := login.conn.Add(req)
// // log.Printf(fmt.Sprintf("899: %v",err)) // // log.Printf("899: %v",err)
// // log.Printf(fmt.Sprintf("899: %v",req)) // // log.Printf("899: %v",req)
// // log.Printf(fmt.Sprintf("899: %v",data)) // // log.Printf("899: %v",data)
// if err != nil { // if err != nil {
// data.Common.Error = err.Error() // data.Common.Error = err.Error()
// } else { // } else {
@ -436,7 +439,7 @@ func trySendCode(login *LoginStatus, choice string, sendto string, data *SendCod
// err = login.conn.Add(req) // err = login.conn.Add(req)
// if err != nil { // if err != nil {
// log.Printf(fmt.Sprintf("286: %v", req)) // log.Printf("286: %v", req)
// data.Common.ErrorMessage = err.Error() // data.Common.ErrorMessage = err.Error()
// return // return
// } // }
@ -493,7 +496,7 @@ func genCode() (code string, code_id string, code_pw string) {
code = fmt.Sprintf("%03d-%03d-%03d", a%1000, b%1000, c%1000) code = fmt.Sprintf("%03d-%03d-%03d", a%1000, b%1000, c%1000)
code_id, code_pw = readCode(code) code_id, code_pw = readCode(code)
log.Printf(fmt.Sprintf("342: %v %v %v", code, code_id, code_pw)) log.Printf("342: %v %v %v", code, code_id, code_pw)
return code, code_id, code_pw return code, code_id, code_pw
} }