Merge Refactored access control entry handling and improved identifier comparison by normalizing case (pr-3414)

cc03c72 - fix(core/acl): refactored access control entry handling and improved identifier comparison by normalizing case

Author: prikolium-cfx

code/client/citicore/se/Security.cpp

@@ -130,9 +130,10 @@ void Context::AddAccessControlEntry(const Principal& principal, const Object& ob
 
 void Context::RemoveAccessControlEntry(const Principal& principal, const Object& object, AccessType type)
 {
-	for (auto it = m_impl->m_aces.begin(); it != m_impl->m_aces.end(); )
+	auto range = m_impl->m_aces.equal_range(object);
+	for (auto it = range.first; it != range.second; )
 	{
-		if (it->first == object && it->second.principal == principal && it->second.type == type)
+		if (it->second.principal == principal && it->second.type == type)
 		{
 			it = m_impl->m_aces.erase(it);
 		}

code/client/citicore/se/Security.h

@@ -8,6 +8,7 @@ class Principal
 	inline explicit Principal(const std::string& principal)
 	{
 		m_identifier = principal;
+		std::transform(m_identifier.begin(), m_identifier.end(), m_identifier.begin(), ::tolower);
 	}
 
 	inline const std::string& GetIdentifier() const
@@ -17,12 +18,12 @@ class Principal
 
 	inline bool operator<(const Principal& right) const
 	{
-		return _stricmp(m_identifier.c_str(), right.m_identifier.c_str()) < 0;
+		return m_identifier < right.m_identifier;
 	}
 
 	inline bool operator==(const Principal& right) const
 	{
-		return _stricmp(m_identifier.c_str(), right.m_identifier.c_str()) == 0;
+		return m_identifier == right.m_identifier;
 	}
 
 private:
@@ -35,6 +36,7 @@ class Object
 	inline explicit Object(const std::string& identifier)
 	{
 		m_identifier = identifier;
+		std::transform(m_identifier.begin(), m_identifier.end(), m_identifier.begin(), ::tolower);
 	}
 
 	inline const std::string& GetIdentifier() const
@@ -44,12 +46,12 @@ class Object
 
 	inline bool operator<(const Object& right) const
 	{
-		return _stricmp(m_identifier.c_str(), right.m_identifier.c_str()) < 0;
+		return m_identifier < right.m_identifier;
 	}
 
 	inline bool operator==(const Object& right) const
 	{
-		return _stricmp(m_identifier.c_str(), right.m_identifier.c_str()) == 0;
+		return m_identifier == right.m_identifier;
 	}
 
 private: