Fixed URL encoding and sort order for CommonPrefixes

weed/s3api/s3api_object_handlers.go

@@ -3371,6 +3371,12 @@ type PartBoundaryInfo struct {
 	ETag       string `json:"etag"`
 }
 
+// rc is a helper type that wraps a Reader and Closer for proper resource cleanup
+type rc struct {
+	io.Reader
+	io.Closer
+}
+
 // getMultipartInfo retrieves multipart metadata for a given part number
 // Returns: (partsCount, partInfo)
 // - partsCount: total number of parts in the multipart object

weed/s3api/s3api_object_handlers_list.go

@@ -207,13 +207,15 @@ func (s3a *S3ApiServer) listFilerEntries(bucket string, originalPrefix string, m
 
 		nextMarker, doErr = s3a.doListFilerEntries(client, reqDir, prefix, cursor, marker, delimiter, false, func(dir string, entry *filer_pb.Entry) {
 			empty = false
-				dirName, entryName, prefixName := entryUrlEncode(dir, entry.Name, encodingTypeUrl)
+			dirName, entryName, _ := entryUrlEncode(dir, entry.Name, encodingTypeUrl)
 			if entry.IsDirectory {
 					// When delimiter is specified, apply delimiter logic to directory key objects too
 				if delimiter != "" && entry.IsDirectoryKeyObject() {
 					// Apply the same delimiter logic as for regular files
 					var delimiterFound bool
-						undelimitedPath := fmt.Sprintf("%s/%s/", dirName, entryName)[len(bucketPrefix):]
+					// Use raw dir and entry.Name (not encoded) to ensure consistent handling
+					// Encoding will be applied after sorting if encodingTypeUrl is set
+					undelimitedPath := fmt.Sprintf("%s/%s/", dir, entry.Name)[len(bucketPrefix):]
 
 					// take into account a prefix if supplied while delimiting.
 					undelimitedPath = strings.TrimPrefix(undelimitedPath, originalPrefix)
@@ -258,8 +260,10 @@ func (s3a *S3ApiServer) listFilerEntries(bucket string, originalPrefix string, m
 						lastEntryWasCommonPrefix = false
 				// https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
 			} else if delimiter == "/" { // A response can contain CommonPrefixes only if you specify a delimiter.
+				// Use raw dir and entry.Name (not encoded) to ensure consistent handling
+				// Encoding will be applied after sorting if encodingTypeUrl is set
 				commonPrefixes = append(commonPrefixes, PrefixEntry{
-							Prefix: fmt.Sprintf("%s/%s/", dirName, prefixName)[len(bucketPrefix):],
+					Prefix: fmt.Sprintf("%s/%s/", dir, entry.Name)[len(bucketPrefix):],
 				})
 				//All of the keys (up to 1,000) rolled up into a common prefix count as a single return when calculating the number of returns.
 				cursor.maxKeys--
@@ -352,10 +356,13 @@ func (s3a *S3ApiServer) listFilerEntries(bucket string, originalPrefix string, m
 			CommonPrefixes: commonPrefixes,
 		}
 	// Sort CommonPrefixes lexicographically to match AWS S3 behavior
+	// Sorting happens on decoded values for correct lexicographic order
 	sort.Slice(response.CommonPrefixes, func(i, j int) bool { return response.CommonPrefixes[i].Prefix < response.CommonPrefixes[j].Prefix })
+	
+	// URL-encode CommonPrefixes AFTER sorting (if EncodingType=url)
+	// This ensures proper sort order (on decoded values) and correct encoding in response
 	if encodingTypeUrl {
 		response.EncodingType = s3.EncodingTypeUrl
-		// URL-encode all common prefixes when EncodingType=url
 		for i := range response.CommonPrefixes {
 			response.CommonPrefixes[i].Prefix = urlPathEscape(response.CommonPrefixes[i].Prefix)
 		}