scottk/databunker
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/databunker.git synced 2025-11-03 11:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove debug messages

Browse Source
This commit is contained in:
root
2020-12-08 20:10:37 +00:00
parent 8c41b0ab14
commit c67f1e7327
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/audit_db.go
View File

@@ -4,7 +4,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"log" //"log"
"time" "time"
uuid "github.com/hashicorp/go-uuid" uuid "github.com/hashicorp/go-uuid"
@@ -197,8 +197,8 @@ func (dbobj dbcon) getAuditEvent(atoken string) (string, []byte, error) {
userTOKEN, _ = basicStringDecrypt(userTOKENEnc, dbobj.masterKey, dbobj.GetCode()) userTOKEN, _ = basicStringDecrypt(userTOKENEnc, dbobj.masterKey, dbobj.GetCode())
if len(before) > 0 { if len(before) > 0 {
before2, after2, _ := dbobj.userDecrypt2(userTOKEN, before, after) before2, after2, _ := dbobj.userDecrypt2(userTOKEN, before, after)
log.Printf("before: %s", before2) //log.Printf("before: %s", before2)
log.Printf("after: %s", after2) //log.Printf("after: %s", after2)
record["before"] = before2 record["before"] = before2
record["after"] = after2 record["after"] = after2
if len(debug) == 0 { if len(debug) == 0 {
@@ -210,7 +210,7 @@ func (dbobj dbcon) getAuditEvent(atoken string) (string, []byte, error) {
} }
if len(after) > 0 { if len(after) > 0 {
after2, _ := dbobj.userDecrypt(userTOKEN, after) after2, _ := dbobj.userDecrypt(userTOKEN, after)
log.Printf("after: %s", after2) //log.Printf("after: %s", after2)
record["after"] = after2 record["after"] = after2
result := fmt.Sprintf(`{"after":%s,"debug":"%s"}`, after2, debug) result := fmt.Sprintf(`{"after":%s,"debug":"%s"}`, after2, debug)
return userTOKEN, []byte(result), nil return userTOKEN, []byte(result), nil

12
src/users_db.go
View File

@@ -90,13 +90,13 @@ func (dbobj dbcon) generateDemoLoginCode(userTOKEN string) int32 {
func (dbobj dbcon) validateUserRecordChange(oldUserJSON []byte, jsonDataPatch []byte, userTOKEN string, authResult string) (bool, error) { func (dbobj dbcon) validateUserRecordChange(oldUserJSON []byte, jsonDataPatch []byte, userTOKEN string, authResult string) (bool, error) {
// prepare merge // prepare merge
fmt.Printf("old json: %s\n", oldUserJSON) //fmt.Printf("old json: %s\n", oldUserJSON)
fmt.Printf("json patch: %s\n", jsonDataPatch) //fmt.Printf("json patch: %s\n", jsonDataPatch)
newJSON, err := jsonpatch.MergePatch(oldUserJSON, jsonDataPatch) newJSON, err := jsonpatch.MergePatch(oldUserJSON, jsonDataPatch)
if err != nil { if err != nil {
return false, err return false, err
} }
fmt.Printf("result: %s\n", newJSON) //fmt.Printf("result: %s\n", newJSON)
return validateUserRecordChange(oldUserJSON, newJSON, authResult) return validateUserRecordChange(oldUserJSON, newJSON, authResult)
} }
@@ -148,13 +148,13 @@ func (dbobj dbcon) updateUserRecordDo(jsonDataPatch []byte, userTOKEN string, ev
oldEmail = normalizeEmail(raw2["email"].(string)) oldEmail = normalizeEmail(raw2["email"].(string))
} }
// merge // merge
fmt.Printf("old json: %s\n", decrypted) //fmt.Printf("old json: %s\n", decrypted)
fmt.Printf("json patch: %s\n", jsonDataPatch) //fmt.Printf("json patch: %s\n", jsonDataPatch)
newJSON, err := jsonpatch.MergePatch(decrypted, jsonDataPatch) newJSON, err := jsonpatch.MergePatch(decrypted, jsonDataPatch)
if err != nil { if err != nil {
return nil, nil, false, err return nil, nil, false, err
} }
fmt.Printf("result: %s\n", newJSON) //fmt.Printf("result: %s\n", newJSON)
var raw map[string]interface{} var raw map[string]interface{}
err = json.Unmarshal(newJSON, &raw) err = json.Unmarshal(newJSON, &raw)