fix RoleId in secrets table
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2024-01-08 15:45:08 +11:00
parent ac60d1daef
commit 1a2b6e5b41
3 changed files with 18 additions and 1 deletions

View File

@@ -30,6 +30,13 @@ func StoreSecret(c *gin.Context) {
return return
} }
if input.SafeId == 0 && len(input.SafeName) == 0 {
errString := "StoreSecret no safe specified\n"
log.Print(errString)
c.JSON(http.StatusBadRequest, gin.H{"error": errString})
return
}
// Don't log this since it contains plaintext secrets // Don't log this since it contains plaintext secrets
//log.Printf("StoreSecret received JSON input '%v'\n", input) //log.Printf("StoreSecret received JSON input '%v'\n", input)

View File

@@ -183,7 +183,7 @@ func GetSecrets(s *Secret, adminRole bool) ([]Secret, error) {
} else if s.UserName != "" { } else if s.UserName != "" {
rows, err = db.Queryx("SELECT * FROM secrets WHERE UserName LIKE ? AND SafeId = ?", s.UserName, s.SafeId) rows, err = db.Queryx("SELECT * FROM secrets WHERE UserName LIKE ? AND SafeId = ?", s.UserName, s.SafeId)
} else { } else {
rows, err = db.Queryx("SELECT * FROM secrets WHERE RoleId = ?", s.SafeId) rows, err = db.Queryx("SELECT * FROM secrets WHERE SafeId = ?", s.SafeId)
//log.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") //err = errors.New("no valid search options specified")
//return secretResults, err //return secretResults, err

View File

@@ -301,6 +301,16 @@ func CreateTables() {
} }
} }
// Remove RoleId column from secrets table
secretsRoleIdCheck, _ := CheckColumnExists("secrets", "RoleId")
if secretsRoleIdCheck {
_, err := db.Exec("ALTER TABLE secrets DROP COLUMN RoleId;")
if err != nil {
log.Printf("Error altering secrets table to renmove RoleId column : '%s'\n", err)
os.Exit(1)
}
}
// Add SafeId column to secrets table // Add SafeId column to secrets table
safeIdCheck, _ := CheckColumnExists("secrets", "SafeId") safeIdCheck, _ := CheckColumnExists("secrets", "SafeId")
if !safeIdCheck { if !safeIdCheck {