diff options
| author | Yehuda Sadeh <yehuda@inktank.com> | 2013-08-26 19:46:43 -0700 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@inktank.com> | 2013-09-04 16:27:03 -0700 |
| commit | 1a9651010aab51c9be2edeccd80e9bd11f5177ce (patch) | |
| tree | bdab926b91acb80db2415400de1e14c893ea2815 | |
| parent | 1bd74a020b93f154b2d4129d512f6334387de7c7 (diff) | |
| download | ceph-1a9651010aab51c9be2edeccd80e9bd11f5177ce.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.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index 8690dd8fdbe..ab6e6644297 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -893,6 +893,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); |