mirror/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-11-24 19:19:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

return NoSuchBucket instead of InternalError delete non-existed bucket.

Browse Source
This commit is contained in:
ruitao.liu 2020-11-12 16:44:16 +08:00
parent e06676f007
commit ab966410d2
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
weed/s3api/s3api_bucket_handlers.go
View File

@ -120,16 +120,19 @@ func (s3a *S3ApiServer) DeleteBucketHandler(w http.ResponseWriter, r *http.Reque
bucket, _ := getBucketAndObject(r) bucket, _ := getBucketAndObject(r)
if entry, err := s3a.get(s3a.option.BucketsPath, bucket); entry != nil && err == nil { entry, err := s3a.get(s3a.option.BucketsPath, bucket)
if id, ok := entry.Extended[xhttp.AmzIdentityId]; ok { if entry == nil || err == filer_pb.ErrNotFound {
if string(id) != r.Header.Get(xhttp.AmzIdentityId) { writeErrorResponse(w, s3err.ErrNoSuchBucket, r.URL)
writeErrorResponse(w, s3err.ErrAccessDenied, r.URL) return
return }
} if id, ok := entry.Extended[xhttp.AmzIdentityId]; ok {
if string(id) != r.Header.Get(xhttp.AmzIdentityId) {
writeErrorResponse(w, s3err.ErrAccessDenied, r.URL)
return
} }
} }
err := s3a.WithFilerClient(func(client filer_pb.SeaweedFilerClient) error { err = s3a.WithFilerClient(func(client filer_pb.SeaweedFilerClient) error {
// delete collection // delete collection
deleteCollectionRequest := &filer_pb.DeleteCollectionRequest{ deleteCollectionRequest := &filer_pb.DeleteCollectionRequest{