From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 6 Apr 2023 15:29:55 +0000 (-0400)
Subject: rgw/op: Init/CompleteMultipart add crypt attrs for iam policy
X-Git-Tag: v18.1.0~99^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=051ebc069fd9baecf4987e5d657d06581aded170;p=ceph.git

rgw/op: Init/CompleteMultipart add crypt attrs for iam policy

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

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 8f5b9d98dedc..d208e5d2c5ef 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -6178,6 +6178,9 @@ int RGWInitMultipart::verify_permission(optional_yield y)
   if (has_s3_existing_tag || has_s3_resource_tag)
     rgw_iam_add_objtags(this, s, has_s3_existing_tag, has_s3_resource_tag);
 
+  // add server-side encryption headers
+  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()) {
     auto identity_policy_res = eval_identity_or_session_policies(this, s->iam_user_policies, s->env,
                                               rgw::IAM::s3PutObject,
@@ -6294,6 +6297,9 @@ int RGWCompleteMultipart::verify_permission(optional_yield y)
   if (has_s3_existing_tag || has_s3_resource_tag)
     rgw_iam_add_objtags(this, s, has_s3_existing_tag, has_s3_resource_tag);
 
+  // add server-side encryption headers
+  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()) {
     auto identity_policy_res = eval_identity_or_session_policies(this, s->iam_user_policies, s->env,
                                               rgw::IAM::s3PutObject,