skip if entry.Extended map is nil.

This commit is contained in:
ruitao.liu
2020-11-12 17:59:31 +08:00
parent ab966410d2
commit c4f0fd6e1b

View File

@@ -125,12 +125,15 @@ func (s3a *S3ApiServer) DeleteBucketHandler(w http.ResponseWriter, r *http.Reque
writeErrorResponse(w, s3err.ErrNoSuchBucket, r.URL) writeErrorResponse(w, s3err.ErrNoSuchBucket, r.URL)
return return
} }
if entry.Extended != nil {
if id, ok := entry.Extended[xhttp.AmzIdentityId]; ok { if id, ok := entry.Extended[xhttp.AmzIdentityId]; ok {
if string(id) != r.Header.Get(xhttp.AmzIdentityId) { if string(id) != r.Header.Get(xhttp.AmzIdentityId) {
writeErrorResponse(w, s3err.ErrAccessDenied, r.URL) writeErrorResponse(w, s3err.ErrAccessDenied, r.URL)
return return
} }
} }
}
err = s3a.WithFilerClient(func(client filer_pb.SeaweedFilerClient) error { err = s3a.WithFilerClient(func(client filer_pb.SeaweedFilerClient) error {
@@ -166,12 +169,15 @@ func (s3a *S3ApiServer) HeadBucketHandler(w http.ResponseWriter, r *http.Request
writeErrorResponse(w, s3err.ErrNoSuchBucket, r.URL) writeErrorResponse(w, s3err.ErrNoSuchBucket, r.URL)
return return
} }
if entry.Extended != nil {
if id, ok := entry.Extended[xhttp.AmzIdentityId]; ok { if id, ok := entry.Extended[xhttp.AmzIdentityId]; ok {
if string(id) != r.Header.Get(xhttp.AmzIdentityId) { if string(id) != r.Header.Get(xhttp.AmzIdentityId) {
writeErrorResponse(w, s3err.ErrAccessDenied, r.URL) writeErrorResponse(w, s3err.ErrAccessDenied, r.URL)
return return
} }
} }
}
writeSuccessResponseEmpty(w) writeSuccessResponseEmpty(w)
} }