Properly limit the maximum size of the content and any processed posts or arguments. The default is unlimited.

wlandry · wlandry · commit 2bdbda9b4a64 · 2016-04-18T11:32:39.000-07:00
diff --git a/src/httpserver/create_webserver.hpp b/src/httpserver/create_webserver.hpp
@@ -52,7 +52,7 @@ class create_webserver
             _max_threads(0),
             _max_connections(0),
             _memory_limit(0),
-            _content_size_limit(0),
+            _content_size_limit(static_cast<size_t>(-1)),
             _connection_timeout(DEFAULT_WS_TIMEOUT),
             _per_IP_connection_limit(0),
             _log_access(0x0),
@@ -94,7 +94,7 @@ class create_webserver
             _max_threads(0),
             _max_connections(0),
             _memory_limit(0),
-            _content_size_limit(0),
+            _content_size_limit(static_cast<size_t>(-1)),
             _connection_timeout(DEFAULT_WS_TIMEOUT),
             _per_IP_connection_limit(0),
             _log_access(0x0),
diff --git a/src/httpserver/http_request.hpp b/src/httpserver/http_request.hpp
@@ -361,7 +361,7 @@ class http_request
          * Default constructor of the class. It is a specific responsibility of apis to initialize this type of objects.
         **/
         http_request():
-            content("")
+            content(""), content_size_limit(static_cast<size_t>(-1))
         {
         }
         /**
@@ -381,6 +381,7 @@ class http_request
             args(b.args),
             querystring(b.querystring),
             content(b.content),
+            content_size_limit(b.content_size_limit),
             version(b.version),
             requestor(b.requestor),
             underlying_connection(b.underlying_connection)
@@ -398,6 +399,7 @@ class http_request
         std::map<std::string, std::string, http::arg_comparator> args;
         std::string querystring;
         std::string content;
+        size_t content_size_limit;
         std::string version;
         std::string requestor;
 
@@ -442,7 +444,7 @@ class http_request
         **/
         void set_arg(const std::string& key, const std::string& value)
         {
-            this->args[key] = value;
+            this->args[key] = value.substr(0,content_size_limit);
         }
         /**
          * Method used to set an argument value by key.
@@ -452,29 +454,37 @@ class http_request
         **/
         void set_arg(const char* key, const char* value, size_t size)
         {
-            this->args[key] = std::string(value, size);
+            this->args[key] = std::string(value,
+                                          std::min(size, content_size_limit));
         }
         /**
          * Method used to set the content of the request
          * @param content The content to set.
         **/
         void set_content(const std::string& content)
         {
-            this->content = content;
+            this->content = content.substr(0,content_size_limit);
+        }
+        /**
+         * Method used to set the maximum size of the content
+         * @param content_size_limit The limit on the maximum size of the content and arg's.
+        **/
+        void set_content_size_limit(size_t content_size_limit)
+        {
+            this->content_size_limit = content_size_limit;
         }
         /**
          * Method used to append content to the request preserving the previous inserted content
          * @param content The content to append.
          * @param size The size of the data to append.
         **/
-        void grow_content(const char* content, size_t size,
-                          size_t content_size_limit)
+        void grow_content(const char* content, size_t size)
         {
             this->content.append(content, size);
             if (this->content.size() > content_size_limit)
-              {
+            {
                 this->content.resize (content_size_limit);
-              }
+            }
         }
         /**
          * Method used to set the path requested.
@@ -565,7 +575,7 @@ class http_request
         {
             std::map<std::string, std::string>::const_iterator it;
             for(it = args.begin(); it != args.end(); ++it)
-                this->args[it->first] = it->second;
+                this->args[it->first] = it->second.substr(0,content_size_limit);
         }
         /**
          * Method used to set the username of the request.
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -655,6 +655,7 @@ int webserver::bodyfull_requests_answer_first_step(
 {
     mr->second = true;
     mr->dhr = new http_request();
+    mr->dhr->set_content_size_limit(content_size_limit);
     const char *encoding = MHD_lookup_connection_value (
             connection,
             MHD_HEADER_KIND,
@@ -699,7 +700,7 @@ int webserver::bodyfull_requests_answer_second_step(
 #ifdef DEBUG
     cout << "Writing content: " << upload_data << endl;
 #endif //DEBUG
-    mr->dhr->grow_content(upload_data, *upload_data_size, content_size_limit);
+    mr->dhr->grow_content(upload_data, *upload_data_size);
 
     if (mr->pp != NULL) MHD_post_process(mr->pp, upload_data, *upload_data_size);
     *upload_data_size = 0;
