fix: Removed exceeding invalid range error when calling GetObject action

versity · Jun 4, 2024 · 0fb6bf6 · 0fb6bf6
1 parent dde3094
commit 0fb6bf6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/backend/posix/posix.go b/backend/posix/posix.go
@@ -1569,7 +1569,7 @@ func (p *Posix) GetObject(_ context.Context, input *s3.GetObjectInput, writer io
 	}
 
 	if startOffset+length > objSize+1 {
-		return nil, s3err.GetAPIError(s3err.ErrInvalidRange)
+		length = objSize - startOffset + 1
 	}
 
 	var contentRange string

diff --git a/tests/integration/tests.go b/tests/integration/tests.go
@@ -3031,16 +3031,20 @@ func GetObject_invalid_ranges(s *S3Conf) error {
 		}
 
 		ctx, cancel = context.WithTimeout(context.Background(), shortTimeout)
-		_, err = s3client.GetObject(ctx, &s3.GetObjectInput{
+		resp, err := s3client.GetObject(ctx, &s3.GetObjectInput{
 			Bucket: &bucket,
 			Key:    &obj,
-			Range:  getPtr("bytes=1000000000-999999999999"),
+			Range:  getPtr("bytes=1500-999999999999"),
 		})
 		cancel()
-		if err := checkApiErr(err, s3err.GetAPIError(s3err.ErrInvalidRange)); err != nil {
+		if err != nil {
 			return err
 		}
 
+		if *resp.ContentLength != dataLength-1500 {
+			return fmt.Errorf("expected content-length to be %v, instead got %v", dataLength-1500, *resp.ContentLength)
+		}
+
 		ctx, cancel = context.WithTimeout(context.Background(), shortTimeout)
 		_, err = s3client.GetObject(ctx, &s3.GetObjectInput{
 			Bucket: &bucket,