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

api: Upon bucket delete remove in-memory state properly. (#4716)

Browse Source 
This PR fixes the issue of cleaning up in-memory state
properly. Without this PR we can lead to security
situations where new bucket would inherit wrong
permissions on bucket and expose objects erroneously.

Fixes #4714
This commit is contained in:
Harshavardhana 2017-07-23 19:35:18 -07:00 committed by Dee Koder
parent b918a6592f
commit 4785555d34
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/bucket-handlers.go
View File

@ -653,12 +653,21 @@ func (api objectAPIHandlers) DeleteBucketHandler(w http.ResponseWriter, r *http.
// Delete bucket access policy, if present - ignore any errors. // Delete bucket access policy, if present - ignore any errors.
_ = removeBucketPolicy(bucket, objectAPI) _ = removeBucketPolicy(bucket, objectAPI)
// Notify all peers (including self) to update in-memory state
S3PeersUpdateBucketPolicy(bucket, policyChange{true, nil})
// Delete notification config, if present - ignore any errors. // Delete notification config, if present - ignore any errors.
_ = removeNotificationConfig(bucket, objectAPI) _ = removeNotificationConfig(bucket, objectAPI)
// Notify all peers (including self) to update in-memory state
S3PeersUpdateBucketNotification(bucket, nil)
// Delete listener config, if present - ignore any errors. // Delete listener config, if present - ignore any errors.
_ = removeListenerConfig(bucket, objectAPI) _ = removeListenerConfig(bucket, objectAPI)
// Notify all peers (including self) to update in-memory state
S3PeersUpdateBucketListener(bucket, []listenerConfig{})
// Write success response. // Write success response.
writeSuccessNoContent(w) writeSuccessNoContent(w)
} }

10
cmd/event-notifier.go
View File

@ -503,9 +503,8 @@ func removeNotificationConfig(bucket string, objAPI ObjectLayer) error {
// Acquire a write lock on notification config before modifying. // Acquire a write lock on notification config before modifying.
objLock := globalNSMutex.NewNSLock(minioMetaBucket, ncPath) objLock := globalNSMutex.NewNSLock(minioMetaBucket, ncPath)
objLock.Lock() objLock.Lock()
err := objAPI.DeleteObject(minioMetaBucket, ncPath) defer objLock.Unlock()
objLock.Unlock() return objAPI.DeleteObject(minioMetaBucket, ncPath)
return err
} }
// Remove listener configuration from storage layer. Used when a bucket is deleted. // Remove listener configuration from storage layer. Used when a bucket is deleted.
@ -516,9 +515,8 @@ func removeListenerConfig(bucket string, objAPI ObjectLayer) error {
// Acquire a write lock on notification config before modifying. // Acquire a write lock on notification config before modifying.
objLock := globalNSMutex.NewNSLock(minioMetaBucket, lcPath) objLock := globalNSMutex.NewNSLock(minioMetaBucket, lcPath)
objLock.Lock() objLock.Lock()
err := objAPI.DeleteObject(minioMetaBucket, lcPath) defer objLock.Unlock()
objLock.Unlock() return objAPI.DeleteObject(minioMetaBucket, lcPath)
return err
} }
// Loads both notification and listener config. // Loads both notification and listener config.