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

more tidy up
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Nathan Coad
2024-01-09 22:40:04 +11:00
parent 32512f3c04
commit 341d5961f0
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
models/secret.go
View File

@@ -154,19 +154,6 @@ func SecretsGetFromMultipleSafes(s *Secret, safeIds []int) ([]Secret, error) {
var err error var err error
var secretResults []Secret var secretResults []Secret
/*
// First use an "In Query" to expand the list of safe Ids to query
// As per https://jmoiron.github.io/sqlx/#inQueries
query, args, _ := sqlx.In("SELECT * FROM secrets WHERE DeviceName LIKE ? AND DeviceCategory LIKE ? AND UserName = ? and SafeId IN (?);", s.DeviceName, s.DeviceCategory, s.UserName, safeIds)
// sqlx.In returns queries with the `?` bindvar, we can rebind it for our backend
query = db.Rebind(query)
rows, err := db.Queryx(query, args)
*/
// TODO use SecretsSearchAllSafes for adminRole of true
args := []interface{}{} args := []interface{}{}
var query string var query string
// Generate placeholders for the IN clause to match multiple SafeId values // Generate placeholders for the IN clause to match multiple SafeId values
@@ -201,7 +188,7 @@ func SecretsGetFromMultipleSafes(s *Secret, safeIds []int) ([]Secret, error) {
} }
// Execute the query // Execute the query
log.Printf("SecretsGetMultipleSafes query string : '%s'\n%+v\n", query, args) log.Printf("SecretsGetMultipleSafes query string :\n'%s'\nQuery Args : %+v\n", query, args)
rows, err := db.Queryx(query, args...) rows, err := db.Queryx(query, args...)
if err != nil { if err != nil {
@@ -220,7 +207,6 @@ func SecretsGetFromMultipleSafes(s *Secret, safeIds []int) ([]Secret, error) {
// Decrypt the secret // Decrypt the secret
_, err = r.DecryptSecret() _, err = r.DecryptSecret()
if err != nil { if err != nil {
//log.Printf("GetSecret unable to decrypt stored secret '%v' : '%s'\n", r.Secret, err)
log.Printf("SecretsGetMultipleSafes unable to decrypt stored secret : '%s'\n", err) log.Printf("SecretsGetMultipleSafes unable to decrypt stored secret : '%s'\n", err)
rows.Close() rows.Close()
return secretResults, err return secretResults, err