MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-07 12:52:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

bypass flag: Allow object retention removal (#9677)

Browse Source
This commit is contained in:
Ashish Kumar Sinha
2020-05-22 22:08:58 +05:30
committed by GitHub
parent e45c90060f
commit bede525dc9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -337,7 +337,7 @@ func ParseObjectRetention(reader io.Reader) (*ObjectRetention, error) {
if err := xml.NewDecoder(io.LimitReader(reader, maxObjectRetentionSize)).Decode(&ret); err != nil { if err := xml.NewDecoder(io.LimitReader(reader, maxObjectRetentionSize)).Decode(&ret); err != nil {
return nil, err return nil, err
} }
if !ret.Mode.Valid() { if ret.Mode != "" && !ret.Mode.Valid() {
return &ret, ErrUnknownWORMModeDirective return &ret, ErrUnknownWORMModeDirective
} }
@@ -347,7 +347,7 @@ func ParseObjectRetention(reader io.Reader) (*ObjectRetention, error) {
return &ret, ErrPastObjectLockRetainDate return &ret, ErrPastObjectLockRetainDate
} }
if ret.RetainUntilDate.Before(t) { if !ret.RetainUntilDate.IsZero() && ret.RetainUntilDate.Before(t) {
return &ret, ErrPastObjectLockRetainDate return &ret, ErrPastObjectLockRetainDate
} }