scottk/databunker
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/databunker.git synced 2025-10-30 17:37:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor variable names

Browse Source
This commit is contained in:
stremovsky
2021-12-16 21:43:06 +02:00
parent 4a1833323b
commit 8ad25a69b6
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/users_db.go
View File

@@ -22,18 +22,18 @@ func (dbobj dbcon) createUserRecord(parsedData userJSON, event *auditEvent) (str
if err != nil { if err != nil {
return "", err return "", err
} }
recordKey, err := generateRecordKey() userKeyBinary, err := generateRecordKey()
if err != nil { if err != nil {
return "", err return "", err
} }
//err = bson.UnmarshalExtJSON(jsonData, false, &bdoc) //err = bson.UnmarshalExtJSON(jsonData, false, &bdoc)
encoded, err := encrypt(dbobj.masterKey, recordKey, parsedData.jsonData) encoded, err := encrypt(dbobj.masterKey, userKeyBinary, parsedData.jsonData)
if err != nil { if err != nil {
return "", err return "", err
} }
encodedStr := base64.StdEncoding.EncodeToString(encoded) encodedStr := base64.StdEncoding.EncodeToString(encoded)
//fmt.Printf("data %s %s\n", parsedData.jsonData, encodedStr) //fmt.Printf("data %s %s\n", parsedData.jsonData, encodedStr)
bdoc["key"] = base64.StdEncoding.EncodeToString(recordKey) bdoc["key"] = base64.StdEncoding.EncodeToString(userKeyBinary)
bdoc["data"] = encodedStr bdoc["data"] = encodedStr
//it is ok to use md5 here, it is only for data sanity //it is ok to use md5 here, it is only for data sanity
md5Hash := md5.Sum([]byte(encodedStr)) md5Hash := md5.Sum([]byte(encodedStr))
@@ -164,7 +164,7 @@ func (dbobj dbcon) updateUserRecordDo(jsonDataPatch []byte, userTOKEN string, ol
// get user key // get user key
userKey := oldUserBson["key"].(string) userKey := oldUserBson["key"].(string)
recordKey, err := base64.StdEncoding.DecodeString(userKey) userKeyBinary, err := base64.StdEncoding.DecodeString(userKey)
if err != nil { if err != nil {
return nil, nil, false, err return nil, nil, false, err
} }
@@ -173,7 +173,7 @@ func (dbobj dbcon) updateUserRecordDo(jsonDataPatch []byte, userTOKEN string, ol
if err != nil { if err != nil {
return nil, nil, false, err return nil, nil, false, err
} }
decrypted, err := decrypt(dbobj.masterKey, recordKey, encData) decrypted, err := decrypt(dbobj.masterKey, userKeyBinary, encData)
if err != nil { if err != nil {
return nil, nil, false, err return nil, nil, false, err
} }
@@ -260,7 +260,7 @@ func (dbobj dbcon) updateUserRecordDo(jsonDataPatch []byte, userTOKEN string, ol
} }
} }
encoded, _ := encrypt(dbobj.masterKey, recordKey, newJSON) encoded, _ := encrypt(dbobj.masterKey, userKeyBinary, newJSON)
encodedStr := base64.StdEncoding.EncodeToString(encoded) encodedStr := base64.StdEncoding.EncodeToString(encoded)
bdoc["key"] = userKey bdoc["key"] = userKey
bdoc["data"] = encodedStr bdoc["data"] = encodedStr
@@ -325,7 +325,7 @@ func (dbobj dbcon) getUserJson(userTOKEN string) ([]byte, error) {
return []byte("{}"), nil return []byte("{}"), nil
} }
userKey := userBson["key"].(string) userKey := userBson["key"].(string)
recordKey, err := base64.StdEncoding.DecodeString(userKey) userKeyBinary, err := base64.StdEncoding.DecodeString(userKey)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -337,7 +337,7 @@ func (dbobj dbcon) getUserJson(userTOKEN string) ([]byte, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
decrypted, err = decrypt(dbobj.masterKey, recordKey, encData) decrypted, err = decrypt(dbobj.masterKey, userKeyBinary, encData)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -356,7 +356,7 @@ func (dbobj dbcon) getUser(userTOKEN string) ([]byte, bson.M, error) {
return []byte("{}"), userBson, nil return []byte("{}"), userBson, nil
} }
userKey := userBson["key"].(string) userKey := userBson["key"].(string)
recordKey, err := base64.StdEncoding.DecodeString(userKey) userKeyBinary, err := base64.StdEncoding.DecodeString(userKey)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
@@ -368,7 +368,7 @@ func (dbobj dbcon) getUser(userTOKEN string) ([]byte, bson.M, error) {
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
decrypted, err = decrypt(dbobj.masterKey, recordKey, encData) decrypted, err = decrypt(dbobj.masterKey, userKeyBinary, encData)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
@@ -409,7 +409,7 @@ func (dbobj dbcon) getUserJsonByIndex(indexValue string, indexName string, conf
} }
// decrypt record // decrypt record
userKey := userBson["key"].(string) userKey := userBson["key"].(string)
recordKey, err := base64.StdEncoding.DecodeString(userKey) userKeyBinary, err := base64.StdEncoding.DecodeString(userKey)
if err != nil { if err != nil {
return nil, "", err return nil, "", err
} }
@@ -421,7 +421,7 @@ func (dbobj dbcon) getUserJsonByIndex(indexValue string, indexName string, conf
if err != nil { if err != nil {
return nil, "", err return nil, "", err
} }
decrypted, err = decrypt(dbobj.masterKey, recordKey, encData) decrypted, err = decrypt(dbobj.masterKey, userKeyBinary, encData)
if err != nil { if err != nil {
return nil, "", err return nil, "", err
} }
@@ -437,7 +437,7 @@ func (dbobj dbcon) getUserByIndex(indexValue string, indexName string, conf Conf
} }
// decrypt record // decrypt record
userKey := userBson["key"].(string) userKey := userBson["key"].(string)
recordKey, err := base64.StdEncoding.DecodeString(userKey) userKeyBinary, err := base64.StdEncoding.DecodeString(userKey)
if err != nil { if err != nil {
return nil, "", nil, err return nil, "", nil, err
} }
@@ -449,7 +449,7 @@ func (dbobj dbcon) getUserByIndex(indexValue string, indexName string, conf Conf
if err != nil { if err != nil {
return nil, "", nil, err return nil, "", nil, err
} }
decrypted, err = decrypt(dbobj.masterKey, recordKey, encData) decrypted, err = decrypt(dbobj.masterKey, userKeyBinary, encData)
if err != nil { if err != nil {
return nil, "", nil, err return nil, "", nil, err
} }
@@ -472,7 +472,7 @@ func (dbobj dbcon) deleteUserRecord(userJSON []byte, userTOKEN string, conf Conf
return false, err return false, err
} }
userKey := oldUserBson["key"].(string) userKey := oldUserBson["key"].(string)
recordKey, err := base64.StdEncoding.DecodeString(userKey) userKeyBinary, err := base64.StdEncoding.DecodeString(userKey)
if err != nil { if err != nil {
return false, err return false, err
} }
@@ -497,7 +497,7 @@ func (dbobj dbcon) deleteUserRecord(userJSON []byte, userTOKEN string, conf Conf
} else { } else {
bdel["loginidx"] = "" bdel["loginidx"] = ""
} }
encoded, _ := encrypt(dbobj.masterKey, recordKey, dataJSON) encoded, _ := encrypt(dbobj.masterKey, userKeyBinary, dataJSON)
encodedStr := base64.StdEncoding.EncodeToString(encoded) encodedStr := base64.StdEncoding.EncodeToString(encoded)
bdoc["key"] = userKey bdoc["key"] = userKey
bdoc["data"] = encodedStr bdoc["data"] = encodedStr
@@ -563,12 +563,12 @@ func (dbobj dbcon) userEncrypt(userTOKEN string, data []byte) (string, error) {
return "", errors.New("not found") return "", errors.New("not found")
} }
userKey := userBson["key"].(string) userKey := userBson["key"].(string)
recordKey, err := base64.StdEncoding.DecodeString(userKey) userKeyBinary, err := base64.StdEncoding.DecodeString(userKey)
if err != nil { if err != nil {
return "", err return "", err
} }
// encrypt data // encrypt data
encoded, err := encrypt(dbobj.masterKey, recordKey, data) encoded, err := encrypt(dbobj.masterKey, userKeyBinary, data)
if err != nil { if err != nil {
return "", err return "", err
} }
@@ -586,7 +586,7 @@ func (dbobj dbcon) userDecrypt(userTOKEN, src string) ([]byte, error) {
return nil, errors.New("not found") return nil, errors.New("not found")
} }
userKey := userBson["key"].(string) userKey := userBson["key"].(string)
recordKey, err := base64.StdEncoding.DecodeString(userKey) userKeyBinary, err := base64.StdEncoding.DecodeString(userKey)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -594,7 +594,7 @@ func (dbobj dbcon) userDecrypt(userTOKEN, src string) ([]byte, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
decrypted, err := decrypt(dbobj.masterKey, recordKey, encData) decrypted, err := decrypt(dbobj.masterKey, userKeyBinary, encData)
return decrypted, err return decrypted, err
} }
@@ -608,7 +608,7 @@ func (dbobj dbcon) userDecrypt2(userTOKEN, src string, src2 string) ([]byte, []b
return nil, nil, errors.New("not found") return nil, nil, errors.New("not found")
} }
userKey := userBson["key"].(string) userKey := userBson["key"].(string)
recordKey, err := base64.StdEncoding.DecodeString(userKey) userKeyBinary, err := base64.StdEncoding.DecodeString(userKey)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
@@ -616,7 +616,7 @@ func (dbobj dbcon) userDecrypt2(userTOKEN, src string, src2 string) ([]byte, []b
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
decrypted, err := decrypt(dbobj.masterKey, recordKey, encData) decrypted, err := decrypt(dbobj.masterKey, userKeyBinary, encData)
if len(src2) == 0 { if len(src2) == 0 {
return decrypted, nil, err return decrypted, nil, err
} }
@@ -624,6 +624,6 @@ func (dbobj dbcon) userDecrypt2(userTOKEN, src string, src2 string) ([]byte, []b
if err != nil { if err != nil {
return decrypted, nil, err return decrypted, nil, err
} }
decrypted2, err := decrypt(dbobj.masterKey, recordKey, encData2) decrypted2, err := decrypt(dbobj.masterKey, userKeyBinary, encData2)
return decrypted, decrypted2, err return decrypted, decrypted2, err
} }