From: Marcus Watts <mwatts@redhat.com>
Date: Wed, 17 Sep 2025 18:49:33 +0000 (-0400)
Subject: copy object encryption fixes - copy_part_enc encryption attributes in result
X-Git-Tag: testing/wip-pdonnell-testing-20260323.122957-tentacle~552
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b12d2d0b252075664b3d6e8a6e8b9fa91dc02a4;p=ceph-ci.git

copy object encryption fixes - copy_part_enc encryption attributes in result

copy_part w/ encrypted parameters; dump destination encryption
parameters on each part.

XXX fixup merge w/ previous

Resolves: rhbz#2394511

Fixes: https://tracker.ceph.com/issues/23264

Signed-off-by: Marcus Watts <mwatts@redhat.com>
(cherry picked from commit 3452fd1235c055d773252902bfffb1e28da6af51)
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index f740924e3c1..823d9690e79 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -2922,6 +2922,8 @@ void RGWPutObj_ObjStore_S3::send_response()
 	dump_header(s, "x-amz-checksum-type", "FULL_OBJECT");
 	dump_header(s, cksum->header_name(), cksum->to_armor());
       }
+      for (auto &it : crypt_http_responses)
+        dump_header(s, it.first, it.second);
       end_header(s, this, to_mime_type(s->format));
       dump_start(s);
       struct tm tmp;