astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-07-23 22:16:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

marshal retention XML in expected format (#15821)

Browse Source
This commit is contained in:
Harshavardhana
2022-10-08 13:11:00 -07:00
committed by GitHub
parent 64cf887b28
commit 3c4ef4338f
2 changed files with 53 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/bucket/object/lock/lock.go
+15 -6
View File
@@ -309,9 +309,12 @@ func (rDate *RetentionDate) UnmarshalXML(d *xml.Decoder, startElement xml.StartE
// While AWS documentation mentions that the date specified
// must be present in ISO 8601 format, in reality they allow
// users to provide RFC 3339 compliant dates.
retDate, err := time.Parse(time.RFC3339, dateStr)
retDate, err := time.Parse(iso8601TimeFormat, dateStr)
if err != nil {
return ErrInvalidRetentionDate
retDate, err = time.Parse(time.RFC3339, dateStr)
if err != nil {
return ErrInvalidRetentionDate
}
}
*rDate = RetentionDate{retDate}
@@ -321,10 +324,10 @@ func (rDate *RetentionDate) UnmarshalXML(d *xml.Decoder, startElement xml.StartE
// MarshalXML encodes expiration date if it is non-zero and encodes
// empty string otherwise
func (rDate *RetentionDate) MarshalXML(e *xml.Encoder, startElement xml.StartElement) error {
if *rDate == (RetentionDate{time.Time{}}) {
if rDate.IsZero() {
return nil
}
return e.EncodeElement(rDate.Format(time.RFC3339), startElement)
return e.EncodeElement(rDate.Format(iso8601TimeFormat), startElement)
}
// ObjectRetention specified in
@@ -414,9 +417,12 @@ func ParseObjectLockRetentionHeaders(h http.Header) (rmode RetMode, r RetentionD
// While AWS documentation mentions that the date specified
// must be present in ISO 8601 format, in reality they allow
// users to provide RFC 3339 compliant dates.
retDate, err = time.Parse(time.RFC3339, dateStr)
retDate, err = time.Parse(iso8601TimeFormat, dateStr)
if err != nil {
return rmode, r, ErrInvalidRetentionDate
retDate, err = time.Parse(time.RFC3339, dateStr)
if err != nil {
return rmode, r, ErrInvalidRetentionDate
}
}
_, replReq := h[textproto.CanonicalMIMEHeaderKey(xhttp.MinIOSourceReplicationRequest)]
@@ -459,6 +465,9 @@ func GetObjectRetentionMeta(meta map[string]string) ObjectRetention {
if t, e := time.Parse(iso8601TimeFormat, tillStr); e == nil {
retainTill = RetentionDate{t.UTC()}
}
if t, e := time.Parse(time.RFC3339, tillStr); e == nil {
retainTill = RetentionDate{t.UTC()}
}
}
return ObjectRetention{XMLNS: "http://s3.amazonaws.com/doc/2006-03-01/", Mode: mode, RetainUntilDate: retainTill}
}