From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 28 Jun 2019 18:54:54 +0000 (-0400)
Subject: rgw: fix MalformedXML errors in PutBucketObjectLock/PutObjRetention
X-Git-Tag: v14.2.5~119^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=183e5054af2fc242a9d27164564bb2084b926184;p=ceph.git

rgw: fix MalformedXML errors in PutBucketObjectLock/PutObjRetention

RGWPutBucketObjectLock was not calling get_params(), so the 'data' it
was trying to parse was empty

RGWPutObjRetention was calling get_params() a second time, which
overwrote the 'data' from the first call

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 33a00eee3cc00e7d6ac3b79d0c00766aa410c53f)
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 5fa74883c3730..20d05333caef8 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -7532,7 +7532,10 @@ void RGWPutBucketObjectLock::execute()
     op_ret = -EINVAL;
     return;
   }
-
+  op_ret = get_params();
+  if (op_ret < 0) {
+    return;
+  }
   if (!parser.parse(data.c_str(), data.length(), 1)) {
     op_ret = -ERR_MALFORMED_XML;
     return;
@@ -7621,10 +7624,6 @@ void RGWPutObjRetention::execute()
     return;
   }
 
-  op_ret = get_params();
-  if (op_ret < 0)
-    return;
-
   if (!parser.parse(data.c_str(), data.length(), 1)) {
     op_ret = -ERR_MALFORMED_XML;
     return;