refactor(parser&tester): add new content type supported, clean tester

src/Parser.cpp

@@ -177,7 +177,7 @@ void Parser::parseHeaders(const char *request, HTTPRequest &req, HTTPResponse &r
 	if (!hasCRLF(request, i, 0))
 		return (res.setStatusCode(400, "No CRLF after headers"));
 	if (!hasMandatoryHeaders(req, res))
-		return ;
+		return;
 	_headersAreParsed = true;
 	saveCokies(req);
 }
@@ -223,7 +223,7 @@ void Parser::parseFileUpload(const std::string &request, HTTPRequest &req, HTTPR
 
 // ----------------UTILS----------------------------
 
-bool Parser::hasMandatoryHeaders(HTTPRequest &req, HTTPResponse& res)
+bool Parser::hasMandatoryHeaders(HTTPRequest &req, HTTPResponse &res)
 {
 	_isChunked = false;
 	int isHost = 0;
@@ -624,9 +624,8 @@ bool Parser::isOrigForm(std::string &requestTarget, int &queryStart)
 
 bool Parser::isValidContentType(std::string type)
 {
-if (type == "text/plain" || type == "text/html" || \
-	type.substr(0, 30) == "multipart/form-data; boundary=" \
-	|| type == "application/octet-stream")
+	if (type == "text/plain" || type == "text/html" || type.substr(0, 30) == "multipart/form-data; boundary=" ||
+		type == "application/octet-stream" || type == "application/x-www-form-urlencoded")
 		return (true);
 	return (false);
 }

tests/CGI.cpp

@@ -0,0 +1,214 @@
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <iostream>
+#include <unistd.h>
+#include <string.h>
+#include <sys/wait.h>
+#include <cstring>
+#include <vector>
+#include <poll.h>
+#include <sstream>
+#include <regex>
+
+#define BUFFER_SIZE 1024
+#define PORT 8080
+#define POLL_TIMOUT 2000
+#define COLOR_GREEN "\033[32m"
+#define COLOR_RED "\033[31m"
+#define COLOR_RESET "\033[0m"
+#define PRINT_RESPONSE 0
+
+bool is_error = false;
+
+struct HTTPTest
+{
+	std::string request;
+	std::string expectedResponse;
+
+	HTTPTest(std::string request, std::string expectedResponse) : request(request), expectedResponse(expectedResponse)
+	{
+	}
+};
+
+std::string extractStatusCode(const std::string &response)
+{
+	std::regex statusLineRegex(R"(HTTP/\d+\.\d+\s+(\d+)\s+.*\r\n)");
+	std::smatch matches;
+	if (std::regex_search(response, matches, statusLineRegex) && matches.size() > 1)
+	{
+		return matches[1].str(); // The first sub-match is the status code
+	}
+	else
+	{
+		std::cerr << "Invalid or malformed HTTP response." << std::endl;
+		return "";
+	}
+	std::istringstream responseStream(response);
+	std::string httpVersion;
+	std::string statusCode;
+
+	responseStream >> httpVersion >> statusCode;
+
+	return statusCode;
+}
+
+void evalSendOutput(ssize_t bytesSent, const char *request, int clientSocket)
+{
+	size_t requestLength = strlen(request);
+
+	if (bytesSent < 0)
+		std::cerr << "Failed to send data." << std::endl;
+	else if (bytesSent == 0 && requestLength > 0)
+		std::cerr << "Unexpected scenario: No data was sent despite a request being available." << std::endl;
+	else if (bytesSent == 0 && requestLength == 0)
+		std::cerr << "You tried to send an empty request. Why?" << std::endl;
+	else if (bytesSent < requestLength)
+		std::cerr << "Request was sent successfully, but not all data was sent." << std::endl;
+	else if (bytesSent > 0 && requestLength == bytesSent)
+	{
+		std::cout << "Request sent successfully" << std::endl;
+		return;
+	}
+	else
+		std::cerr << "Something impossible happened." << std::endl;
+
+	// For all error cases, we close the socket.
+	std::cerr << "Request: " << request << std::endl;
+	close(clientSocket);
+}
+
+bool waitForResponseWitPoll(int socketFd, int timoutMilliseconds)
+{
+	struct pollfd pollFd;
+	pollFd.fd = socketFd;
+	pollFd.events = POLLIN;
+	pollFd.revents = 0;
+	std::cout << "Waiting for response..." << std::endl;
+	int ret = poll(&pollFd, 1, timoutMilliseconds);
+	if (ret < 0)
+	{
+		std::cerr << "Poll failed" << std::endl;
+		return false;
+	}
+	else if (ret == 0)
+	{
+		std::cerr << "Poll timed out" << std::endl;
+		return false;
+	}
+	else if (pollFd.revents & POLLIN)
+	{
+		return true;
+	}
+	else
+	{
+		std::cerr << "Poll returned an unexpected value" << std::endl;
+		return false;
+	}
+}
+
+void sendData(const std::vector<HTTPTest> &tests, sockaddr_in serverAddress)
+{
+	for (size_t i = 0; i < tests.size(); ++i)
+	{
+		const auto &test = tests[i];
+		std::cout << "--------------------------------" << std::endl;
+		std::cout << "Processing request #" << i + 1 << std::endl;
+		std::cout << "Request: " << test.request << std::endl;
+		int clientSocket = socket(AF_INET, SOCK_STREAM, 0);
+		if (clientSocket < 0)
+		{
+			std::cerr << "Socket creation failed" << std::endl;
+			continue;
+		}
+		if (connect(clientSocket, (struct sockaddr *)&serverAddress, sizeof(serverAddress)) < 0)
+		{
+			std::cerr << "Connection failed" << std::endl;
+			close(clientSocket);
+			continue;
+		}
+		ssize_t bytesSent = send(clientSocket, test.request.c_str(), test.request.size(), 0);
+
+		char buffer[BUFFER_SIZE];
+		if (waitForResponseWitPoll(clientSocket, POLL_TIMOUT))
+		{
+			ssize_t bytesRead = read(clientSocket, buffer, BUFFER_SIZE);
+			if (bytesRead < 0)
+				std::cerr << "Failed to read data." << std::endl;
+			else if (bytesRead == 0)
+				std::cerr << "No data was read." << std::endl;
+			else
+			{
+				buffer[bytesRead] = '\0';
+				std::string statusCode = extractStatusCode(buffer);
+				if (statusCode == test.expectedResponse)
+				{
+					if (PRINT_RESPONSE)
+						std::cout << "Response: " << buffer << std::endl;
+					std::cout << "Status code: " << statusCode << std::endl;
+					std::cout << COLOR_GREEN "✅ Test Passed" COLOR_RESET << std::endl;
+				}
+				else
+				{
+					if (PRINT_RESPONSE)
+						std::cout << "Response: " << buffer << std::endl;
+					std::cout << "Status code: " << statusCode << std::endl;
+					std::cerr << COLOR_RED "❌ Test Failed" COLOR_RESET << std::endl;
+					is_error = true;
+				}
+			}
+		}
+		else
+		{
+			std::cerr << "No response was received" << std::endl;
+		}
+		close(clientSocket);
+		sleep(1);
+		std::cout << "--------------------------------" << std::endl;
+	}
+}
+
+// void cgi(sockaddr_in serverAdress)
+// {
+// 	std::string queryString = "?name=Jasasane&salad=Caesar";
+// 	std::stringstream request;
+// 	request << "POST /database/salad_db.py" << queryString << " HTTP/1.1\r\n"
+// 			<< "Host: www.saladbook.xyz\r\n"
+// 			<< "Content-Length: 0\r\n"
+// 			<< "\r\n";
+
+// 	std::vector<HTTPTest> tests = {HTTPTest(request.str(), "200")};
+// 	sendData(tests, serverAdress);
+// }
+
+void cgi(sockaddr_in serverAdress)
+{
+	std::string postData = "action=add&name=Jasasane&salad=Caesar";
+	std::stringstream request;
+	request << "POST /database/salad_db.py HTTP/1.1\r\n"
+			<< "Host: www.saladbook.xyz\r\n"
+			<< "Content-Type: application/x-www-form-urlencoded\r\n"
+			<< "Content-Length: " << postData.size() << "\r\n"
+			<< "\r\n"
+			<< postData;
+
+	std::vector<HTTPTest> tests = {HTTPTest(request.str(), "200")};
+	sendData(tests, serverAdress);
+}
+
+int main(void)
+{
+	sockaddr_in serverAddress;
+	serverAddress.sin_family = AF_INET;
+	serverAddress.sin_port = htons(PORT);
+	serverAddress.sin_addr.s_addr = INADDR_ANY;
+
+	// NOTE: when you run a test, configfile and dir structure should fit
+	// salad(serverAddress); // standard routing tests
+	cgi(serverAddress);
+
+	if (is_error)
+		exit(1);
+	else if (!is_error)
+		std::cout << std::endl << "     🎉 All tests passed 🎉" << std::endl << std::endl;
+	exit(0);
+}

var/www.saladbook.xyz/database/database.json

@@ -2,6 +2,5 @@
     "Stefano": "Carrot",
     "Leo": "nicoise",
     "Daniil": "with_beets",
-    "Jane": "Caesar",
-    "Jasasane": "Caesar"
+
 }

var/www.saladbook.xyz/database/salad_db.py

@@ -35,6 +35,12 @@ def main():
     print("Content-type: text/html\n")
     print()
 
+    # Print the environment variables for debugging
+    for key, value in os.environ.items():
+        print(f"DEBUG: {key}={value}<br>")
+    print("<br>")
+
+
     # Print the QUERY_STRING environment variable for debugging
     query_string = os.getenv('QUERY_STRING', '')
     print(f"DEBUG: QUERY_STRING: {query_string}<br>")
@@ -50,12 +56,13 @@ def main():
     # Simulating CGI environment for demonstration
     form = cgi.FieldStorage(fp=None, headers=None, environ={'REQUEST_METHOD':'GET', 'CONTENT_TYPE':'application/x-www-form-urlencoded', 'QUERY_STRING': query_string})
 
-    action = form.getvalue('action')
+    #take action from env variable method
+    action = os.getenv('REQUEST_METHOD', '') 
     name = form.getvalue('name')
     salad = form.getvalue('salad')
     print(f"DEBUG: action={action}, name={name}, salad={salad}<br>")
 
-    if action == 'add' and name and salad:
+    if action == 'POST' and name and salad:
         # Add or update an entry
         data[name] = salad
         save_database(data, filename)