From: Orit Wasserman <owasserm@redhat.com>
Date: Mon, 12 Mar 2018 09:38:54 +0000 (+0200)
Subject: rgw: trim all spaces inside a metadata value
X-Git-Tag: v12.2.6~53^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F22177%2Fhead;p=ceph.git

rgw: trim all spaces inside a metadata value

Fixes: http://tracker.ceph.com/issues/23301
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 9dfd55826378292fc11074a73ff6a75f40122aa2)
---

diff --git a/src/rgw/rgw_auth_s3.cc b/src/rgw/rgw_auth_s3.cc
index 4508e8131f2f..0904e825520e 100644
--- a/src/rgw/rgw_auth_s3.cc
+++ b/src/rgw/rgw_auth_s3.cc
@@ -17,6 +17,7 @@
 
 #include <boost/container/small_vector.hpp>
 #include <boost/utility/string_view.hpp>
+#include <boost/algorithm/string/trim_all.hpp>
 
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_rgw
@@ -620,7 +621,8 @@ get_v4_canonical_headers(const req_info& info,
   std::string canonical_hdrs;
   for (const auto& header : canonical_hdrs_map) {
     const boost::string_view& name = header.first;
-    const std::string& value = header.second;
+    std::string value = header.second;
+    boost::trim_all<std::string>(value);
 
     canonical_hdrs.append(name.data(), name.length())
                   .append(":", std::strlen(":"))