From 4cc6e05a7a550b277c22ac43f2088fe7a0423716 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 6 Apr 2023 11:29:55 -0400 Subject: [PATCH] rgw/op: Init/CompleteMultipart add crypt attrs for iam policy Signed-off-by: Casey Bodley --- src/rgw/rgw_op.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 8002777632a2b..0de16500f19f0 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -6214,6 +6214,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, @@ -6330,6 +6333,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, -- 2.39.5