rgw/admin: 'bucket chown' skips object acls for BucketOwnerEnforced

Signed-off-by: Casey Bodley <[email protected]>

Author: cbodley

src/rgw/rgw_bucket.cc

@@ -139,7 +139,14 @@ int rgw_chown_bucket_and_objects(rgw::sal::Driver* driver, rgw::sal::Bucket* buc
   /* Chown on the bucket */
   int ret = bucket->chown(dpp, new_user->get_id(), y);
   if (ret < 0) {
-    set_err_msg(err_msg, "Failed to change object ownership: " + cpp_strerror(-ret));
+    set_err_msg(err_msg, "Failed to change bucket ownership: " + cpp_strerror(-ret));
+    return ret;
+  }
+
+  // skip object acls when BucketOwnerEnforced
+  if (auto ownership = rgw::s3::get_object_ownership(bucket->get_attrs());
+      ownership == rgw::s3::ObjectOwnership::BucketOwnerEnforced) {
+    return 0;
   }
 
   /* Now chown on all the objects in the bucket */