diff --git a/src/email.go b/src/email.go index 6075c17e..1b25acc4 100644 --- a/src/email.go +++ b/src/email.go @@ -1,7 +1,6 @@ package main import ( - "fmt" "log" "net/smtp" "strconv" @@ -43,8 +42,8 @@ func adminEmailAlert(action string, adminEmail string, cfg Config) { err := smtp.SendMail(cfg.SMTP.Server+":"+cfg.SMTP.Port, auth, cfg.SMTP.User, dest, []byte(msg)) if err != nil { - fmt.Printf("smtp error: %s", err) + log.Printf("smtp error: %s", err) return } - fmt.Println("Mail sent successfully!") + log.Println("Mail sent successfully!") } diff --git a/src/lbasis_db.go b/src/lbasis_db.go index 0992acee..86f729d4 100644 --- a/src/lbasis_db.go +++ b/src/lbasis_db.go @@ -2,7 +2,7 @@ package main import ( "encoding/json" - "fmt" + "log" "strings" "time" @@ -41,7 +41,7 @@ func (dbobj dbcon) createLegalBasis(brief string, newbrief string, module string bdoc["requiredflag"] = requiredflag raw, err := dbobj.store.GetRecord(storage.TblName.Legalbasis, "brief", brief) if err != nil { - fmt.Printf("error to find:%s", err) + log.Printf("error to find: %s\n", err) return false, err } if raw != nil { @@ -56,7 +56,7 @@ func (dbobj dbcon) createLegalBasis(brief string, newbrief string, module string bdoc["creationtime"] = now _, err = dbobj.store.CreateRecord(storage.TblName.Legalbasis, &bdoc) if err != nil { - fmt.Printf("error to insert record: %s\n", err) + log.Printf("error to insert record: %s\n", err) return false, err } return true, nil @@ -188,7 +188,7 @@ func (dbobj dbcon) checkLegalBasis(brief string) (bool, error) { func (dbobj dbcon) getLegalBasis(brief string) (bson.M, error) { row, err := dbobj.store.GetRecord(storage.TblName.Legalbasis, "brief", brief) if err != nil { - fmt.Printf("error to find:%s", err) + log.Printf("error to find: %s\n", err) return nil, err } return row, err diff --git a/src/sharedrecords_api.go b/src/sharedrecords_api.go index ca2412f0..1dea957a 100644 --- a/src/sharedrecords_api.go +++ b/src/sharedrecords_api.go @@ -95,7 +95,7 @@ func (e mainEnv) getRecord(w http.ResponseWriter, r *http.Request, ps httprouter } recordInfo, err := e.db.getSharedRecord(record) if err != nil { - fmt.Printf("%d access denied for : %s\n", http.StatusForbidden, record) + log.Printf("%d access denied for : %s\n", http.StatusForbidden, record) w.WriteHeader(http.StatusForbidden) w.Write([]byte("Access denied")) return diff --git a/src/sms.go b/src/sms.go index 8b5e165c..a25c9372 100644 --- a/src/sms.go +++ b/src/sms.go @@ -1,7 +1,6 @@ package main import ( - "fmt" "log" "net/http" "net/url" @@ -26,7 +25,7 @@ func sendCodeByPhoneDo(domain string, client *http.Client, code int32, identity finalURL = strings.ReplaceAll(finalURL, "_FROM_", url.QueryEscape(cfg.Sms.From)) finalURL = strings.ReplaceAll(finalURL, "_TOKEN_", url.QueryEscape(cfg.Sms.Token)) finalURL = strings.ReplaceAll(finalURL, "_MSG_", url.QueryEscape(msg)) - fmt.Printf("finalURL: %s\n", finalURL) + log.Printf("sendCodeByPhoneDo finalURL: %s\n", finalURL) if len(cfg.Sms.Method) == 0 || strings.ToUpper(cfg.Sms.Method) == "GET" { req, _ := http.NewRequest("GET", finalURL, nil) if len(cfg.Sms.BasicAuth) > 0 && strings.Contains(cfg.Sms.BasicAuth, ":") { @@ -42,7 +41,7 @@ func sendCodeByPhoneDo(domain string, client *http.Client, code int32, identity } } resp, _ := client.Do(req) - fmt.Println(resp.Status) + log.Println(resp.Status) return } body := cfg.Sms.Body @@ -82,5 +81,5 @@ func sendCodeByPhoneDo(domain string, client *http.Client, code int32, identity } req.Header.Add("Content-Type", cType) resp, _ := client.Do(req) - fmt.Println(resp.Status) + log.Println(resp.Status) } diff --git a/src/storage/sqlite-storage.go b/src/storage/sqlite-storage.go index ca311799..ccef0262 100644 --- a/src/storage/sqlite-storage.go +++ b/src/storage/sqlite-storage.go @@ -77,7 +77,7 @@ func (dbobj *SQLiteDB) OpenDB(filepath *string) error { if len(dbfile) >= 3 && dbfile[len(dbfile)-3:] != ".db" { dbfile = dbfile + ".db" } - fmt.Printf("Databunker db file is: %s\n", dbfile) + log.Printf("Databunker db file is: %s\n", dbfile) // collect list of all tables /* if _, err := os.Stat(dbfile); !os.IsNotExist(err) { diff --git a/src/users_api.go b/src/users_api.go index 23537fbd..4a90ca6f 100644 --- a/src/users_api.go +++ b/src/users_api.go @@ -3,6 +3,7 @@ package main import ( "errors" "fmt" + "log" "net/http" "github.com/julienschmidt/httprouter" @@ -17,7 +18,7 @@ func (e mainEnv) userCreate(w http.ResponseWriter, r *http.Request, ps httproute if e.conf.Generic.CreateUserWithoutAccessToken == false { // anonymous user can not create user record, check token if e.enforceAuth(w, r, event) == "" { - fmt.Println("failed to create user, access denied, try to change Create_user_without_access_token") + log.Println("failed to create user, access denied, try to configure Create_user_without_access_token\n") return } } @@ -182,7 +183,7 @@ func (e mainEnv) userList(w http.ResponseWriter, r *http.Request, ps httprouter. limit = atoi(value[0]) } resultJSON, counter, _ := e.db.getUsers(offset, limit) - fmt.Printf("Total count of events: %d\n", counter) + log.Printf("Total count of events: %d\n", counter) w.Header().Set("Content-Type", "application/json; charset=utf-8") w.WriteHeader(200) if counter == 0 { @@ -400,7 +401,7 @@ func (e mainEnv) userPrelogin(w http.ResponseWriter, r *http.Request, ps httprou fmt.Fprintf(w, `{"status":"error","result":"record not found","captchaurl":"%s"}`, captcha) return } - fmt.Println("user record not found, still returning ok status") + log.Println("user record not found, returning ok status") } w.Header().Set("Content-Type", "application/json; charset=utf-8") w.WriteHeader(200) diff --git a/src/utils.go b/src/utils.go index c8f13a3e..c0772fb4 100644 --- a/src/utils.go +++ b/src/utils.go @@ -469,7 +469,7 @@ func enforceUUID(w http.ResponseWriter, uuidCode string, event *auditEvent) bool func getJSONPostMap(r *http.Request) (map[string]interface{}, error) { cType, _, err := mime.ParseMediaType(r.Header.Get("Content-Type")) if err != nil { - fmt.Printf("ignoring empty content-type: %s\n", err) + log.Printf("ignoring empty content-type: %s\n", err) return nil, nil } cType = strings.ToLower(cType) @@ -492,7 +492,7 @@ func getJSONPostMap(r *http.Request) (map[string]interface{}, error) { } form, err := url.ParseQuery(body) if err != nil { - fmt.Printf("error in http data parsing: %s\n", err) + log.Printf("error to parse HTTP data request: %s\n", err) return nil, err } if len(form) == 0 { @@ -529,7 +529,7 @@ func getJSONPostMap(r *http.Request) (map[string]interface{}, error) { func getJSONPostData(r *http.Request) ([]byte, error) { cType, _, err := mime.ParseMediaType(r.Header.Get("Content-Type")) if err != nil { - fmt.Printf("ignoring empty content-type: %s\n", err) + log.Printf("ignoring empty content-type: %s\n", err) return nil, nil } cType = strings.ToLower(cType) @@ -553,7 +553,7 @@ func getJSONPostData(r *http.Request) ([]byte, error) { } form, err := url.ParseQuery(body) if err != nil { - fmt.Printf("error in http data parsing: %s\n", err) + log.Printf("error in HTTP data request: %s\n", err) return nil, err } if len(form) == 0 {