Started whitelist code

Author: thegrb93

projects/premake5.lua

@@ -4,7 +4,14 @@ newoption({
 	value = "path to garrysmod_common directory"
 })
 
+newoption({
+	trigger = "whitelist",
+	description = "Enables wrapping of getaddrinfo and a whitelist file to filter valid addresses and ports",
+	value = "0 or 1"
+})
+
 local gmcommon = _OPTIONS.gmcommon or os.getenv("GARRYSMOD_COMMON")
+local whitelist = _OPTIONS.whitelist == "1"
 if gmcommon == nil then
 	error("you didn't provide a path to your garrysmod_common (https://github.com/danielga/garrysmod_common) directory")
 end
@@ -16,6 +23,7 @@ local LUASOCKET_FOLDER = "../luasocket/src"
 CreateWorkspace({name = "socket.core"})
 	CreateProject({serverside = true, manual_files = true})
 		files("../source/socket.cpp")
+		if whitelist then files("../source/whitelist.cpp") end
 		IncludeLuaShared()
 		links("socket")
 
@@ -24,6 +32,7 @@ CreateWorkspace({name = "socket.core"})
 
 	CreateProject({serverside = false, manual_files = true})
 		files("../source/socket.cpp")
+		if whitelist then files("../source/whitelist.cpp") end
 		IncludeLuaShared()
 		links("socket")
 
@@ -52,19 +61,24 @@ CreateWorkspace({name = "socket.core"})
 		IncludeLuaShared()
 
 		filter("system:windows")
-			defines({
+			local windowsdefines = {
 				"LUASOCKET_API=__declspec(dllexport)",
-				"MIME_API=__declspec(dllexport)"
-			})
+				"MIME_API=__declspec(dllexport)",
+				"getaddrinfo=__wrap_getaddrinfo"
+			}
+			if whitelist then windowsdefines[#windowsdefines+1] = "getaddrinfo=__wrap_getaddrinfo" end
+			defines(windowsdefines)
 			files(LUASOCKET_FOLDER .. "/wsocket.c")
 			links("ws2_32")
 
 		filter("system:not windows")
-			defines({
+			local unixdefines = {
 				"LUASOCKET_API=''",
 				"UNIX_API=''",
 				"MIME_API=''"
-			})
+			}
+			if whitelist then unixdefines[#unixdefines+1] = "getaddrinfo=__wrap_getaddrinfo" end
+			defines(unixdefines)
 			files(LUASOCKET_FOLDER .. "/usocket.c")
 
 CreateWorkspace({name = "mime.core"})

source/whitelist.cpp

@@ -0,0 +1,43 @@
+#undef getaddrinfo
+
+#include "socket.h"
+#include <vector>
+
+std::vector<std::pair<std::string, std::string> > whitelist;
+
+void parseWhitelist()
+{
+}
+
+bool isSafe(unsigned char* pNodeName, unsigned char* pServiceName)
+{
+	for(auto i = whitelist.begin(), end = whitelist.end(); i!=end; ++i)
+	{
+		if(i->first == NodeStr && i->second == pServiceName)
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+extern "C" {
+
+	WINSOCK_API_LINKAGE INT WSAAPI __wrap_getaddrinfo(
+		_In_opt_        PCSTR               pNodeName,
+		_In_opt_        PCSTR               pServiceName,
+		_In_opt_        const ADDRINFOA *   pHints,
+		_Outptr_        PADDRINFOA *        ppResult
+	)
+	{
+		if(isSafe(pNodeName, pServiceName))
+		{
+			return getaddrinfo(pNodeName, pServiceName, pHints, ppResult);
+		}
+		else
+		{
+			return EAI_FAIL;
+		}
+	}
+
+}