rgw: add helper for bucket + account PublicAccessBlock config

get_public_access_conf() takes an optional account, and checks
RGW_ATTR_PUBLIC_ACCESS on that in addition to the bucket. if both attrs
are found, return the union of their configurations

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index bdb0d3fe157dae1271cff2c08e8c7abe705ccaa2..0e63f048ab4a48a688f906ff11fdc5e33c835d27 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -395,6 +395,37 @@ get_public_access_conf_from_attr(const map<string, bufferlist>& attrs)
   return configuration;
 }
 
+static int read_public_access_conf(const DoutPrefixProvider *dpp,
+                                   optional_yield y, rgw::sal::Driver* driver,
+                                   const rgw_owner& bucket_owner,
+                                   const std::map<std::string, bufferlist>& bucket_attrs,
+                                   PublicAccessBlockConfiguration& config)
+{
+  auto bucket_config = get_public_access_conf_from_attr(bucket_attrs);
+
+  const auto* account_id = std::get_if<rgw_account_id>(&bucket_owner);
+  if (!account_id) {
+    config = std::move(bucket_config);
+    return 0;
+  }
+
+  // if the bucket owner is an account, check for account-level config
+  RGWAccountInfo account_info;
+  std::map<std::string, bufferlist> account_attrs;
+  RGWObjVersionTracker objv; // ignored
+  int r = driver->load_account_by_id(dpp, y, *account_id, account_info,
+                                     account_attrs, objv);
+  if (r < 0) {
+    ldpp_dout(dpp, 1) << "ERROR: " << __func__ <<  " failed to load bucket "
+        "owner's account=" << *account_id << " with " << cpp_strerror(r) << dendl;
+    return r;
+  }
+
+  auto account_config = get_public_access_conf_from_attr(account_attrs);
+  config = config_union(bucket_config, account_config);
+  return 0;
+}
+
 static int read_bucket_policy(const DoutPrefixProvider *dpp, 
                               rgw::sal::Driver* driver,
                               req_state *s,
@@ -623,7 +654,13 @@ int rgw_build_bucket_policies(const DoutPrefixProvider *dpp, rgw::sal::Driver* d
       return -EINVAL;
     }
 
-    s->public_access_block = get_public_access_conf_from_attr(s->bucket_attrs);
+    ret = read_public_access_conf(dpp, y, driver,
+                                  s->bucket->get_owner(),
+                                  s->bucket->get_attrs(),
+                                  s->public_access_block);
+    if (ret < 0) {
+      return ret;
+    }
     s->bucket_object_ownership = rgw::s3::get_object_ownership(s->bucket_attrs);
   }
 

diff --git a/src/rgw/rgw_public_access.cc b/src/rgw/rgw_public_access.cc
index 77c372f149c314eb029e661019164bb3c1c446b6..7a0b644e424735a177aa0accbfc8150ee6dcdeca 100644 (file)
--- a/src/rgw/rgw_public_access.cc
+++ b/src/rgw/rgw_public_access.cc
@@ -35,3 +35,14 @@ std::ostream& operator<< (std::ostream& os, const PublicAccessBlockConfiguration
     return os;
 }
 
+auto config_union(const PublicAccessBlockConfiguration& lhs,
+                  const PublicAccessBlockConfiguration& rhs)
+  -> PublicAccessBlockConfiguration
+{
+  return {
+    .BlockPublicAcls = lhs.BlockPublicAcls || rhs.BlockPublicAcls,
+    .IgnorePublicAcls = lhs.IgnorePublicAcls || rhs.IgnorePublicAcls,
+    .BlockPublicPolicy = lhs.BlockPublicPolicy || rhs.BlockPublicPolicy,
+    .RestrictPublicBuckets = lhs.RestrictPublicBuckets || rhs.RestrictPublicBuckets,
+  };
+}

diff --git a/src/rgw/rgw_public_access.h b/src/rgw/rgw_public_access.h
index dc282ef3ad8c5e6fed2b29c5a4778010d3ed0d26..dd3fb8c223ffd5ed1889cf366e8e906c5a26bf3c 100644 (file)
--- a/src/rgw/rgw_public_access.h
+++ b/src/rgw/rgw_public_access.h
@@ -14,6 +14,8 @@
  */
 
 #pragma once
+
+#include <iosfwd>
 #include "include/encoding.h"
 
 class XMLObj;
@@ -44,7 +46,12 @@ struct PublicAccessBlockConfiguration {
   }
 
   void decode_xml(XMLObj *obj);
-  void dump_xml(Formatter *f) const;
+  void dump_xml(ceph::Formatter *f) const;
 };
 WRITE_CLASS_ENCODER(PublicAccessBlockConfiguration)
 std::ostream& operator<< (std::ostream& os, const PublicAccessBlockConfiguration& access_conf);
+
+/// Return the union of two configurations by memberwise logical-or.
+auto config_union(const PublicAccessBlockConfiguration& lhs,
+                  const PublicAccessBlockConfiguration& rhs)
+  -> PublicAccessBlockConfiguration;