Update 1.1 (#2)

[+] Added a IP Whitelist.
[#] Fixed a crash

Author: RaphaelIT7

README.md

@@ -1,6 +1,14 @@
 This Project aims to add a HTTPServer to Gmod.
 
 This project uses the [cpp-httplib](https://github.com/yhirose/cpp-httplib) as the HTTPServer.
+
+TODO:
+- Move IP Whitelist chec to a Pre-routing handler
+- Add a Error handler and function
+- Add a Exception handler and function
+- Add a Pre-routing handler and function
+- Add a Post-routing handler and function
+
 # Functions
 ## Basic Functions
 #### httpserver.Start(String IP, Number Port)
@@ -14,17 +22,25 @@ This is internally used to manage all requests and to call all functions needed.
 ## Method Functions
 All Method functions add a listener for the given path and the given method, like this:
 ```lua
-httpserver.Get("/", function(_, response) 
-  print("GET request") 
-  response.SetContent("You sent a GET request.", "text/plain")
+httpserver.Get("/public", function(_, response) 
+  print("Public GET request") 
+  response.SetContent("You sent a GET request to a public site.", "text/plain", false)
+end)
+
+httpserver.Get("/private", function(_, response) 
+  print("Public GET request") 
+  response.SetContent("You sent a GET request to a private site.", "text/plain", true)
 end)
 ```
-#### httpserver.Get(String path, function (Request, Response))
-#### httpserver.Put(String path, function (Request, Response))
-#### httpserver.Post(String path, function (Request, Response))
-#### httpserver.Patch(String path, function (Request, Response))
-#### httpserver.Delete(String path, function (Request, Response))
-#### httpserver.Options(String path, function (Request, Response))
+
+If you enable the IP Whitelist, only requests sent by connected players are processed.
+
+#### httpserver.Get(String path, function (Request, Response), bool ipwhitelist)
+#### httpserver.Put(String path, function (Request, Response), bool ipwhitelist)
+#### httpserver.Post(String path, function (Request, Response), bool ipwhitelist)
+#### httpserver.Patch(String path, function (Request, Response), bool ipwhitelist)
+#### httpserver.Delete(String path, function (Request, Response), bool ipwhitelist)
+#### httpserver.Options(String path, function (Request, Response), bool ipwhitelist)
 
 ## Additional Functions
 #### httpserver.IsRunning()

source/httpserver.cpp

@@ -1,5 +1,8 @@
 #include "threadtools.h"
 #include "util.h"
+#include <netadr.h>
+#include "iclient.h"
+#include "inetchannel.h"
 
 CThreadFastMutex* Mutex = new CThreadFastMutex();
 
@@ -154,9 +157,29 @@ void HttpServer::Think()
 	Mutex->Unlock();
 }
 
-httplib::Server::Handler HttpServer::CreateHandler(const char* path, int func)
+httplib::Server::Handler HttpServer::CreateHandler(const char* path, int func, bool ipwhitelist)
 {
 	return [=](const httplib::Request& req, httplib::Response& res) {
+		if (ipwhitelist) {
+			bool found = false;
+			for (int i = 1; i <= Gmod_Server->GetMaxClients(); ++i)
+			{
+				INetChannelInfo* channel = Engine->GetPlayerNetInfo(i);
+				if (channel == nullptr) { continue; }; // We skip bots and empty slots with this.
+
+				IClient* client = Gmod_Server->GetClient(i - 1);
+				netadr_s addr = client->GetNetChannel()->GetRemoteAddress();
+				std::string address = addr.ToString();
+				size_t port_pos = address.find(":");
+				if (address.substr(0, port_pos) == req.remote_addr || (req.remote_addr == "127.0.0.1" && address.substr(0, port_pos) == "loopback")) {
+					found = true;
+					break;
+				}
+			}
+
+			if (!found) { return; }
+		}
+
 		RequestData_t* request = new RequestData_t;
 		request->path = path;
 		request->request = req;
@@ -191,34 +214,34 @@ httplib::Server::Handler HttpServer::CreateHandler(const char* path, int func)
 	};
 }
 
-void HttpServer::Get(const char* path, int func)
+void HttpServer::Get(const char* path, int func, bool ipwhitelist)
 {
-	server.Get(path, CreateHandler(path, func));
+	server.Get(path, CreateHandler(path, func, ipwhitelist));
 }
 
-void HttpServer::Post(const char* path, int func)
+void HttpServer::Post(const char* path, int func, bool ipwhitelist)
 {
-	server.Post(path, CreateHandler(path, func));
+	server.Post(path, CreateHandler(path, func, ipwhitelist));
 }
 
-void HttpServer::Put(const char* path, int func)
+void HttpServer::Put(const char* path, int func, bool ipwhitelist)
 {
-	server.Put(path, CreateHandler(path, func));
+	server.Put(path, CreateHandler(path, func, ipwhitelist));
 }
 
-void HttpServer::Patch(const char* path, int func)
+void HttpServer::Patch(const char* path, int func, bool ipwhitelist)
 {
-	server.Patch(path, CreateHandler(path, func));
+	server.Patch(path, CreateHandler(path, func, ipwhitelist));
 }
 
-void HttpServer::Delete(const char* path, int func)
+void HttpServer::Delete(const char* path, int func, bool ipwhitelist)
 {
-	server.Delete(path, CreateHandler(path, func));
+	server.Delete(path, CreateHandler(path, func, ipwhitelist));
 }
 
-void HttpServer::Options(const char* path, int func)
+void HttpServer::Options(const char* path, int func, bool ipwhitelist)
 {
-	server.Options(path, CreateHandler(path, func));
+	server.Options(path, CreateHandler(path, func, ipwhitelist));
 }
 
 void HttpServer::Start(const char* address, unsigned port)
@@ -238,7 +261,10 @@ void HttpServer::Stop()
 {
 	if (status == HTTPSERVER_OFFLINE) { return; }
 
+	Mutex->Lock();
 	server.stop();
 	delete data;
+	Mutex->Unlock();
+
 	status = HTTPSERVER_OFFLINE;
 }

source/httpserver.h

@@ -50,13 +50,13 @@ class HttpServer
 	void Think();
 	void Start(const char*, unsigned);
 	void Stop();
-	void Get(const char*, int);
-	void Post(const char*, int);
-	void Put(const char*, int);
-	void Patch(const char*, int);
-	void Delete(const char*, int);
-	void Options(const char*, int);
-	httplib::Server::Handler CreateHandler(const char*, int);
+	void Get(const char*, int, bool);
+	void Post(const char*, int, bool);
+	void Put(const char*, int, bool);
+	void Patch(const char*, int, bool);
+	void Delete(const char*, int, bool);
+	void Options(const char*, int, bool);
+	httplib::Server::Handler CreateHandler(const char*, int, bool);
 private:
 	ThreadData_t* data;
 };

source/lua.cpp

@@ -14,71 +14,77 @@ LUA_FUNCTION(Think)
 LUA_FUNCTION(Get)
 {
 	const char* path = LUA->CheckString(1);
+	bool ip_whitelist = LUA->GetBool(3);
 	LUA->CheckType(2, Type::Function);
 	LUA->Push(2);
 	int func = LUA->ReferenceCreate();
 
-	HTTPServer->Get(path, func);
+	HTTPServer->Get(path, func, ip_whitelist);
 
 	return 0;
 }
 
 LUA_FUNCTION(Post)
 {
 	const char* path = LUA->CheckString(1);
+	bool ip_whitelist = LUA->GetBool(3);
 	LUA->CheckType(2, Type::Function);
 	LUA->Push(2);
 	int func = LUA->ReferenceCreate();
 
-	HTTPServer->Post(path, func);
+	HTTPServer->Post(path, func, ip_whitelist);
 
 	return 0;
 }
 
 LUA_FUNCTION(Put)
 {
 	const char* path = LUA->CheckString(1);
+	bool ip_whitelist = LUA->GetBool(3);
 	LUA->CheckType(2, Type::Function);
 	LUA->Push(2);
 	int func = LUA->ReferenceCreate();
 
-	HTTPServer->Put(path, func);
+	HTTPServer->Put(path, func, ip_whitelist);
 
 	return 0;
 }
 
 LUA_FUNCTION(Patch)
 {
 	const char* path = LUA->CheckString(1);
+	bool ip_whitelist = LUA->GetBool(3);
 	LUA->CheckType(2, Type::Function);
 	LUA->Push(2);
 	int func = LUA->ReferenceCreate();
 
-	HTTPServer->Patch(path, func);
+	HTTPServer->Patch(path, func, ip_whitelist);
 
 	return 0;
 }
 
 LUA_FUNCTION(Delete)
 {
 	const char* path = LUA->CheckString(1);
+	bool ip_whitelist = LUA->GetBool(3);
 	LUA->CheckType(2, Type::Function);
 	LUA->Push(2);
 	int func = LUA->ReferenceCreate();
 
-	HTTPServer->Delete(path, func);
+	HTTPServer->Delete(path, func, ip_whitelist);
 
 	return 0;
 }
 
 LUA_FUNCTION(Options)
 {
 	const char* path = LUA->CheckString(1);
+	bool ip_whitelist = LUA->GetBool(3);
 	LUA->CheckType(2, Type::Function);
 	LUA->Push(2);
 	int func = LUA->ReferenceCreate();
 
-	HTTPServer->Options(path, func);
+	HTTPServer->Options(path, func, ip_whitelist);
 
 	return 0;
 }

source/main.cpp

@@ -9,6 +9,14 @@ GMOD_MODULE_OPEN()
 
 	HTTPServer = new HttpServer();
 
+	Gmod_Server = InterfacePointers::Server();
+	if (Gmod_Server == nullptr)
+		ThrowError("Failed to get IServer");
+
+	Engine = InterfacePointers::VEngineServer();
+	if (Engine == nullptr)
+		ThrowError("Failed to get IVEngineServer");
+
 	LUA_InitServer(LUA);
 
 	return 0;

source/util.cpp

@@ -4,6 +4,8 @@
 
 GarrysMod::Lua::ILuaBase* GlobalLUA;
 HttpServer* HTTPServer;
+IServer* Gmod_Server;
+IVEngineServer* Engine;
 
 // should never be used outside of main thread!!! what happends: memory access violation
 void LuaPrint(const char* Text) {

source/util.h

@@ -4,11 +4,15 @@
 #include "httpserver.h"
 #include <string>
 #include "lua.h"
+#include "iserver.h"
+#include "eiface.h"
 
 using namespace GarrysMod::Lua;
 
 extern GarrysMod::Lua::ILuaBase* GlobalLUA;
 extern HttpServer* HTTPServer;
+extern IServer* Gmod_Server;
+extern IVEngineServer* Engine;
 
 extern void LuaPrint(const char*);
 extern void LuaPrint(std::string);