MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-12 07:23:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1053 from harshavardhana/infinite-loop

Browse Source 
listObjects: Marker should be unescaped before being used internally.
This commit is contained in:
Harshavardhana 2016-01-26 23:38:57 -08:00
commit 0c96ace8ad
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/fs/fs-bucket-listobjects.go
View File

@ -19,6 +19,7 @@ package fs
import ( import (
"errors" "errors"
"hash/fnv" "hash/fnv"
"net/url"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
@ -259,10 +260,16 @@ func (fs Filesystem) ListObjects(bucket, prefix, marker, delimiter string, maxKe
return ListObjectsResult{}, probe.NewError(e) return ListObjectsResult{}, probe.NewError(e)
} }
// Unescape the marker values.
markerUnescaped, e := url.QueryUnescape(marker)
if e != nil {
return ListObjectsResult{}, probe.NewError(e)
}
reqParams := listObjectsParams{} reqParams := listObjectsParams{}
reqParams.Bucket = bucket reqParams.Bucket = bucket
reqParams.Prefix = filepath.FromSlash(prefix) reqParams.Prefix = filepath.FromSlash(prefix)
reqParams.Marker = filepath.FromSlash(marker) reqParams.Marker = filepath.FromSlash(markerUnescaped)
reqParams.Delimiter = filepath.FromSlash(delimiter) reqParams.Delimiter = filepath.FromSlash(delimiter)
reqParams.MaxKeys = maxKeys reqParams.MaxKeys = maxKeys