MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-08 13:45:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Handle empty retention in get/put object retention (#9948)

Browse Source 
Fixes #9943
This commit is contained in:
kannappanr 2020-06-30 16:44:24 -07:00 committed by GitHub
parent c0ac25bfff
commit 5089a7167d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/object-handlers.go
View File

@ -2844,8 +2844,13 @@ func (api objectAPIHandlers) PutObjectRetentionHandler(w http.ResponseWriter, r
return return
} }
objInfo.UserDefined[strings.ToLower(xhttp.AmzObjectLockMode)] = string(objRetention.Mode) if objRetention.Mode.Valid() {
objInfo.UserDefined[strings.ToLower(xhttp.AmzObjectLockRetainUntilDate)] = objRetention.RetainUntilDate.UTC().Format(time.RFC3339) objInfo.UserDefined[strings.ToLower(xhttp.AmzObjectLockMode)] = string(objRetention.Mode)
objInfo.UserDefined[strings.ToLower(xhttp.AmzObjectLockRetainUntilDate)] = objRetention.RetainUntilDate.UTC().Format(time.RFC3339)
} else {
delete(objInfo.UserDefined, strings.ToLower(xhttp.AmzObjectLockRetainUntilDate))
delete(objInfo.UserDefined, strings.ToLower(xhttp.AmzObjectLockMode))
}
if objInfo.UserTags != "" { if objInfo.UserTags != "" {
objInfo.UserDefined[xhttp.AmzObjectTagging] = objInfo.UserTags objInfo.UserDefined[xhttp.AmzObjectTagging] = objInfo.UserTags
} }
@ -2914,6 +2919,11 @@ func (api objectAPIHandlers) GetObjectRetentionHandler(w http.ResponseWriter, r
retention := objectlock.GetObjectRetentionMeta(objInfo.UserDefined) retention := objectlock.GetObjectRetentionMeta(objInfo.UserDefined)
if !retention.Mode.Valid() {
writeErrorResponse(ctx, w, errorCodes.ToAPIErr(ErrNoSuchObjectLockConfiguration), r.URL, guessIsBrowserReq(r))
return
}
writeSuccessResponseXML(w, encodeResponse(retention)) writeSuccessResponseXML(w, encodeResponse(retention))
// Notify object retention accessed via a GET request. // Notify object retention accessed via a GET request.
sendEvent(eventArgs{ sendEvent(eventArgs{

11
pkg/bucket/object/lock/lock.go
View File

@ -341,6 +341,14 @@ func ParseObjectRetention(reader io.Reader) (*ObjectRetention, error) {
return &ret, ErrUnknownWORMModeDirective return &ret, ErrUnknownWORMModeDirective
} }
if ret.Mode.Valid() && ret.RetainUntilDate.IsZero() {
return &ret, ErrMalformedXML
}
if !ret.Mode.Valid() && !ret.RetainUntilDate.IsZero() {
return &ret, ErrMalformedXML
}
t, err := UTCNowNTP() t, err := UTCNowNTP()
if err != nil { if err != nil {
logger.LogIf(context.Background(), err) logger.LogIf(context.Background(), err)
@ -431,7 +439,10 @@ func GetObjectRetentionMeta(meta map[string]string) ObjectRetention {
} }
if ok { if ok {
mode = parseRetMode(modeStr) mode = parseRetMode(modeStr)
} else {
return ObjectRetention{}
} }
tillStr, ok = meta[strings.ToLower(AmzObjectLockRetainUntilDate)] tillStr, ok = meta[strings.ToLower(AmzObjectLockRetainUntilDate)]
if !ok { if !ok {
tillStr, ok = meta[AmzObjectLockRetainUntilDate] tillStr, ok = meta[AmzObjectLockRetainUntilDate]