Added partial support to ip ban

Sebastiano Merlino · Sebastiano Merlino · commit bd612a6b244b · 2012-03-31T23:23:41.000+02:00
Added methods to unban ips and to unregister resources
diff --git a/src/Webserver.cpp b/src/Webserver.cpp
@@ -400,6 +400,21 @@ void Webserver::registerResource(const string& resource, HttpResource* http_reso
 	this->registeredResources[HttpEndpoint(resource, family, true)] = http_resource;
 }
 
+void Webserver::unregisterResource(const string& resource)
+{
+    this->registeredResources.erase(HttpEndpoint(resource));
+}
+
+void Webserver::banIp(const string& ip)
+{
+    this->bans.insert(ip);
+}
+
+void Webserver::unbanIp(const string& ip)
+{
+    this->bans.erase(ip);
+}
+
 int Webserver::buildRequestHeader (void *cls, enum MHD_ValueKind kind, const char *key, const char *value)
 {
 	HttpRequest* dhr = (HttpRequest*)(cls);
@@ -431,7 +446,11 @@ int Webserver::buildRequestArgs (void *cls, enum MHD_ValueKind kind, const char
 
 int policyCallback (void *cls, const struct sockaddr* addr, socklen_t addrlen)
 {
-	// TODO: Develop a system that allow to study a configurable policy callback
+    if(((Webserver*)cls)->bans.count(get_ip_str(addr, addrlen)))
+        return MHD_NO;
+#ifdef DEBUG
+    cout << get_ip_str(addr, addrlen) << endl;
+#endif
 	return MHD_YES;
 }
 
diff --git a/src/httpserver/Webserver.hpp b/src/httpserver/Webserver.hpp
@@ -36,6 +36,7 @@
 #include <cstring>
 #include <map>
 #include <vector>
+#include <set>
 #include <string>
 #include <utility>
 #include <memory>
@@ -204,6 +205,9 @@ class Webserver
 		 * @param family boolean indicating whether the resource is registered for the endpoint and its child or not.
 		**/
 		void registerResource(const std::string& resource, HttpResource* http_resource, bool family = false);
+        void unregisterResource(const std::string& resource);
+        void banIp(const std::string& ip);
+        void unbanIp(const std::string& ip);
 		/**
 		 * Method used to kill the webserver waiting for it to terminate
 		**/
@@ -236,6 +240,7 @@ class Webserver
 		bool running;
 
 		std::map<HttpEndpoint, HttpResource* > registeredResources;
+        std::set<std::string> bans;
 		struct MHD_Daemon *daemon;
 		static int not_found_page 
 		(
