RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 17:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: fix multi-delete query param parsing.

Browse Source 
Multi-delete is triggered by a query parameter on POST, but there are
multiple valid ways of representing it, and Ceph should accept ANY way
that has the query parameter set, regardless of what value or absence of
value.

This caused the RubyGem aws-sdk-v1 to break, and has been present since
multi-delete was first added in commit 0a1f4a97da, for the bobtail
release.

Fixes: http://tracker.ceph.com/issues/16618
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
This commit is contained in:
Robin H. Johnson 2016-07-07 14:14:36 -07:00
parent 33fb3bc63f
commit a7016e1b67
No known key found for this signature in database
GPG Key ID: 19395F23C58826C4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rgw/rgw_rest.cc
View File

@ -1548,7 +1548,7 @@ int RGWHandler_REST::read_permissions(RGWOp* op_obj)
case OP_POST:
case OP_COPY:
/* is it a 'multi-object delete' request? */
if (s->info.request_params == "delete") {
if (s->info.args.exists("delete")) {
only_bucket = true;
break;
}

2
src/rgw/rgw_rest_s3.cc
View File

@ -2866,7 +2866,7 @@ RGWOp *RGWHandler_REST_Bucket_S3::op_delete()
RGWOp *RGWHandler_REST_Bucket_S3::op_post()
{
if ( s->info.request_params == "delete" ) {
if (s->info.args.exists("delete")) {
return new RGWDeleteMultiObj_ObjStore_S3;
}