[s3] Another delimiter + prefix fix for Contents

dzbarsky · Sep 23, 2024 · 2d4a4b2 · 2d4a4b2
1 parent 7af77d5
commit 2d4a4b2
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/services/s3/s3.go b/services/s3/s3.go
@@ -1035,8 +1035,15 @@ func (s *S3) ListObjectsV2(input ListObjectsV2Input) (*ListObjectsV2Output, *aws
 	continuationToken := ""
 	var keysToInclude []string
 	for _, key := range keysSorted {
-		if input.Delimiter != nil && strings.Contains(key, *input.Delimiter) {
-			continue
+		if input.Delimiter != nil {
+			keyWithoutPrefix := key
+			if input.Prefix != nil {
+				keyWithoutPrefix = key[len(*input.Prefix):]
+			}
+
+			if strings.Contains(keyWithoutPrefix, *input.Delimiter) {
+				continue
+			}
 		}
 
 		if len(keysToInclude) >= maxKeys {
@@ -1085,7 +1092,7 @@ func (s *S3) ListObjectsV2(input ListObjectsV2Input) (*ListObjectsV2Output, *aws
 		commonPrefixes := make(map[string]struct{})
 		for _, key := range keysSorted {
 			if input.Prefix != nil {
-				key, _ = strings.CutPrefix(key, *input.Prefix)
+				key = key[len(*input.Prefix):]
 			}
 			i := strings.Index(key, *input.Delimiter)
 			if i != -1 {