From fab1ddb86e762bc9605342c910de26d34f5e6016 Mon Sep 17 00:00:00 2001 From: jonaustin09 Date: Thu, 16 May 2024 11:59:03 -0400 Subject: [PATCH] fix: Fixes #556, Changed errors from InvalidRequest to MalformedXML when calling PutObjectLockConfiguration with invalid request body or both days and years specified --- auth/object_lock.go | 4 ++-- tests/integration/tests.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/auth/object_lock.go b/auth/object_lock.go index 8f65bf0b..37252f02 100644 --- a/auth/object_lock.go +++ b/auth/object_lock.go @@ -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 diff --git a/tests/integration/tests.go b/tests/integration/tests.go index b195d17a..12006b5e 100644 --- a/tests/integration/tests.go +++ b/tests/integration/tests.go @@ -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