From: yuliyang <yuliyang@cmss.chinamobile.com>
Date: Fri, 2 Dec 2022 12:20:20 +0000 (+0000)
Subject: rgw: list with Delimiter should url encode when encoding-type=url
X-Git-Tag: v18.1.0~611^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a1cb0e79b29d3396b9191f977238e6b8b66e9848;p=ceph.git

rgw: list with Delimiter should url encode when encoding-type=url

Signed-off-by: yuliyang_yewu <yuliyang_yewu@cmss.chinamobile.com>
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 4de7f604e14a..7f085e7c0a23 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -1765,7 +1765,11 @@ void RGWListBucket_ObjStore_S3::send_common_response()
   s->formatter->dump_string("Prefix", prefix);
   s->formatter->dump_int("MaxKeys", max);
   if (!delimiter.empty()) {
-    s->formatter->dump_string("Delimiter", delimiter);
+    if (encode_key) {
+      s->formatter->dump_string("Delimiter", url_encode(delimiter, false));
+    } else {
+      s->formatter->dump_string("Delimiter", delimiter);
+    }
   }
   s->formatter->dump_string("IsTruncated", (max && is_truncated ? "true"
               : "false"));