summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@inktank.com>2013-08-26 19:46:43 -0700
committerYehuda Sadeh <yehuda@inktank.com>2013-09-04 16:27:27 -0700
commit97a97c3c554f689dd3f987e63eaa2b9c5ec1dd0a (patch)
tree7f50e8a98d33d68d248cb380624423404e7a3cc7
parent7a0bd5bc2c6e5464f70b19154834448ac1e4c369 (diff)
downloadceph-97a97c3c554f689dd3f987e63eaa2b9c5ec1dd0a.tar.gz
rgw: check object name after rebuilding it in S3 POST
Fixes: #6088 Backport: bobtail, cuttlefish, dumpling When posting an object it is possible to provide a key name that refers to the original filename, however we need to verify that in the end we don't end up with an empty object name. Reviewed-by: Josh Durgin <josh.durgin@inktank.com> Signed-off-by: Yehuda Sadeh <yehuda@inktank.com> (cherry picked from commit c8ec532fadc0df36e4b265fe20a2ff3e35319744)
-rw-r--r--src/rgw/rgw_rest_s3.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index a88d2a36da7..cb10f34fb2b 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -797,6 +797,11 @@ int RGWPostObj_ObjStore_S3::get_params()
rebuild_key(s->object_str);
+ if (s->object_str.empty()) {
+ err_msg = "Empty object name";
+ return -EINVAL;
+ }
+
env.add_var("key", s->object_str);
part_str("Content-Type", &content_type);