From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 12 Apr 2023 15:18:15 +0000 (-0400)
Subject: rgw/s3: dump Message field in Error response even if empty
X-Git-Tag: v16.2.13~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=23c7228c7d0d6f39a80c9848903965bebb6f8df1;p=ceph.git

rgw/s3: dump Message field in Error response even if empty

some clients like veeam fail to decode the response if Message is missing

Fixes: https://tracker.ceph.com/issues/59433

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 6de9e376b61fc11be9033a03d027dd0fa7f200ad)
(cherry picked from commit 796f50b08e1b424d67812d1e7f443618b9059cd9)
---

diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
index 3d09a1e001fa..005d256d5ed5 100644
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -360,8 +360,7 @@ void dump(struct req_state* s)
     s->formatter->open_object_section("Error");
   if (!s->err.err_code.empty())
     s->formatter->dump_string("Code", s->err.err_code);
-  if (!s->err.message.empty())
-    s->formatter->dump_string("Message", s->err.message);
+  s->formatter->dump_string("Message", s->err.message);
   if (!s->bucket_name.empty())	// TODO: connect to expose_bucket
     s->formatter->dump_string("BucketName", s->bucket_name);
   if (!s->trans_id.empty())	// TODO: connect to expose_bucket or another toggle