mirrors/versitygw
1
0
Fork 0
mirror of https://github.com/versity/versitygw.git synced 2026-01-08 04:35:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #569 from versity/fix/556-put-object-lock-config-days-years-validation

Browse Source 
PutObjectLockConfiguration both years and days specified
This commit is contained in:
Ben McClelland
2024-05-16 09:47:49 -07:00
committed by GitHub
parent a0e3cfad9f fab1ddb86e
commit c4b4af3539
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
auth/object_lock.go
View File

@@ -36,7 +36,7 @@ type BucketLockConfig struct {
func ParseBucketLockConfigurationInput(input []byte) ([]byte, error) {
var lockConfig types.ObjectLockConfiguration
if err := xml.Unmarshal(input, &lockConfig); err != nil {
return nil, s3err.GetAPIError(s3err.ErrInvalidRequest)
return nil, s3err.GetAPIError(s3err.ErrMalformedXML)
}
config := BucketLockConfig{
@@ -46,7 +46,7 @@ func ParseBucketLockConfigurationInput(input []byte) ([]byte, error) {
if lockConfig.Rule != nil && lockConfig.Rule.DefaultRetention != nil {
retention := lockConfig.Rule.DefaultRetention
if retention.Years != nil && retention.Days != nil {
return nil, s3err.GetAPIError(s3err.ErrInvalidRequest)
return nil, s3err.GetAPIError(s3err.ErrMalformedXML)
}
config.DefaultRetention = retention

4
tests/integration/tests.go
View File

@@ -6336,7 +6336,7 @@ func PutObjectLockConfiguration_empty_config(s *S3Conf) error {
Bucket: &bucket,
})
cancel()
if err := checkApiErr(err, s3err.GetAPIError(s3err.ErrInvalidRequest)); err != nil {
if err := checkApiErr(err, s3err.GetAPIError(s3err.ErrMalformedXML)); err != nil {
return err
}
return nil
@@ -6385,7 +6385,7 @@ func PutObjectLockConfiguration_both_years_and_days(s *S3Conf) error {
},
})
cancel()
if err := checkApiErr(err, s3err.GetAPIError(s3err.ErrInvalidRequest)); err != nil {
if err := checkApiErr(err, s3err.GetAPIError(s3err.ErrMalformedXML)); err != nil {
return err
}
return nil