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

still trying
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Nathan Coad
2024-01-09 11:22:12 +11:00
parent 309d9c8fa3
commit 143e402dd6
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
models/secret.go
View File

@@ -66,10 +66,9 @@ func SecretsGetAllowedForGroup(s *Secret, userId int) ([]UserSecret, error) {
var secretResults []UserSecret var secretResults []UserSecret
queryArgs := []interface{}{} queryArgs := []interface{}{}
query := `SELECT permissions.ReadOnly, permissions.SafeId, safes.SafeName, query := `SELECT users.UserId, users.GroupId, permissions.ReadOnly, permissions.SafeId, safes.SafeName, secrets.*
secrets.SecretId, secrets.SafeId, secrets.DeviceName, secrets.DeviceCategory, secrets.UserName AS SecretUser, secrets.Secret FROM users
FROM groups INNER JOIN groups ON users.GroupId = groups.GroupId
INNER JOIN users ON users.GroupId = groups.GroupId
INNER JOIN permissions ON groups.GroupId = permissions.GroupId INNER JOIN permissions ON groups.GroupId = permissions.GroupId
INNER JOIN safes on permissions.SafeId = safes.SafeId INNER JOIN safes on permissions.SafeId = safes.SafeId
INNER JOIN secrets on secrets.SafeId = safes.SafeId INNER JOIN secrets on secrets.SafeId = safes.SafeId
@@ -95,7 +94,7 @@ func SecretsGetAllowedForGroup(s *Secret, userId int) ([]UserSecret, error) {
} }
if s.UserName != "" { if s.UserName != "" {
query += " AND UserName LIKE ? " query += " AND secrets.UserName LIKE ? "
queryArgs = append(queryArgs, s.UserName) queryArgs = append(queryArgs, s.UserName)
} }