From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 1 Mar 2024 15:15:27 +0000 (-0500)
Subject: rgw: remove unused object lock stuff from CompleteMultipart
X-Git-Tag: v19.1.0~240^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a6e290beaf7712909aadf479a95c9225ca4c3d6b;p=ceph.git

rgw: remove unused object lock stuff from CompleteMultipart

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 1576c1f5b98ecc838b47a916199e3cae8c925acb)
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index cdbd53639e8..d1b83828656 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -6545,28 +6545,6 @@ int RGWCompleteMultipart::verify_permission(optional_yield y)
   rgw_iam_add_crypt_attrs(s->env, s->info.crypt_attribute_map);
 
   if (s->iam_policy || ! s->iam_user_policies.empty() || ! s->session_policies.empty()) {
-    if (s->bucket->get_info().obj_lock_enabled() && bypass_governance_mode) {
-      auto r = eval_identity_or_session_policies(this, s->iam_user_policies, s->env,
-                                  rgw::IAM::s3BypassGovernanceRetention, ARN(s->bucket->get_key(), s->object->get_name()));
-      if (r == Effect::Deny) {
-        bypass_perm = false;
-      } else if (r == Effect::Pass && s->iam_policy) {
-        ARN arn(s->bucket->get_key(), s->object->get_name());
-        r = s->iam_policy->eval(s->env, *s->auth.identity, rgw::IAM::s3BypassGovernanceRetention, arn);    
-        if (r == Effect::Deny) {
-          bypass_perm = false;
-        }
-      } else if (r == Effect::Pass && !s->session_policies.empty()) {
-        r = eval_identity_or_session_policies(this, s->session_policies, s->env,
-                               rgw::IAM::s3BypassGovernanceRetention, ARN(s->bucket->get_key(), s->object->get_name()));
-        if (r == Effect::Deny) {
-          bypass_perm = false;
-        }
-      } else if (r == Effect::Pass) {
-        bypass_perm = false;
-      }
-      bypass_governance_mode &= bypass_perm;
-    }
     auto identity_policy_res = eval_identity_or_session_policies(this, s->iam_user_policies, s->env,
                                               rgw::IAM::s3PutObject,
                                               s->object->get_obj());
diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
index 6e962de4f47..fa61aefc563 100644
--- a/src/rgw/rgw_op.h
+++ b/src/rgw/rgw_op.h
@@ -1843,9 +1843,6 @@ protected:
   std::unique_ptr<rgw::sal::Notification> res;
   std::unique_ptr<rgw::sal::Object> meta_obj;
   off_t ofs = 0;
-  //object lock
-  bool bypass_perm = true;
-  bool bypass_governance_mode = false;
 
 public:
   RGWCompleteMultipart() {}
diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index d830fd40caa..a7c35f3773c 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -1572,12 +1572,6 @@ int RGWCompleteMultipart_ObjStore::get_params(optional_yield y)
   std::tie(op_ret, data) = read_all_input(s, max_size);
   if (op_ret < 0)
     return op_ret;
-  
-  const char *bypass_gov_header = s->info.env->get("HTTP_X_AMZ_BYPASS_GOVERNANCE_RETENTION");
-  if (bypass_gov_header) {
-    std::string bypass_gov_decoded = url_decode(bypass_gov_header);
-    bypass_governance_mode = boost::algorithm::iequals(bypass_gov_decoded, "true");
-  }
 
   return 0;
 }