gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

skip if entry.Extended map is nil.

Browse Source
This commit is contained in:
ruitao.liu
2020-11-12 17:59:31 +08:00
parent ab966410d2
commit c4f0fd6e1b
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
weed/s3api/s3api_bucket_handlers.go
View File

@@ -125,10 +125,13 @@ 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 id, ok := entry.Extended[xhttp.AmzIdentityId]; ok {
if string(id) != r.Header.Get(xhttp.AmzIdentityId) { if entry.Extended != nil {
writeErrorResponse(w, s3err.ErrAccessDenied, r.URL) if id, ok := entry.Extended[xhttp.AmzIdentityId]; ok {
return if string(id) != r.Header.Get(xhttp.AmzIdentityId) {
writeErrorResponse(w, s3err.ErrAccessDenied, r.URL)
return
}
} }
} }
@@ -166,10 +169,13 @@ 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 id, ok := entry.Extended[xhttp.AmzIdentityId]; ok {
if string(id) != r.Header.Get(xhttp.AmzIdentityId) { if entry.Extended != nil {
writeErrorResponse(w, s3err.ErrAccessDenied, r.URL) if id, ok := entry.Extended[xhttp.AmzIdentityId]; ok {
return if string(id) != r.Header.Get(xhttp.AmzIdentityId) {
writeErrorResponse(w, s3err.ErrAccessDenied, r.URL)
return
}
} }
} }