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

logic fix
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Nathan Coad
2023-04-05 11:37:26 +10:00
parent b9a0c3ec0a
commit 969d1ca8d0
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
controllers/retrieve_secrets.go
View File

@@ -48,11 +48,7 @@ func RetrieveSecret(c *gin.Context) {
s.DeviceCategory = input.DeviceCategory s.DeviceCategory = input.DeviceCategory
// Don't apply a role filter if user has admin role // Don't apply a role filter if user has admin role
if u.Admin { results, err = models.GetSecrets(&s, u.Admin)
results, err = models.GetSecrets(&s, false)
} else {
results, err = models.GetSecrets(&s, true)
}
if err != nil { if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
@@ -138,11 +134,7 @@ func ListSecrets(c *gin.Context) {
} }
// If user is admin then list everything, otherwise only list for current role // If user is admin then list everything, otherwise only list for current role
if u.Admin { results, err = models.GetSecrets(&models.Secret{RoleId: u.RoleId}, u.Admin)
results, err = models.GetSecrets(&models.Secret{}, false)
} else {
results, err = models.GetSecrets(&models.Secret{RoleId: u.RoleId}, true)
}
if err != nil { if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})

2
models/secret.go
View File

@@ -50,7 +50,7 @@ func GetSecrets(s *Secret, adminRole bool) ([]Secret, error) {
var rows *sqlx.Rows var rows *sqlx.Rows
var secretResults []Secret var secretResults []Secret
log.Printf("GetSecret querying values '%v'\n", s) log.Printf("GetSecret querying values '%v' with admin role '%v'\n", s, adminRole)
// Admin roles should be able to access all secrets so don't do any filter based on RoleId // Admin roles should be able to access all secrets so don't do any filter based on RoleId
if adminRole { if adminRole {