gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rgw: get bucket_owner from policy

Browse Source 
We already read the bucket policy, we can get the bucket
owner from there.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
This commit is contained in:
Yehuda Sadeh 2013-02-07 14:41:24 -08:00
parent f6af1e76a8
commit 70532d1985
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/rgw/rgw_op.cc
View File

@ -300,22 +300,11 @@ int rgw_build_policies(RGWRados *store, struct req_state *s, bool only_bucket, b
}
s->bucket = bucket_info.bucket;
if (s->user.user_id.compare(bucket_info.owner) != 0) {
ret = rgw_get_user_info_by_uid(store, bucket_info.owner, bucket_owner_info);
if (ret < 0) {
ldout(s->cct, 0) << "NOTICE: couldn't get bucket owner info for (id=" << bucket_info.owner << ")" << dendl;
return ret;
}
s->bucket_owner.set_id(bucket_info.owner);
s->bucket_owner.set_name(bucket_owner_info.display_name);
} else {
s->bucket_owner = s->owner;
}
string no_obj;
RGWAccessControlPolicy bucket_acl(s->cct);
ret = read_policy(store, s, bucket_info, s->bucket_acl, s->bucket, no_obj);
s->bucket_owner = s->bucket_acl->get_owner();
}
/* we're passed only_bucket = true when we specifically need the bucket's