MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-25 14:45:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

XL: ListObjects should not list when delimiter and prefix are '/'. (#1777)

Browse Source
This commit is contained in:
Harshavardhana 2016-05-27 15:43:51 -07:00 committed by Harshavardhana
parent 27cc8a6529
commit ba8bdec077
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs-v1.go
View File

@ -338,6 +338,15 @@ func (fs fsObjects) listObjectsFS(bucket, prefix, marker, delimiter string, maxK
return ListObjectsInfo{}, nil return ListObjectsInfo{}, nil
} }
// For delimiter and prefix as '/' we do not list anything at all
// since according to s3 spec we stop at the 'delimiter'
// along // with the prefix. On a flat namespace with 'prefix'
// as '/' we don't have any entries, since all the keys are
// of form 'keyName/...'
if delimiter == slashSeparator && prefix == slashSeparator {
return ListObjectsInfo{}, nil
}
// Over flowing count - reset to maxObjectList. // Over flowing count - reset to maxObjectList.
if maxKeys < 0 || maxKeys > maxObjectList { if maxKeys < 0 || maxKeys > maxObjectList {
maxKeys = maxObjectList maxKeys = maxObjectList

8
object-api-listobjects_test.go
View File

@ -413,6 +413,12 @@ func testListObjects(obj ObjectLayer, instanceType string, t *testing.T) {
{Name: "obj2"}, {Name: "obj2"},
}, },
}, },
// ListObjectsResult-30.
// Prefix and Delimiter is set to '/', (testCase 62).
{
IsTruncated: false,
Objects: []ObjectInfo{},
},
} }
testCases := []struct { testCases := []struct {
@ -521,6 +527,8 @@ func testListObjects(obj ObjectLayer, instanceType string, t *testing.T) {
// Test with marker set as hierarhical value and with delimiter. (60-61) // Test with marker set as hierarhical value and with delimiter. (60-61)
{"test-bucket-list-object", "", "Asia/India/India-summer-photos-1", "/", 10, resultCases[28], nil, true}, {"test-bucket-list-object", "", "Asia/India/India-summer-photos-1", "/", 10, resultCases[28], nil, true},
{"test-bucket-list-object", "", "Asia/India/Karnataka/Bangalore/Koramangala/pics", "/", 10, resultCases[29], nil, true}, {"test-bucket-list-object", "", "Asia/India/Karnataka/Bangalore/Koramangala/pics", "/", 10, resultCases[29], nil, true},
// Test with prefix and delimiter set to '/'. (62)
{"test-bucket-list-object", "/", "", "/", 10, resultCases[30], nil, true},
} }
for i, testCase := range testCases { for i, testCase := range testCases {

8
xl-v1-list-objects.go
View File

@ -114,6 +114,14 @@ func (xl xlObjects) ListObjects(bucket, prefix, marker, delimiter string, maxKey
return ListObjectsInfo{}, nil return ListObjectsInfo{}, nil
} }
// For delimiter and prefix as '/' we do not list anything at all
// since according to s3 spec we stop at the 'delimiter' along
// with the prefix. On a flat namespace with 'prefix' as '/'
// we don't have any entries, since all the keys are of form 'keyName/...'
if delimiter == slashSeparator && prefix == slashSeparator {
return ListObjectsInfo{}, nil
}
// Over flowing count - reset to maxObjectList. // Over flowing count - reset to maxObjectList.
if maxKeys < 0 || maxKeys > maxObjectList { if maxKeys < 0 || maxKeys > maxObjectList {
maxKeys = maxObjectList maxKeys = maxObjectList