nathan/smt
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases 2 Wiki Activity

change to use logging instead of print to stdout

Browse Source
This commit is contained in:
Nathan Coad
2023-04-03 12:00:01 +10:00
parent f2ac6097d6
commit 5cc67501d3
11 changed files with 88 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
models/secret.go
View File

@@ -6,8 +6,8 @@ import (
"crypto/rand"
"encoding/hex"
"errors"
"fmt"
"io"
"log"
"os"
"github.com/jmoiron/sqlx"
@@ -29,16 +29,16 @@ func (s *Secret) SaveSecret() (*Secret, error) {
var err error
fmt.Printf("SaveSecret storing values '%v'\n", s)
log.Printf("SaveSecret storing values '%v'\n", s)
result, err := db.NamedExec((`INSERT INTO secrets (RoleId, DeviceName, DeviceCategory, UserName, Secret) VALUES (:RoleId, :DeviceName, :DeviceCategory, :UserName, :Secret)`), s)
if err != nil {
fmt.Printf("StoreSecret error executing sql record : '%s'\n", err)
log.Printf("StoreSecret error executing sql record : '%s'\n", err)
return s, err
} else {
affected, _ := result.RowsAffected()
id, _ := result.LastInsertId()
fmt.Printf("StoreSecret insert returned result id '%d' affecting %d row(s).\n", id, affected)
log.Printf("StoreSecret insert returned result id '%d' affecting %d row(s).\n", id, affected)
}
return s, nil
@@ -50,7 +50,7 @@ func GetSecrets(s *Secret) ([]Secret, error) {
var rows *sqlx.Rows
var secretResults []Secret
fmt.Printf("GetSecret querying values '%v'\n", s)
log.Printf("GetSecret querying values '%v'\n", s)
// Determine whether to query for a specific device or a category of devices
// Prefer querying device name than category
@@ -61,13 +61,13 @@ func GetSecrets(s *Secret) ([]Secret, error) {
} else if s.DeviceCategory != "" {
rows, err = db.Queryx("SELECT * FROM secrets WHERE DeviceCategory LIKE ? AND RoleId = ?", s.DeviceCategory, s.RoleId)
} else {
fmt.Printf("GetSecret no valid search options specified\n")
log.Printf("GetSecret no valid search options specified\n")
err = errors.New("no valid search options specified")
return secretResults, err
}
if err != nil {
fmt.Printf("GetSecret error executing sql record : '%s'\n", err)
log.Printf("GetSecret error executing sql record : '%s'\n", err)
return secretResults, err
} else {
// parse all the results into a slice
@@ -75,20 +75,20 @@ func GetSecrets(s *Secret) ([]Secret, error) {
var r Secret
err = rows.StructScan(&r)
if err != nil {
fmt.Printf("GetSecret error parsing sql record : '%s'\n", err)
log.Printf("GetSecret error parsing sql record : '%s'\n", err)
return secretResults, err
}
// Decrypt the secret
_, err = r.DecryptSecret()
if err != nil {
fmt.Printf("GetSecret unable to decrypt stored secret '%v', skipping result.\n", r.Secret)
log.Printf("GetSecret unable to decrypt stored secret '%v', skipping result.\n", r.Secret)
} else {
secretResults = append(secretResults, r)
}
}
fmt.Printf("GetSecret retrieved '%d' results\n", len(secretResults))
log.Printf("GetSecret retrieved '%d' results\n", len(secretResults))
}
return secretResults, nil
@@ -98,22 +98,22 @@ func (s *Secret) UpdateSecret() (*Secret, error) {
var err error
fmt.Printf("UpdateSecret storing values '%v'\n", s)
log.Printf("UpdateSecret storing values '%v'\n", s)
if s.SecretId == 0 {
err = errors.New("UpdateSecret unable to locate secret with empty secretId field")
fmt.Printf("UpdateSecret error in pre-check : '%s'\n", err)
log.Printf("UpdateSecret error in pre-check : '%s'\n", err)
return s, err
}
result, err := db.NamedExec((`UPDATE secrets SET DeviceName = :DeviceName, DeviceCategory = :DeviceCategory, UserName = :UserName, Secret = :Secret WHERE SecretId = :SecretId`), s)
if err != nil {
fmt.Printf("UpdateSecret error executing sql record : '%s'\n", err)
log.Printf("UpdateSecret error executing sql record : '%s'\n", err)
return &Secret{}, err
} else {
affected, _ := result.RowsAffected()
id, _ := result.LastInsertId()
fmt.Printf("UpdateSecret insert returned result id '%d' affecting %d row(s).\n", id, affected)
log.Printf("UpdateSecret insert returned result id '%d' affecting %d row(s).\n", id, affected)
}
return s, nil
@@ -128,35 +128,35 @@ func (s *Secret) EncryptSecret() (*Secret, error) {
//key := []byte("ECB518652A170880555136EA1F9752D6")
plaintext := []byte(s.Secret)
fmt.Printf("EncryptSecret applying key '%v' of length '%d' to plaintext secret '%s'\n", key, len(key), s.Secret)
log.Printf("EncryptSecret applying key '%v' of length '%d' to plaintext secret '%s'\n", key, len(key), s.Secret)
block, err := aes.NewCipher(key)
if err != nil {
fmt.Printf("EncryptSecret NewCipher error '%s'\n", err)
log.Printf("EncryptSecret NewCipher error '%s'\n", err)
return s, err
}
// Never use more than 2^32 random nonces with a given key because of the risk of a repeat.
nonce := make([]byte, nonceSize)
if _, err := io.ReadFull(rand.Reader, nonce); err != nil {
fmt.Printf("EncryptSecret nonce generation error '%s'\n", err)
log.Printf("EncryptSecret nonce generation error '%s'\n", err)
return s, err
}
fmt.Printf("EncryptSecret random nonce value is '%x'\n", nonce)
log.Printf("EncryptSecret random nonce value is '%x'\n", nonce)
aesgcm, err := cipher.NewGCM(block)
if err != nil {
fmt.Printf("EncryptSecret NewGCM error '%s'\n", err)
log.Printf("EncryptSecret NewGCM error '%s'\n", err)
return s, err
}
ciphertext := aesgcm.Seal(nil, nonce, plaintext, nil)
fmt.Printf("EncryptSecret generated ciphertext '%x''\n", ciphertext)
log.Printf("EncryptSecret generated ciphertext '%x''\n", ciphertext)
// Create a new slice to store nonce at the start and then the resulting ciphertext
// Nonce is always 12 bytes
combinedText := append(nonce, ciphertext...)
fmt.Printf("EncryptSecret combined secret value is now '%x'\n", combinedText)
log.Printf("EncryptSecret combined secret value is now '%x'\n", combinedText)
// Store the value back into the struct ready for database operations
s.Secret = hex.EncodeToString(combinedText)
@@ -175,44 +175,44 @@ func (s *Secret) DecryptSecret() (*Secret, error) {
//key := []byte("ECB518652A170880555136EA1F9752D6")
if len(s.Secret) < nonceSize {
fmt.Printf("DecryptSecret ciphertext is too short to decrypt\n")
log.Printf("DecryptSecret ciphertext is too short to decrypt\n")
return s, errors.New("ciphertext is too short")
}
crypted, err := hex.DecodeString(s.Secret)
if err != nil {
fmt.Printf("DecryptSecret unable to convert hex encoded string due to error '%s'\n", err)
log.Printf("DecryptSecret unable to convert hex encoded string due to error '%s'\n", err)
return s, err
}
fmt.Printf("DecryptSecret processing secret '%x'\n", crypted)
log.Printf("DecryptSecret processing secret '%x'\n", crypted)
//nonce, _ := hex.DecodeString("64a9433eae7ccceee2fc0eda")
// The nonce is the first 12 bytes from the ciphertext
nonce := crypted[:nonceSize]
ciphertext := crypted[nonceSize:]
fmt.Printf("DecryptSecret applying key '%v' and nonce '%x' to ciphertext '%x'\n", key, nonce, ciphertext)
log.Printf("DecryptSecret applying key '%v' and nonce '%x' to ciphertext '%x'\n", key, nonce, ciphertext)
block, err := aes.NewCipher(key)
if err != nil {
fmt.Printf("DecryptSecret NewCipher error '%s'\n", err)
log.Printf("DecryptSecret NewCipher error '%s'\n", err)
return s, err
}
aesgcm, err := cipher.NewGCM(block)
if err != nil {
fmt.Printf("DecryptSecret NewGCM error '%s'\n", err)
log.Printf("DecryptSecret NewGCM error '%s'\n", err)
return s, err
}
plaintext, err := aesgcm.Open(nil, nonce, ciphertext, nil)
if err != nil {
fmt.Printf("DecryptSecret Open error '%s'\n", err)
log.Printf("DecryptSecret Open error '%s'\n", err)
return s, err
}
fmt.Printf("DecryptSecret plaintext is '%s'\n", plaintext)
log.Printf("DecryptSecret plaintext is '%s'\n", plaintext)
s.Secret = string(plaintext)
return s, nil