From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 1 Jul 2025 14:42:15 +0000 (-0400)
Subject: rgw/s3: fix PutObject's canned_acl comparisons for BlockPublicAcls
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84e45bb0cc0771d0d242b864103c55ea2f432d29;p=ceph-ci.git

rgw/s3: fix PutObject's canned_acl comparisons for BlockPublicAcls

canned_acl.compare() returns 0 for matches, so this was rejecting all canned acls

Fixes: https://tracker.ceph.com/issues/49135
Resolves: rhbz#2344639

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

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index e8ce0cb17eb..1c11fd5382a 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -4100,9 +4100,9 @@ int RGWPutObj::init_processing(optional_yield y) {
 
   // reject public canned acls
   if (s->bucket_access_conf && s->bucket_access_conf->block_public_acls() &&
-      (s->canned_acl.compare("public-read") ||
-       s->canned_acl.compare("public-read-write") ||
-       s->canned_acl.compare("authenticated-read"))) {
+      (s->canned_acl == "public-read" ||
+       s->canned_acl == "public-read-write" ||
+       s->canned_acl == "authenticated-read")) {
     return -EACCES;
   }