mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
return NoSuchBucket instead of InternalError delete non-existed bucket.
This commit is contained in:
parent
e06676f007
commit
ab966410d2
|
@ -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{
|
||||||
|
|
Loading…
Reference in a new issue