MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-23 11:55:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic in tagging request proxying (#19032)

Browse Source
This commit is contained in:
Poorna 2024-02-11 18:18:43 -08:00 committed by GitHub
parent 53997ecc79
commit a9cf32811c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/bucket-replication.go
View File

@ -2409,8 +2409,7 @@ func proxyTaggingToRepTarget(ctx context.Context, bucket, object string, tags *t
taggedCount++ taggedCount++
continue continue
} }
errCode := minio.ToErrorResponse(err).Code if err != nil {
if errCode != "NoSuchKey" && errCode != "NoSuchVersion" {
terr = err terr = err
} }
} }
@ -2470,6 +2469,9 @@ func proxyGetTaggingToRepTarget(ctx context.Context, bucket, object string, opts
tgs, _ = tags.MapToObjectTags(tagSlc[idx]) tgs, _ = tags.MapToObjectTags(tagSlc[idx])
} }
} }
if len(errs) == 1 {
proxy.Err = errs[0]
}
return tgs, proxy return tgs, proxy
} }

2
cmd/object-handlers.go
View File

@ -3317,7 +3317,7 @@ func (api objectAPIHandlers) GetObjectTaggingHandler(w http.ResponseWriter, r *h
globalReplicationStats.incProxy(bucket, getObjectTaggingAPI, false) globalReplicationStats.incProxy(bucket, getObjectTaggingAPI, false)
// proxy to replication target if site replication is in place. // proxy to replication target if site replication is in place.
tags, gerr := proxyGetTaggingToRepTarget(ctx, bucket, object, opts, proxytgts) tags, gerr := proxyGetTaggingToRepTarget(ctx, bucket, object, opts, proxytgts)
if gerr.Err != nil { if gerr.Err != nil || tags == nil {
globalReplicationStats.incProxy(bucket, getObjectTaggingAPI, true) globalReplicationStats.incProxy(bucket, getObjectTaggingAPI, true)
writeErrorResponse(ctx, w, toAPIError(ctx, gerr.Err), r.URL) writeErrorResponse(ctx, w, toAPIError(ctx, gerr.Err), r.URL)
return return