From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Wed, 19 Aug 2015 18:32:39 +0000 (+0200)
Subject: rgw: url_decode values from X-Object-Manifest during GET on Swift DLO.
X-Git-Tag: v9.1.0~317^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=69cf089596a0e5d4da2826b5c276306316a00690;p=ceph.git

rgw: url_decode values from X-Object-Manifest during GET on Swift DLO.

Fixes: #12728
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index c3827714d0f1e..9094e9d7c1e29 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -808,8 +808,13 @@ int RGWGetObj::handle_user_manifest(const char *prefix)
   if (pos < 0)
     return -EINVAL;
 
-  string bucket_name = prefix_str.substr(0, pos);
-  string obj_prefix = prefix_str.substr(pos + 1);
+  string bucket_name_raw, bucket_name;
+  bucket_name_raw = prefix_str.substr(0, pos);
+  url_decode(bucket_name_raw, bucket_name);
+
+  string obj_prefix_raw, obj_prefix;
+  obj_prefix_raw = prefix_str.substr(pos + 1);
+  url_decode(obj_prefix_raw, obj_prefix);
 
   rgw_bucket bucket;