RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 09:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: don't overwrite bucket / object owner when setting acls

Browse Source 
Fixes: #10978
Backport: hammer, firefly

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
This commit is contained in:
Yehuda Sadeh 2015-02-27 15:32:50 -08:00
parent e0fbe5c596
commit eb13f2d4b6
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/rgw/rgw_op.cc
View File

@ -2445,7 +2445,6 @@ void RGWPutACLs::execute()
RGWAccessControlPolicy_S3 new_policy(s->cct);
stringstream ss;
char *new_data = NULL;
ACLOwner owner;
rgw_obj obj;
ret = 0;
@ -2455,8 +2454,10 @@ void RGWPutACLs::execute()
return;
}
owner.set_id(s->user.user_id);
owner.set_name(s->user.display_name);
RGWAccessControlPolicy *existing_policy = (s->object.empty() ? s->bucket_acl : s->object_acl);
owner = existing_policy->get_owner();
ret = get_params();
if (ret < 0)

1
src/rgw/rgw_op.h
View File

@ -664,6 +664,7 @@ protected:
int ret;
size_t len;
char *data;
ACLOwner owner;
public:
RGWPutACLs() {

16
src/rgw/rgw_rest_s3.cc
View File

@ -495,16 +495,16 @@ void RGWStatBucket_ObjStore_S3::send_response()
dump_start(s);
}
static int create_s3_policy(struct req_state *s, RGWRados *store, RGWAccessControlPolicy_S3& s3policy)
static int create_s3_policy(struct req_state *s, RGWRados *store, RGWAccessControlPolicy_S3& s3policy, ACLOwner& owner)
{
if (s->has_acl_header) {
if (!s->canned_acl.empty())
return -ERR_INVALID_REQUEST;
return s3policy.create_from_headers(store, s->info.env, s->owner);
return s3policy.create_from_headers(store, s->info.env, owner);
}
return s3policy.create_canned(s->owner, s->bucket_owner, s->canned_acl);
return s3policy.create_canned(owner, s->bucket_owner, s->canned_acl);
}
class RGWLocationConstraint : public XMLObj
@ -560,7 +560,7 @@ int RGWCreateBucket_ObjStore_S3::get_params()
{
RGWAccessControlPolicy_S3 s3policy(s->cct);
int r = create_s3_policy(s, store, s3policy);
int r = create_s3_policy(s, store, s3policy, s->owner);
if (r < 0)
return r;
@ -661,7 +661,7 @@ int RGWPutObj_ObjStore_S3::get_params()
if (!s->length)
return -ERR_LENGTH_REQUIRED;
int r = create_s3_policy(s, store, s3policy);
int r = create_s3_policy(s, store, s3policy, s->owner);
if (r < 0)
return r;
@ -1411,7 +1411,7 @@ int RGWCopyObj_ObjStore_S3::init_dest_policy()
RGWAccessControlPolicy_S3 s3policy(s->cct);
/* build a policy for the target object */
int r = create_s3_policy(s, store, s3policy);
int r = create_s3_policy(s, store, s3policy, s->owner);
if (r < 0)
return r;
@ -1528,7 +1528,7 @@ int RGWPutACLs_ObjStore_S3::get_policy_from_state(RGWRados *store, struct req_st
s->canned_acl.clear();
}
int r = create_s3_policy(s, store, s3policy);
int r = create_s3_policy(s, store, s3policy, owner);
if (r < 0)
return r;
@ -1670,7 +1670,7 @@ void RGWOptionsCORS_ObjStore_S3::send_response()
int RGWInitMultipart_ObjStore_S3::get_params()
{
RGWAccessControlPolicy_S3 s3policy(s->cct);
ret = create_s3_policy(s, store, s3policy);
ret = create_s3_policy(s, store, s3policy, s->owner);
if (ret < 0)
return ret;