diff options
| author | Kalpesh Pandya <kapandya@redhat.com> | 2021-06-16 10:33:52 +0200 |
|---|---|---|
| committer | Kalpesh Pandya <kapandya@redhat.com> | 2021-07-02 04:11:20 +0200 |
| commit | 3a9b43a9356968d9d05abe48cfcaefaacbf65177 (patch) | |
| tree | 3be4c779fbd8332c08410523e573ea1d787178fd /src/rgw/rgw_acl.cc | |
| parent | Merge PR #41935 into master (diff) | |
| download | ceph-3a9b43a9356968d9d05abe48cfcaefaacbf65177.tar.xz ceph-3a9b43a9356968d9d05abe48cfcaefaacbf65177.zip | |
rgw: DPP addition 3
Following files have been covered in this PR:
1. rgw_period_puller.cc
2. rgw_reshard.cc
3. rgw_sal_rados.cc
4. services/svc_sync_modules.cc
5. services/svc_bucket_sobj.cc
6. services/svc_notify.cc
7. rgw_acl_swift.cc
8. rgw_acl.cc
9. rgw_sync_module_aws.cc
10. rgw_tools.cc
11. services/svc_sys_obj_cache.cc
12. rgw_bucket_sync.cc
Signed-off-by: Kalpesh Pandya <kapandya@redhat.com>
Diffstat (limited to 'src/rgw/rgw_acl.cc')
| -rw-r--r-- | src/rgw/rgw_acl.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/rgw/rgw_acl.cc b/src/rgw/rgw_acl.cc index ec5de88cecb..a87cd8e2b1e 100644 --- a/src/rgw/rgw_acl.cc +++ b/src/rgw/rgw_acl.cc @@ -150,11 +150,12 @@ uint32_t RGWAccessControlList::get_group_perm(const DoutPrefixProvider *dpp, return 0; } -uint32_t RGWAccessControlList::get_referer_perm(const uint32_t current_perm, +uint32_t RGWAccessControlList::get_referer_perm(const DoutPrefixProvider *dpp, + const uint32_t current_perm, const std::string http_referer, const uint32_t perm_mask) { - ldout(cct, 5) << "Searching permissions for referer=" << http_referer + ldpp_dout(dpp, 5) << "Searching permissions for referer=" << http_referer << " mask=" << perm_mask << dendl; /* This function is basically a transformation from current perm to @@ -168,7 +169,7 @@ uint32_t RGWAccessControlList::get_referer_perm(const uint32_t current_perm, } } - ldout(cct, 5) << "Found referer permission=" << referer_perm << dendl; + ldpp_dout(dpp, 5) << "Found referer permission=" << referer_perm << dendl; return referer_perm & perm_mask; } @@ -203,7 +204,7 @@ uint32_t RGWAccessControlPolicy::get_perm(const DoutPrefixProvider* dpp, /* Should we continue looking up even deeper? */ if (nullptr != http_referer && (perm & perm_mask) != perm_mask) { - perm = acl.get_referer_perm(perm, http_referer, perm_mask); + perm = acl.get_referer_perm(dpp, perm, http_referer, perm_mask); } ldpp_dout(dpp, 5) << "-- Getting permissions done for identity=" << auth_identity |