fix: crash observed for anonymous deletes from UI (#9107)

This commit is contained in:
Harshavardhana 2020-03-09 21:21:35 -07:00 committed by GitHub
parent 667f42515a
commit 5ab9cc029d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -690,6 +690,17 @@ next:
} }
} }
if authErr == errNoAuthToken { if authErr == errNoAuthToken {
// Check if object is allowed to be deleted anonymously
if !globalPolicySys.IsAllowed(policy.Args{
Action: policy.DeleteObjectAction,
BucketName: args.BucketName,
ConditionValues: getConditionValues(r, "", "", nil),
IsOwner: false,
ObjectName: objectName,
}) {
return toJSONError(ctx, errAccessDenied)
}
// Check if object is allowed to be deleted anonymously // Check if object is allowed to be deleted anonymously
if globalPolicySys.IsAllowed(policy.Args{ if globalPolicySys.IsAllowed(policy.Args{
Action: policy.BypassGovernanceRetentionAction, Action: policy.BypassGovernanceRetentionAction,
@ -710,6 +721,18 @@ next:
continue continue
} }
if authErr == errNoAuthToken {
// Check if object is allowed to be deleted anonymously
if !globalPolicySys.IsAllowed(policy.Args{
Action: iampolicy.DeleteObjectAction,
BucketName: args.BucketName,
ConditionValues: getConditionValues(r, "", "", nil),
IsOwner: false,
ObjectName: objectName,
}) {
return toJSONError(ctx, errAccessDenied)
}
} else {
if !globalIAMSys.IsAllowed(iampolicy.Args{ if !globalIAMSys.IsAllowed(iampolicy.Args{
AccountName: claims.AccessKey, AccountName: claims.AccessKey,
Action: iampolicy.DeleteObjectAction, Action: iampolicy.DeleteObjectAction,
@ -721,6 +744,7 @@ next:
}) { }) {
return toJSONError(ctx, errAccessDenied) return toJSONError(ctx, errAccessDenied)
} }
}
// For directories, list the contents recursively and remove. // For directories, list the contents recursively and remove.
marker := "" marker := ""