From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 16:37:53 +0000 (+0000)
Subject: Merge pull request #54837 from imtzw/urlencode
X-Git-Tag: v19.1.0~372
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ebd79592bd175c516b3f3fe6901585b80bc5f0f5;p=ceph.git

Merge pull request #54837 from imtzw/urlencode

rgw: fix list obj v1 nextmarker

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

ebd79592bd175c516b3f3fe6901585b80bc5f0f5
diff --cc src/rgw/rgw_rest_s3.cc
index b3d3891b0ea97,511adb990ad12..f76ac80cf8e6d
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@@ -4151,15 -4103,11 +4107,11 @@@ void RGWListBucketMultiparts_ObjStore_S
      for (iter = uploads.begin(); iter != uploads.end(); ++iter) {
        rgw::sal::MultipartUpload* upload = iter->get();
        s->formatter->open_array_section("Upload");
-       if (encode_url) {
-         s->formatter->dump_string("Key", url_encode(upload->get_key(), false));
-       } else {
-         s->formatter->dump_string("Key", upload->get_key());
-       }
+       dump_urlsafe(s, encode_url, "Key", upload->get_key(), false);
        s->formatter->dump_string("UploadId", upload->get_upload_id());
        const ACLOwner& owner = upload->get_owner();
 -      dump_owner(s, owner.get_id(), owner.get_display_name(), "Initiator");
 -      dump_owner(s, owner.get_id(), owner.get_display_name()); // Owner
 +      dump_owner(s, owner.id, owner.display_name, "Initiator");
 +      dump_owner(s, owner.id, owner.display_name); // Owner
        s->formatter->dump_string("StorageClass", "STANDARD");
        dump_time(s, "Initiated", upload->get_mtime());
        s->formatter->close_section();