Merge pull request ceph#5617 from rzarzynski/wip-12728

rgw: url_decode bucket name and prefix from X-Object-Manifest during GET on Swift DLO. Reviewed-by: Yehuda Sadeh <[email protected]>
shishirng · Aug 24, 2015 · 0347122 · 0347122
2 parents 888a633 + 69cf089
commit 0347122
Showing 1 changed file with 7 additions and 2 deletions.
diff --git 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;