rgw: make verify_bucket_permission functions const

clwluvw · clwluvw · commit b0200c627b1c · 2025-04-28T18:56:06.000+02:00
Signed-off-by: Seena Fallah &lt;seenafallah@gmail.com&gt;
diff --git a/src/rgw/driver/rados/rgw_data_sync.cc b/src/rgw/driver/rados/rgw_data_sync.cc
@@ -2701,7 +2701,7 @@ int RGWUserPermHandler::Bucket::init(RGWUserPermHandler *handler,
   return 0;
 }
 
-bool RGWUserPermHandler::Bucket::verify_bucket_permission(const rgw_obj_key& obj_key, const uint64_t op)
+bool RGWUserPermHandler::Bucket::verify_bucket_permission(const rgw_obj_key& obj_key, const uint64_t op) const
 {
   const rgw_obj obj(ps->bucket_info.bucket, obj_key);
   const auto arn = rgw::ARN(obj);
@@ -2732,7 +2732,7 @@ bool RGWUserPermHandler::Bucket::verify_bucket_permission(const rgw_obj_key& obj
                                   {}, op);
 }
 
-rgw::IAM::Effect RGWUserPermHandler::Bucket::evaluate_iam_policies(const rgw_obj_key& obj_key, const uint64_t op)
+rgw::IAM::Effect RGWUserPermHandler::Bucket::evaluate_iam_policies(const rgw_obj_key& obj_key, const uint64_t op) const
 {
   const rgw_obj obj(ps->bucket_info.bucket, obj_key);
   const auto arn = rgw::ARN(obj);
diff --git a/src/rgw/driver/rados/rgw_data_sync.h b/src/rgw/driver/rados/rgw_data_sync.h
@@ -911,8 +911,8 @@ class RGWUserPermHandler {
              const RGWBucketInfo& bucket_info,
              const std::map<std::string, bufferlist>& bucket_attrs);
 
-    bool verify_bucket_permission(const rgw_obj_key& obj_key, const uint64_t op);
-    rgw::IAM::Effect evaluate_iam_policies(const rgw_obj_key& obj_key, const uint64_t op);
+    bool verify_bucket_permission(const rgw_obj_key& obj_key, const uint64_t op) const;
+    rgw::IAM::Effect evaluate_iam_policies(const rgw_obj_key& obj_key, const uint64_t op) const;
   };
 
   static int policy_from_attrs(CephContext *cct,
diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
@@ -1329,7 +1329,7 @@ bool verify_user_permission_no_policy(const DoutPrefixProvider* dpp,
   return verify_user_permission_no_policy(dpp, &ps, s->user_acl, perm);
 }
 
-bool verify_requester_payer_permission(struct perm_state_base *s)
+bool verify_requester_payer_permission(const perm_state_base *s)
 {
   if (!s->bucket_info.requester_pays)
     return true;
@@ -1350,7 +1350,7 @@ bool verify_requester_payer_permission(struct perm_state_base *s)
 }
 
 bool verify_bucket_permission(const DoutPrefixProvider* dpp,
-                              struct perm_state_base * const s,
+                              const perm_state_base * const s,
                               const rgw::ARN& arn,
                               bool account_root,
                               const RGWAccessControlPolicy& user_acl,
@@ -1434,7 +1434,7 @@ bool verify_bucket_permission(const DoutPrefixProvider* dpp,
                                   session_policies, op);
 }
 
-bool verify_bucket_permission_no_policy(const DoutPrefixProvider* dpp, struct perm_state_base * const s,
+bool verify_bucket_permission_no_policy(const DoutPrefixProvider* dpp, const perm_state_base * const s,
 					const RGWAccessControlPolicy& user_acl,
 					const RGWAccessControlPolicy& bucket_acl,
 					const int perm)
diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
@@ -1751,7 +1751,7 @@ struct perm_state : public perm_state_base {
  * to do the requested action  */
 bool verify_bucket_permission_no_policy(
   const DoutPrefixProvider* dpp,
-  struct perm_state_base * const s,
+  const perm_state_base * const s,
   const RGWAccessControlPolicy& user_acl,
   const RGWAccessControlPolicy& bucket_acl,
   const int perm);
@@ -1787,7 +1787,7 @@ bool verify_user_permission_no_policy(const DoutPrefixProvider* dpp,
                                       req_state * const s,
                                       int perm);
 bool verify_bucket_permission(const DoutPrefixProvider* dpp,
-                              struct perm_state_base * const s,
+                              const perm_state_base * const s,
                               const rgw::ARN& arn,
                               bool account_root,
                               const RGWAccessControlPolicy& user_acl,

Original file line number	Diff line number	Diff line change
`@@ -2701,7 +2701,7 @@ int RGWUserPermHandler::Bucket::init(RGWUserPermHandler *handler,`
`2701`	`2701`	`return 0;`
`2702`	`2702`	`}`
`2703`	`2703`
`2704`		`-bool RGWUserPermHandler::Bucket::verify_bucket_permission(const rgw_obj_key& obj_key, const uint64_t op)`
	`2704`	`+bool RGWUserPermHandler::Bucket::verify_bucket_permission(const rgw_obj_key& obj_key, const uint64_t op) const`
`2705`	`2705`	`{`
`2706`	`2706`	`const rgw_obj obj(ps->bucket_info.bucket, obj_key);`
`2707`	`2707`	`const auto arn = rgw::ARN(obj);`
`@@ -2732,7 +2732,7 @@ bool RGWUserPermHandler::Bucket::verify_bucket_permission(const rgw_obj_key& obj`
`2732`	`2732`	`{}, op);`
`2733`	`2733`	`}`
`2734`	`2734`
`2735`		`-rgw::IAM::Effect RGWUserPermHandler::Bucket::evaluate_iam_policies(const rgw_obj_key& obj_key, const uint64_t op)`
	`2735`	`+rgw::IAM::Effect RGWUserPermHandler::Bucket::evaluate_iam_policies(const rgw_obj_key& obj_key, const uint64_t op) const`
`2736`	`2736`	`{`
`2737`	`2737`	`const rgw_obj obj(ps->bucket_info.bucket, obj_key);`
`2738`	`2738`	`const auto arn = rgw::ARN(obj);`
Original file line number	Diff line number	Diff line change
`@@ -1329,7 +1329,7 @@ bool verify_user_permission_no_policy(const DoutPrefixProvider* dpp,`
`1329`	`1329`	`return verify_user_permission_no_policy(dpp, &ps, s->user_acl, perm);`
`1330`	`1330`	`}`
`1331`	`1331`
`1332`		`-bool verify_requester_payer_permission(struct perm_state_base *s)`
	`1332`	`+bool verify_requester_payer_permission(const perm_state_base *s)`
`1333`	`1333`	`{`
`1334`	`1334`	`if (!s->bucket_info.requester_pays)`
`1335`	`1335`	`return true;`
`@@ -1350,7 +1350,7 @@ bool verify_requester_payer_permission(struct perm_state_base *s)`
`1350`	`1350`	`}`
`1351`	`1351`
`1352`	`1352`	`bool verify_bucket_permission(const DoutPrefixProvider* dpp,`
`1353`		`- struct perm_state_base * const s,`
	`1353`	`+ const perm_state_base * const s,`
`1354`	`1354`	`const rgw::ARN& arn,`
`1355`	`1355`	`bool account_root,`
`1356`	`1356`	`const RGWAccessControlPolicy& user_acl,`
`@@ -1434,7 +1434,7 @@ bool verify_bucket_permission(const DoutPrefixProvider* dpp,`
`1434`	`1434`	`session_policies, op);`
`1435`	`1435`	`}`
`1436`	`1436`
`1437`		`-bool verify_bucket_permission_no_policy(const DoutPrefixProvider* dpp, struct perm_state_base * const s,`
	`1437`	`+bool verify_bucket_permission_no_policy(const DoutPrefixProvider* dpp, const perm_state_base * const s,`
`1438`	`1438`	`const RGWAccessControlPolicy& user_acl,`
`1439`	`1439`	`const RGWAccessControlPolicy& bucket_acl,`
`1440`	`1440`	`const int perm)`