MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-05-22 01:53:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix support OBDAdminAction is valid action (#9354)

Browse Source
This commit is contained in:
Harshavardhana 2020-04-15 12:16:40 -07:00 committed by GitHub
parent 6a8298b137
commit bde0f444db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/admin-handlers-users.go
View File

@ -565,7 +565,16 @@ func (a adminAPIHandlers) ListCannedPolicies(w http.ResponseWriter, r *http.Requ
return return
} }
if err = json.NewEncoder(w).Encode(policies); err != nil { var newPolicies = make(map[string]iampolicy.Policy)
for name, p := range policies {
_, err = json.Marshal(p)
if err != nil {
logger.LogIf(ctx, err)
continue
}
newPolicies[name] = p
}
if err = json.NewEncoder(w).Encode(newPolicies); err != nil {
writeErrorResponseJSON(ctx, w, toAdminAPIErr(ctx, err), r.URL) writeErrorResponseJSON(ctx, w, toAdminAPIErr(ctx, err), r.URL)
return return
} }

2
pkg/iam/policy/admin-action.go
View File

@ -115,6 +115,7 @@ var supportedAdminActions = map[AdminAction]struct{}{
TopLocksAdminAction: {}, TopLocksAdminAction: {},
ProfilingAdminAction: {}, ProfilingAdminAction: {},
TraceAdminAction: {}, TraceAdminAction: {},
OBDInfoAdminAction: {},
ConsoleLogAdminAction: {}, ConsoleLogAdminAction: {},
KMSKeyStatusAdminAction: {}, KMSKeyStatusAdminAction: {},
ServerUpdateAdminAction: {}, ServerUpdateAdminAction: {},
@ -159,6 +160,7 @@ var adminActionConditionKeyMap = map[Action]condition.KeySet{
StorageInfoAdminAction: condition.NewKeySet(condition.AllSupportedAdminKeys...), StorageInfoAdminAction: condition.NewKeySet(condition.AllSupportedAdminKeys...),
ServerInfoAdminAction: condition.NewKeySet(condition.AllSupportedAdminKeys...), ServerInfoAdminAction: condition.NewKeySet(condition.AllSupportedAdminKeys...),
DataUsageInfoAdminAction: condition.NewKeySet(condition.AllSupportedAdminKeys...), DataUsageInfoAdminAction: condition.NewKeySet(condition.AllSupportedAdminKeys...),
OBDInfoAdminAction: condition.NewKeySet(condition.AllSupportedAdminKeys...),
TopLocksAdminAction: condition.NewKeySet(condition.AllSupportedAdminKeys...), TopLocksAdminAction: condition.NewKeySet(condition.AllSupportedAdminKeys...),
ProfilingAdminAction: condition.NewKeySet(condition.AllSupportedAdminKeys...), ProfilingAdminAction: condition.NewKeySet(condition.AllSupportedAdminKeys...),
TraceAdminAction: condition.NewKeySet(condition.AllSupportedAdminKeys...), TraceAdminAction: condition.NewKeySet(condition.AllSupportedAdminKeys...),

7
pkg/iam/policy/constants.go
View File

@ -72,9 +72,10 @@ var AdminDiagnostics = Policy{
{ {
SID: policy.ID(""), SID: policy.ID(""),
Effect: policy.Allow, Effect: policy.Allow,
Actions: NewActionSet(ProfilingAdminAction, TraceAdminAction, Actions: NewActionSet(ProfilingAdminAction,
ConsoleLogAdminAction, ServerInfoAdminAction, TraceAdminAction, ConsoleLogAdminAction,
TopLocksAdminAction, OBDInfoAdminAction), ServerInfoAdminAction, TopLocksAdminAction,
OBDInfoAdminAction),
Resources: NewResourceSet(NewResource("*", "")), Resources: NewResourceSet(NewResource("*", "")),
}, },
}, },