Allow * wildcard

Author: thegrb93

source/whitelist.cpp

@@ -1,15 +1,15 @@
 #undef getaddrinfo
 
 #include "socket.h"
+#include <vector>
 #include <map>
-#include <set>
 #include <fstream>
 #include <sstream>
 #include <regex>
 
 //Somewhere glua can't read?
 const char* whitelistDir = "../gm_socket_whitelist.txt";
-std::map<std::string, std::set<std::string> > whitelist;
+std::map<std::string, std::vector<std::regex> > whitelist;
 
 enum : int
 {
@@ -27,14 +27,19 @@ int parseWhitelist()
 		filereader << input.rdbuf();
 		std::string filedata = filereader.str();
 		std::regex line_parser("(?:(?!\r?\n).)+");
-		std::regex entry_parser("^[ \\t]*([\\w\\.-]+)\\:(\\d+)[ \\t]*$");
+		std::regex entry_parser("^[ \\t]*([\\w\\.\\*-]+)\\:(\\d+)[ \\t]*$");
+		std::regex wildcard("\\*");
+		std::regex dot("\\.");
 		for (std::sregex_iterator line = std::sregex_iterator(filedata.begin(), filedata.end(), line_parser), end = std::sregex_iterator(); line != end; ++line)
 		{
 			const std::string& linestr = line->operator[](0);
 			std::smatch match;
 			if(std::regex_match(linestr, match, entry_parser))
 			{
-				whitelist[match[1].str()].insert(match[2].str());
+				std::string domain = match[1];
+				domain = std::regex_replace(domain, wildcard, "[\\w-]+");
+				domain = std::regex_replace(domain, dot, "\\.");
+				whitelist[match[2].str()].push_back(std::regex(domain));
 			}
 		}
 		if (whitelist.empty())
@@ -56,8 +61,22 @@ void clearWhitelist()
 
 bool isSafe(const char* pNodeName, const char* pServiceName)
 {
-    std::map<std::string, std::set<std::string> >::iterator domain = whitelist.find(pNodeName);
-    return domain != whitelist.end() && domain->second.count(pServiceName)==1;
+	std::map<std::string, std::vector<std::regex> >::iterator domains = whitelist.find(pServiceName);
+	if (domains != whitelist.end())
+	{
+		for (auto i = domains->second.begin(), end = domains->second.end(); i != end; ++i)
+		{
+			if (std::regex_match(pNodeName, *i))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	else
+	{
+		return false;
+	}
 }
 
 extern "C" {