MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 22:25:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix listing of service and sts accounts (#14977)

Browse Source 
Now returns user does not exist error if the user is not known to the system
This commit is contained in:
Aditya Manthramurthy 2022-05-25 15:28:54 -07:00 committed by GitHub
parent dea8220eee
commit 5aae7178ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
cmd/iam-store.go
View File

@ -1795,14 +1795,29 @@ func (store *IAMStoreSys) ListTempAccounts(ctx context.Context, accessKey string
cache := store.rlock() cache := store.rlock()
defer store.runlock() defer store.runlock()
userExists := false
var tempAccounts []auth.Credentials var tempAccounts []auth.Credentials
for _, v := range cache.iamUsersMap { for _, v := range cache.iamUsersMap {
if v.IsTemp() && v.ParentUser == accessKey { isDerived := false
// Hide secret key & session key here if v.IsServiceAccount() || v.IsTemp() {
v.SecretKey = "" isDerived = true
v.SessionToken = ""
tempAccounts = append(tempAccounts, v)
} }
if !isDerived && v.AccessKey == accessKey {
userExists = true
} else if isDerived && v.ParentUser == accessKey {
userExists = true
if v.IsTemp() {
// Hide secret key & session key here
v.SecretKey = ""
v.SessionToken = ""
tempAccounts = append(tempAccounts, v)
}
}
}
if !userExists {
return nil, errNoSuchUser
} }
return tempAccounts, nil return tempAccounts, nil
@ -1813,14 +1828,29 @@ func (store *IAMStoreSys) ListServiceAccounts(ctx context.Context, accessKey str
cache := store.rlock() cache := store.rlock()
defer store.runlock() defer store.runlock()
userExists := false
var serviceAccounts []auth.Credentials var serviceAccounts []auth.Credentials
for _, v := range cache.iamUsersMap { for _, v := range cache.iamUsersMap {
if v.IsServiceAccount() && v.ParentUser == accessKey { isDerived := false
// Hide secret key & session key here if v.IsServiceAccount() || v.IsTemp() {
v.SecretKey = "" isDerived = true
v.SessionToken = ""
serviceAccounts = append(serviceAccounts, v)
} }
if !isDerived && v.AccessKey == accessKey {
userExists = true
} else if isDerived && v.ParentUser == accessKey {
userExists = true
if v.IsServiceAccount() {
// Hide secret key & session key here
v.SecretKey = ""
v.SessionToken = ""
serviceAccounts = append(serviceAccounts, v)
}
}
}
if !userExists {
return nil, errNoSuchUser
} }
return serviceAccounts, nil return serviceAccounts, nil