validations on making httpRequests

example/main.cpp

@@ -9,6 +9,7 @@
 // Personally, I don't encourange using namespaces, but, I left it here just so
 // that the code could be more readable ¯\_(ツ)_/¯
 using namespace expresso::core;
+using namespace expresso::enums;
 using namespace expresso::middleware;
 
 // Global variable, just for fun :)

include/expresso/core/response.h

@@ -10,7 +10,7 @@
 #include <zippuccino/zipper.h>
 
 #include <expresso/core/cookie.h>
-#include <expresso/core/status_code.h>
+#include <expresso/enums/status_code.h>
 
 namespace expresso {
 
@@ -21,7 +21,7 @@ class Response {
   bool hasEnded;
 
   int socket;
-  expresso::core::STATUS_CODE statusCode;
+  expresso::enums::STATUS_CODE statusCode;
 
   std::string message;
   std::vector<Cookie *> cookies;
@@ -41,7 +41,7 @@ class Response {
   void setCookie(Cookie *cookie);
   std::string get(std::string headerName);
 
-  Response &status(expresso::core::STATUS_CODE code);
+  Response &status(expresso::enums::STATUS_CODE code);
   Response &send(std::string response);
   Response &json(std::string response);
   Response &json(json::object response);

include/expresso/core/server.h

@@ -7,6 +7,7 @@
 #include <nexus/pool.h>
 
 #include <expresso/core/router.h>
+#include <expresso/enums/verbs.h>
 #include <expresso/version.h>
 
 namespace expresso {

include/expresso/core/status_code.h → include/expresso/enums/status_code.h

@@ -2,7 +2,7 @@
 
 namespace expresso {
 
-namespace core {
+namespace enums {
 
 enum STATUS_CODE {
   // Informational responses
@@ -105,6 +105,6 @@ enum STATUS_CODE {
   NETWORK_CONNECT_TIMEOUT_ERROR = 599
 };
 
-} // namespace core
+} // namespace enums
 
 } // namespace expresso

include/expresso/enums/verbs.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <set>
+#include <string>
+
+namespace expresso {
+
+namespace enums {
+
+static const std::set<std::string> VERBS = {"GET",    "POST",    "PUT", "PATCH",
+                                            "DELETE", "OPTIONS", "HEAD"};
+
+} // namespace enums
+
+} // namespace expresso

src/core/response.cpp

@@ -19,7 +19,7 @@ std::map<std::string, std::set<std::string>> Response::MIME_TYPES = {
 
 expresso::core::Response::Response(int clientSocket)
     : hasEnded(false), socket(clientSocket),
-      statusCode(expresso::core::STATUS_CODE::OK), message("") {
+      statusCode(expresso::enums::STATUS_CODE::OK), message("") {
   return;
 }
 
@@ -57,7 +57,7 @@ std::string expresso::core::Response::get(std::string headerName) {
 }
 
 expresso::core::Response &
-expresso::core::Response::status(expresso::core::STATUS_CODE code) {
+expresso::core::Response::status(expresso::enums::STATUS_CODE code) {
   this->statusCode = code;
 
   return *this;
@@ -168,7 +168,7 @@ void expresso::core::Response::sendFiles(const std::set<std::string> &paths,
 }
 
 void expresso::core::Response::sendNotFound() {
-  this->status(expresso::core::STATUS_CODE::NOT_FOUND)
+  this->status(expresso::enums::STATUS_CODE::NOT_FOUND)
       .send(expresso::core::Response::NOT_FOUND)
       .end();
 

src/core/server.cpp

@@ -110,7 +110,7 @@ void expresso::core::Server::handleConnection(int clientSocket) {
     logger::error(
         e.what(),
         "void expresso::core::Server::handleConnection(int clientSocket)");
-    res->status(STATUS_CODE::BAD_REQUEST).send("Bad Request");
+    res->status(expresso::enums::STATUS_CODE::BAD_REQUEST).send("Bad Request");
   }
 
   return;
@@ -125,8 +125,20 @@ expresso::core::Server::makeRequest(std::string &request) noexcept(false) {
 
   std::vector<std::string> parts = brewtils::string::split(line, " ");
   req.method = parts[0];
+  if (expresso::enums::VERBS.find(req.method) == expresso::enums::VERBS.end()) {
+    logger::error("Unsupported HTTP method: " + req.method,
+                  "expresso::core::Server::makeRequest(std::string &request) "
+                  "noexcept(false)");
+  }
+
   req.path = parts[1];
   req.httpVersion = parts[2];
+  if (req.httpVersion.substr(0, 5) != "HTTP/") {
+    logger::error("Invalid HTTP version: " + req.httpVersion,
+                  "expresso::core::Server::makeRequest(std::string &request) "
+                  "noexcept(false)");
+  }
+
   req.tempPath = req.path.substr(1, req.path.size());
 
   // Headers

src/middleware/cors.cpp

@@ -84,7 +84,7 @@ bool expresso::middleware::Cors::use(expresso::core::Request &req,
 
   if (requestOrigin == "") {
     res.set("Access-Control-Allow-Origin", "null");
-    res.status(expresso::core::STATUS_CODE::FORBIDDEN)
+    res.status(expresso::enums::STATUS_CODE::FORBIDDEN)
         .send(expresso::middleware::Cors::FORBIDDEN);
     return false;
   }
@@ -101,7 +101,7 @@ bool expresso::middleware::Cors::use(expresso::core::Request &req,
 
   if (!isOriginPresent) {
     res.set("Access-Control-Allow-Origin", "null");
-    res.status(expresso::core::STATUS_CODE::FORBIDDEN)
+    res.status(expresso::enums::STATUS_CODE::FORBIDDEN)
         .send(expresso::middleware::Cors::FORBIDDEN);
     return false;
   }

src/middleware/static_serve.cpp

@@ -32,7 +32,7 @@ bool expresso::middleware::StaticServe::use(expresso::core::Request &req,
 
     res.send(this->getFolderHTML(req, tempPath));
     res.set("Content-Type", "text/html");
-    res.status(expresso::core::STATUS_CODE::OK);
+    res.status(expresso::enums::STATUS_CODE::OK);
     return false;
   }