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

Copy metadata on update (#8755)

Browse Source 
Fixes #8706

Co-authored-by: Harshavardhana <harsha@minio.io>
This commit is contained in:
Klaus Post 2020-01-06 19:15:45 +01:00 committed by Harshavardhana
parent ae0b165431
commit fe379f9428
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/object-lock.go
View File

@ -595,16 +595,32 @@ func checkPutObjectRetentionAllowed(ctx context.Context, r *http.Request, bucket
// filter object lock metadata if s3:GetObjectRetention permission is denied or if isCopy flag set. // filter object lock metadata if s3:GetObjectRetention permission is denied or if isCopy flag set.
func filterObjectLockMetadata(ctx context.Context, r *http.Request, bucket, object string, metadata map[string]string, isCopy bool, getRetPerms APIErrorCode) map[string]string { func filterObjectLockMetadata(ctx context.Context, r *http.Request, bucket, object string, metadata map[string]string, isCopy bool, getRetPerms APIErrorCode) map[string]string {
// Copy on write
dst := metadata
var copied bool
delKey := func(key string) {
if _, ok := metadata[key]; !ok {
return
}
if !copied {
dst = make(map[string]string, len(metadata))
for k, v := range metadata {
dst[k] = v
}
copied = true
}
delete(dst, key)
}
ret := getObjectRetentionMeta(metadata) ret := getObjectRetentionMeta(metadata)
if ret.Mode == Invalid || isCopy { if ret.Mode == Invalid || isCopy {
delete(metadata, xhttp.AmzObjectLockMode) delKey(xhttp.AmzObjectLockMode)
delete(metadata, xhttp.AmzObjectLockRetainUntilDate) delKey(xhttp.AmzObjectLockRetainUntilDate)
return metadata return metadata
} }
if getRetPerms == ErrNone { if getRetPerms == ErrNone {
return metadata return dst
} }
delete(metadata, xhttp.AmzObjectLockMode) delKey(xhttp.AmzObjectLockMode)
delete(metadata, xhttp.AmzObjectLockRetainUntilDate) delKey(xhttp.AmzObjectLockRetainUntilDate)
return metadata return dst
} }