refactor(http): HTTP layer full refactor — parser hardening, DRY, helpers

.gitignore

@@ -1,4 +1,5 @@
 *.o
+obj/
 
 # test binaries (built locally from tests/)
 test_parser

Makefile

@@ -3,19 +3,20 @@ CXX     = c++
 CXXFLAGS = -Wall -Wextra -Werror -std=c++98
 
 SRCS    = $(shell find src -name "*.cpp")
-OBJS    = $(SRCS:.cpp=.o)
+OBJS    = $(SRCS:src/%.cpp=obj/%.o)
 INCS    = -I include
 
 all: $(NAME)
 
 $(NAME): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(OBJS) -o $(NAME)
 
-%.o: %.cpp
+obj/%.o: src/%.cpp
+	@mkdir -p $(dir $@)
 	$(CXX) $(CXXFLAGS) $(INCS) -c $< -o $@
 
 clean:
-	rm -f $(OBJS)
+	rm -rf obj
 
 fclean: clean
 	rm -f $(NAME)

include/http/RequestParser.hpp

@@ -3,16 +3,29 @@
 
 #include "HttpRequest.hpp"
 #include <string>
+#include <exception>
 
 class RequestParser {
 public:
+    class ParseException : public std::exception {
+    public:
+        ParseException(int code, const std::string& msg) : _code(code), _msg(msg) {}
+        ~ParseException() throw() {}
+        int         getCode() const { return _code; }
+        const char* what()    const throw() { return _msg.c_str(); }
+    private:
+        int         _code;
+        std::string _msg;
+    };
+
     HttpRequest parse(const std::string& raw);
 
 private:
-    bool        isValid(const std::string& raw);
-    void        parseFirstLine(const std::string& line, HttpRequest& req);
-    void        parseHeaders(const std::string& raw, HttpRequest& req, std::size_t firstLineEnd, std::size_t headerBodySep);
-    void        parseBody(const std::string& raw, HttpRequest& req, std::size_t headerBodySep);
+    void parseRequestLine(const std::string& firstLine, HttpRequest& req);
+    void parseHeaderLine(const std::string& line, std::string& key, std::string& value);
+    void validateHostHeader(const std::string& value, bool& hasHostHeader);
+    void parseHeaders(const std::string& raw, HttpRequest& req, std::size_t firstLineEnd, std::size_t headerBodySep);
+    void parseBody(const std::string& raw, HttpRequest& req, std::size_t headerBodySep);
 };
 
 #endif

include/http/builders/HttpBuilders.hpp

@@ -0,0 +1,13 @@
+#ifndef HTTP_BUILDERS_HPP
+#define HTTP_BUILDERS_HPP
+
+#include "../HttpResponse.hpp"
+#include <string>
+
+HttpResponse buildHttpError(int statusCode, const std::string& statusMessage);
+HttpResponse buildHttpOk(const std::string& body, const std::string& contentType);
+HttpResponse buildHttpCreated(const std::string& body);
+HttpResponse buildHttpNoContent();
+HttpResponse buildRedirect(const std::string& url);
+
+#endif

include/http/processHttp.hpp

@@ -0,0 +1,9 @@
+#ifndef PROCESS_HTTP_HPP
+#define PROCESS_HTTP_HPP
+
+#include "../config/ServerConfig.hpp"
+#include <string>
+
+std::string processHttp(const std::string& rawRequest, const ServerConfig& server);
+
+#endif

include/http/utils/HttpUtils.hpp

@@ -1,10 +1,10 @@
 #ifndef HTTP_UTILS_HPP
 #define HTTP_UTILS_HPP
 
-#include "../HttpResponse.hpp"
 #include <string>
 
-HttpResponse buildHttpError(int statusCode, const std::string& statusMessage);
-std::string  getContentType(const std::string& filePath);
+bool        writeFdFromString(int fd, const std::string& data);
+bool        readFdToString(int fd, std::string& body);
+std::string getContentType(const std::string& filePath);
 
 #endif

include/http/utils/StringUtils.hpp

@@ -5,6 +5,7 @@
 
 std::string urlDecode(const std::string& encoded);
 bool        hasPathTraversal(const std::string& uri);
+std::string extractUriPath(const std::string& uri);
 std::string extractQueryString(const std::string& uri);
 std::string extractFilename(const std::string& uri);
 

src/http/builders/buildHttpCreated.cpp

@@ -0,0 +1,16 @@
+#include "../../../include/http/builders/HttpBuilders.hpp"
+#include <sstream>
+
+HttpResponse buildHttpCreated(const std::string& body)
+{
+    HttpResponse       response;
+    std::ostringstream contentLength;
+
+    response.status_code = 201;
+    response.status_msg  = "Created";
+    response.body        = body;
+    response.headers["Content-Type"] = "text/plain";
+    contentLength << body.size();
+    response.headers["Content-Length"] = contentLength.str();
+    return response;
+}

src/http/builders/buildHttpError.cpp

@@ -0,0 +1,16 @@
+#include "../../../include/http/builders/HttpBuilders.hpp"
+#include <sstream>
+
+HttpResponse buildHttpError(int statusCode, const std::string& statusMessage)
+{
+    HttpResponse       response;
+    std::ostringstream contentLength;
+
+    response.status_code = statusCode;
+    response.status_msg  = statusMessage;
+    response.body        = "<html><body><h1>" + statusMessage + "</h1></body></html>";
+    response.headers["Content-Type"] = "text/html";
+    contentLength << response.body.size();
+    response.headers["Content-Length"] = contentLength.str();
+    return response;
+}

src/http/builders/buildHttpNoContent.cpp

@@ -0,0 +1,10 @@
+#include "../../../include/http/builders/HttpBuilders.hpp"
+
+HttpResponse buildHttpNoContent()
+{
+    HttpResponse response;
+    response.status_code               = 204;
+    response.status_msg                = "No Content";
+    response.headers["Content-Length"] = "0";
+    return response;
+}

src/http/builders/buildHttpOk.cpp

@@ -0,0 +1,16 @@
+#include "../../../include/http/builders/HttpBuilders.hpp"
+#include <sstream>
+
+HttpResponse buildHttpOk(const std::string& body, const std::string& contentType)
+{
+    HttpResponse       response;
+    std::ostringstream contentLength;
+
+    response.status_code = 200;
+    response.status_msg  = "OK";
+    response.body        = body;
+    response.headers["Content-Type"] = contentType;
+    contentLength << body.size();
+    response.headers["Content-Length"] = contentLength.str();
+    return response;
+}

src/http/builders/buildRedirect.cpp

@@ -0,0 +1,11 @@
+#include "../../../include/http/builders/HttpBuilders.hpp"
+
+HttpResponse buildRedirect(const std::string& url)
+{
+    HttpResponse response;
+    response.status_code               = 301;
+    response.status_msg                = "Moved Permanently";
+    response.headers["Location"]       = url;
+    response.headers["Content-Length"] = "0";
+    return response;
+}

src/http/cgi/env.cpp

@@ -11,15 +11,11 @@ std::vector<std::string> CgiHandler::buildEnv(const HttpRequest& request,
     envVars.push_back("QUERY_STRING="   + extractQueryString(request.uri));
     envVars.push_back("SCRIPT_FILENAME=" + scriptPath);
 
-    std::string pathWithoutQuery = request.uri;
-    std::size_t queryPosition    = pathWithoutQuery.find('?');
-    if (queryPosition != std::string::npos)
-        pathWithoutQuery = pathWithoutQuery.substr(0, queryPosition);
-    envVars.push_back("PATH_INFO=" + pathWithoutQuery);
+    envVars.push_back("PATH_INFO=" + extractUriPath(request.uri));
 
     std::map<std::string, std::string>::const_iterator headerIt;
 
-    headerIt = request.headers.find("Content-Type");
+    headerIt = request.headers.find("content-type");
     if (headerIt != request.headers.end())
         envVars.push_back("CONTENT_TYPE=" + headerIt->second);
     else
@@ -34,7 +30,7 @@ std::vector<std::string> CgiHandler::buildEnv(const HttpRequest& request,
     else
         envVars.push_back("CONTENT_LENGTH=0");
 
-    headerIt = request.headers.find("Host");
+    headerIt = request.headers.find("host");
     if (headerIt != request.headers.end())
         envVars.push_back("HTTP_HOST=" + headerIt->second);