Eliminated unescaper and validator delegates

Author: Sebastiano Merlino

src/httpserver/webserver.hpp

@@ -96,49 +96,6 @@ class logging_delegate
         virtual void log_error(const std::string& s) const;
 };
 
-/**
- * Delegate class used to validate requests before serve it
-**/
-class request_validator
-{
-    public:
-        /**
-         * Delegate constructor
-        **/
-        request_validator();
-        /**
-         * Destructor of the class
-        **/
-        virtual ~request_validator();
-        /**
-         * Method used to validate a request. The validation method is entirely based upon the requestor address.
-         * @param address The requestor address
-         * @return true if the request is considered to be valid, false otherwise.
-        **/
-        virtual bool validate(const std::string& address) const;
-};
-
-/**
- * Delegate class used to unescape requests uri before serving it.
-**/
-class unescaper
-{
-    public:
-        /**
-         * Delegate constructor
-        **/
-        unescaper();
-        /**
-         * Destructor of the class
-        **/
-        virtual ~unescaper();
-        /**
-         * Method used to unescape the uri.
-         * @param s pointer to the uri string representation to unescape.
-        **/
-        virtual void unescape(char* s) const;
-};
-
 class event_supplier
 {
     public:
@@ -160,6 +117,9 @@ class event_supplier
 
 class create_webserver;
 
+typedef bool(*validator_ptr)(const std::string&);
+typedef void(*unescaper_ptr)(char*);
+
 /**
  * Class representing the webserver. Main class of the apis.
 **/
@@ -196,8 +156,8 @@ class webserver
             int connection_timeout = DEFAULT_WS_TIMEOUT,
             int per_IP_connection_limit = 0,
             logging_delegate* log_delegate = 0x0,
-            request_validator* validator = 0x0,
-            unescaper* unescaper_pointer = 0x0,
+            validator_ptr validator = 0x0,
+            unescaper_ptr unescaper = 0x0,
             const struct sockaddr* bind_address = 0x0,
             int bind_socket = 0,
             int max_thread_stack_size = 0,
@@ -281,13 +241,25 @@ class webserver
 
         void set_logging_delegate(logging_delegate* log_delegate, bool delete_old = false);
 
-        const request_validator* get_request_validator() const;
+        const validator_ptr get_request_validator() const
+        {
+            return this->validator;
+        }
 
-        void set_request_validator(request_validator* validator, bool delete_old = false);
+        void set_request_validator(validator_ptr validator)
+        {
+            this->validator = validator;
+        }
 
-        const unescaper* get_unescaper() const;
+        const unescaper_ptr get_unescaper() const
+        {
+            return this->unescaper;
+        }
 
-        void set_unescaper(unescaper* unescaper_pointer, bool delete_old = false);
+        void set_unescaper(unescaper_ptr unescaper)
+        {
+            this->unescaper = unescaper;
+        }
 
         void register_event_supplier(const std::string& id, event_supplier* ev_supplier);
 
@@ -306,8 +278,8 @@ class webserver
         int connection_timeout;
         int per_IP_connection_limit;
         logging_delegate* log_delegate;
-        request_validator* validator;
-        unescaper* unescaper_pointer;
+        validator_ptr validator;
+        unescaper_ptr unescaper;
         const struct sockaddr* bind_address;
         int bind_socket;
         int max_thread_stack_size;
@@ -470,7 +442,7 @@ class create_webserver
             _per_IP_connection_limit(0),
             _log_delegate(0x0),
             _validator(0x0),
-            _unescaper_pointer(0x0),
+            _unescaper(0x0),
             _bind_address(0x0),
             _bind_socket(0),
             _max_thread_stack_size(0),
@@ -509,7 +481,7 @@ class create_webserver
             _per_IP_connection_limit(0),
             _log_delegate(0x0),
             _validator(0x0),
-            _unescaper_pointer(0x0),
+            _unescaper(0x0),
             _bind_address(0x0),
             _bind_socket(0),
             _max_thread_stack_size(0),
@@ -546,8 +518,8 @@ class create_webserver
         create_webserver& connection_timeout(int connection_timeout) { _connection_timeout = connection_timeout; return *this; }
         create_webserver& per_IP_connection_limit(int per_IP_connection_limit) { _per_IP_connection_limit = per_IP_connection_limit; return *this; }
         create_webserver& log_delegate(logging_delegate* log_delegate) { _log_delegate = log_delegate; return *this; }
-        create_webserver& validator(request_validator* validator) { _validator = validator; return *this; }
-        create_webserver& unescaper_pointer(unescaper* unescaper_pointer) { _unescaper_pointer = unescaper_pointer; return *this; }
+        create_webserver& validator(validator_ptr validator) { _validator = validator; return *this; }
+        create_webserver& unescaper(unescaper_ptr unescaper) { _unescaper = unescaper; return *this; }
         create_webserver& bind_address(const struct sockaddr* bind_address) { _bind_address = bind_address; return *this; }
         create_webserver& bind_socket(int bind_socket) { _bind_socket = bind_socket; return *this; }
         create_webserver& max_thread_stack_size(int max_thread_stack_size) { _max_thread_stack_size = max_thread_stack_size; return *this; }
@@ -594,8 +566,8 @@ class create_webserver
         int _connection_timeout;
         int _per_IP_connection_limit;
         logging_delegate* _log_delegate;
-        request_validator* _validator;
-        unescaper* _unescaper_pointer;
+        validator_ptr _validator;
+        unescaper_ptr _unescaper;
         const struct sockaddr* _bind_address;
         int _bind_socket;
         int _max_thread_stack_size;

src/webserver.cpp

@@ -294,7 +294,6 @@ void access_log(webserver*, string);
 size_t unescaper_func(void*, struct MHD_Connection*, char*);
 size_t internal_unescaper(void*, char*);
 
-
 struct compare_value
 {
     bool operator() (const std::pair<int, int>& left, const std::pair<int, int>& right) const
@@ -332,20 +331,6 @@ void logging_delegate::log_access(const string& s) const {}
 
 void logging_delegate::log_error(const string& s) const {}
 
-//REQUEST VALIDATOR
-request_validator::request_validator() {}
-
-request_validator::~request_validator() {}
-
-bool request_validator::validate(const string& address) const { return true; }
-
-//UNESCAPER
-unescaper::unescaper() {}
-
-unescaper::~unescaper() {}
-
-void unescaper::unescape(char* s) const {}
-
 //EVENT SUPPLIER
 event_supplier::event_supplier() {}
 
@@ -396,8 +381,8 @@ webserver::webserver
     int connection_timeout,
     int per_IP_connection_limit,
     logging_delegate* log_delegate,
-    request_validator* validator,
-    unescaper* unescaper_pointer,
+    validator_ptr validator,
+    unescaper_ptr unescaper,
     const struct sockaddr* bind_address,
     int bind_socket,
     int max_thread_stack_size,
@@ -434,7 +419,7 @@ webserver::webserver
     per_IP_connection_limit(per_IP_connection_limit),
     log_delegate(log_delegate),
     validator(validator),
-    unescaper_pointer(unescaper_pointer),
+    unescaper(unescaper),
     bind_address(bind_address),
     bind_socket(bind_socket),
     max_thread_stack_size(max_thread_stack_size),
@@ -475,7 +460,7 @@ webserver::webserver(const create_webserver& params):
     per_IP_connection_limit(params._per_IP_connection_limit),
     log_delegate(params._log_delegate),
     validator(params._validator),
-    unescaper_pointer(params._unescaper_pointer),
+    unescaper(params._unescaper),
     bind_address(params._bind_address),
     bind_socket(params._bind_socket),
     max_thread_stack_size(params._max_thread_stack_size),
@@ -517,7 +502,7 @@ webserver& webserver::operator=(const webserver& b)
     per_IP_connection_limit = b.per_IP_connection_limit;
     log_delegate = b.log_delegate;
     validator = b.validator;
-    unescaper_pointer = b.unescaper_pointer;
+    unescaper = b.unescaper;
     bind_address = b.bind_address;
     bind_socket = b.bind_socket;
     max_thread_stack_size = b.max_thread_stack_size;
@@ -1165,9 +1150,9 @@ size_t unescaper_func(void * cls, struct MHD_Connection *c, char *s)
 size_t internal_unescaper(void* cls, char* s)
 {
     webserver* dws = static_cast<webserver*>(cls);
-    if(dws->unescaper_pointer != 0x0)
+    if(dws->unescaper != 0x0)
     {
-        dws->unescaper_pointer->unescape(s);
+        dws->unescaper(s);
         return strlen(s);
     }
     else
@@ -1201,30 +1186,6 @@ void webserver::set_logging_delegate(logging_delegate* log_delegate, bool delete
     this->log_delegate = log_delegate;
 }
 
-const request_validator* webserver::get_request_validator() const
-{
-    return this->validator;
-}
-
-void webserver::set_request_validator(request_validator* validator, bool delete_old)
-{
-    if(delete_old && this->validator != 0x0)
-        delete this->validator;
-    this->validator = validator;
-}
-
-const unescaper* webserver::get_unescaper() const
-{
-    return this->unescaper_pointer;
-}
-
-void webserver::set_unescaper(unescaper* u, bool delete_old)
-{
-    if(delete_old && this->unescaper_pointer != 0x0)
-        delete this->unescaper_pointer;
-    this->unescaper_pointer = unescaper_pointer;
-}
-
 void webserver::upgrade_handler (void *cls, struct MHD_Connection* connection,
     void **con_cls, int upgrade_socket)
 {