rgw/iam: UserPolicy apis use forward_iam_request_to_master()

fix signature mismatch errors when PutUserPolicy/DeleteUserPolicy are
forwarded in multisite

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

diff --git a/src/rgw/rgw_rest_iam.cc b/src/rgw/rgw_rest_iam.cc
index 079a9f46071826d8955f1dbaca05b62258f44b6d..c6f5a584c70a936a879f7304c61f7e4ffd9a7bd4 100644 (file)
--- a/src/rgw/rgw_rest_iam.cc
+++ b/src/rgw/rgw_rest_iam.cc
@@ -34,10 +34,10 @@ static const std::unordered_map<std::string_view, op_generator> op_generators =
   {"AttachRolePolicy", make_iam_attach_role_policy_op},
   {"DetachRolePolicy", make_iam_detach_role_policy_op},
   {"ListAttachedRolePolicies", make_iam_list_attached_role_policies_op},
-  {"PutUserPolicy", [](const bufferlist& bl_post_body) -> RGWOp* {return new RGWPutUserPolicy;}},
+  {"PutUserPolicy", [](const bufferlist& bl_post_body) -> RGWOp* {return new RGWPutUserPolicy(bl_post_body);}},
   {"GetUserPolicy", [](const bufferlist& bl_post_body) -> RGWOp* {return new RGWGetUserPolicy;}},
   {"ListUserPolicies", [](const bufferlist& bl_post_body) -> RGWOp* {return new RGWListUserPolicies;}},
-  {"DeleteUserPolicy", [](const bufferlist& bl_post_body) -> RGWOp* {return new RGWDeleteUserPolicy;}},
+  {"DeleteUserPolicy", [](const bufferlist& bl_post_body) -> RGWOp* {return new RGWDeleteUserPolicy(bl_post_body);}},
   {"AttachUserPolicy", make_iam_attach_user_policy_op},
   {"DetachUserPolicy", make_iam_detach_user_policy_op},
   {"ListAttachedUserPolicies", make_iam_list_attached_user_policies_op},

diff --git a/src/rgw/rgw_rest_user_policy.cc b/src/rgw/rgw_rest_user_policy.cc
index 0da2552fc2f066572d3551f36e30e7cc6776969d..ccc86aa72e1289bdbc50518bae0b50d59b2045d0 100644 (file)
--- a/src/rgw/rgw_rest_user_policy.cc
+++ b/src/rgw/rgw_rest_user_policy.cc
@@ -111,8 +111,9 @@ int RGWRestUserPolicy::verify_permission(optional_yield y)
 }
 
 
-RGWPutUserPolicy::RGWPutUserPolicy()
-  : RGWRestUserPolicy(rgw::IAM::iamPutUserPolicy, RGW_CAP_WRITE)
+RGWPutUserPolicy::RGWPutUserPolicy(const ceph::bufferlist& post_body)
+  : RGWRestUserPolicy(rgw::IAM::iamPutUserPolicy, RGW_CAP_WRITE),
+    post_body(post_body)
 {
 }
 
@@ -132,6 +133,29 @@ int RGWPutUserPolicy::get_params()
   return RGWRestUserPolicy::get_params();
 }
 
+int RGWPutUserPolicy::forward_to_master(optional_yield y, const rgw::SiteConfig& site)
+{
+  RGWXMLDecoder::XMLParser parser;
+  if (!parser.init()) {
+    ldpp_dout(this, 0) << "ERROR: failed to initialize xml parser" << dendl;
+    return -EINVAL;
+  }
+
+  s->info.args.remove("UserName");
+  s->info.args.remove("PolicyName");
+  s->info.args.remove("PolicyDocument");
+  s->info.args.remove("Action");
+  s->info.args.remove("Version");
+
+  int r = forward_iam_request_to_master(this, site, s->user->get_info(),
+                                        post_body, parser, s->info, y);
+  if (r < 0) {
+    ldpp_dout(this, 20) << "ERROR: forward_iam_request_to_master failed with error code: " << r << dendl;
+    return r;
+  }
+  return 0;
+}
+
 void RGWPutUserPolicy::execute(optional_yield y)
 {
   // validate the policy document
@@ -146,11 +170,12 @@ void RGWPutUserPolicy::execute(optional_yield y)
     return;
   }
 
-  op_ret = rgw_forward_request_to_master(this, *s->penv.site, s->user->get_id(),
-                                         nullptr, nullptr, s->info, y);
-  if (op_ret < 0) {
-    ldpp_dout(this, 0) << "ERROR: forward_request_to_master returned ret=" << op_ret << dendl;
-    return;
+  const rgw::SiteConfig& site = *s->penv.site;
+  if (!site.is_meta_master()) {
+    op_ret = forward_to_master(y, site);
+    if (op_ret) {
+      return;
+    }
   }
 
   op_ret = retry_raced_user_write(this, y, user.get(),
@@ -296,8 +321,9 @@ void RGWListUserPolicies::execute(optional_yield y)
 }
 
 
-RGWDeleteUserPolicy::RGWDeleteUserPolicy()
-  : RGWRestUserPolicy(rgw::IAM::iamDeleteUserPolicy, RGW_CAP_WRITE)
+RGWDeleteUserPolicy::RGWDeleteUserPolicy(const ceph::bufferlist& post_body)
+  : RGWRestUserPolicy(rgw::IAM::iamDeleteUserPolicy, RGW_CAP_WRITE),
+    post_body(post_body)
 {
 }
 
@@ -311,22 +337,40 @@ int RGWDeleteUserPolicy::get_params()
   return RGWRestUserPolicy::get_params();
 }
 
+int RGWDeleteUserPolicy::forward_to_master(optional_yield y, const rgw::SiteConfig& site)
+{
+  RGWXMLDecoder::XMLParser parser;
+  if (!parser.init()) {
+    ldpp_dout(this, 0) << "ERROR: failed to initialize xml parser" << dendl;
+    return -EINVAL;
+  }
+
+  s->info.args.remove("UserName");
+  s->info.args.remove("PolicyName");
+  s->info.args.remove("Action");
+  s->info.args.remove("Version");
+
+  int r = forward_iam_request_to_master(this, site, s->user->get_info(),
+                                        post_body, parser, s->info, y);
+  if (r < 0) {
+    ldpp_dout(this, 20) << "ERROR: forward_iam_request_to_master failed with error code: " << r << dendl;
+    return r;
+  }
+  return 0;
+}
+
 void RGWDeleteUserPolicy::execute(optional_yield y)
 {
-  op_ret = rgw_forward_request_to_master(this, *s->penv.site, s->user->get_id(),
-                                         nullptr, nullptr, s->info, y);
-  if (op_ret < 0) {
-    // a policy might've been uploaded to this site when there was no sync
-    // req. in earlier releases, proceed deletion
-    if (op_ret != -ENOENT) {
-      ldpp_dout(this, 5) << "forward_request_to_master returned ret=" << op_ret << dendl;
+  const rgw::SiteConfig& site = *s->penv.site;
+  if (!site.is_meta_master()) {
+    op_ret = forward_to_master(y, site);
+    if (op_ret) {
       return;
     }
-    ldpp_dout(this, 0) << "ERROR: forward_request_to_master returned ret=" << op_ret << dendl;
   }
 
   op_ret = retry_raced_user_write(this, y, user.get(),
-      [this, y] {
+      [this, y, &site] {
         rgw::sal::Attrs& attrs = user->get_attrs();
         std::map<std::string, std::string> policies;
         if (auto it = attrs.find(RGW_ATTR_USER_POLICY); it != attrs.end()) try {
@@ -338,6 +382,9 @@ void RGWDeleteUserPolicy::execute(optional_yield y)
 
         auto policy = policies.find(policy_name);
         if (policy == policies.end()) {
+          if (!site.is_meta_master()) {
+            return 0; // delete succeeded on the master
+          }
           s->err.message = "No such PolicyName on the user";
           return -ERR_NO_SUCH_ENTITY;
         }
@@ -541,7 +588,7 @@ void RGWDetachUserPolicy_IAM::execute(optional_yield y)
   }
 
   op_ret = retry_raced_user_write(this, y, user.get(),
-      [this, y] {
+      [this, y, &site] {
         rgw::sal::Attrs& attrs = user->get_attrs();
         rgw::IAM::ManagedPolicies policies;
         if (auto it = attrs.find(RGW_ATTR_MANAGED_POLICY); it != attrs.end()) try {
@@ -553,6 +600,9 @@ void RGWDetachUserPolicy_IAM::execute(optional_yield y)
 
         auto i = policies.arns.find(policy_arn);
         if (i == policies.arns.end()) {
+          if (!site.is_meta_master()) {
+            return 0; // delete succeeded on the master
+          }
           s->err.message = "No such PolicyArn on the user";
           return ERR_NO_SUCH_ENTITY;
         }

diff --git a/src/rgw/rgw_rest_user_policy.h b/src/rgw/rgw_rest_user_policy.h
index 117226edc27d2c84fb4d28a914b120a976891fa2..5e78eda61e9ce38889cdf5059445aaab0353c36d 100644 (file)
--- a/src/rgw/rgw_rest_user_policy.h
+++ b/src/rgw/rgw_rest_user_policy.h
@@ -32,9 +32,11 @@ public:
 };
 
 class RGWPutUserPolicy : public RGWRestUserPolicy {
+  bufferlist post_body;
   int get_params() override;
+  int forward_to_master(optional_yield y, const rgw::SiteConfig& site);
 public:
-  RGWPutUserPolicy();
+  RGWPutUserPolicy(const ceph::bufferlist& post_body);
   void execute(optional_yield y) override;
   const char* name() const override { return "put_user_policy"; }
   RGWOpType get_type() override { return RGW_OP_PUT_USER_POLICY; }
@@ -61,9 +63,11 @@ public:
 };
 
 class RGWDeleteUserPolicy : public RGWRestUserPolicy {
+  bufferlist post_body;
   int get_params() override;
+  int forward_to_master(optional_yield y, const rgw::SiteConfig& site);
 public:
-  RGWDeleteUserPolicy();
+  RGWDeleteUserPolicy(const ceph::bufferlist& post_body);
   void execute(optional_yield y) override;
   const char* name() const override { return "delete_user_policy"; }
   RGWOpType get_type() override { return RGW_OP_DELETE_USER_POLICY; }