RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 23:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw/acl/swift: merge_policy() as free function

Browse Source 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2023-11-16 13:25:36 -05:00
parent 33bc63e8d6
commit 4e1738db99
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/rgw/rgw_acl_swift.cc
View File

@ -194,10 +194,8 @@ int create_container_policy(const DoutPrefixProvider *dpp,
return 0;
}
} // namespace rgw::swift
void RGWAccessControlPolicy_SWIFT::filter_merge(uint32_t rw_mask,
RGWAccessControlPolicy_SWIFT *old)
void merge_policy(uint32_t rw_mask, const RGWAccessControlPolicy& src,
RGWAccessControlPolicy& dest)
{
/* rw_mask&SWIFT_PERM_READ => setting read acl,
* rw_mask&SWIFT_PERM_WRITE => setting write acl
@ -207,15 +205,13 @@ void RGWAccessControlPolicy_SWIFT::filter_merge(uint32_t rw_mask,
return;
}
rw_mask ^= (SWIFT_PERM_READ|SWIFT_PERM_WRITE);
for (auto &iter: old->acl.get_grant_map()) {
ACLGrant& grant = iter.second;
for (const auto &iter: src.get_acl().get_grant_map()) {
const ACLGrant& grant = iter.second;
uint32_t perm = grant.get_permission().get_permissions();
rgw_user id;
string url_spec;
if (!grant.get_id(id)) {
if (grant.get_group() != ACL_GROUP_ALL_USERS) {
url_spec = grant.get_referer();
if (url_spec.empty()) {
if (string url_spec = grant.get_referer(); url_spec.empty()) {
continue;
}
if (perm == 0) {
@ -225,11 +221,13 @@ void RGWAccessControlPolicy_SWIFT::filter_merge(uint32_t rw_mask,
}
}
if (perm & rw_mask) {
acl.add_grant(grant);
dest.get_acl().add_grant(grant);
}
}
}
} // namespace rgw::swift
void RGWAccessControlPolicy_SWIFT::to_str(string& read, string& write)
{
multimap<string, ACLGrant>& m = acl.get_grant_map();

6
src/rgw/rgw_acl_swift.h
View File

@ -27,12 +27,16 @@ int create_container_policy(const DoutPrefixProvider *dpp,
uint32_t& rw_mask,
RGWAccessControlPolicy& policy);
/// Copy grants matching the permission mask (SWIFT_PERM_READ/WRITE) from
/// one policy to another.
void merge_policy(uint32_t rw_mask, const RGWAccessControlPolicy& src,
RGWAccessControlPolicy& dest);
} // namespace rgw::swift
class RGWAccessControlPolicy_SWIFT : public RGWAccessControlPolicy
{
public:
void filter_merge(uint32_t mask, RGWAccessControlPolicy_SWIFT *policy);
void to_str(std::string& read, std::string& write);
};

6
src/rgw/rgw_op.cc
View File

@ -4988,11 +4988,7 @@ void RGWPutMetadataBucket::execute(optional_yield y)
* contain such keys yet. */
if (has_policy) {
if (s->dialect.compare("swift") == 0) {
auto old_policy = \
static_cast<RGWAccessControlPolicy_SWIFT*>(s->bucket_acl.get());
auto new_policy = static_cast<RGWAccessControlPolicy_SWIFT*>(&policy);
new_policy->filter_merge(policy_rw_mask, old_policy);
policy = *new_policy;
rgw::swift::merge_policy(policy_rw_mask, *s->bucket_acl, policy);
}
buffer::list bl;
policy.encode(bl);