Make output of get_or_create_file_info const and introduce new setters

The output of get_or_create_file_info should be const. As previously the result was used to direclty alter the content of the struct new setters to set the file_system_file_name and to grow the size are introduced (and used)
etr · etr · Mar 3, 2022 · Feb 8, 2022 · Feb 9, 2022 · Feb 10, 2022
commit 329c066662c4fbf91d2838292a03540535c3d9f3
diff --git a/src/http_request.cpp b/src/http_request.cpp
@@ -127,8 +127,8 @@ const std::map<std::string, std::string, http::arg_comparator> http_request::get
     return arguments;
 }
 
-file_info_s &http_request::get_or_create_file_info(const char *upload_file_name) {
-    return files[std::string(upload_file_name)];
+const file_info_s& http_request::get_or_create_file_info(const std::string& upload_file_name) {
+    return files[upload_file_name];
 }
 
 const std::string http_request::get_querystring() const {

diff --git a/src/httpserver/http_request.hpp b/src/httpserver/http_request.hpp
@@ -141,7 +141,7 @@ class http_request {
       * @param upload_file_name the file name the user uploaded (this is the identifier for the map entry)
       * @result a file info struct file_info_s
      **/
-     file_info_s &get_or_create_file_info(const char *upload_file_name);
+     const file_info_s& get_or_create_file_info(const std::string& upload_file_name);
 
      /**
       * Method used to get all files passed with the request.
@@ -318,6 +318,24 @@ class http_request {
          }
      }
 
+     /**
+      * Method used to set the file system file name into the map by key.
+      * @param upload_file_name The file name the user uploaded (identifying the map entry)
+      * @param file_system_file_name The path to the file in the file system (the name may not be the original name depending on configuration of the webserver)
+     **/
+     void set_file_system_file_name(const std::string& upload_file_name, const std::string& file_system_file_name) {
+         files[upload_file_name].file_system_file_name = file_system_file_name;
+     }
+
+     /**
+      * Method used grow the filesize of an entry in the map by key.
+      * @param upload_file_name The file name the user uploaded (identifying the map entry)
+      * @param additional_file_size The additional size as a number to be added to the entry.
+     **/
+     void grow_file_size(const std::string& upload_file_name, size_t additional_file_size) {
+         files[upload_file_name].file_size += additional_file_size;
+     }
+
      /**
       * Method used to set the path requested.
       * @param path The path searched by the request.

diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -471,14 +471,14 @@ MHD_Result webserver::post_iterator(void *cls, enum MHD_ValueKind kind,
 
         if (filename && mr->ws->file_upload_target != FILE_UPLOAD_MEMORY_ONLY) {
             // either get the existing file info struct or create a new one in the file map
-            file_info_s &file_info = mr->dhr->get_or_create_file_info(filename);
+            const file_info_s &file_info = mr->dhr->get_or_create_file_info(filename);
             // if the file_system_file_name is not filled yet, this is a new entry and the name has to be set
             // (either random or copy of the original filename)
             if (file_info.file_system_file_name.empty()) {
                 if (mr->ws->generate_random_filename_on_upload) {
-                    file_info.file_system_file_name = http_utils::generate_random_upload_filename(mr->ws->post_upload_dir);
+                    mr->dhr->set_file_system_file_name(filename, http_utils::generate_random_upload_filename(mr->ws->post_upload_dir));
                 } else {
-                    file_info.file_system_file_name = mr->ws->post_upload_dir + "/" + std::string(filename);
+                    mr->dhr->set_file_system_file_name(filename, mr->ws->post_upload_dir + "/" + std::string(filename));
                 }
                 // to not append to an already existing file, delete an already existing file
                 unlink(file_info.file_system_file_name.c_str());
@@ -499,7 +499,7 @@ MHD_Result webserver::post_iterator(void *cls, enum MHD_ValueKind kind,
             }
 
             // update the file size in the map
-            file_info.file_size += size;
+            mr->dhr->grow_file_size(filename, size);
         }
         return MHD_YES;
     } catch(const std::exception& e) {