Implemented chunked request trailer parsing

Author: PythonGermany

TODO.md

@@ -4,10 +4,12 @@
 - [ ] fcntl subject
 - [ ] remove inet_ntop
 
+- [ ] Is is possible for client to send data whilst cgi is processing?
 - [ ] (Optional) Fix problem of no server response in case of connection being destructed due to timeout, in every case but especially if cgi is active
 - [ ] (Optional) Implement try_files or similar
 - [ ] (Does not occur anymore without having actively tried to fix it) Investigate random closing of program without any notice after sending a first request
 
+- [x] Implement and fix chunked request trailer parsing
 - [x] Figure out why resolving symlinks doesnt work
 - [x] Replace c function for wildcard pattern matching with own function
 - [x] Figure out why login for wordpress doesn't work

include/config/Init.hpp

@@ -1,11 +1,9 @@
 #ifndef INIT_HPP
 #define INIT_HPP
 
-#include <vector>
-
-#include "../poll/ListenSocket.hpp"
-#include "../poll/Poll.hpp"
+#include "ListenSocket.hpp"
 #include "Log.hpp"
+#include "Poll.hpp"
 #include "VirtualHost.hpp"
 
 class Init {

include/http/Http.hpp

@@ -50,6 +50,7 @@ class Http : public AConnection {
   void OnRequestRecv(std::string msg);
   void OnHeadRecv(std::string msg);
   void OnChunkSizeRecv(std::string msg);
+  void OnTrailerRecv(std::string msg);
   void OnBodyRecv(std::string msg);
   void OnCgiRecv(std::string msg);
   void OnCgiError();
@@ -59,7 +60,7 @@ class Http : public AConnection {
   void processFile(std::string uri);
   void processBodyRequest();
   void processPutData(const std::string& data);
-  void processPostData(std::string& data);
+  void processPostData(const std::string& data);
   void getPutResponse(std::string uri);
   void processOptions(std::string uri);
   void processDelete(std::string uri);

include/http/Request.hpp

@@ -14,22 +14,27 @@ class Request {
   std::string _method;
   Uri _uri;
   std::string _version;
-  std::map<std::string, std::string> _headers;
+  std::map<std::string, std::list<std::string> > _headers;
 
  public:
   Request();
   Request(const Request &rhs);
   Request &operator=(const Request &rhs);
   ~Request();
 
-  void setHeader(std::string key, std::string value);
+  void setHeaderField(std::string key, const std::string &value);
+  void setHeaderFieldValue(std::string key, const std::string &value);
 
   std::string getMethod() const;
   Uri &getUri();
   std::string getVersion() const;
-  std::string getHeader(std::string key) const;
+  std::string getHeaderField(std::string key) const;
 
-  void deleteHeaderField(std::string key, std::string value);
+  void removeHeader(std::string key);
+  void removeHeaderValue(std::string key, const std::string &value);
+
+  bool isMethod(const std::string &method);
+  bool hasHeaderFieldValue(std::string key, const std::string &value);
 
   int parseStatus(std::string line);
   int parseHeaderFields(std::string fields);

include/poll/AConnection.hpp

@@ -35,7 +35,13 @@ class AConnection : public IFileDescriptor {
   virtual void OnCgiError() = 0;
 
  protected:
-  typedef enum state_e { REQUEST_LINE, HEAD, BODY, CHUNK_SIZE } state_t;
+  typedef enum state_e {
+    REQUEST_LINE,
+    HEAD,
+    BODY,
+    CHUNK_SIZE,
+    TRAILER
+  } state_t;
 
   Address client;
   Address host;
@@ -51,6 +57,7 @@ class AConnection : public IFileDescriptor {
   virtual void OnRequestRecv(std::string msg) = 0;
   virtual void OnHeadRecv(std::string msg) = 0;
   virtual void OnChunkSizeRecv(std::string msg) = 0;
+  virtual void OnTrailerRecv(std::string msg) = 0;
   virtual void OnBodyRecv(std::string msg) = 0;
   void send(std::istream *msg);
   void cgiSend(std::string const &msg);

include/poll/Poll.hpp

@@ -1,8 +1,6 @@
 #ifndef POLL_HPP
 #define POLL_HPP
 
-#include <sys/time.h>
-
 #include <csignal>
 #include <vector>
 

include/utils/utils.hpp

@@ -30,6 +30,8 @@ std::string trim(const std::string& str, std::string chars = " \f\n\r\t\v");
 // @exception No custom exceptions
 std::string& trimStart(std::string& str, std::string chars = " \f\n\r\t\v");
 
+std::string trimStart(const std::string& str, std::string chars);
+
 // Cuts a string from start to end
 // @param str The string to cut from
 // @param start The start index
@@ -57,13 +59,21 @@ T split(const std::string& str, std::string delim, bool allowEmpty = false) {
   return tokens;
 }
 
-// Concatenates a vector of strings into a single string
-// @param values The vector of strings
+// Concatenates a container of strings into a single string
+// @param values The container of strings
 // @param separator The separator to use
 // @return The concatenated string
 // @exception No custom exceptions
-std::string concatenate(const std::vector<std::string>& values,
-                        std::string separator);
+template <typename T>
+std::string concatenate(const T& values, std::string separator) {
+  std::string value;
+  typename T::const_iterator it = values.begin();
+  for (; it != values.end(); it++) {
+    if (it != values.begin()) value += separator;
+    value += *it;
+  }
+  return value;
+}
 
 // Checks if a string starts with a prefix
 // @param str The string to check