From: Seena Fallah <seenafallah@gmail.com>
Date: Tue, 20 Feb 2024 14:54:06 +0000 (+0100)
Subject: rgw: return 204 on bucket public access block deletion
X-Git-Tag: v19.1.0~236^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8bee8fb9f1a7e19706bef8a642d11e03341cb66;p=ceph.git

rgw: return 204 on bucket public access block deletion

According to AWS doc (https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeletePublicAccessBlock.html#API_DeletePublicAccessBlock_ResponseSyntax) 204 shall be returned on delete request.

Fixes: https://tracker.ceph.com/issues/64492
Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit 48a454971c9979dfd9a95cc9619ca864aeda26a5)
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index ab19a15dbc58..9e32c4982809 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -9017,9 +9017,12 @@ void RGWGetBucketPublicAccessBlock::execute(optional_yield y)
 
 void RGWDeleteBucketPublicAccessBlock::send_response()
 {
-  if (op_ret) {
-    set_req_state_err(s, op_ret);
+  if (!op_ret) {
+    /* A successful Delete request should return a 204 */
+    op_ret = STATUS_NO_CONTENT;
   }
+
+  set_req_state_err(s, op_ret);
   dump_errno(s);
   end_header(s);
 }