Merge pull request #1170 from versity/sis/getobjectattributes-invalid-single-attr

fix: Fixes the case for GetObjectAttributes to return InvalidArgument if a single invalid object attribute is provided.

s3api/utils/utils.go

@@ -298,6 +298,9 @@ func ParseObjectAttributes(ctx *fiber.Ctx) (map[s3response.ObjectAttributes]stru
 	var err error
 	ctx.Request().Header.VisitAll(func(key, value []byte) {
 		if string(key) == "X-Amz-Object-Attributes" {
+			if len(value) == 0 {
+				return
+			}
 			oattrs := strings.Split(string(value), ",")
 			for _, a := range oattrs {
 				attr := s3response.ObjectAttributes(a)
@@ -310,11 +313,15 @@ func ParseObjectAttributes(ctx *fiber.Ctx) (map[s3response.ObjectAttributes]stru
 		}
 	})
 
+	if err != nil {
+		return nil, err
+	}
+
 	if len(attrs) == 0 {
 		return nil, s3err.GetAPIError(s3err.ErrObjectAttributesInvalidHeader)
 	}
 
-	return attrs, err
+	return attrs, nil
 }
 
 type objLockCfg struct {

tests/integration/group-tests.go

@@ -178,6 +178,7 @@ func TestGetObjectAttributes(s *S3Conf) {
 	GetObjectAttributes_non_existing_object(s)
 	GetObjectAttributes_invalid_attrs(s)
 	GetObjectAttributes_invalid_parent(s)
+	GetObjectAttributes_invalid_single_attribute(s)
 	GetObjectAttributes_empty_attrs(s)
 	GetObjectAttributes_existing_object(s)
 	//TODO: remove the condition after implementing checksums in azure
@@ -868,6 +869,7 @@ func GetIntTests() IntTests {
 		"GetObjectAttributes_non_existing_object":                                 GetObjectAttributes_non_existing_object,
 		"GetObjectAttributes_invalid_attrs":                                       GetObjectAttributes_invalid_attrs,
 		"GetObjectAttributes_invalid_parent":                                      GetObjectAttributes_invalid_parent,
+		"GetObjectAttributes_invalid_single_attribute":                            GetObjectAttributes_invalid_single_attribute,
 		"GetObjectAttributes_empty_attrs":                                         GetObjectAttributes_empty_attrs,
 		"GetObjectAttributes_existing_object":                                     GetObjectAttributes_existing_object,
 		"GetObjectAttributes_checksums":                                           GetObjectAttributes_checksums,

tests/integration/tests.go

@@ -3723,6 +3723,27 @@ func GetObjectAttributes_invalid_parent(s *S3Conf) error {
 	})
 }
 
+func GetObjectAttributes_invalid_single_attribute(s *S3Conf) error {
+	testName := "GetObjectAttributes_invalid_single_attribute"
+	return actionHandler(s, testName, func(s3client *s3.Client, bucket string) error {
+		obj := "my-obj"
+		ctx, cancel := context.WithTimeout(context.Background(), shortTimeout)
+		_, err := s3client.GetObjectAttributes(ctx, &s3.GetObjectAttributesInput{
+			Bucket: &bucket,
+			Key:    &obj,
+			ObjectAttributes: []types.ObjectAttributes{
+				types.ObjectAttributes("invalid_attr"),
+			},
+		})
+		cancel()
+		if err := checkApiErr(err, s3err.GetAPIError(s3err.ErrInvalidObjectAttributes)); err != nil {
+			return err
+		}
+
+		return nil
+	})
+}
+
 func GetObjectAttributes_empty_attrs(s *S3Conf) error {
 	testName := "GetObjectAttributes_empty_attrs"
 	return actionHandler(s, testName, func(s3client *s3.Client, bucket string) error {