pacific: rgw: an empty tagset is allowed by S3

Fixes: https://tracker.ceph.com/issues/58470
Signed-off-by: Volker Theile <vtheile@suse.com>
Signed-off-by: Liu Lan <liulan_yewu@cmss.chinamobile.com>
(cherry picked from commit 3ae77c51a74f441d1e9a078fc7bf61103f783b5e)

diff --git a/src/rgw/rgw_tag.cc b/src/rgw/rgw_tag.cc
index e60a265e7384e3e08f9047e59dd1ca92f0d89a68..b9ca88f04ac6c2da7a6b36eb50dde0c9c9654994 100644 (file)
--- a/src/rgw/rgw_tag.cc
+++ b/src/rgw/rgw_tag.cc
@@ -32,6 +32,9 @@ int RGWObjTags::check_and_add_tag(const string&key, const string& val){
 }
 
 int RGWObjTags::set_from_string(const string& input){
+  if (input.empty()) {
+    return 0;
+  }
   int ret=0;
   vector <string> kvs;
   boost::split(kvs, input, boost::is_any_of("&"));

diff --git a/src/rgw/rgw_tag_s3.cc b/src/rgw/rgw_tag_s3.cc
index 2c352c592030254bf6f076bfe2a47022ab953df9..494e6b8744f00c26b3794b86603967bb704ba39c 100644 (file)
--- a/src/rgw/rgw_tag_s3.cc
+++ b/src/rgw/rgw_tag_s3.cc
@@ -30,7 +30,8 @@ void RGWObjTagEntry_S3::dump_xml(Formatter *f) const {
 void RGWObjTagSet_S3::decode_xml(XMLObj *obj) {
   vector<RGWObjTagEntry_S3> entries;
 
-  RGWXMLDecoder::decode_xml("Tag", entries, obj, true);
+  bool mandatory{false};
+  RGWXMLDecoder::decode_xml("Tag", entries, obj, mandatory);
 
   for (auto& entry : entries) {
     const std::string& key = entry.get_key();