astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-07-20 04:30:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

web: Remove bucket policy when we have no more statements. (#2779)

Browse Source
This commit is contained in:
Harshavardhana
2016-09-26 03:11:22 -07:00
committed by GitHub
parent be0e06c0aa
commit cfbab22237
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/web-handlers.go
+7
View File
@@ -614,6 +614,7 @@ func (web *webAPIHandlers) ListAllBucketPolicies(r *http.Request, args *ListAllB
}
reply.UIVersion = miniobrowser.UIVersion
reply.Policies = []bucketAccessPolicy{}
for prefix, policy := range policy.GetPolicies(policyInfo.Statements, args.BucketName) {
reply.Policies = append(reply.Policies, bucketAccessPolicy{
Prefix: prefix,
@@ -650,6 +651,12 @@ func (web *webAPIHandlers) SetBucketPolicy(r *http.Request, args *SetBucketPolic
return &json2.Error{Message: err.Error()}
}
policyInfo.Statements = policy.SetPolicy(policyInfo.Statements, bucketP, args.BucketName, args.Prefix)
if len(policyInfo.Statements) == 0 {
if err = removeBucketPolicy(args.BucketName, objectAPI); err != nil {
return &json2.Error{Message: err.Error()}
}
return nil
}
data, err := json.Marshal(policyInfo)
if err != nil {
return &json2.Error{Message: err.Error()}