Merge pull request #5511 from thotz/existingbucketsuserpolicy

obc: Do not delete user for retain policy if it is owner
This commit is contained in:
Sébastien Han authored and GitHub committed 2020-06-03 14:11:57 +02:00
commit fc648970c4
2 files changed
+22 -1

No files matched your search

@@ -255,6 +255,28 @@ func (p Provisioner) Revoke(ob *bktv1alpha1.ObjectBucket) error {
}
}
if bucket.Owner == p.cephUserName {
statement := NewPolicyStatement().
WithSID(p.cephUserName).
ForPrincipals(p.cephUserName).
ForResources(p.bucketName).
ForSubResources(p.bucketName).
Denies().
Actions(AllowedActions...)
if policy == nil {
policy = NewBucketPolicy(*statement)
} else {
policy = policy.ModifyBucketPolicy(*statement)
}
out, err := s3svc.PutBucketPolicy(p.bucketName, *policy)
logger.Infof("PutBucketPolicy output: %v", out)
if err != nil {
return errors.Wrap(err, "failed to update policy")
} else {
return nil
}
}
// drop policy if present
if policy != nil {
policy = policy.DropPolicyStatements(p.cephUserName)
@@ -184,7 +184,6 @@ var AllowedActions = []action{
GetBucketLocation,
GetBucketLogging,
GetBucketNotification,
GetBucketPolicy,
GetBucketTagging,
GetBucketVersioning,
GetBucketWebsite,