Add NameValueCollection::getAll method

Author: slvrtrn

base/poco/Net/include/Poco/Net/NameValueCollection.h

@@ -79,6 +79,11 @@ namespace Net
         /// Returns the value of the first name-value pair with the given name.
         /// If no value with the given name has been found, the defaultValue is returned.
 
+        const std::vector<std::reference_wrapper<const std::string>> getAll(const std::string & name) const;
+        /// Returns all values of all name-value pairs with the given name.
+        ///
+        /// Returns an empty vector if there are no name-value pairs with the given name.
+
         bool has(const std::string & name) const;
         /// Returns true if there is at least one name-value pair
         /// with the given name.

base/poco/Net/src/NameValueCollection.cpp

@@ -15,6 +15,7 @@
 #include "Poco/Net/NameValueCollection.h"
 #include "Poco/Exception.h"
 #include <algorithm>
+#include <functional>
 
 
 using Poco::NotFoundException;
@@ -55,7 +56,7 @@ void NameValueCollection::swap(NameValueCollection& nvc)
 	std::swap(_map, nvc._map);
 }
 
-	
+
 const std::string& NameValueCollection::operator [] (const std::string& name) const
 {
 	ConstIterator it = _map.find(name);
@@ -65,8 +66,8 @@ const std::string& NameValueCollection::operator [] (const std::string& name) co
 		throw NotFoundException(name);
 }
 
-	
-void NameValueCollection::set(const std::string& name, const std::string& value)	
+
+void NameValueCollection::set(const std::string& name, const std::string& value)
 {
 	Iterator it = _map.find(name);
 	if (it != _map.end())
@@ -75,13 +76,13 @@ void NameValueCollection::set(const std::string& name, const std::string& value)
 		_map.insert(HeaderMap::ValueType(name, value));
 }
 
-	
+
 void NameValueCollection::add(const std::string& name, const std::string& value)
 {
 	_map.insert(HeaderMap::ValueType(name, value));
 }
 
-	
+
 const std::string& NameValueCollection::get(const std::string& name) const
 {
 	ConstIterator it = _map.find(name);
@@ -101,6 +102,15 @@ const std::string& NameValueCollection::get(const std::string& name, const std::
 		return defaultValue;
 }
 
+const std::vector<std::reference_wrapper<const std::string>> NameValueCollection::getAll(const std::string& name) const
+{
+    std::vector<std::reference_wrapper<const std::string>> values;
+    for (ConstIterator it = _map.find(name); it != _map.end(); it++)
+        if (it->first == name)
+            values.push_back(it->second);
+    return values;
+}
+
 
 bool NameValueCollection::has(const std::string& name) const
 {
@@ -113,19 +123,19 @@ NameValueCollection::ConstIterator NameValueCollection::find(const std::string&
 	return _map.find(name);
 }
 
-	
+
 NameValueCollection::ConstIterator NameValueCollection::begin() const
 {
 	return _map.begin();
 }
 
-	
+
 NameValueCollection::ConstIterator NameValueCollection::end() const
 {
 	return _map.end();
 }
 
-	
+
 bool NameValueCollection::empty() const
 {
 	return _map.empty();

src/Server/HTTPHandler.cpp

@@ -734,22 +734,19 @@ void HTTPHandler::processQuery(
         return false;
     };
 
-    auto role_params_it = params.find("role");
-    if (role_params_it != params.end())
+    auto roles = params.getAll("role");
+    if (!roles.empty())
     {
-        std::vector<UUID> roles_ids;
         const auto & access_control = context->getAccessControl();
         const auto & user = context->getUser();
-        for (; role_params_it != params.end(); role_params_it++)
+        std::vector<UUID> roles_ids(roles.size());
+        for (size_t i = 0; i < roles.size(); i++)
         {
-            if (role_params_it->first == "role")
-            {
-                auto role_id = access_control.getID<Role>(role_params_it->second);
-                if (user->granted_roles.isGranted(role_id))
-                    roles_ids.push_back(role_id);
-                else
-                    throw Exception(ErrorCodes::SET_NON_GRANTED_ROLE, "Role {} should be granted to set as a current", role_params_it->second);
-            }
+            auto role_id = access_control.getID<Role>(roles[i]);
+            if (user->granted_roles.isGranted(role_id))
+                roles_ids[i] = role_id;
+            else
+                throw Exception(ErrorCodes::SET_NON_GRANTED_ROLE, "Role {} should be granted to set as a current", roles[i].get());
         }
         context->setCurrentRoles(roles_ids);
     }