From 5c7a509cc9de6577b4181c78b853c4e37b5b41e3 Mon Sep 17 00:00:00 2001
From: Denis Kirillov <denis@nspcc.ru>
Date: Mon, 29 Aug 2022 14:50:48 +0300
Subject: [PATCH] [#684] Fix continuation token for directories

Signed-off-by: Denis Kirillov <denis@nspcc.ru>
---
 api/handler/object_list_test.go | 49 +++++++++++++++++++++++++++++++++
 api/layer/object.go             |  1 +
 2 files changed, 50 insertions(+)

diff --git a/api/handler/object_list_test.go b/api/handler/object_list_test.go
index 7c3ba1a31..439edb35e 100644
--- a/api/handler/object_list_test.go
+++ b/api/handler/object_list_test.go
@@ -120,6 +120,35 @@ func TestS3BucketListDelimiterBasic(t *testing.T) {
 	require.Equal(t, "quux/", listV1Response.CommonPrefixes[1].Prefix)
 }
 
+func TestS3BucketListV2DelimiterPrefix(t *testing.T) {
+	tc := prepareHandlerContext(t)
+
+	bktName := "bucket-for-listingv2"
+	objects := []string{"asdf", "boo/bar", "boo/baz/xyzzy", "cquux/thud", "cquux/bla"}
+	bktInfo, _ := createBucketAndObject(t, tc, bktName, objects[0])
+
+	for _, objName := range objects[1:] {
+		createTestObject(tc.Context(), t, tc, bktInfo, objName)
+	}
+
+	var empty []string
+	delim := "/"
+	prefix := ""
+
+	continuationToken := validateListV2(t, tc, bktName, prefix, delim, "", 1, true, false, []string{"asdf"}, empty)
+	continuationToken = validateListV2(t, tc, bktName, prefix, delim, continuationToken, 1, true, false, empty, []string{"boo/"})
+	validateListV2(t, tc, bktName, prefix, delim, continuationToken, 1, false, true, empty, []string{"cquux/"})
+
+	continuationToken = validateListV2(t, tc, bktName, prefix, delim, "", 2, true, false, []string{"asdf"}, []string{"boo/"})
+	validateListV2(t, tc, bktName, prefix, delim, continuationToken, 2, false, true, empty, []string{"cquux/"})
+
+	prefix = "boo/"
+	continuationToken = validateListV2(t, tc, bktName, prefix, delim, "", 1, true, false, []string{"boo/bar"}, empty)
+	validateListV2(t, tc, bktName, prefix, delim, continuationToken, 1, false, true, empty, []string{"boo/baz/"})
+
+	validateListV2(t, tc, bktName, prefix, delim, "", 2, false, true, []string{"boo/bar"}, []string{"boo/baz/"})
+}
+
 func listObjectsV2(t *testing.T, tc *handlerContext, bktName, prefix, delimiter, startAfter, continuationToken string, maxKeys int) *ListObjectsV2Response {
 	query := prepareCommonListObjectsQuery(prefix, delimiter, maxKeys)
 	if len(startAfter) != 0 {
@@ -137,6 +166,26 @@ func listObjectsV2(t *testing.T, tc *handlerContext, bktName, prefix, delimiter,
 	return res
 }
 
+func validateListV2(t *testing.T, tc *handlerContext, bktName, prefix, delimiter, continuationToken string, maxKeys int,
+	isTruncated, last bool, checkObjects, checkPrefixes []string) string {
+	response := listObjectsV2(t, tc, bktName, prefix, delimiter, "", continuationToken, maxKeys)
+
+	require.Equal(t, isTruncated, response.IsTruncated)
+	require.Equal(t, last, len(response.NextContinuationToken) == 0)
+
+	require.Len(t, response.Contents, len(checkObjects))
+	for i := 0; i < len(checkObjects); i++ {
+		require.Equal(t, checkObjects[i], response.Contents[i].Key)
+	}
+
+	require.Len(t, response.CommonPrefixes, len(checkPrefixes))
+	for i := 0; i < len(checkPrefixes); i++ {
+		require.Equal(t, checkPrefixes[i], response.CommonPrefixes[i].Prefix)
+	}
+
+	return response.NextContinuationToken
+}
+
 func prepareCommonListObjectsQuery(prefix, delimiter string, maxKeys int) url.Values {
 	query := make(url.Values)
 
diff --git a/api/layer/object.go b/api/layer/object.go
index 0ac1dbceb..1949eec10 100644
--- a/api/layer/object.go
+++ b/api/layer/object.go
@@ -788,6 +788,7 @@ func tryDirectory(bktInfo *data.BucketInfo, node *data.NodeVersion, prefix, deli
 	}
 
 	return &data.ObjectInfo{
+		ID:             node.OID, // to use it as continuation token
 		CID:            bktInfo.CID,
 		IsDir:          true,
 		IsDeleteMarker: node.IsDeleteMarker(),