MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-02-09 04:38:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Checking the existence of the bucket in DeleteObjectHandler (#6085)

Browse Source 
Fixes #6077
This commit is contained in:
Praveen raj Mani 2018-07-01 11:05:43 +05:30 committed by Harshavardhana
parent 25f9b0bc3b
commit 360f3f9335
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/object-handlers.go
View File

@ -31,6 +31,7 @@ import (
"sort" "sort"
"strconv" "strconv"
etcd "github.com/coreos/etcd/client"
"github.com/gorilla/mux" "github.com/gorilla/mux"
miniogo "github.com/minio/minio-go" miniogo "github.com/minio/minio-go"
"github.com/minio/minio/cmd/logger" "github.com/minio/minio/cmd/logger"
@ -1539,6 +1540,27 @@ func (api objectAPIHandlers) DeleteObjectHandler(w http.ResponseWriter, r *http.
return return
} }
if globalDNSConfig != nil {
_, err := globalDNSConfig.Get(bucket)
if err != nil {
if etcd.IsKeyNotFound(err) || err == dns.ErrNoEntriesFound {
writeErrorResponse(w, ErrNoSuchBucket, r.URL)
} else {
writeErrorResponse(w, toAPIErrorCode(err), r.URL)
}
return
}
} else {
getBucketInfo := objectAPI.GetBucketInfo
if api.CacheAPI() != nil {
getBucketInfo = api.CacheAPI().GetBucketInfo
}
if _, err := getBucketInfo(ctx, bucket); err != nil {
writeErrorResponse(w, toAPIErrorCode(err), r.URL)
return
}
}
// http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectDELETE.html // http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectDELETE.html
// Ignore delete object errors while replying to client, since we are // Ignore delete object errors while replying to client, since we are
// suppposed to reply only 204. Additionally log the error for // suppposed to reply only 204. Additionally log the error for