rgw/iam: RGWUntagRole uses lower/upper bounds for iteration

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

diff --git a/src/rgw/rgw_rest_role.cc b/src/rgw/rgw_rest_role.cc
index f3a17a86146066ff5e6c560f0ca82b6e08b907ea..620a1adc0d8fafb6b235e232e9958c8c16493d85 100644 (file)
--- a/src/rgw/rgw_rest_role.cc
+++ b/src/rgw/rgw_rest_role.cc
@@ -1,7 +1,9 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab ft=cpp
 
+#include <algorithm>
 #include <errno.h>
+#include <iterator>
 #include <regex>
 
 #include "common/errno.h"
@@ -874,11 +876,14 @@ int RGWUntagRole::get_params()
     return -EINVAL;
   }
 
-  auto val_map = s->info.args.get_params();
-  for (auto& it : val_map) {
-    if (it.first.find("TagKeys.member.") != string::npos) {
-        tagKeys.emplace_back(it.second);
-    }
+  const auto& params = s->info.args.get_params();
+  const std::string prefix = "TagKeys.member.";
+  if (auto l = params.lower_bound(prefix); l != params.end()) {
+    // copy matching values into untag vector
+    std::transform(l, params.upper_bound(prefix), std::back_inserter(untag),
+        [] (const std::pair<const std::string, std::string>& p) {
+          return p.second;
+        });
   }
   return 0;
 }
@@ -903,17 +908,11 @@ void RGWUntagRole::execute(optional_yield y)
     s->info.args.remove("RoleName");
     s->info.args.remove("Action");
     s->info.args.remove("Version");
-    auto& val_map = s->info.args.get_params();
-    std::vector<std::multimap<std::string, std::string>::iterator> iters;
-    for (auto it = val_map.begin(); it!= val_map.end(); it++) {
-      if (it->first.find("Tags.member.") == 0) {
-        iters.emplace_back(it);
-      }
+    auto& params = s->info.args.get_params();
+    if (auto l = params.lower_bound("TagKeys.member."); l != params.end()) {
+      params.erase(l, params.upper_bound("TagKeys.member."));
     }
 
-    for (auto& it : iters) {
-      val_map.erase(it);
-    }
     op_ret = forward_iam_request_to_master(this, site, s->user->get_info(),
                                            bl_post_body, parser, s->info, y);
     if (op_ret < 0) {
@@ -922,7 +921,7 @@ void RGWUntagRole::execute(optional_yield y)
     }
   }
 
-  _role->erase_tags(tagKeys);
+  _role->erase_tags(untag);
   op_ret = _role->update(this, y);
 
   if (op_ret == 0) {

diff --git a/src/rgw/rgw_rest_role.h b/src/rgw/rgw_rest_role.h
index acd8f6f94eef7b2b0f45ca0bfc5384d8b33407fe..59a5cf79cdf20588b0f894120f4f6bc139540f2a 100644 (file)
--- a/src/rgw/rgw_rest_role.h
+++ b/src/rgw/rgw_rest_role.h
@@ -18,7 +18,6 @@ protected:
   std::string path_prefix;
   std::string max_session_duration;
   std::multimap<std::string,std::string> tags;
-  std::vector<std::string> tagKeys;
   std::unique_ptr<rgw::sal::RGWRole> _role;
   int verify_permission(optional_yield y) override;
   int init_processing(optional_yield y) override;
@@ -163,6 +162,7 @@ public:
 
 class RGWUntagRole : public RGWRoleWrite {
   bufferlist bl_post_body;
+  std::vector<std::string> untag;
 public:
   RGWUntagRole(const bufferlist& bl_post_body) : bl_post_body(bl_post_body) {};
   void execute(optional_yield y) override;