From 27f6ac4348e953ac46c5ad96a8757ae2b193299a Mon Sep 17 00:00:00 2001
From: josephcheel <josephcheelnakashima@gmail.com>
Date: Thu, 27 Jun 2024 13:10:40 +0200
Subject: [PATCH 01/31] Added cgi for multiple locations and cookies

---
 conf/eval.conf                    |  43 ++++++++-
 mandatory/inc/Header.hpp          |   2 +
 mandatory/inc/Location.hpp        |  19 ++--
 mandatory/inc/LocationParser.hpp  |   5 +-
 mandatory/inc/Parser.hpp          |   3 +-
 mandatory/src/FileContent.cpp     |   1 +
 mandatory/src/Header.cpp          |  10 +-
 mandatory/src/ListeningSocket.cpp |   3 +-
 mandatory/src/Location.cpp        | 100 ++++++++++++-------
 mandatory/src/LocationParser.cpp  |  38 +++++++-
 mandatory/src/Parser.cpp          |  53 +---------
 mandatory/src/utils.cpp           |   2 +-
 www/web3/index6.html              | 101 ++++++++++++++++++++
 www/web7/set-cookie.html          | 146 ++++++++++++++++++++++++++++
 www/web7/set-cookie2.html         | 154 ++++++++++++++++++++++++++++++
 www/web7/test.html                |  34 +++++++
 www/web7/welcome.html             |  76 +++++++++++++++
 17 files changed, 683 insertions(+), 107 deletions(-)
 create mode 100644 www/web3/index6.html
 create mode 100644 www/web7/set-cookie.html
 create mode 100644 www/web7/set-cookie2.html
 create mode 100644 www/web7/test.html
 create mode 100644 www/web7/welcome.html

diff --git a/conf/eval.conf b/conf/eval.conf
index b8b42b4..dec4347 100644
--- a/conf/eval.conf
+++ b/conf/eval.conf
@@ -11,7 +11,7 @@ server:{
 */ 
 server:{
 				
-	port:8080;                			# listening port, mandatory parameter
+	port:8080:8084;                			# listening port, mandatory parameter
 	host:0.0.0.0;                     # host or 127.0.0.1 by default
 	server_name:example.com;                   # specify server_name, need to be added into /etc/hosts to work
 	error_page:./www/errors;    			    # default error page
@@ -33,7 +33,7 @@ server:{
       return:/uploads;			# redirection
   }
   location:{                   
-      name:/post;
+      name:/post/;
       allow_methods: GET;         #allowed methods in location, GET only by default
       index:index5.html;               # default page when requesting a directory, copies root index by default
       alias: ./www/web3;         # replaces location part of URI. 
@@ -46,11 +46,11 @@ server:{
   }
   location:{                   
 	  name:/cgi-bin;
-	  alias:./www/web6;  
+	  cgi_enabled: trusde; 
+	  alias:./www/web4;  
 	  allow_methods: GET, POST, DELETE;
 	  autoindex:on;
-	  cgi_path:/usr/bin/python3, /bin/sh;
-	  cgi_extension:.py,  .sh;
+	  cgi_extension:cgi, py, sh;
   }
   location:{
 	  name:/cgi-no-bin;
@@ -64,4 +64,37 @@ server:{
 	  allow_methods: GET;
 	  autoindex:on;
   }
+  location:{
+	  name:/set-cookie/;
+	#   set-cookie:id, name, lastname;
+
+	  alias:./www/web7;
+	  index:set-cookie.html;
+	  allow_methods: GET, POST;
+	  autoindex:on;
+  }
+  location:{
+	  name:/post-cookie/;
+	  allow_methods: GET, POST;
+	  set-cookie:id, name, lastname, theme;
+	  alias:./www/web7;
+	  index:welcome.html;
+	#   index:cookie_get.html;
+	  autoindex:off;
+  }
+   location:{
+	  name:/get-cookie/;
+	  set-cookie:id, name, lastname, theme;
+	  alias:./www/web7;
+	  index:welcome.html;
+	  allow_methods: GET, POST;
+	#   autoindex:on;
+  }
+  location:{
+	  name:/cookie/;
+	  alias:./www/web7;
+	  allow_methods: GET, POST;
+	#   index:welcome.html;
+	  autoindex:on;
+  }
 };
diff --git a/mandatory/inc/Header.hpp b/mandatory/inc/Header.hpp
index d7d8b77..e9e0509 100644
--- a/mandatory/inc/Header.hpp
+++ b/mandatory/inc/Header.hpp
@@ -22,6 +22,7 @@ class Header
 		size_t contentLength;
 		std::string contentType;
 		std::map<std::string, std::string> attributes;
+		std::multimap<std::string, std::string> cookies;
 
 	public:
 		Header();
@@ -46,4 +47,5 @@ class Header
 		std::string getContentType();
 		std::string getAttribute(std::string key);
 		void printReceivedHeader();
+		void setCookie(std::string value);
 };
diff --git a/mandatory/inc/Location.hpp b/mandatory/inc/Location.hpp
index 02fc795..9e1bab9 100644
--- a/mandatory/inc/Location.hpp
+++ b/mandatory/inc/Location.hpp
@@ -15,8 +15,9 @@
 #define VAR_LOC_ALLOW_METHODS "allow_methods"
 #define VAR_LOC_AUTOINDEX "autoindex"
 #define VAR_LOC_ALIAS "alias"
-#define VAR_LOC_CGI_PATH "cgi_path"
+#define VAR_LOC_CGI_ENABLED "cgi_enabled"
 #define VAR_LOC_CGI_EXTENSION "cgi_extension"
+#define VAR_LOC_COOKIE "set-cookie"
 #define STR_START "location:{"
 
 
@@ -38,15 +39,17 @@ class Location
 		std::string autoindexStr;
 		bool autoindex;
 		std::string alias;
-		std::string cgiPathStr;
-		std::vector<std::string> cgiPath;
 		std::string cgiExtensionStr;
 		std::vector<std::string> cgiExtension;
+		std::string cookiesStr;
+		std::vector<std::string> cookies;
 		enum LocationType LocationType;
+		std::string cgiEnabledStr;
 		bool isGetAllowed;
 		bool isPostAllowed;
 		bool isDeleteAllowed;
 		bool isCgi;
+		bool isCookie;
 		int loadData(const std::string &data);
 
 	public:
@@ -75,7 +78,10 @@ class Location
 		const std::string& getAlias() const ;
 		enum LocationType getLocationType();
 		bool getIsCgi() const;
+		bool getIsCookie() const;
+		std::vector<std::string>  getCookies() const;
 		// Setter methods
+
 		void setName(const std::string&);
 		void setRoot(const std::string&);
 		void setReturn(const std::string&);
@@ -84,15 +90,16 @@ class Location
 		void setAllowMethods(const std::string& );
 		void setAutoindex(const std::string&);
 		void setAlias(const std::string&);
-		void setCgiPathStr(const std::string &paths);
-		void setCgiPath(const std::string &paths);
+		void setCgiEnabledStr(const std::string &option);
+		bool setCgiEnabled();
 		void setCgiExtensionStr(const std::string &extensions);
 		void setCgiExtension(const std::string &extensions);
+		void setCookieStr(const std::string &cookie);
+		void setCookies(const std::string &cookie);
 		// Load data from a string configuration
 		void print();
 		void checkVariables(bool serverAutoIndex);
 		std::vector<std::string> getCgiExtension();
-		std::vector<std::string> getCgiPath();
 };
 
 //typedef void (Location::*location)(std::string);
diff --git a/mandatory/inc/LocationParser.hpp b/mandatory/inc/LocationParser.hpp
index 54a577f..f845ccc 100644
--- a/mandatory/inc/LocationParser.hpp
+++ b/mandatory/inc/LocationParser.hpp
@@ -32,12 +32,12 @@ class LocationParser
 		Header request;
 		Header response;
 		Server *server;
-		// FileContent *fileContent;
 		Receive *receiver;
-		//std::string path;
+		std::vector<std::string> cookies;
 		std::string query;
 		bool isAutoIndex;
 		bool isCGI;
+		bool isCookie;
 		size_t startRange;
 		size_t endRange;
 		std::string cgiPath;
@@ -52,6 +52,7 @@ class LocationParser
 		bool getIsAutoIndex();
 		bool getIsCGI();
 		void checks();
+		void setCookies();
 		size_t getStartRange();
 		size_t getEndRange();
 		std::string getQuery();
diff --git a/mandatory/inc/Parser.hpp b/mandatory/inc/Parser.hpp
index 4a6e44d..a9a1b84 100644
--- a/mandatory/inc/Parser.hpp
+++ b/mandatory/inc/Parser.hpp
@@ -31,7 +31,6 @@ class Parser
 		static int checkLocationName(std::string name);
 		static int checkRootAliasReturn(std::string root, std::string alias, std::string return_);
 		static bool checkReturnIgnore(std::string allowMethods, std::string autoindex, std::string index);
-		static bool checkCgiString(std::string cgiPath, std::string cgiExtension);
-		static bool checkCgi(std::vector<std::string> paths, std::vector<std::string> extensions);
+		static bool checkCgi(std::string cgiExtension);
 		static bool checkAllowedMethods(std::string allowMethods);
 };
\ No newline at end of file
diff --git a/mandatory/src/FileContent.cpp b/mandatory/src/FileContent.cpp
index 5b3a0f2..493d6d1 100644
--- a/mandatory/src/FileContent.cpp
+++ b/mandatory/src/FileContent.cpp
@@ -114,6 +114,7 @@ bool FileContent::setFileName(const std::string &file_name, const std::string &f
 		// else if (this->isCgi)
 		else if (cgiModule->getIsCGI() )
 		{
+			std::cout << "CGI" << std::endl;
 			cgiModule->setFileName(file_name, fileArgs);
 			this->setIsFileOpen(true);
 		}
diff --git a/mandatory/src/Header.cpp b/mandatory/src/Header.cpp
index 6736334..61dbb97 100644
--- a/mandatory/src/Header.cpp
+++ b/mandatory/src/Header.cpp
@@ -96,7 +96,9 @@ std::string Header::generateHeader() const
 	header += "Content-Type: " + contentType + "\r\n";
 	for (std::map<std::string, std::string>::const_iterator it = attributes.begin(); it != attributes.end(); ++it)
 		header += it->first + ": " + it->second + "\r\n";
-	
+	for (std::multimap<std::string, std::string>::const_iterator it = cookies.begin(); it != cookies.end(); ++it)
+		header += it->first + ": " + it->second + "\r\n";
+	// response.setAttribute("Set-Cookie", "id=123; name=Joseph; lastname=Cheel; theme=light;");
 	header += "\r\n";
 	
 	return header;
@@ -141,6 +143,12 @@ void Header::setDate()
 	this->date = buffer;
 }
 
+void Header::setCookie(std::string value)
+{
+	this->cookies.insert(std::pair<std::string, std::string>("Set-Cookie", value));
+}
+
+
 void Header::setLastModified(std::string lastModified)
 {
 	this->lastModified = lastModified;
diff --git a/mandatory/src/ListeningSocket.cpp b/mandatory/src/ListeningSocket.cpp
index d4a9a05..162e04a 100644
--- a/mandatory/src/ListeningSocket.cpp
+++ b/mandatory/src/ListeningSocket.cpp
@@ -171,6 +171,7 @@ void ListeningSocket::loadRequest(std::vector<Server *> servers)
 	{
 		this->getFileContentForStatusCode(e);
 	}
+	Parser.setCookies();
 	this->request = Parser.getRequest();
 	this->response = Parser.getResponse();
 	this->setIsAutoIndex(Parser.getIsAutoIndex());
@@ -178,6 +179,6 @@ void ListeningSocket::loadRequest(std::vector<Server *> servers)
 
 	this->setStartRange(Parser.getStartRange());
 	this->setEndRange(Parser.getEndRange());
-
+	
 	this->setFileName(this->request.getPath(), Parser.getQuery());
 }
diff --git a/mandatory/src/Location.cpp b/mandatory/src/Location.cpp
index 1a8f593..46f58d4 100644
--- a/mandatory/src/Location.cpp
+++ b/mandatory/src/Location.cpp
@@ -6,7 +6,7 @@
 /*   By: jcheel-n <jcheel-n@student.42barcelona.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/29 17:38:18 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/24 23:41:29 by jcheel-n         ###   ########.fr       */
+/*   Updated: 2024/06/27 01:38:11 by jcheel-n         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -22,7 +22,8 @@ std::map<std::string, int> var_names_location()
 	varnames[VAR_LOC_ALLOW_METHODS] = 0;
 	varnames[VAR_LOC_AUTOINDEX] = 0;
 	varnames[VAR_LOC_ALIAS] = 0;
-	varnames[VAR_LOC_CGI_PATH] = 0;
+	varnames[VAR_LOC_CGI_ENABLED] = 0;
+	varnames[VAR_LOC_COOKIE] = 0;
 	varnames[VAR_LOC_CGI_EXTENSION] = 0;
 	return varnames;
 }
@@ -38,7 +39,8 @@ std::map<std::string, void (Location::*)(const std::string&)> getLocationMethods
 	locationMethods[VAR_LOC_ALLOW_METHODS] = &Location::setAllowMethodsStr;
 	locationMethods[VAR_LOC_AUTOINDEX] = &Location::setAutoindex;
 	locationMethods[VAR_LOC_ALIAS] = &Location::setAlias;
-	locationMethods[VAR_LOC_CGI_PATH] = &Location::setCgiPathStr;
+	locationMethods[VAR_LOC_CGI_ENABLED] = &Location::setCgiEnabledStr;
+	locationMethods[VAR_LOC_COOKIE] = &Location::setCookieStr;
 	locationMethods[VAR_LOC_CGI_EXTENSION] = &Location::setCgiExtensionStr;
 	return locationMethods;
 }
@@ -53,13 +55,14 @@ Location::Location()
 	allowMethodsStr = "";
 	autoindex = "";
 	alias = "";
-	cgiPathStr = "";
+	// cgiPathStr = "";
 	cgiExtensionStr = "";
 	isCgi = false;
 }
 Location::Location(std::string const &content)
 {
 	this->isCgi = false;
+	this->cgiEnabledStr = "";
 	this->loadData(content);
 }
 
@@ -91,6 +94,8 @@ bool Location::getPostAllowed() const { return isPostAllowed; }
 bool Location::getDeleteAllowed() const { return isDeleteAllowed; }
 enum LocationType Location::getLocationType() { return this->LocationType; }
 bool Location::getIsCgi() const { return isCgi; }
+bool Location::getIsCookie() const { return isCookie; }
+std::vector<std::string>  Location::getCookies() const { return cookies; }
 // Setter methods
 void Location::setName(const std::string &n) { name = n; }
 void Location::setRoot(const std::string &r) { root = r; }
@@ -99,7 +104,26 @@ void Location::setIndex(const std::string &idx) { index = idx; }
 void Location::setAllowMethodsStr(const std::string &allow) { allowMethodsStr = allow; }
 void Location::setAutoindex(const std::string &autoidx) { autoindexStr = autoidx; }
 void Location::setAlias(const std::string &als) { alias = als; }
-void Location::setCgiPathStr(const std::string &paths) { this->cgiPathStr = paths; }
+void Location::setCgiEnabledStr(const std::string &cgiEnabled)
+{
+	this->cgiEnabledStr = cgiEnabled;
+}
+void Location::setCookieStr(const std::string &cookie) {this->isCookie = true ; this->cookiesStr = cookie; }
+bool Location::setCgiEnabled()
+{
+	if (this->cgiEnabledStr == "true")
+		isCgi = true;
+	else if (cgiEnabledStr == "false")
+		isCgi = false;
+	else if (!this->cgiEnabledStr.empty() && (this->cgiEnabledStr != "true" || this->cgiEnabledStr != "false"))
+	{
+		printLog("WARNING", "cgi_enabled\t\tis not defined correctly. Set to default " CHR_GREEN "false" RESET);
+		isCgi = false;
+	}
+	else if (this->cgiEnabledStr.empty())
+		isCgi = false;
+	return isCgi;
+}
 void Location::setCgiExtensionStr(const std::string &extensions) { this->cgiExtensionStr = extensions; }
 
 void Location::setAllowMethods(const std::string& methods)
@@ -132,17 +156,17 @@ void Location::setAllowMethods(const std::string& methods)
 		}
 	}
 }
-void Location ::setCgiPath(const std::string &paths)
-{
-	std::string line;
-	std::istringstream cgiPathStream(paths);
-	while (std::getline(cgiPathStream, line, ','))
-	{
-		if (line.length() == 0)
-			continue;
-		this->cgiPath.push_back(line);
-	}
-}
+// void Location ::setCgiPath(const std::string &paths)
+// {
+// 	std::string line;
+// 	std::istringstream cgiPathStream(paths);
+// 	while (std::getline(cgiPathStream, line, ','))
+// 	{
+// 		if (line.length() == 0)
+// 			continue;
+// 		this->cgiPath.push_back(line);
+// 	}
+// }
 
 void Location ::setCgiExtension(const std::string &extensions)
 {
@@ -207,24 +231,31 @@ void Location::print()
 	std::cout << "Allow Methods: " << allowMethodsStr << std::endl;
 	std::cout << "Autoindex: " << autoindex << std::endl;
 	std::cout << "Alias: " << alias << std::endl;
-	std::cout << "Cgi Path: " << cgiPathStr << std::endl;
+	// std::cout << "Cgi Path: " << cgiPathStr << std::endl;
 	std::cout << "Cgi Extension: " << cgiExtensionStr << std::endl;
 }
 
+void Location::setCookies(const std::string &cookie)
+{
+	std::string line;
+	std::istringstream cookieStream(cookie);
+	while (std::getline(cookieStream, line, ','))
+	{
+		if (line.length() == 0)
+			continue;
+		this->cookies.push_back(line);
+	}
+}
+
+
 void Location::checkVariables(bool serverAutoIndex)
 {
-	switch (Parser::checkLocationName(this->name))
+	Parser::checkLocationName(this->name);
+	if (this->setCgiEnabled())
 	{
-		case 2:
-			if (!Parser::checkCgiString(this->cgiPathStr, this->cgiExtensionStr))
-				exit(1);
-			this->setCgiPath(this->cgiPathStr);
-			this->setCgiExtension(this->cgiExtensionStr);
-			Parser::checkCgi(this->cgiPath, this->cgiExtension);
-			this->isCgi = true;
-			break ;
-		case 1:
-			break;
+		this->setCgiExtension(this->cgiExtensionStr);
+		if (!Parser::checkCgi(this->cgiExtensionStr))
+			exit(1);
 	}
 	
 	switch (Parser::checkRootAliasReturn(this->root, this->alias,this->return_))
@@ -271,6 +302,13 @@ void Location::checkVariables(bool serverAutoIndex)
 		this->isGetAllowed = true;
 	if (LocationType != RETURN)
 		Parser::checkIndex(this->getIndex(), this->getRoot());
+	if (this->isCookie && this->cookiesStr.empty())
+	{
+		printLog("WARNING", "cookie\t\t\tnot defined.");
+		this->isCookie = false;
+	}
+	else if (this->isCookie && !this->cookiesStr.empty())
+		this->setCookies(this->cookiesStr);
 	
 }
 
@@ -278,8 +316,4 @@ void Location::checkVariables(bool serverAutoIndex)
 	{
 		return this->cgiExtension;
 	}
-	
-	std::vector<std::string> Location::getCgiPath()
-	{
-		return this->cgiPath;
-	}
\ No newline at end of file
+	
\ No newline at end of file
diff --git a/mandatory/src/LocationParser.cpp b/mandatory/src/LocationParser.cpp
index d89ca91..d4840bc 100644
--- a/mandatory/src/LocationParser.cpp
+++ b/mandatory/src/LocationParser.cpp
@@ -72,16 +72,19 @@ int LocationParser::matchingLocation()
 		{
 			if (isAllowedMethod(locations[i]) == NOT_ALLOWED)
 				return NOT_ALLOWED;
+			
 			std::string rawPath = this->request.getPath();
 			this->isAutoIndex = locations[i]->getAutoIndex();
+			if ((this->isCookie = locations[i]->getIsCookie()) == true)
+				this->cookies = locations[i]->getCookies();
 			if (locations[i]->getIsCgi() == true)
 			{
 				std::string extension;
 				if (rawPath.rfind(".") != std::string::npos)
 					extension = rawPath.substr(rawPath.rfind(".") + 1, rawPath.size());
-
 				for (size_t y = 0; y < locations[i]->getCgiExtension().size(); y++)
 				{
+
 					if (locations[i]->getCgiExtension()[y] == extension)
 						this->isCGI = true;
 				}		
@@ -192,12 +195,28 @@ bool isMethodNotStandard(std::string method)
 	return false;
 }
 
+void LocationParser::setCookies()
+{
+	if (isCookie)
+	{
+		std::string setcookie;
+		std::vector<std::string> querylines = splitString(this->query, '&');
+		for (size_t i = 0; i < querylines.size(); i++)
+		{
+			std::vector<std::string> queryline = splitString(querylines[i], '=');
+			if (std::find(this->cookies.begin(), this->cookies.end(), queryline[0]) != this->cookies.end())
+				response.setCookie(queryline[0] + "=" + queryline[1] + "; path=/");
+		}	
+	}
+}
+
 void LocationParser::checks()
 {
 	std::string path;
 	if (this->request.getPath().find("?") != std::string::npos)
 	{
 		this->query = this->request.getPath().substr(this->request.getPath().find("?") + 1);
+		this->query = decodeURL(this->query);
 		this->request.setPath(this->request.getPath().substr(0, this->request.getPath().find("?")));
 	}
 	switch (this->matchingLocation())
@@ -218,7 +237,6 @@ void LocationParser::checks()
 	}
 
 	this->request.setPath(decodeURL(this->request.getPath()));
-	// std::cout << request.getPath() << std::endl;
 	if (isBadRequest(receiver->getRequest()))//|| isURIMalformed(this->request.getPath())
 	{
 		response.setStatus("400 Bad Request");
@@ -332,8 +350,12 @@ void LocationParser::checks()
 				{
 					std::cout << "filename: " << lines[i] << std::endl;
 					std::string filename = lines[i].substr(lines[i].find("filename=") + 10, lines[i].size());
+					std::string path = this->request.getPath();
 					filename = filename.substr(0, filename.find("\""));
-					std::string path = this->request.getPath() + "/" + filename;
+					if (path.find(filename) == std::string::npos)
+					{
+						path +=  "/" + filename;	
+					}
 					if (access(path.c_str(), F_OK) == 0)
 					{
 						response.setStatus("403 Forbidden");
@@ -349,8 +371,11 @@ void LocationParser::checks()
 		}
 		else if (receiver->getisform())
 		{
-			this->query = body;
-			response.setStatus("200 Created");
+			this->query = decodeURL(body);
+			std::cout << this->query << std::endl;
+
+			response.setStatus("201 Created");
+			throw CREATED_CODE;
 		}
 		response.setServer(server->getServerName());
 	}
@@ -359,7 +384,10 @@ void LocationParser::checks()
 		if (std::remove(this->request.getPath().c_str()) == 0)
 			response.setStatus("200 OK");
 		else
+		{
 			response.setStatus("404 Not Found");
+			throw NOT_FOUND_CODE;
+		}
 	}
 	else
 	{
diff --git a/mandatory/src/Parser.cpp b/mandatory/src/Parser.cpp
index 6f053d0..1dffdcf 100644
--- a/mandatory/src/Parser.cpp
+++ b/mandatory/src/Parser.cpp
@@ -304,11 +304,6 @@ int Parser::checkLocationName(std::string name)
 		printLog("ERROR", "location name\t\t\t\tmust start with /" );
 		exit(1);
 	}
-	std::string tmp;
-	tmp = name;
-	tmp.erase(std::remove(tmp.begin(), tmp.end(), '/'), tmp.end());
-	if (tmp == "cgi-bin")
-		return 2;
 	return 1;
 }
 
@@ -358,20 +353,9 @@ bool Parser::checkReturnIgnore(std::string allowMethods, std::string autoindex,
 	return true;
 }
 
-bool Parser::checkCgiString(std::string cgiPath, std::string cgiExtension)
+bool Parser::checkCgi(std::string cgiExtension)
 {
-	if (cgiPath.empty() && cgiExtension.empty())
-	{
-		printLog("ERROR", "cgi_path\t\t\tis not defined.");
-		printLog("ERROR", "cgi_extension\t\t\tis not defined.");
-		return false;
-	}
-	else if (cgiPath.empty())
-	{
-		printLog("ERROR", "cgi_path\t\t\tis not defined.");
-		return false;
-	}
-	else if (cgiExtension.empty())
+	if (cgiExtension.empty())
 	{
 		printLog("ERROR", "cgi_extension\t\t\tis not defined.");
 		return false;
@@ -380,39 +364,6 @@ bool Parser::checkCgiString(std::string cgiPath, std::string cgiExtension)
 	return true;
 }
 
-bool Parser::checkCgi(std::vector<std::string> paths, std::vector<std::string> extensions)
-{
-	if (paths.size() != extensions.size())
-	{
-		printLog("ERROR", "cgi_path and cgi_extension must have the same number of elements.");
-		return false;
-	}
-	for (size_t size = 0; size < paths.size(); size++)
-	{
-		switch (isFilePermissions(paths[size], X_OK))
-		{
-			case -2:
-				printLog("ERROR", "cgi_path\t\t<" + paths[size]  + ">\tempty path");
-				return false;
-			case -1:
-				printLog("ERROR", "cgi_path\t\t<" + paths[size] + ">\terror getting file metadata");
-				return false;
-			case -3:
-				printLog("ERROR", "cgi_path\t\t<" + paths[size] + ">\tnot a regular file");
-				return false;
-			case -4:
-				printLog("ERROR", "cgi_path\t\t<" + paths[size] + ">\tpermission denied");
-				return false;
-			case -5:
-				printLog("ERROR", "cgi_path\t\t<" + paths[size] + ">\tfile not found");
-				return false;
-			default:
-				break ;
-		}
-	}
-	return true;
-}
-
 bool Parser::checkAllowedMethods(std::string allowMethods)
 {
 	if (allowMethods.length() == 0)
diff --git a/mandatory/src/utils.cpp b/mandatory/src/utils.cpp
index e5e082c..8826a5a 100644
--- a/mandatory/src/utils.cpp
+++ b/mandatory/src/utils.cpp
@@ -86,7 +86,7 @@ size_t stringToSizeT(const std::string& str) {
 std::vector<std::string> splitString(const std::string& str, char delimiter) {
 	std::vector<std::string> result;
 	std::string token;
-	std::cout << "str: " << str << std::endl;
+	// std::cout << "str: " << str << std::endl;
 	std::istringstream tokenStream(str);
 
 	while (std::getline(tokenStream, token, delimiter)) {
diff --git a/www/web3/index6.html b/www/web3/index6.html
new file mode 100644
index 0000000..7fed569
--- /dev/null
+++ b/www/web3/index6.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>File Upload and Delete</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            margin: 0;
+            padding: 0;
+            background-color: #f0f0f0;
+        }
+        .container {
+            max-width: 600px;
+            margin: 50px auto;
+            padding: 20px;
+            background-color: #fff;
+            border-radius: 5px;
+            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+        }
+        h1 {
+            text-align: center;
+            margin-bottom: 20px;
+        }
+        form {
+            margin-bottom: 20px;
+        }
+        input[type="file"], input[type="text"] {
+            display: block;
+            margin-bottom: 10px;
+            width: 100%;
+            padding: 10px;
+            border: 1px solid #ccc;
+            border-radius: 3px;
+            box-sizing: border-box;
+        }
+        input[type="submit"], input[type="button"] {
+            display: block;
+            width: 100%;
+            padding: 10px;
+            background-color: #007bff;
+            color: #fff;
+            border: none;
+            border-radius: 3px;
+            cursor: pointer;
+            box-sizing: border-box;
+        }
+        input[type="submit"]:hover, input[type="button"]:hover {
+            background-color: #0056b3;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <h1>Upload File</h1>
+        <form id="uploadForm" action="/uploads" method="post" enctype="multipart/form-data">
+            <input type="file" name="file" id="fileInput" required>
+            <input type="submit" value="Upload File">
+        </form>
+
+        <h1>Delete File</h1>
+        <form id="deleteForm" action="/uploads/" method="post">
+            <label for="fileName">Enter File Name to Delete:</label>
+            <input type="text" name="fileName" id="fileName" placeholder="Enter file name..." required>
+            <input type="button" value="Delete File" onclick="deleteFile()">
+        </form>
+    </div>
+
+    <script>
+        // Function to submit the delete request
+        function deleteFile() {
+            const fileName = document.getElementById("fileName").value.trim();
+            if (!fileName) {
+                alert("Please enter a file name to delete.");
+                return;
+            }
+            if (!confirm(`Are you sure you want to delete ${fileName}?`)) {
+                return;
+            }
+            // Send DELETE request using fetch API
+            fetch(`/uploads/${fileName}`, {
+                method: "DELETE",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify({ fileName: fileName })
+            })
+            .then(response => {
+                if (response.ok) {
+                    alert("File deleted successfully.");
+                    // Optionally, update the UI or perform other actions after successful deletion
+                } else {
+                    alert("Failed to delete file.");
+                }
+            })
+            .catch(error => console.error("Error deleting file:", error));
+        }
+    </script>
+</body>
+</html>
diff --git a/www/web7/set-cookie.html b/www/web7/set-cookie.html
new file mode 100644
index 0000000..a48082e
--- /dev/null
+++ b/www/web7/set-cookie.html
@@ -0,0 +1,146 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Themed Form</title>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            margin: 0;
+            padding: 0;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+            transition: background-color 0.3s, color 0.3s;
+        }
+
+        .light-theme {
+            background-color: #ffffff;
+            color: #000000;
+        }
+
+        .dark-theme {
+            background-color: #2e2e2e;
+            color: #ffffff;
+        }
+
+        .form-container {
+            text-align: center;
+            padding: 20px;
+            border-radius: 8px;
+            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+        }
+
+        .form-group {
+            margin-bottom: 15px;
+        }
+
+        .form-group label {
+            display: block;
+            margin-bottom: 5px;
+        }
+
+        .form-group input {
+            padding: 8px;
+            width: 100%;
+            border: 1px solid #ccc;
+            border-radius: 4px;
+        }
+
+        .form-group input:focus {
+            border-color: #0066cc;
+        }
+
+        .theme-switcher {
+            margin-bottom: 15px;
+        }
+
+        .theme-switcher button {
+            background: none;
+            border: none;
+            cursor: pointer;
+            font-size: 24px;
+            margin: 0 10px;
+        }
+
+        .theme-switcher button:focus {
+            outline: none;
+        }
+
+        .theme-switcher .dark-icon {
+            display: none;
+        }
+
+        .dark-theme .theme-switcher .dark-icon {
+            display: inline;
+        }
+
+        .dark-theme .theme-switcher .light-icon {
+            display: none;
+        }
+    </style>
+</head>
+<body>
+    <div class="form-container">
+        <div class="theme-switcher">
+            <button type="button" onclick="setTheme('light')">
+                <i class="fa-solid fa-sun light-icon"></i>
+                <i class="fa-solid fa-moon dark-icon"></i>
+            </button>
+            <button type="button" onclick="setTheme('dark')">
+                <i class="fa-solid fa-moon light-icon"></i>
+                <i class="fa-solid fa-sun dark-icon"></i>
+            </button>
+        </div>
+        <h1>Enter your details</h1>
+        <form onsubmit="return checkForm()" action="/get-cookie/" method="POST">
+            <div class="form-group">
+                <label for="name">Name</label>
+                <input type="text" id="name" name="name" placeholder="Enter your name">
+            </div>
+            <div class="form-group">
+                <label for="lastname">Last Name</label>
+                <input type="text" id="lastname" name="lastname" placeholder="Enter your last name">
+            </div>
+            <input type="hidden" id="theme" name="theme" value="">
+            <button type="submit">Submit</button>
+        </form>
+    </div>
+
+    <script>
+        let theme = 'light'; // Default theme is light
+
+        // Apply the theme from previous session or default to light
+        if(localStorage.getItem('theme')) {
+            theme = localStorage.getItem('theme');
+        }
+        setTheme(theme);
+
+        function setTheme(newTheme) {
+            theme = newTheme;
+            document.body.classList.toggle('dark-theme', theme === 'dark');
+            document.body.classList.toggle('light-theme', theme === 'light');
+            localStorage.setItem('theme', theme);
+            document.getElementById('theme').value = theme;
+        }
+
+        function checkForm() {
+            const name = document.getElementById('name').value.trim();
+            const lastname = document.getElementById('lastname').value.trim();
+
+            if (!name) {
+                alert('Please enter your name.');
+                return false;
+            } else if (!lastname) {
+                alert('Please enter your last name.');
+                return false;
+            } else {
+                return true;
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/www/web7/set-cookie2.html b/www/web7/set-cookie2.html
new file mode 100644
index 0000000..402206d
--- /dev/null
+++ b/www/web7/set-cookie2.html
@@ -0,0 +1,154 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Themed Form</title>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            margin: 0;
+            padding: 0;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+            transition: background-color 0.3s, color 0.3s;
+        }
+
+        .light-theme {
+            background-color: #ffffff;
+            color: #000000;
+        }
+
+        .dark-theme {
+            background-color: #2e2e2e;
+            color: #ffffff;
+        }
+
+        .form-container {
+            text-align: center;
+            padding: 20px;
+            border-radius: 8px;
+            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+        }
+
+        .form-group {
+            margin-bottom: 15px;
+        }
+
+        .form-group label {
+            display: block;
+            margin-bottom: 5px;
+        }
+
+        .form-group input {
+            padding: 8px;
+            width: 100%;
+            border: 1px solid #ccc;
+            border-radius: 4px;
+        }
+
+        .form-group input:focus {
+            border-color: #0066cc;
+        }
+
+        .theme-switcher {
+            margin-bottom: 15px;
+        }
+
+        .theme-switcher button {
+            background: none;
+            border: none;
+            cursor: pointer;
+            font-size: 24px;
+            margin: 0 10px;
+        }
+
+        .theme-switcher button:focus {
+            outline: none;
+        }
+
+        .theme-switcher .dark-icon {
+            display: none;
+        }
+
+        .dark-theme .theme-switcher .dark-icon {
+            display: inline;
+        }
+
+        .dark-theme .theme-switcher .light-icon {
+            display: none;
+        }
+    </style>
+</head>
+<body>
+    <div class="form-container">
+        <div class="theme-switcher">
+            <button type="button" onclick="setTheme('light')">
+                <i class="fa-solid fa-sun light-icon"></i>
+                <i class="fa-solid fa-moon dark-icon"></i>
+            </button>
+            <button type="button" onclick="setTheme('dark')">
+                <i class="fa-solid fa-moon light-icon"></i>
+                <i class="fa-solid fa-sun dark-icon"></i>
+            </button>
+        </div>
+        <h1>Enter your details</h1>
+        <form id="detailsForm">
+            <div class="form-group">
+                <label for="name">Name</label>
+                <input type="text" id="name" name="name" placeholder="Enter your name">
+            </div>
+            <div class="form-group">
+                <label for="lastname">Last Name</label>
+                <input type="text" id="lastname" name="lastname" placeholder="Enter your last name">
+            </div>
+            <input type="hidden" id="theme" name="theme" value="">
+            <button type="button" onclick="submitForm()">Submit</button>
+        </form>
+    </div>
+
+    <script>
+        let theme = 'light'; // Default theme is light
+
+        // Apply the theme from previous session or default to light
+        if(localStorage.getItem('theme')) {
+            theme = localStorage.getItem('theme');
+        }
+        setTheme(theme);
+
+        function setTheme(newTheme) {
+            theme = newTheme;
+            document.body.classList.toggle('dark-theme', theme === 'dark');
+            document.body.classList.toggle('light-theme', theme === 'light');
+            localStorage.setItem('theme', theme);
+            document.getElementById('theme').value = theme;
+        }
+
+        function submitForm() {
+            const name = document.getElementById('name').value.trim();
+            const lastname = document.getElementById('lastname').value.trim();
+
+            if (!name) {
+                alert('Please enter your name.');
+                return;
+            } else if (!lastname) {
+                alert('Please enter your last name.');
+                return;
+            }
+
+            // Construct URL with form data and theme
+            const url = '/get-cookie/?' + new URLSearchParams({
+                name: name,
+                lastname: lastname,
+                theme: theme
+            });
+
+            // Redirect to the constructed URL
+            window.location.href = url;
+        }
+    </script>
+</body>
+</html>
diff --git a/www/web7/test.html b/www/web7/test.html
new file mode 100644
index 0000000..c617ef7
--- /dev/null
+++ b/www/web7/test.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Set Cookie Example</title>
+</head>
+<body>
+    <h2>Set Cookie Example</h2>
+    <form id="setCookieForm">
+        <label for="attribute">Attribute:</label>
+        <input type="text" id="attribute" name="Attribute" required>
+        <br><br>
+        <label for="value">Value:</label>
+        <input type="text" id="value" name="value" required>
+        <br><br>
+        <button type="submit">Set Cookie</button>
+    </form>
+
+    <script>
+        document.getElementById('setCookieForm').addEventListener('submit', function(event) {
+            event.preventDefault(); // Prevent form submission
+            
+            const attribute = document.getElementById('attribute').value;
+            const value = document.getElementById('value').value;
+
+            // Construct the URL for the GET request
+            const url = `/set-cookie/?Attribute=${encodeURIComponent(attribute)}&value=${encodeURIComponent(value)}`;
+
+            // Redirect to the URL
+            window.location.href = url;
+        });
+    </script>
+</body>
+</html>
diff --git a/www/web7/welcome.html b/www/web7/welcome.html
new file mode 100644
index 0000000..7925a54
--- /dev/null
+++ b/www/web7/welcome.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Welcome Back!</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            margin: 0;
+            padding: 0;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+            background-color: #f0f0f0;
+            color: #333333;
+        }
+
+        .light-theme {
+            background-color: #ffffff;
+            color: #000000;
+        }
+
+        .dark-theme {
+            background-color: #2e2e2e;
+            color: #ffffff;
+        }
+
+        .content {
+            text-align: center;
+            padding: 20px;
+            border-radius: 8px;
+            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+        }
+    </style>
+</head>
+<body>
+    <div class="content">
+        <h1>Welcome Back, <span id="name"></span> <span id="lastname"></span>!</h1>
+        <p>You are using the <span id="theme"></span> theme.</p>
+    </div>
+
+    <script>
+        // Function to retrieve the value of a cookie by name
+        function getCookie(name) {
+            const value = `; ${document.cookie}`;
+            const parts = value.split(`; ${name}=`);
+            if (parts.length === 2) return parts.pop().split(';').shift();
+        }
+
+        // Example usage
+        document.addEventListener('DOMContentLoaded', function() {
+            // Retrieve cookie values
+            const name = getCookie('name');
+            const lastname = getCookie('lastname');
+            const theme = getCookie('theme');
+
+            // Default user data if cookies are not set
+            const userData = {
+                Name: name || 'Guest',
+                Lastname: lastname || '',
+                Theme: theme || 'light'
+            };
+
+            // Apply the theme
+            document.body.classList.add(userData.Theme === 'dark' ? 'dark-theme' : 'light-theme');
+
+            // Replace placeholders with actual user data
+            document.getElementById('name').textContent = userData.Name;
+            document.getElementById('lastname').textContent = userData.Lastname;
+            document.getElementById('theme').textContent = userData.Theme;
+        });
+    </script>
+</body>
+</html>

From 4f781bd6f4d3203f614a837dfd40fb506ada5797 Mon Sep 17 00:00:00 2001
From: josephcheel <josephcheelnakashima@gmail.com>
Date: Thu, 27 Jun 2024 13:41:45 +0200
Subject: [PATCH 02/31] Added check for path for alias too

---
 mandatory/src/Location.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mandatory/src/Location.cpp b/mandatory/src/Location.cpp
index 46f58d4..3ce1d2c 100644
--- a/mandatory/src/Location.cpp
+++ b/mandatory/src/Location.cpp
@@ -6,7 +6,7 @@
 /*   By: jcheel-n <jcheel-n@student.42barcelona.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/29 17:38:18 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/27 01:38:11 by jcheel-n         ###   ########.fr       */
+/*   Updated: 2024/06/27 13:39:19 by jcheel-n         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -300,8 +300,11 @@ void Location::checkVariables(bool serverAutoIndex)
 	this->setAllowMethods(this->allowMethodsStr);
 	if (!Parser::checkAllowedMethods(this->allowMethodsStr))
 		this->isGetAllowed = true;
-	if (LocationType != RETURN)
-		Parser::checkIndex(this->getIndex(), this->getRoot());
+	if (LocationType == ROOT)
+		Parser::checkIndex(this->getIndex(), this->getRoot() + "/" + this->getName());
+	else if (LocationType == ALIAS)
+		Parser::checkIndex(this->getIndex(), this->getAlias());
+
 	if (this->isCookie && this->cookiesStr.empty())
 	{
 		printLog("WARNING", "cookie\t\t\tnot defined.");

From ba7b327803c3e6c7452b70846d281d5cc7c87bde Mon Sep 17 00:00:00 2001
From: josephcheel <josephcheelnakashima@gmail.com>
Date: Thu, 27 Jun 2024 13:46:35 +0200
Subject: [PATCH 03/31] normalized multilple //

---
 mandatory/src/LocationParser.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mandatory/src/LocationParser.cpp b/mandatory/src/LocationParser.cpp
index d4840bc..80da4b3 100644
--- a/mandatory/src/LocationParser.cpp
+++ b/mandatory/src/LocationParser.cpp
@@ -237,6 +237,9 @@ void LocationParser::checks()
 	}
 
 	this->request.setPath(decodeURL(this->request.getPath()));
+	ExtendedString tmp = this->request.getPath();
+	tmp.replaceFirstString("//", "/");
+	this->request.setPath(tmp);
 	if (isBadRequest(receiver->getRequest()))//|| isURIMalformed(this->request.getPath())
 	{
 		response.setStatus("400 Bad Request");
@@ -348,7 +351,6 @@ void LocationParser::checks()
 			{
 				if (lines[i].find("filename=") != std::string::npos)
 				{
-					std::cout << "filename: " << lines[i] << std::endl;
 					std::string filename = lines[i].substr(lines[i].find("filename=") + 10, lines[i].size());
 					std::string path = this->request.getPath();
 					filename = filename.substr(0, filename.find("\""));

From ddfa60dd1294b64c8491b6c6e2f3678f8d020e88 Mon Sep 17 00:00:00 2001
From: josephcheel <josephcheelnakashima@gmail.com>
Date: Thu, 27 Jun 2024 23:53:22 +0200
Subject: [PATCH 04/31] added hash function to cookie management

---
 conf/eval.conf          | 26 ++++----------------------
 mandatory/src/utils.cpp | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/conf/eval.conf b/conf/eval.conf
index dec4347..d92afb8 100644
--- a/conf/eval.conf
+++ b/conf/eval.conf
@@ -11,7 +11,7 @@ server:{
 */ 
 server:{
 				
-	port:8080:8084;                			# listening port, mandatory parameter
+	port:8080, 8081;                			# listening port, mandatory parameter
 	host:0.0.0.0;                     # host or 127.0.0.1 by default
 	server_name:example.com;                   # specify server_name, need to be added into /etc/hosts to work
 	error_page:./www/errors;    			    # default error page
@@ -19,11 +19,6 @@ server:{
 	root:./www/web1;              # root folder of site directory, full or relative path, mandatory parameter
 	index:index.html;                   # default page when requesting a directory, index.html by default
 	autoindex: on;
-#   location:{                   
-#       name:/;
-#      root:./www/web1;              # root folder of site directory, full or relative path, mandatory parameter
-# 	 index:index.html;                   # default page when requesting a directory, index.html by default
-#   }
   location:{                   
       name:/redirect;
       return:https://www.42barcelona.com/;         # redirection
@@ -46,8 +41,8 @@ server:{
   }
   location:{                   
 	  name:/cgi-bin;
-	  cgi_enabled: trusde; 
-	  alias:./www/web4;  
+	  cgi_enabled: true; 
+	  alias:./www/web6;  
 	  allow_methods: GET, POST, DELETE;
 	  autoindex:on;
 	  cgi_extension:cgi, py, sh;
@@ -66,21 +61,10 @@ server:{
   }
   location:{
 	  name:/set-cookie/;
-	#   set-cookie:id, name, lastname;
-
 	  alias:./www/web7;
-	  index:set-cookie.html;
+	  index:set-cookie2.html;
 	  allow_methods: GET, POST;
 	  autoindex:on;
-  }
-  location:{
-	  name:/post-cookie/;
-	  allow_methods: GET, POST;
-	  set-cookie:id, name, lastname, theme;
-	  alias:./www/web7;
-	  index:welcome.html;
-	#   index:cookie_get.html;
-	  autoindex:off;
   }
    location:{
 	  name:/get-cookie/;
@@ -88,13 +72,11 @@ server:{
 	  alias:./www/web7;
 	  index:welcome.html;
 	  allow_methods: GET, POST;
-	#   autoindex:on;
   }
   location:{
 	  name:/cookie/;
 	  alias:./www/web7;
 	  allow_methods: GET, POST;
-	#   index:welcome.html;
 	  autoindex:on;
   }
 };
diff --git a/mandatory/src/utils.cpp b/mandatory/src/utils.cpp
index 8826a5a..9c2eea7 100644
--- a/mandatory/src/utils.cpp
+++ b/mandatory/src/utils.cpp
@@ -198,3 +198,17 @@ void replaceFirstString(std::string& mainString, const std::string& searchString
 		pos += replaceString.length();
 	}
 }
+
+std::string getRandomHash(int lenght)
+{
+	std::string characters = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+	std::string hash;
+	int x;
+    std::srand(static_cast<unsigned>(std::time(0)) ^ reinterpret_cast<unsigned long>(&x));
+
+	// std::srand(static_cast<unsigned>(std::time(0)) ^ static_cast<unsigned>(getpid()));
+	for (int i = 0 ; i < lenght; i++)
+		hash += characters[rand() % characters.size()];
+	return hash;
+}
\ No newline at end of file

From 05152f2ee2c645d330cc79e3ba0f3f07cf6edec7 Mon Sep 17 00:00:00 2001
From: josephcheel <josephcheelnakashima@gmail.com>
Date: Fri, 28 Jun 2024 00:00:04 +0200
Subject: [PATCH 05/31] set-cookie corrected html file

---
 conf/eval.conf            |   2 +-
 www/web7/set-cookie3.html | 170 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 171 insertions(+), 1 deletion(-)
 create mode 100644 www/web7/set-cookie3.html

diff --git a/conf/eval.conf b/conf/eval.conf
index d92afb8..14e5e80 100644
--- a/conf/eval.conf
+++ b/conf/eval.conf
@@ -62,7 +62,7 @@ server:{
   location:{
 	  name:/set-cookie/;
 	  alias:./www/web7;
-	  index:set-cookie2.html;
+	  index:set-cookie3.html;
 	  allow_methods: GET, POST;
 	  autoindex:on;
   }
diff --git a/www/web7/set-cookie3.html b/www/web7/set-cookie3.html
new file mode 100644
index 0000000..604bc7e
--- /dev/null
+++ b/www/web7/set-cookie3.html
@@ -0,0 +1,170 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Themed Form</title>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            margin: 0;
+            padding: 0;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+            transition: background-color 0.3s, color 0.3s;
+        }
+
+        .light-theme {
+            background-color: #ffffff;
+            color: #000000;
+        }
+
+        .dark-theme {
+            background-color: #2e2e2e;
+            color: #ffffff;
+        }
+
+        .form-container {
+            text-align: center;
+            padding: 20px;
+            border-radius: 8px;
+            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+        }
+
+        .form-group {
+            margin-bottom: 15px;
+        }
+
+        .form-group label {
+            display: block;
+            margin-bottom: 5px;
+        }
+
+        .form-group input {
+            padding: 8px;
+            width: 100%;
+            border: 1px solid #ccc;
+            border-radius: 4px;
+            box-sizing: border-box;
+        }
+
+        .form-group input:focus {
+            border-color: #0066cc;
+        }
+
+        .theme-switcher {
+            margin-bottom: 15px;
+            opacity: 0.5; /* Make the theme switcher more faded */
+            display: flex;
+            justify-content: center;
+            gap: 10px;
+        }
+
+        .theme-switcher button {
+            background: none;
+            border: none;
+            cursor: pointer;
+            font-size: 24px;
+            opacity: 1; /* Ensure icons are fully visible despite the faded container */
+        }
+
+        .theme-switcher button:focus {
+            outline: none;
+        }
+
+        .theme-switcher .light-icon,
+        .theme-switcher .dark-icon {
+            display: inline-block;
+        }
+
+        .dark-theme .theme-switcher .light-icon {
+            opacity: 0.5;
+        }
+
+        .dark-theme .theme-switcher .dark-icon {
+            opacity: 1;
+        }
+
+        .light-theme .theme-switcher .light-icon {
+            opacity: 1;
+        }
+
+        .light-theme .theme-switcher .dark-icon {
+            opacity: 0.5;
+        }
+    </style>
+</head>
+<body>
+    <div class="form-container">
+        <div class="theme-switcher">
+            <button type="button" onclick="setTheme('light')">
+                <i class="fa-solid fa-sun light-icon"></i>
+            </button>
+            <button type="button" onclick="setTheme('dark')">
+                <i class="fa-solid fa-moon dark-icon"></i>
+            </button>
+        </div>
+        <h1>Enter your details</h1>
+        <form id="detailsForm">
+            <div class="form-group">
+                <label for="name">Name</label>
+                <input type="text" id="name" name="name" placeholder="Enter your name">
+            </div>
+            <div class="form-group">
+                <label for="lastname">Last Name</label>
+                <input type="text" id="lastname" name="lastname" placeholder="Enter your last name">
+            </div>
+            <input type="hidden" id="theme" name="theme" value="">
+            <button type="button" onclick="submitForm()">Submit</button>
+        </form>
+    </div>
+
+    <script>
+        let theme = 'light'; // Default theme is light
+
+        // Apply the theme from previous session or default to light
+        if(localStorage.getItem('theme')) {
+            theme = localStorage.getItem('theme');
+        }
+        setTheme(theme);
+
+        function setTheme(newTheme) {
+            theme = newTheme;
+            document.body.classList.toggle('dark-theme', theme === 'dark');
+            document.body.classList.toggle('light-theme', theme === 'light');
+            localStorage.setItem('theme', theme);
+            document.getElementById('theme').value = theme;
+
+            // Update icons visibility based on the theme
+            document.querySelector('.light-icon').style.opacity = (theme === 'light') ? '1' : '0.5';
+            document.querySelector('.dark-icon').style.opacity = (theme === 'dark') ? '1' : '0.5';
+        }
+
+        function submitForm() {
+            const name = document.getElementById('name').value.trim();
+            const lastname = document.getElementById('lastname').value.trim();
+
+            if (!name) {
+                alert('Please enter your name.');
+                return;
+            } else if (!lastname) {
+                alert('Please enter your last name.');
+                return;
+            }
+
+            // Construct URL with form data and theme
+            const url = '/get-cookie/?' + new URLSearchParams({
+                name: name,
+                lastname: lastname,
+                theme: theme
+            });
+
+            // Redirect to the constructed URL
+            window.location.href = url;
+        }
+    </script>
+</body>
+</html>

From 17b5f2757652ef1d89bab1d4d941ca32c47e280e Mon Sep 17 00:00:00 2001
From: Joseph Cheel nakashima <jcheel-n@car3s2.42barcelona.com>
Date: Sat, 29 Jun 2024 12:30:04 +0200
Subject: [PATCH 06/31] now error pages are shwn

---
 mandatory/src/ListeningSocket.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mandatory/src/ListeningSocket.cpp b/mandatory/src/ListeningSocket.cpp
index 162e04a..bfd2934 100644
--- a/mandatory/src/ListeningSocket.cpp
+++ b/mandatory/src/ListeningSocket.cpp
@@ -170,10 +170,13 @@ void ListeningSocket::loadRequest(std::vector<Server *> servers)
 	catch (int e)
 	{
 		this->getFileContentForStatusCode(e);
+	
 	}
 	Parser.setCookies();
 	this->request = Parser.getRequest();
 	this->response = Parser.getResponse();
+	if (this->getCode() >= 400)
+		return ;
 	this->setIsAutoIndex(Parser.getIsAutoIndex());
 	this->setIsCGI(Parser.getIsCGI());
 

From db7a19cd642a8ac96d2a1d677d68302e61cbbf27 Mon Sep 17 00:00:00 2001
From: "ernesto.avedillo" <eavedillo@yahoo.es>
Date: Sat, 29 Jun 2024 12:33:26 +0200
Subject: [PATCH 07/31] Templates only in one folder

---
 {StatusCodes => Templates}/ErrorTemplate.html | 0
 {Master => Templates}/dir_list.html           | 0
 mandatory/inc/ListDir.hpp                     | 5 +++--
 mandatory/inc/StatusCodesDefinition.hpp       | 2 +-
 mandatory/src/ListDir.cpp                     | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename {StatusCodes => Templates}/ErrorTemplate.html (100%)
 rename {Master => Templates}/dir_list.html (100%)

diff --git a/StatusCodes/ErrorTemplate.html b/Templates/ErrorTemplate.html
similarity index 100%
rename from StatusCodes/ErrorTemplate.html
rename to Templates/ErrorTemplate.html
diff --git a/Master/dir_list.html b/Templates/dir_list.html
similarity index 100%
rename from Master/dir_list.html
rename to Templates/dir_list.html
diff --git a/mandatory/inc/ListDir.hpp b/mandatory/inc/ListDir.hpp
index 0811886..b5f6bbf 100644
--- a/mandatory/inc/ListDir.hpp
+++ b/mandatory/inc/ListDir.hpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   ListDir.hpp                                        :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/07 19:03:57 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/21 14:35:44 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/29 12:32:21 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,6 +20,7 @@
 #include "Attributes.hpp"
 #include "utils.hpp"
 #include "colors.h"
+#define TEMPLATE_LIST_DIR "./Template/dir_list.html"
 class ListDir
 {
     private:
diff --git a/mandatory/inc/StatusCodesDefinition.hpp b/mandatory/inc/StatusCodesDefinition.hpp
index 73681e3..0cc0ccb 100644
--- a/mandatory/inc/StatusCodesDefinition.hpp
+++ b/mandatory/inc/StatusCodesDefinition.hpp
@@ -1,4 +1,4 @@
-#define DEFAULT_ERROR_FILE "./StatusCodes/ErrorTemplate.html"
+#define DEFAULT_ERROR_FILE "./Template/ErrorTemplate.html"
 #define CONTINUE_CODE 100
 #define SWITCHING_PROTOCOLS_CODE 101
 #define OK_CODE 200
diff --git a/mandatory/src/ListDir.cpp b/mandatory/src/ListDir.cpp
index 0195795..1f609c5 100644
--- a/mandatory/src/ListDir.cpp
+++ b/mandatory/src/ListDir.cpp
@@ -116,7 +116,7 @@ bool ListDir::getIsSendComlete()
 
 void ListDir::openMasterListFile() 
 {
-	std::string filename = "./Master/dir_list.html";
+	std::string filename = TEMPLATE_LIST_DIR;
 	file.open(filename.c_str(), std::ios::out | std::ios::binary);
 }
 

From 51c12b0a7d9a2060b523078cc9f13e25bab16c46 Mon Sep 17 00:00:00 2001
From: "ernesto.avedillo" <eavedillo@yahoo.es>
Date: Sat, 29 Jun 2024 12:33:51 +0200
Subject: [PATCH 08/31] Return when error detedted

---
 conf/eval.conf                    | 1 +
 mandatory/src/ListeningSocket.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/conf/eval.conf b/conf/eval.conf
index 14e5e80..7b77f8d 100644
--- a/conf/eval.conf
+++ b/conf/eval.conf
@@ -69,6 +69,7 @@ server:{
    location:{
 	  name:/get-cookie/;
 	  set-cookie:id, name, lastname, theme;
+	  set-id: true;
 	  alias:./www/web7;
 	  index:welcome.html;
 	  allow_methods: GET, POST;
diff --git a/mandatory/src/ListeningSocket.cpp b/mandatory/src/ListeningSocket.cpp
index 162e04a..905a421 100644
--- a/mandatory/src/ListeningSocket.cpp
+++ b/mandatory/src/ListeningSocket.cpp
@@ -170,6 +170,7 @@ void ListeningSocket::loadRequest(std::vector<Server *> servers)
 	catch (int e)
 	{
 		this->getFileContentForStatusCode(e);
+		return ;
 	}
 	Parser.setCookies();
 	this->request = Parser.getRequest();

From 57e9e45b7910198764ff09eed0afe2a189e82445 Mon Sep 17 00:00:00 2001
From: Joseph Cheel nakashima <jcheel-n@car3s2.42barcelona.com>
Date: Sat, 29 Jun 2024 12:38:16 +0200
Subject: [PATCH 09/31] now seems to work, error codes pages

---
 mandatory/src/ListeningSocket.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mandatory/src/ListeningSocket.cpp b/mandatory/src/ListeningSocket.cpp
index bfd2934..817d9ee 100644
--- a/mandatory/src/ListeningSocket.cpp
+++ b/mandatory/src/ListeningSocket.cpp
@@ -170,13 +170,13 @@ void ListeningSocket::loadRequest(std::vector<Server *> servers)
 	catch (int e)
 	{
 		this->getFileContentForStatusCode(e);
-	
+		this->request = Parser.getRequest();
+		this->response = Parser.getResponse();
+		return ;
 	}
 	Parser.setCookies();
 	this->request = Parser.getRequest();
 	this->response = Parser.getResponse();
-	if (this->getCode() >= 400)
-		return ;
 	this->setIsAutoIndex(Parser.getIsAutoIndex());
 	this->setIsCGI(Parser.getIsCGI());
 

From 978e8848cc6f00f87681c8711bccbdaaa61f7b9f Mon Sep 17 00:00:00 2001
From: Joseph Cheel nakashima <jcheel-n@car3s2.42barcelona.com>
Date: Sat, 29 Jun 2024 12:41:53 +0200
Subject: [PATCH 10/31] solved wrong path for template statuscodes

---
 mandatory/inc/StatusCodesDefinition.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mandatory/inc/StatusCodesDefinition.hpp b/mandatory/inc/StatusCodesDefinition.hpp
index 0cc0ccb..149cbd9 100644
--- a/mandatory/inc/StatusCodesDefinition.hpp
+++ b/mandatory/inc/StatusCodesDefinition.hpp
@@ -1,4 +1,4 @@
-#define DEFAULT_ERROR_FILE "./Template/ErrorTemplate.html"
+#define DEFAULT_ERROR_FILE "./Templates/ErrorTemplate.html"
 #define CONTINUE_CODE 100
 #define SWITCHING_PROTOCOLS_CODE 101
 #define OK_CODE 200

From b1f90cc0db97547e0d584b5f1a259355d813eeec Mon Sep 17 00:00:00 2001
From: Joseph Cheel nakashima <jcheel-n@car3s2.42barcelona.com>
Date: Sat, 29 Jun 2024 12:53:13 +0200
Subject: [PATCH 11/31] Wrong listDir path solved

---
 mandatory/inc/ListDir.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mandatory/inc/ListDir.hpp b/mandatory/inc/ListDir.hpp
index b5f6bbf..964c3be 100644
--- a/mandatory/inc/ListDir.hpp
+++ b/mandatory/inc/ListDir.hpp
@@ -20,7 +20,7 @@
 #include "Attributes.hpp"
 #include "utils.hpp"
 #include "colors.h"
-#define TEMPLATE_LIST_DIR "./Template/dir_list.html"
+#define TEMPLATE_LIST_DIR "./Templates/dir_list.html"
 class ListDir
 {
     private:

From 2ccca8fabfccbf91086f30f791001672e2ea3d51 Mon Sep 17 00:00:00 2001
From: "ernesto.avedillo" <eavedillo@yahoo.es>
Date: Sat, 29 Jun 2024 13:34:01 +0200
Subject: [PATCH 12/31] correct error 500 in CGI

---
 conf/simple.conf      | 2 +-
 mandatory/src/CGI.cpp | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/conf/simple.conf b/conf/simple.conf
index b412eff..2e7d479 100644
--- a/conf/simple.conf
+++ b/conf/simple.conf
@@ -67,7 +67,7 @@ server:{
 	  alias:./www/web4;  
 	  allow_methods: GET, POST, DELETE;
 	  autoindex:on;
-	  cgi_path:/bin/sh;
+	  cgi_enabled: true;
 	  cgi_extension:cgi;
   }
 };
diff --git a/mandatory/src/CGI.cpp b/mandatory/src/CGI.cpp
index d48ba56..611e661 100644
--- a/mandatory/src/CGI.cpp
+++ b/mandatory/src/CGI.cpp
@@ -120,7 +120,6 @@ std::string CGI::execute()
 	signal(SIGALRM, &CGI::alarm_handler);
 	int fd[2], tmp_fd;
 	tmp_fd = dup(STDOUT_FILENO);
-	std::cout << "Executable: " << Executable << std::endl;
 	std::vector<char*> ExecArray;
 	ExecArray.push_back(const_cast<char *>(Executable.c_str()));
 	std::vector<ExtendedString>::iterator itb = args.begin();
@@ -149,7 +148,7 @@ std::string CGI::execute()
 		{
 			// Handle error executing file
 			std::cerr << "Error executing file " << Executable << "  with errno " << errno << std::endl;
-			exit(EXIT_FAILURE);
+			exit(errno);
 		}
 	} 
 	// Parent process
@@ -171,9 +170,10 @@ std::string CGI::execute()
 	// }
 	// else 
 	// {
-		if (WIFEXITED(status)) 
+		if (WIFEXITED(status) && WEXITSTATUS(status) == 0) 
 		{
 			// Read the output from the file descriptor
+			std::cerr << "Error executing file 3 " << Executable << "  with errno " << WIFEXITED(status) << std::endl;
 			char buffer[1024];
 			ssize_t bytesRead;
 			while ((bytesRead = read(fd[0], buffer, sizeof(buffer))) > 0) {
@@ -183,7 +183,10 @@ std::string CGI::execute()
 			fd[1] = tmp_fd;
 		}
 		else
+		{
+			std::cerr << "Error executing file 2 " << Executable << "  with errno " << WIFEXITED(status) << std::endl;
 			throw INTERNAL_SERVER_ERROR_CODE;
+		}
 	// }
 		return output;
 }

From 08ccd8ee3eb29faf75a93b3b978203a8455d9b4b Mon Sep 17 00:00:00 2001
From: "ernesto.avedillo" <eavedillo@yahoo.es>
Date: Sat, 29 Jun 2024 13:35:29 +0200
Subject: [PATCH 13/31] add env in CGI header

---
 mandatory/inc/CGI.hpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mandatory/inc/CGI.hpp b/mandatory/inc/CGI.hpp
index 7ea9076..db7d92c 100644
--- a/mandatory/inc/CGI.hpp
+++ b/mandatory/inc/CGI.hpp
@@ -19,6 +19,7 @@ class CGI
 		std::string CGIFolder;
 		std::string fileName;
 		std::string fileArgs;
+		char **env;
 		bool isCGI;
 		std::vector <ExtendedString> args;
 		std::map<std::string, std::string> CGIExtensions;
@@ -38,6 +39,7 @@ class CGI
 		//bool setIsCGI(const std::string &str);
 		void setArgs(const std::string &);
 		void setCGIMapExtensions(std::string const &cgi_extension);
+		void setEnv(char **);
 		//getters
 		std::string getFileName();
 		std::string getCGIFolder();
@@ -45,6 +47,7 @@ class CGI
 		std::string getCGIExtension(const std::string &);
 		std::string getFileExtension();
 		std::map<std::string, std::string>::iterator findCGIExtension(const std::string &);
+		char **getEnv();
 		//------ OTHER Methods ------//
 		std::string execute();
 		CGI *clone();

From 571b138328c542f070a641b4d85032849a52fbd5 Mon Sep 17 00:00:00 2001
From: "ernesto.avedillo" <eavedillo@yahoo.es>
Date: Sat, 29 Jun 2024 16:31:31 +0200
Subject: [PATCH 14/31] Remove comments

---
 mandatory/src/CGI.cpp |  45 ++++++++++++++----------------------------
 www/web4/cgi/test.cgi | Bin 17096 -> 17400 bytes
 www/web4/cgi/test.cpp |  18 ++++++++++++++++-
 3 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/mandatory/src/CGI.cpp b/mandatory/src/CGI.cpp
index 611e661..0e1b45b 100644
--- a/mandatory/src/CGI.cpp
+++ b/mandatory/src/CGI.cpp
@@ -147,48 +147,33 @@ std::string CGI::execute()
 		if (execve(Executable.c_str(), ExecArray.data(), NULL) == -1)
 		{
 			// Handle error executing file
-			std::cerr << "Error executing file " << Executable << "  with errno " << errno << std::endl;
 			exit(errno);
 		}
 	} 
 	// Parent process
 	close(fd[1]);
-	// Wait for the child process to finish
 	CGI::ChildPID = pid;
 	alarm(timeout);
 	int status;
-	// pid_t result = waitpid(pid, &status, 0);
 	waitpid(pid, &status, 0);
 
 	std::string output;
-	// Check if the child process exited normally
-	// std::cout << "Result: " << static_cast <int> (result) << "errno "<< EINTR << "vs" << errno << std::endl;
-	// if (result == -1 && errno == EINTR) 
-	// {
-	// 	kill(pid, SIGKILL);
-	// 	throw GATEWAY_TIME_OUT_CODE;
-	// }
-	// else 
-	// {
-		if (WIFEXITED(status) && WEXITSTATUS(status) == 0) 
-		{
-			// Read the output from the file descriptor
-			std::cerr << "Error executing file 3 " << Executable << "  with errno " << WIFEXITED(status) << std::endl;
-			char buffer[1024];
-			ssize_t bytesRead;
-			while ((bytesRead = read(fd[0], buffer, sizeof(buffer))) > 0) {
-				output += std::string(buffer, bytesRead);
-			}
-			close(fd[0]);
-			fd[1] = tmp_fd;
-		}
-		else
-		{
-			std::cerr << "Error executing file 2 " << Executable << "  with errno " << WIFEXITED(status) << std::endl;
-			throw INTERNAL_SERVER_ERROR_CODE;
+	if (WIFEXITED(status) && WEXITSTATUS(status) == 0) 
+	{
+		// Read the output from the file descriptor
+		char buffer[1024];
+		ssize_t bytesRead;
+		while ((bytesRead = read(fd[0], buffer, sizeof(buffer))) > 0) {
+			output += std::string(buffer, bytesRead);
 		}
-	// }
-		return output;
+		close(fd[0]);
+		fd[1] = tmp_fd;
+	}
+	else
+	{
+		throw INTERNAL_SERVER_ERROR_CODE;
+	}
+	return output;
 }
 
 void CGI::setCGIMapExtensions(std::string const &cgi_extension)
diff --git a/www/web4/cgi/test.cgi b/www/web4/cgi/test.cgi
index 29f5a9843928fb34a4a47af028ecb45b449bf7a4..be7201cca025640cc65bebc5e996f30b06130772 100755
GIT binary patch
delta 4281
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
NI#0MWC73-w<9`*$Tf+bV

delta 3578
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

diff --git a/www/web4/cgi/test.cpp b/www/web4/cgi/test.cpp
index d0728f3..f47ee7e 100644
--- a/www/web4/cgi/test.cpp
+++ b/www/web4/cgi/test.cpp
@@ -27,7 +27,23 @@ int main(int av, char **ac)
 
 	for (int i = 1; i < av; i++)
 	{
-		cout << "<tr><td>" << "Argumento de entrada N." << i << "= " << ac[i] << "</td></tr>\n";
+		cout << "<tr><td>" << "Argumento de entrada Nº" << i << "= " << ac[i] << "</td></tr>\n";
+	}
+	for (int i = 0; i < 24; i++)
+	{
+		cout << "<tr><td>" << ENV[i] << "</td><td>";
+
+		// attempt to retrieve value of environment variable
+		char *value = getenv(ENV[i].c_str());
+		if (value != 0)
+		{
+			cout << value;
+		}
+		else
+		{
+			cout << "Environment variable does not exist.";
+		}
+		cout << "</td></tr>\n";
 	}
 
 	cout << "</table><\n";

From 465b35997bd6dd43e73a6a3cb70362a5ee35f03e Mon Sep 17 00:00:00 2001
From: "ernesto.avedillo" <eavedillo@yahoo.es>
Date: Sat, 29 Jun 2024 16:45:19 +0200
Subject: [PATCH 15/31] implement environment variables

---
 mandatory/inc/CGI.hpp         |  5 ++--
 mandatory/inc/Environment.hpp | 31 +++++++++++++++++++++++
 mandatory/src/CGI.cpp         |  2 +-
 mandatory/src/Environment.cpp | 47 +++++++++++++++++++++++++++++++++++
 4 files changed, 81 insertions(+), 4 deletions(-)
 create mode 100644 mandatory/inc/Environment.hpp
 create mode 100644 mandatory/src/Environment.cpp

diff --git a/mandatory/inc/CGI.hpp b/mandatory/inc/CGI.hpp
index db7d92c..539bae8 100644
--- a/mandatory/inc/CGI.hpp
+++ b/mandatory/inc/CGI.hpp
@@ -12,8 +12,9 @@
 #include "StatusCodesDefinition.hpp"
 #include <signal.h>
 #include "ExtendedString.hpp"
+#include "Environment.hpp"
 
-class CGI
+class CGI : public Environment
 {
 	private:
 		std::string CGIFolder;
@@ -39,7 +40,6 @@ class CGI
 		//bool setIsCGI(const std::string &str);
 		void setArgs(const std::string &);
 		void setCGIMapExtensions(std::string const &cgi_extension);
-		void setEnv(char **);
 		//getters
 		std::string getFileName();
 		std::string getCGIFolder();
@@ -47,7 +47,6 @@ class CGI
 		std::string getCGIExtension(const std::string &);
 		std::string getFileExtension();
 		std::map<std::string, std::string>::iterator findCGIExtension(const std::string &);
-		char **getEnv();
 		//------ OTHER Methods ------//
 		std::string execute();
 		CGI *clone();
diff --git a/mandatory/inc/Environment.hpp b/mandatory/inc/Environment.hpp
new file mode 100644
index 0000000..f90079b
--- /dev/null
+++ b/mandatory/inc/Environment.hpp
@@ -0,0 +1,31 @@
+#pragma once
+#include <iostream>
+#include <string>
+#include <map>
+#include <vector>
+#include "ExtendedString.hpp"
+
+#define KEYS_DEFINED "COMSPEC,DOCUMENT_ROOT,GATEWAY_INTERFACE,\\
+                    HTTP_ACCEPT,HTTP_ACCEPT_ENCODING,\\
+                    HTTP_ACCEPT_LANGUAGE,HTTP_CONNECTION,HTTP_HOST,\\
+                    HTTP_USER_AGENT,PATH,QUERY_STRING,REMOTE_ADDR,\\
+                    REMOTE_PORT,REQUEST_METHOD,REQUEST_URI,\\
+                    SCRIPT_FILENAME,SCRIPT_NAME,SERVER_ADDR,\\
+                    SERVER_ADMIN,SERVER_NAME,SERVER_PORT,\\
+                    SERVER_PROTOCOL,SERVER_SIGNATURE,SERVER_SOFTWARE"
+
+class Environment
+{
+    private:
+        std::map<std::string, std::string> _env;
+        std::vector<std::string> _envKeys;
+        void DefineKeys();
+    public:
+        Environment();
+        ~Environment();
+        void setEnv(const std::string $key, const std::string $value);
+        char **getEnv();
+        std::string getEnv(std::string key);
+        std::vector<std::string> getEnvKeys();
+
+};
diff --git a/mandatory/src/CGI.cpp b/mandatory/src/CGI.cpp
index 0e1b45b..686262a 100644
--- a/mandatory/src/CGI.cpp
+++ b/mandatory/src/CGI.cpp
@@ -144,7 +144,7 @@ std::string CGI::execute()
 		close(fd[0]);
 		// Convert the arguments vector to a null-terminated array
 		// Execute the file with its parameters
-		if (execve(Executable.c_str(), ExecArray.data(), NULL) == -1)
+		if (execve(Executable.c_str(), ExecArray.data(), this->getEnv()) == -1)
 		{
 			// Handle error executing file
 			exit(errno);
diff --git a/mandatory/src/Environment.cpp b/mandatory/src/Environment.cpp
new file mode 100644
index 0000000..52e7156
--- /dev/null
+++ b/mandatory/src/Environment.cpp
@@ -0,0 +1,47 @@
+#include "../inc/Environment.hpp"
+
+Environment::Environment()
+{
+    this->DefineKeys();
+}
+
+Environment::~Environment()
+{
+}
+
+void Environment::DefineKeys()
+{
+    ExtendedString keys(KEYS_DEFINED);
+    std::vector<ExtendedString> _envKeys = keys.splitString(',');
+}
+
+void Environment::setEnv(const std::string key, const std::string value)
+{
+    this->_env[key] = value;
+}
+
+char **Environment::getEnv()
+{
+    std::vector<char*> RetornoEnv;
+    int i = 0;
+    std::map<std::string, std::string>::iterator itb = this->_env.begin();
+    std::map<std::string, std::string>::iterator ite = this->_env.end();
+    while (itb != ite)
+    {
+        std::string envVar = itb->first + "=" + itb->second;
+        RetornoEnv.push_back(const_cast<char*>(envVar.c_str()));
+        ++itb;
+    }
+    RetornoEnv.push_back(NULL);
+    return RetornoEnv.data();
+}
+
+std::string Environment::getEnv(std::string key)
+{
+    return this->_env[key];
+}
+
+std::vector<std::string> Environment::getEnvKeys()
+{
+    return this->_envKeys;
+}
\ No newline at end of file

From 1e4cad56cbebd16cc4988161c5ba7d2938591e2d Mon Sep 17 00:00:00 2001
From: "ernesto.avedillo" <eavedillo@yahoo.es>
Date: Sat, 29 Jun 2024 17:02:04 +0200
Subject: [PATCH 16/31] Define Keys removed

---
 mandatory/inc/Environment.hpp | 5 +++--
 mandatory/src/Environment.cpp | 7 -------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/mandatory/inc/Environment.hpp b/mandatory/inc/Environment.hpp
index f90079b..1c237f5 100644
--- a/mandatory/inc/Environment.hpp
+++ b/mandatory/inc/Environment.hpp
@@ -5,7 +5,9 @@
 #include <vector>
 #include "ExtendedString.hpp"
 
-#define KEYS_DEFINED "COMSPEC,DOCUMENT_ROOT,GATEWAY_INTERFACE,\\
+#define HOST_KEY "HOST"
+#define POR_ADDRESS_KEY "HOST"
+ #define OT "GATEWAY_INTERFACE,\\
                     HTTP_ACCEPT,HTTP_ACCEPT_ENCODING,\\
                     HTTP_ACCEPT_LANGUAGE,HTTP_CONNECTION,HTTP_HOST,\\
                     HTTP_USER_AGENT,PATH,QUERY_STRING,REMOTE_ADDR,\\
@@ -19,7 +21,6 @@ class Environment
     private:
         std::map<std::string, std::string> _env;
         std::vector<std::string> _envKeys;
-        void DefineKeys();
     public:
         Environment();
         ~Environment();
diff --git a/mandatory/src/Environment.cpp b/mandatory/src/Environment.cpp
index 52e7156..5079bc4 100644
--- a/mandatory/src/Environment.cpp
+++ b/mandatory/src/Environment.cpp
@@ -2,19 +2,12 @@
 
 Environment::Environment()
 {
-    this->DefineKeys();
 }
 
 Environment::~Environment()
 {
 }
 
-void Environment::DefineKeys()
-{
-    ExtendedString keys(KEYS_DEFINED);
-    std::vector<ExtendedString> _envKeys = keys.splitString(',');
-}
-
 void Environment::setEnv(const std::string key, const std::string value)
 {
     this->_env[key] = value;

From cd9907674d5f570ab66a16133e86ae7e3f3fd23e Mon Sep 17 00:00:00 2001
From: Joseph Cheel nakashima <jcheel-n@car3s2.42barcelona.com>
Date: Sat, 29 Jun 2024 17:02:42 +0200
Subject: [PATCH 17/31] CGI environment variables

---
 mandatory/inc/ListeningSocket.hpp | 35 +++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/mandatory/inc/ListeningSocket.hpp b/mandatory/inc/ListeningSocket.hpp
index 29a0d55..ec000b8 100644
--- a/mandatory/inc/ListeningSocket.hpp
+++ b/mandatory/inc/ListeningSocket.hpp
@@ -29,6 +29,41 @@
 #include "Header.hpp"
 #include "LocationParser.hpp"
 
+// SCRIPT_FILENAME
+// QUERY_STRING
+// REQUEST_METHOD
+// CONTENT_TYPE
+
+// CONTENT_LENGTH
+
+// GATEWAY_INTERFACE CGI/1.1
+// SERVER_SOFTWARE	webservcheelave
+
+// REMOTE_ADDR 127.0.0.1
+// REMOTE_PORT 8080
+
+// SERVER_ADDR localhost
+// SERVER_PORT 8080	
+// The name of the authentication scheme used to protect the servlet. For example, BASIC, SSL, or null if the servlet was not protected.
+
+// CONTENT_LENGTH
+
+// The length of the request body in bytes made available by the input stream or -1 if the length is not known. For HTTP servlets, the value returned is the same as the value of the CGI variable CONTENT_LENGTH.
+
+// CONTENT_TYPE
+
+// The MIME type of the body of the request, or null if the type is not known. For HTTP servlets, the value returned is the same as the value of the CGI variable CONTENT_TYPE.
+
+// SERVER_NAME webserver
+// HTTP_HOST
+// HTTP_USER_AGENT
+// HTTP_ACCEPT
+// HTTP_ACCEPT_LANGUAGE
+// HTTP_ACCEPT_ENCODING
+// HTTP_COOKIE
+// HTTP_CONNECTION
+// HTTP_UPGRADE_INSECURE_REQUESTS
+
 
 #define MAX_CONNECTIONS 10
 

From b4aab3f39222a197765a6a518038f589fe2cb2df Mon Sep 17 00:00:00 2001
From: "ernesto.avedillo" <eavedillo@yahoo.es>
Date: Sat, 29 Jun 2024 17:17:25 +0200
Subject: [PATCH 18/31] remove vector keys

---
 mandatory/inc/CGI.hpp         |  1 -
 mandatory/inc/Environment.hpp | 51 ++++++++++++++++++++---------------
 mandatory/src/Environment.cpp | 10 +++----
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/mandatory/inc/CGI.hpp b/mandatory/inc/CGI.hpp
index 539bae8..493ecbc 100644
--- a/mandatory/inc/CGI.hpp
+++ b/mandatory/inc/CGI.hpp
@@ -20,7 +20,6 @@ class CGI : public Environment
 		std::string CGIFolder;
 		std::string fileName;
 		std::string fileArgs;
-		char **env;
 		bool isCGI;
 		std::vector <ExtendedString> args;
 		std::map<std::string, std::string> CGIExtensions;
diff --git a/mandatory/inc/Environment.hpp b/mandatory/inc/Environment.hpp
index 1c237f5..eadca78 100644
--- a/mandatory/inc/Environment.hpp
+++ b/mandatory/inc/Environment.hpp
@@ -5,28 +5,37 @@
 #include <vector>
 #include "ExtendedString.hpp"
 
-#define HOST_KEY "HOST"
-#define POR_ADDRESS_KEY "HOST"
- #define OT "GATEWAY_INTERFACE,\\
-                    HTTP_ACCEPT,HTTP_ACCEPT_ENCODING,\\
-                    HTTP_ACCEPT_LANGUAGE,HTTP_CONNECTION,HTTP_HOST,\\
-                    HTTP_USER_AGENT,PATH,QUERY_STRING,REMOTE_ADDR,\\
-                    REMOTE_PORT,REQUEST_METHOD,REQUEST_URI,\\
-                    SCRIPT_FILENAME,SCRIPT_NAME,SERVER_ADDR,\\
-                    SERVER_ADMIN,SERVER_NAME,SERVER_PORT,\\
-                    SERVER_PROTOCOL,SERVER_SIGNATURE,SERVER_SOFTWARE"
+#define SCRIPT_FILENAME_KEY					"SCRIPT_FILENAME"
+#define QUERY_STRING_KEY					"QUERY_STRING"
+#define REQUEST_METHOD_KEY					"REQUEST_METHOD"
+#define CONTENT_TYPE_KEY					"CONTENT_TYPE"
+#define CONTENT_LENGTH_KEY					"CONTENT_LENGTH"
+#define GATEWAY_INTERFACE_KEY				"GATEWAY_INTERFACE"
+#define SERVER_SOFTWARE_KEY					"SERVER_SOFTWARE"
+#define REMOTE_ADDR_KEY						"REMOTE_ADDR"
+#define REMOTE_PORT_KEY						"REMOTE_PORT"
+#define SERVER_ADDR_KEY						"SERVER_ADDR"
+#define SERVER_PORT_KEY						"SERVER_PORT"
+#define CONTENT_LENGTH_KEY					"CONTENT_LENGTH"
+#define CONTENT_TYPE_KEY					"CONTENT_TYPE"
+#define SERVER_NAME_KEY						"SERVER_NAME"
+#define HTTP_HOST_KEY						"HTTP_HOST"
+#define HTTP_USER_AGENT_KEY					"HTTP_USER_AGENT"
+#define HTTP_ACCEPT_KEY						"HTTP_ACCEPT"
+#define HTTP_ACCEPT_LANGUAGE_KEY			"HTTP_ACCEPT_LANGUAGE"
+#define HTTP_ACCEPT_ENCODING_KEY			"HTTP_ACCEPT_ENCODING"
+#define HTTP_COOKIE_KEY						"HTTP_COOKIE"
+#define HTTP_CONNECTION_KEY					"HTTP_CONNECTION"
+#define HTTP_UPGRADE_INSECURE_REQUESTS_KEY	"HTTP_UPGRADE_INSECURE_REQUESTS"
 
 class Environment
 {
-    private:
-        std::map<std::string, std::string> _env;
-        std::vector<std::string> _envKeys;
-    public:
-        Environment();
-        ~Environment();
-        void setEnv(const std::string $key, const std::string $value);
-        char **getEnv();
-        std::string getEnv(std::string key);
-        std::vector<std::string> getEnvKeys();
-
+	private:
+		std::map<std::string, std::string> _env;
+	public:
+		Environment();
+		~Environment();
+		void setEnv(const std::string $key, const std::string $value);
+		char **getEnv();
+		std::string getEnv(std::string key);
 };
diff --git a/mandatory/src/Environment.cpp b/mandatory/src/Environment.cpp
index 5079bc4..6236edf 100644
--- a/mandatory/src/Environment.cpp
+++ b/mandatory/src/Environment.cpp
@@ -16,7 +16,7 @@ void Environment::setEnv(const std::string key, const std::string value)
 char **Environment::getEnv()
 {
     std::vector<char*> RetornoEnv;
-    int i = 0;
+    char **env;
     std::map<std::string, std::string>::iterator itb = this->_env.begin();
     std::map<std::string, std::string>::iterator ite = this->_env.end();
     while (itb != ite)
@@ -26,15 +26,11 @@ char **Environment::getEnv()
         ++itb;
     }
     RetornoEnv.push_back(NULL);
-    return RetornoEnv.data();
+    env = RetornoEnv.data();
+    return env;
 }
 
 std::string Environment::getEnv(std::string key)
 {
     return this->_env[key];
 }
-
-std::vector<std::string> Environment::getEnvKeys()
-{
-    return this->_envKeys;
-}
\ No newline at end of file

From d61826262bfd2c8beee91fd6b5b248ae1511deca Mon Sep 17 00:00:00 2001
From: Joseph Cheel nakashima <jcheel-n@car3s2.42barcelona.com>
Date: Sat, 29 Jun 2024 17:19:44 +0200
Subject: [PATCH 19/31] CGI constructor with environment

---
 mandatory/inc/CGI.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mandatory/inc/CGI.hpp b/mandatory/inc/CGI.hpp
index 539bae8..ba1f409 100644
--- a/mandatory/inc/CGI.hpp
+++ b/mandatory/inc/CGI.hpp
@@ -20,7 +20,7 @@ class CGI : public Environment
 		std::string CGIFolder;
 		std::string fileName;
 		std::string fileArgs;
-		char **env;
+		// char **env;
 		bool isCGI;
 		std::vector <ExtendedString> args;
 		std::map<std::string, std::string> CGIExtensions;

From 3f835fe2ce4922e7a37ef1a9758fac5eb34c4416 Mon Sep 17 00:00:00 2001
From: Joseph Cheel nakashima <jcheel-n@car3s2.42barcelona.com>
Date: Sat, 29 Jun 2024 17:30:20 +0200
Subject: [PATCH 20/31] setting some environment variables

---
 mandatory/inc/Environment.hpp     |  1 +
 mandatory/inc/FileContent.hpp     |  3 ++-
 mandatory/inc/ListeningSocket.hpp |  3 ++-
 mandatory/src/CGI.cpp             |  6 +++---
 mandatory/src/ListeningSocket.cpp | 21 ++++++++++++++++++++-
 mandatory/src/Server.cpp          |  1 +
 6 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/mandatory/inc/Environment.hpp b/mandatory/inc/Environment.hpp
index eadca78..d17f3d9 100644
--- a/mandatory/inc/Environment.hpp
+++ b/mandatory/inc/Environment.hpp
@@ -27,6 +27,7 @@
 #define HTTP_COOKIE_KEY						"HTTP_COOKIE"
 #define HTTP_CONNECTION_KEY					"HTTP_CONNECTION"
 #define HTTP_UPGRADE_INSECURE_REQUESTS_KEY	"HTTP_UPGRADE_INSECURE_REQUESTS"
+#define PATH_INFO_KEY						"PATH_INFO"
 
 class Environment
 {
diff --git a/mandatory/inc/FileContent.hpp b/mandatory/inc/FileContent.hpp
index ab1cda7..c55806b 100644
--- a/mandatory/inc/FileContent.hpp
+++ b/mandatory/inc/FileContent.hpp
@@ -20,6 +20,8 @@
 //#define MAX_SENT_BYTES 8192
 class FileContent : public StatusCode
 {
+	protected:
+		CGI *cgiModule;
 	private:
 		std::string fileName;
 		std::string indexName;
@@ -35,7 +37,6 @@ class FileContent : public StatusCode
 		long long startRange;
 		long long currentSendingPosition;
 		long long lastSendingPosition;
-		CGI *cgiModule;
 		ListDir *listDir;
 		//Server *server;
 		size_t completeContentSize;
diff --git a/mandatory/inc/ListeningSocket.hpp b/mandatory/inc/ListeningSocket.hpp
index ec000b8..08ba1c5 100644
--- a/mandatory/inc/ListeningSocket.hpp
+++ b/mandatory/inc/ListeningSocket.hpp
@@ -28,7 +28,7 @@
 #include "FileContent.hpp"
 #include "Header.hpp"
 #include "LocationParser.hpp"
-
+#include "Environment.hpp"
 // SCRIPT_FILENAME
 // QUERY_STRING
 // REQUEST_METHOD
@@ -99,4 +99,5 @@ class ListeningSocket : public FileContent
 	std::string getAnswerToSend();
 	bool receive();
 	void matchServerName(std::vector<Server *> servers);
+	void setCgiEnviroment();
 };
diff --git a/mandatory/src/CGI.cpp b/mandatory/src/CGI.cpp
index 686262a..cb1b0cf 100644
--- a/mandatory/src/CGI.cpp
+++ b/mandatory/src/CGI.cpp
@@ -1,6 +1,6 @@
 #include "../inc/CGI.hpp"
 
-CGI::CGI()
+CGI::CGI() : Environment()
 {
 	this->fileName = "";
 	this->fileArgs = "";
@@ -9,7 +9,7 @@ CGI::CGI()
 	this->setCGIMapExtensions("cgi");
 }
 
-CGI::CGI(const std::string &folder, const std::string &extensions)
+CGI::CGI(const std::string &folder, const std::string &extensions) : Environment()
 {
 	this->fileName = "";
 	this->isCGI = false;
@@ -17,7 +17,7 @@ CGI::CGI(const std::string &folder, const std::string &extensions)
 	this->setCGIMapExtensions(extensions);
 }
 
-CGI::CGI(const CGI &src)
+CGI::CGI(const CGI &src) : Environment()
 {
 	this->fileName = "";
 	this->isCGI = false;
diff --git a/mandatory/src/ListeningSocket.cpp b/mandatory/src/ListeningSocket.cpp
index 817d9ee..89de875 100644
--- a/mandatory/src/ListeningSocket.cpp
+++ b/mandatory/src/ListeningSocket.cpp
@@ -158,11 +158,29 @@ void ListeningSocket::matchServerName(std::vector<Server *> servers)
 	}
 }
 
+void ListeningSocket::setCgiEnviroment()
+{
+	this->cgiModule->setEnv(SERVER_ADDR_KEY, server->getHost());
+	this->cgiModule->setEnv(SERVER_NAME_KEY, server->getServerName());
+	this->cgiModule->setEnv(REQUEST_METHOD_KEY, this->request.getMethod());
+	// this->cgiModule->setEnv(PATH_INFO, this->request.getPath());
+	// this->cgiModule->setEnv(PROT, this->request.getProtocol());
+	this->cgiModule->setEnv(SERVER_PORT_KEY, this->request.getAttribute("Host").substr(this->request.getAttribute("Host").find(":")));
+	this->cgiModule->setEnv(CONTENT_LENGTH_KEY, this->request.getAttribute("Content-Lenght"));
+	this->cgiModule->setEnv(CONTENT_TYPE_KEY, this->request.getAttribute("Content-Type"));
+	this->cgiModule->setEnv(HTTP_USER_AGENT_KEY, this->request.getAttribute("User-Agent"));
+	// this->cgiModule->setEnv(, this->request.getAttribute("Host"));
+	this->cgiModule->setEnv(SERVER_SOFTWARE_KEY, "ws_cheelave/1.0");
+	this->cgiModule->setEnv(GATEWAY_INTERFACE_KEY, "CGI/1.1");
+	// this->cgiModule->setEnv(QUERY_STRING_KEY,this->);
+}
+
 void ListeningSocket::loadRequest(std::vector<Server *> servers)
 {
 	this->request = Header(this->receiver->getRequest());
 	matchServerName(servers);
-	LocationParser Parser(this->request, this->server, this->receiver);
+	LocationParser Parser(this->request, this->server, this->receiver);	
+	this->setCgiEnviroment();
 	try 
 	{
 		 Parser.checks();
@@ -174,6 +192,7 @@ void ListeningSocket::loadRequest(std::vector<Server *> servers)
 		this->response = Parser.getResponse();
 		return ;
 	}
+	this->cgiModule->setEnv(SCRIPT_FILENAME_KEY, this->request.getPath());
 	Parser.setCookies();
 	this->request = Parser.getRequest();
 	this->response = Parser.getResponse();
diff --git a/mandatory/src/Server.cpp b/mandatory/src/Server.cpp
index e528e3b..0a31276 100644
--- a/mandatory/src/Server.cpp
+++ b/mandatory/src/Server.cpp
@@ -32,6 +32,7 @@ std::map<std::string, void (Server::*)(const std::string &)> ServerSetters()
 Server::Server(std::string &str)
 {
 	this->cgiModule = new CGI();
+	this->cgiModule->setEnv("SERVER_HOST", this->getHost());
 	while (str.find("location") != std::string::npos)
 	{
 		std::string aux = str.substr(str.find("location:{"));

From 818e0f3491fbefc1628996dfe706ea35fddfe560 Mon Sep 17 00:00:00 2001
From: "ernesto.avedillo" <eavedillo@yahoo.es>
Date: Sat, 29 Jun 2024 17:33:21 +0200
Subject: [PATCH 21/31] add in test ENV var

---
 www/web4/cgi/test.cgi | Bin 17400 -> 17504 bytes
 www/web4/cgi/test.cpp |  18 +++++++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/www/web4/cgi/test.cgi b/www/web4/cgi/test.cgi
index be7201cca025640cc65bebc5e996f30b06130772..6df911ee55bf66e061131f20ce36327ba4d60b5b 100755
GIT binary patch
delta 4655
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
Suy2W_@@qV>M4;ELDfmBW4=RcP

delta 4552
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

diff --git a/www/web4/cgi/test.cpp b/www/web4/cgi/test.cpp
index f47ee7e..7211917 100644
--- a/www/web4/cgi/test.cpp
+++ b/www/web4/cgi/test.cpp
@@ -3,15 +3,15 @@
 using namespace std;
 
 const string ENV[24] = {
-	"COMSPEC", "DOCUMENT_ROOT", "GATEWAY_INTERFACE",
-	"HTTP_ACCEPT", "HTTP_ACCEPT_ENCODING",
-	"HTTP_ACCEPT_LANGUAGE", "HTTP_CONNECTION",
-	"HTTP_HOST", "HTTP_USER_AGENT", "PATH",
-	"QUERY_STRING", "REMOTE_ADDR", "REMOTE_PORT",
-	"REQUEST_METHOD", "REQUEST_URI", "SCRIPT_FILENAME",
-	"SCRIPT_NAME", "SERVER_ADDR", "SERVER_ADMIN",
-	"SERVER_NAME", "SERVER_PORT", "SERVER_PROTOCOL",
-	"SERVER_SIGNATURE", "SERVER_SOFTWARE"};
+	"SCRIPT_FILENAME", "QUERY_STRING", "REQUEST_METHOD",
+	"CONTENT_TYPE", "CONTENT_LENGTH",
+	"GATEWAY_INTERFACE", "SERVER_SOFTWARE",
+	"REMOTE_ADDR", "REMOTE_PORT", "SERVER_ADDR",
+	"SERVER_PORT", "CONTENT_LENGTH", "CONTENT_TYPE",
+	"SERVER_NAME", "HTTP_HOST", "HTTP_USER_AGENT",
+	"HTTP_ACCEPT", "HTTP_ACCEPT_LANGUAGE", "HTTP_ACCEPT_ENCODING",
+	"HTTP_COOKIE", "HTTP_CONNECTION", "HTTP_UPGRADE_INSECURE_REQUESTS",
+	"PATH_INFO"}; 
 
 int main(int av, char **ac)
 {

From 5aac907c65bff5d60db2d54eddf62fd2dffbb820 Mon Sep 17 00:00:00 2001
From: Joseph Cheel nakashima <jcheel-n@car3s2.42barcelona.com>
Date: Sat, 29 Jun 2024 18:50:42 +0200
Subject: [PATCH 22/31] Location adding set-sessionn-id

---
 mandatory/inc/Location.hpp | 24 ++++++++++++++++++------
 mandatory/src/Location.cpp | 20 ++++++++++++++++----
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/mandatory/inc/Location.hpp b/mandatory/inc/Location.hpp
index 9e1bab9..fbdeb54 100644
--- a/mandatory/inc/Location.hpp
+++ b/mandatory/inc/Location.hpp
@@ -18,6 +18,7 @@
 #define VAR_LOC_CGI_ENABLED "cgi_enabled"
 #define VAR_LOC_CGI_EXTENSION "cgi_extension"
 #define VAR_LOC_COOKIE "set-cookie"
+#define VAR_LOC_SESSION_ID "set-session-id"
 #define STR_START "location:{"
 
 
@@ -34,22 +35,31 @@ class Location
 		std::string root;
 		std::string return_;
 		std::string index;
+		std::string alias;
+		enum LocationType LocationType;
+		
 		std::string allowMethodsStr;
 		std::vector<std::string> allowMethods; 
-		std::string autoindexStr;
-		bool autoindex;
-		std::string alias;
+
 		std::string cgiExtensionStr;
 		std::vector<std::string> cgiExtension;
+		
+		bool isCookie;
 		std::string cookiesStr;
 		std::vector<std::string> cookies;
-		enum LocationType LocationType;
-		std::string cgiEnabledStr;
+		
 		bool isGetAllowed;
 		bool isPostAllowed;
 		bool isDeleteAllowed;
+		
+		bool autoindex;
+		std::string autoindexStr;
+		
 		bool isCgi;
-		bool isCookie;
+		std::string cgiEnabledStr;
+		
+		bool isSessionId;
+		std::string sessionIdStr;
 		int loadData(const std::string &data);
 
 	public:
@@ -79,6 +89,7 @@ class Location
 		enum LocationType getLocationType();
 		bool getIsCgi() const;
 		bool getIsCookie() const;
+		bool getIsSessionId() const;
 		std::vector<std::string>  getCookies() const;
 		// Setter methods
 
@@ -96,6 +107,7 @@ class Location
 		void setCgiExtension(const std::string &extensions);
 		void setCookieStr(const std::string &cookie);
 		void setCookies(const std::string &cookie);
+		void setSessionIdStr(const std::string &name);
 		// Load data from a string configuration
 		void print();
 		void checkVariables(bool serverAutoIndex);
diff --git a/mandatory/src/Location.cpp b/mandatory/src/Location.cpp
index 3ce1d2c..eea1308 100644
--- a/mandatory/src/Location.cpp
+++ b/mandatory/src/Location.cpp
@@ -25,6 +25,7 @@ std::map<std::string, int> var_names_location()
 	varnames[VAR_LOC_CGI_ENABLED] = 0;
 	varnames[VAR_LOC_COOKIE] = 0;
 	varnames[VAR_LOC_CGI_EXTENSION] = 0;
+	varnames[VAR_LOC_SESSION_ID] = 0;
 	return varnames;
 }
 
@@ -42,6 +43,7 @@ std::map<std::string, void (Location::*)(const std::string&)> getLocationMethods
 	locationMethods[VAR_LOC_CGI_ENABLED] = &Location::setCgiEnabledStr;
 	locationMethods[VAR_LOC_COOKIE] = &Location::setCookieStr;
 	locationMethods[VAR_LOC_CGI_EXTENSION] = &Location::setCgiExtensionStr;
+	locationMethods[VAR_LOC_SESSION_ID] = &Location::setSessionIdStr;
 	return locationMethods;
 }
 
@@ -58,6 +60,8 @@ Location::Location()
 	// cgiPathStr = "";
 	cgiExtensionStr = "";
 	isCgi = false;
+	isSessionId = false;
+	isCookie = false;
 }
 Location::Location(std::string const &content)
 {
@@ -104,10 +108,10 @@ void Location::setIndex(const std::string &idx) { index = idx; }
 void Location::setAllowMethodsStr(const std::string &allow) { allowMethodsStr = allow; }
 void Location::setAutoindex(const std::string &autoidx) { autoindexStr = autoidx; }
 void Location::setAlias(const std::string &als) { alias = als; }
-void Location::setCgiEnabledStr(const std::string &cgiEnabled)
-{
+void Location::setCgiEnabledStr(const std::string &cgiEnabled) {
 	this->cgiEnabledStr = cgiEnabled;
 }
+void Location::setSessionIdStr(const std::string &name){ this->isSessionId = true ; this->sessionIdStr = name; }
 void Location::setCookieStr(const std::string &cookie) {this->isCookie = true ; this->cookiesStr = cookie; }
 bool Location::setCgiEnabled()
 {
@@ -231,7 +235,6 @@ void Location::print()
 	std::cout << "Allow Methods: " << allowMethodsStr << std::endl;
 	std::cout << "Autoindex: " << autoindex << std::endl;
 	std::cout << "Alias: " << alias << std::endl;
-	// std::cout << "Cgi Path: " << cgiPathStr << std::endl;
 	std::cout << "Cgi Extension: " << cgiExtensionStr << std::endl;
 }
 
@@ -312,7 +315,16 @@ void Location::checkVariables(bool serverAutoIndex)
 	}
 	else if (this->isCookie && !this->cookiesStr.empty())
 		this->setCookies(this->cookiesStr);
-	
+
+// 	if (this->isSessionId && this->sessionIdStr.empty())
+// 	{
+// 		printLog("WARNING", "set-sesion-id\t\t\tnot defined.");
+// 		this->isSessionId = false;
+// 	}
+// 	else if (this->isSessionId && !this->sessionIdStr.empty())
+// 	{
+
+// 	}
 }
 
 	std::vector<std::string> Location::getCgiExtension()

From b2a0561f65ed7e9d60a35e2eed1b4a78f741e388 Mon Sep 17 00:00:00 2001
From: "ernesto.avedillo" <eavedillo@yahoo.es>
Date: Sat, 29 Jun 2024 18:53:50 +0200
Subject: [PATCH 23/31] add variable environment

---
 mandatory/inc/Environment.hpp |   3 +--
 mandatory/src/CGI.cpp         |  15 ++++++++++++++-
 mandatory/src/Environment.cpp |  35 +++++++++++++++++++++++++---------
 www/web4/cgi/test.cgi         | Bin 17504 -> 16384 bytes
 www/web4/cgi/test.cpp         |  35 +++++++---------------------------
 5 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/mandatory/inc/Environment.hpp b/mandatory/inc/Environment.hpp
index d17f3d9..e34bf48 100644
--- a/mandatory/inc/Environment.hpp
+++ b/mandatory/inc/Environment.hpp
@@ -27,7 +27,6 @@
 #define HTTP_COOKIE_KEY						"HTTP_COOKIE"
 #define HTTP_CONNECTION_KEY					"HTTP_CONNECTION"
 #define HTTP_UPGRADE_INSECURE_REQUESTS_KEY	"HTTP_UPGRADE_INSECURE_REQUESTS"
-#define PATH_INFO_KEY						"PATH_INFO"
 
 class Environment
 {
@@ -37,6 +36,6 @@ class Environment
 		Environment();
 		~Environment();
 		void setEnv(const std::string $key, const std::string $value);
-		char **getEnv();
+		std::vector<char*>getEnv();
 		std::string getEnv(std::string key);
 };
diff --git a/mandatory/src/CGI.cpp b/mandatory/src/CGI.cpp
index cb1b0cf..f8c7541 100644
--- a/mandatory/src/CGI.cpp
+++ b/mandatory/src/CGI.cpp
@@ -144,9 +144,21 @@ std::string CGI::execute()
 		close(fd[0]);
 		// Convert the arguments vector to a null-terminated array
 		// Execute the file with its parameters
-		if (execve(Executable.c_str(), ExecArray.data(), this->getEnv()) == -1)
+		std::vector<char*> envp = this->getEnv();
+		// std::vector<char*>::iterator itb2 = envp.begin();
+		// std::vector<char*>::iterator ite2 = envp.end();
+		// while(itb2 != ite2)
+		// {
+		// 	std::cout << *itb2 << std::endl;
+		// 	itb2++;
+		// }
+    	// std::cout<< "-------11------------------" << std::endl;
+	    // std::cout<< "----------222---------------" << std::endl;
+ 
+		if (execve(Executable.c_str(), ExecArray.data(), envp.data()) == -1)
 		{
 			// Handle error executing file
+			std::cerr << "Error: " << errno << std::endl;
 			exit(errno);
 		}
 	} 
@@ -158,6 +170,7 @@ std::string CGI::execute()
 	waitpid(pid, &status, 0);
 
 	std::string output;
+	std::cout << "Status: " << status << std::endl;
 	if (WIFEXITED(status) && WEXITSTATUS(status) == 0) 
 	{
 		// Read the output from the file descriptor
diff --git a/mandatory/src/Environment.cpp b/mandatory/src/Environment.cpp
index 6236edf..1706005 100644
--- a/mandatory/src/Environment.cpp
+++ b/mandatory/src/Environment.cpp
@@ -1,4 +1,5 @@
 #include "../inc/Environment.hpp"
+#include <cstring>
 
 Environment::Environment()
 {
@@ -13,20 +14,36 @@ void Environment::setEnv(const std::string key, const std::string value)
     this->_env[key] = value;
 }
 
-char **Environment::getEnv()
+std::vector<char*> Environment::getEnv()
 {
-    std::vector<char*> RetornoEnv;
-    char **env;
+    std::vector<std::string> aux;
+    std::vector<char*> env;
     std::map<std::string, std::string>::iterator itb = this->_env.begin();
     std::map<std::string, std::string>::iterator ite = this->_env.end();
-    while (itb != ite)
+    while(itb != ite)
     {
-        std::string envVar = itb->first + "=" + itb->second;
-        RetornoEnv.push_back(const_cast<char*>(envVar.c_str()));
-        ++itb;
+        aux.push_back(itb->first + "=" + itb->second);
+        itb++;
     }
-    RetornoEnv.push_back(NULL);
-    env = RetornoEnv.data();
+    // std::cout<< "-------------------------" << std::endl;
+    std::vector<std::string>::iterator itb1 = aux.begin();
+    std::vector<std::string>::iterator ite1 = aux.end();
+    while(itb1 != ite1)
+    {
+        // std::cout << itb1->c_str() << std::endl;
+        env.push_back(const_cast<char*>(itb1->c_str()));
+        itb1++;
+    }
+    env.push_back(NULL);
+ 	// 	std::vector<char*>::iterator itb2 = env.begin();
+	// 	std::vector<char*>::iterator ite2 = env.end();
+	// 	while(itb2 != ite2)
+	// 	{
+	// 		std::cout << *itb2 << std::endl;
+	// 		itb2++;
+	// 	}
+
+    // std::cout<< "-------------------------" << std::endl;
     return env;
 }
 
diff --git a/www/web4/cgi/test.cgi b/www/web4/cgi/test.cgi
index 6df911ee55bf66e061131f20ce36327ba4d60b5b..b99ffab9bef613ae4d2fd2782884307f42c61050 100755
GIT binary patch
literal 16384
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
Tc+**szwxum<I(^jpo;$huIKYP

literal 17504
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

diff --git a/www/web4/cgi/test.cpp b/www/web4/cgi/test.cpp
index 7211917..00b7abd 100644
--- a/www/web4/cgi/test.cpp
+++ b/www/web4/cgi/test.cpp
@@ -2,18 +2,7 @@
 #include <stdlib.h>
 using namespace std;
 
-const string ENV[24] = {
-	"SCRIPT_FILENAME", "QUERY_STRING", "REQUEST_METHOD",
-	"CONTENT_TYPE", "CONTENT_LENGTH",
-	"GATEWAY_INTERFACE", "SERVER_SOFTWARE",
-	"REMOTE_ADDR", "REMOTE_PORT", "SERVER_ADDR",
-	"SERVER_PORT", "CONTENT_LENGTH", "CONTENT_TYPE",
-	"SERVER_NAME", "HTTP_HOST", "HTTP_USER_AGENT",
-	"HTTP_ACCEPT", "HTTP_ACCEPT_LANGUAGE", "HTTP_ACCEPT_ENCODING",
-	"HTTP_COOKIE", "HTTP_CONNECTION", "HTTP_UPGRADE_INSECURE_REQUESTS",
-	"PATH_INFO"}; 
-
-int main(int av, char **ac)
+int main(int av, char **ac, char **envp)
 {
 	(void)av;
 	cout << "<html>\n";
@@ -27,25 +16,15 @@ int main(int av, char **ac)
 
 	for (int i = 1; i < av; i++)
 	{
-		cout << "<tr><td>" << "Argumento de entrada Nº" << i << "= " << ac[i] << "</td></tr>\n";
+		cout << "<tr><td>" << "Argumento de entrada N." << i << "= " << ac[i] << "</td></tr>\n";
 	}
-	for (int i = 0; i < 24; i++)
+	cout << "<tr><td>" << "Variables de entorno" << "</td></tr>\n";
+	int i = 0;
+	while(envp[i] != NULL)
 	{
-		cout << "<tr><td>" << ENV[i] << "</td><td>";
-
-		// attempt to retrieve value of environment variable
-		char *value = getenv(ENV[i].c_str());
-		if (value != 0)
-		{
-			cout << value;
-		}
-		else
-		{
-			cout << "Environment variable does not exist.";
-		}
-		cout << "</td></tr>\n";
+		cout << "<tr><td>" << "N." << i << "= " << envp[i] << "</td></tr>\n";
+		i++;
 	}
-
 	cout << "</table><\n";
 	cout << "</body>\n";
 	cout << "</html>\n";

From 77f16ab339e64ea8d12f67b4615d68a0c7993d26 Mon Sep 17 00:00:00 2001
From: "ernesto.avedillo" <eavedillo@yahoo.es>
Date: Sun, 30 Jun 2024 12:05:43 +0200
Subject: [PATCH 24/31] convert environment to pointer of chars

---
 mandatory/inc/Environment.hpp |  1 +
 mandatory/src/CGI.cpp         | 13 +------------
 mandatory/src/Environment.cpp | 34 ++++++++++++----------------------
 3 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/mandatory/inc/Environment.hpp b/mandatory/inc/Environment.hpp
index e34bf48..3add8e5 100644
--- a/mandatory/inc/Environment.hpp
+++ b/mandatory/inc/Environment.hpp
@@ -32,6 +32,7 @@ class Environment
 {
 	private:
 		std::map<std::string, std::string> _env;
+		std::vector<char*> _envArray;
 	public:
 		Environment();
 		~Environment();
diff --git a/mandatory/src/CGI.cpp b/mandatory/src/CGI.cpp
index f8c7541..3b7400d 100644
--- a/mandatory/src/CGI.cpp
+++ b/mandatory/src/CGI.cpp
@@ -87,11 +87,9 @@ std::string CGI::getCGIFolder()
 
 void CGI::setArgs(const std::string &str)
 {
-	std::cout << "Args: " << str << std::endl;
 	std::vector<std::string> vec = splitString(str, '&');
 	for (size_t i = 0; i < vec.size(); i++)
 	{
-		std::cout << "Args: " << vec[i] << std::endl;
 		args.push_back(vec[i]);
 	}
 
@@ -145,15 +143,7 @@ std::string CGI::execute()
 		// Convert the arguments vector to a null-terminated array
 		// Execute the file with its parameters
 		std::vector<char*> envp = this->getEnv();
-		// std::vector<char*>::iterator itb2 = envp.begin();
-		// std::vector<char*>::iterator ite2 = envp.end();
-		// while(itb2 != ite2)
-		// {
-		// 	std::cout << *itb2 << std::endl;
-		// 	itb2++;
-		// }
-    	// std::cout<< "-------11------------------" << std::endl;
-	    // std::cout<< "----------222---------------" << std::endl;
+ 
  
 		if (execve(Executable.c_str(), ExecArray.data(), envp.data()) == -1)
 		{
@@ -170,7 +160,6 @@ std::string CGI::execute()
 	waitpid(pid, &status, 0);
 
 	std::string output;
-	std::cout << "Status: " << status << std::endl;
 	if (WIFEXITED(status) && WEXITSTATUS(status) == 0) 
 	{
 		// Read the output from the file descriptor
diff --git a/mandatory/src/Environment.cpp b/mandatory/src/Environment.cpp
index 1706005..28955d0 100644
--- a/mandatory/src/Environment.cpp
+++ b/mandatory/src/Environment.cpp
@@ -7,6 +7,13 @@ Environment::Environment()
 
 Environment::~Environment()
 {
+    std::vector<char*>::iterator itb = this->_envArray.begin();
+    std::vector<char*>::iterator ite = this->_envArray.end();  
+    while(itb != ite)
+    {
+        delete *itb;
+        itb++;
+    }
 }
 
 void Environment::setEnv(const std::string key, const std::string value)
@@ -16,35 +23,18 @@ void Environment::setEnv(const std::string key, const std::string value)
 
 std::vector<char*> Environment::getEnv()
 {
-    std::vector<std::string> aux;
-    std::vector<char*> env;
     std::map<std::string, std::string>::iterator itb = this->_env.begin();
     std::map<std::string, std::string>::iterator ite = this->_env.end();
     while(itb != ite)
     {
-        aux.push_back(itb->first + "=" + itb->second);
+        std::string *tmp = new std::string(itb->first + "=" + itb->second + '\0');
+        _envArray.push_back(const_cast<char*>(tmp->c_str()));
         itb++;
     }
-    // std::cout<< "-------------------------" << std::endl;
-    std::vector<std::string>::iterator itb1 = aux.begin();
-    std::vector<std::string>::iterator ite1 = aux.end();
-    while(itb1 != ite1)
-    {
-        // std::cout << itb1->c_str() << std::endl;
-        env.push_back(const_cast<char*>(itb1->c_str()));
-        itb1++;
-    }
-    env.push_back(NULL);
- 	// 	std::vector<char*>::iterator itb2 = env.begin();
-	// 	std::vector<char*>::iterator ite2 = env.end();
-	// 	while(itb2 != ite2)
-	// 	{
-	// 		std::cout << *itb2 << std::endl;
-	// 		itb2++;
-	// 	}
+    _envArray.push_back(NULL);
+
+    return _envArray;
 
-    // std::cout<< "-------------------------" << std::endl;
-    return env;
 }
 
 std::string Environment::getEnv(std::string key)

From 01bd03953a435db0c2fd51d9acbc654b0f8c8303 Mon Sep 17 00:00:00 2001
From: Joseph Cheel nakashima <jcheel-n@car1s4.42barcelona.com>
Date: Sun, 30 Jun 2024 12:11:34 +0200
Subject: [PATCH 25/31] initialize uninitialize variables

---
 mandatory/src/Location.cpp       | 18 +++++-------------
 mandatory/src/LocationParser.cpp |  1 +
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/mandatory/src/Location.cpp b/mandatory/src/Location.cpp
index 3ce1d2c..5a9aea0 100644
--- a/mandatory/src/Location.cpp
+++ b/mandatory/src/Location.cpp
@@ -55,14 +55,18 @@ Location::Location()
 	allowMethodsStr = "";
 	autoindex = "";
 	alias = "";
-	// cgiPathStr = "";
 	cgiExtensionStr = "";
 	isCgi = false;
+	isCookie = false;
+	cookiesStr = "";
+	std::cout << "INITITALIZE" << std::endl;
 }
 Location::Location(std::string const &content)
 {
 	this->isCgi = false;
 	this->cgiEnabledStr = "";
+	isCookie = false;
+	cookiesStr = "";
 	this->loadData(content);
 }
 
@@ -156,17 +160,6 @@ void Location::setAllowMethods(const std::string& methods)
 		}
 	}
 }
-// void Location ::setCgiPath(const std::string &paths)
-// {
-// 	std::string line;
-// 	std::istringstream cgiPathStream(paths);
-// 	while (std::getline(cgiPathStream, line, ','))
-// 	{
-// 		if (line.length() == 0)
-// 			continue;
-// 		this->cgiPath.push_back(line);
-// 	}
-// }
 
 void Location ::setCgiExtension(const std::string &extensions)
 {
@@ -231,7 +224,6 @@ void Location::print()
 	std::cout << "Allow Methods: " << allowMethodsStr << std::endl;
 	std::cout << "Autoindex: " << autoindex << std::endl;
 	std::cout << "Alias: " << alias << std::endl;
-	// std::cout << "Cgi Path: " << cgiPathStr << std::endl;
 	std::cout << "Cgi Extension: " << cgiExtensionStr << std::endl;
 }
 
diff --git a/mandatory/src/LocationParser.cpp b/mandatory/src/LocationParser.cpp
index 80da4b3..5b170fe 100644
--- a/mandatory/src/LocationParser.cpp
+++ b/mandatory/src/LocationParser.cpp
@@ -409,6 +409,7 @@ LocationParser::LocationParser(Header request_, Server *server_, Receive *receiv
 	this->isAutoIndex = server->getAutoIndex();
 	this->startRange = 0;
 	this->endRange = 0;
+	this->isCookie = false;
 }
 
 LocationParser::~LocationParser()

From 2e8088beb8ab971cb734de23466bd1b7cb2f1a15 Mon Sep 17 00:00:00 2001
From: Joseph Cheel nakashima <jcheel-n@car1s4.42barcelona.com>
Date: Sun, 30 Jun 2024 13:26:03 +0200
Subject: [PATCH 26/31] solved not permission delete

---
 mandatory/src/ListeningSocket.cpp | 5 ++++-
 mandatory/src/LocationParser.cpp  | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/mandatory/src/ListeningSocket.cpp b/mandatory/src/ListeningSocket.cpp
index 89de875..452634b 100644
--- a/mandatory/src/ListeningSocket.cpp
+++ b/mandatory/src/ListeningSocket.cpp
@@ -105,8 +105,11 @@ bool ListeningSocket::sendData(int clientSocketFd)
 	ExtendedString answer = this->getAnswerToSend();
 	// std::cout << "answer: " << answer.size() << std::endl;
 	// std::cout << "My answer: " << answer << std::endl;
-	if ((send(clientSocketFd, answer.c_str(), answer.size(), 0)) < 0)
+	int ret;
+	if ((ret = send(clientSocketFd, answer.c_str(), answer.size(), 0)) < 0)
 		std::cerr << "Failed to write to client" << std::endl;
+	else if (ret == 0)
+		printLog("WARNING", "send 0 bytes");
 	return this->getIsSendComplete();
 }
 
diff --git a/mandatory/src/LocationParser.cpp b/mandatory/src/LocationParser.cpp
index 5b170fe..e982ab5 100644
--- a/mandatory/src/LocationParser.cpp
+++ b/mandatory/src/LocationParser.cpp
@@ -383,6 +383,15 @@ void LocationParser::checks()
 	}
 	else if (this->request.getMethod() == "DELETE")
 	{
+		switch (isFilePermissions(this->request.getPath(), W_OK))
+		{
+			case -5:
+				response.setStatus("404 Not Found");
+				throw NOT_FOUND_CODE;
+			case -4:
+				response.setStatus("403 Forbidden");
+				throw FORBIDDEN_CODE;
+		}
 		if (std::remove(this->request.getPath().c_str()) == 0)
 			response.setStatus("200 OK");
 		else

From f1f65b4323a22500471b2d8a03ec164ec2ad8e0c Mon Sep 17 00:00:00 2001
From: "ernesto.avedillo" <eavedillo@yahoo.es>
Date: Sun, 30 Jun 2024 13:39:27 +0200
Subject: [PATCH 27/31] UNKNOWN request solved

---
 mandatory/inc/Environment.hpp     |  2 ++
 mandatory/inc/FileContent.hpp     |  4 ----
 mandatory/src/FileContent.cpp     |  1 +
 mandatory/src/ListeningSocket.cpp | 12 +++++-------
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/mandatory/inc/Environment.hpp b/mandatory/inc/Environment.hpp
index 3add8e5..afd5719 100644
--- a/mandatory/inc/Environment.hpp
+++ b/mandatory/inc/Environment.hpp
@@ -27,6 +27,8 @@
 #define HTTP_COOKIE_KEY						"HTTP_COOKIE"
 #define HTTP_CONNECTION_KEY					"HTTP_CONNECTION"
 #define HTTP_UPGRADE_INSECURE_REQUESTS_KEY	"HTTP_UPGRADE_INSECURE_REQUESTS"
+#define PATH_INFO_KEY						"PATH_INFO"
+
 
 class Environment
 {
diff --git a/mandatory/inc/FileContent.hpp b/mandatory/inc/FileContent.hpp
index c55806b..7e8f9b4 100644
--- a/mandatory/inc/FileContent.hpp
+++ b/mandatory/inc/FileContent.hpp
@@ -38,16 +38,12 @@ class FileContent : public StatusCode
 		long long currentSendingPosition;
 		long long lastSendingPosition;
 		ListDir *listDir;
-		//Server *server;
 		size_t completeContentSize;
 		std::string splitFileFromArgs(const std::string &);
 		bool FileOrFolerExtists(const std::string &);
 		size_t endRange;
-	//	bool isCgi;
 	public:
-		// FileContent(Server *);
 		FileContent();
-		// FileContent(const std::string &, Server *);
 		~FileContent();
 		int openFile();
 		bool setFileName(const std::string &, const std::string &);
diff --git a/mandatory/src/FileContent.cpp b/mandatory/src/FileContent.cpp
index 493d6d1..3733ff5 100644
--- a/mandatory/src/FileContent.cpp
+++ b/mandatory/src/FileContent.cpp
@@ -98,6 +98,7 @@ std::string FileContent::getContent()
 
 bool FileContent::setFileName(const std::string &file_name, const std::string &fileArgs)
 {
+	std::cout << file_name << std::endl;
 	bool fileOrFolderExists = this->FileOrFolerExtists(file_name);
 	if (fileOrFolderExists)
 	{
diff --git a/mandatory/src/ListeningSocket.cpp b/mandatory/src/ListeningSocket.cpp
index 89de875..1794287 100644
--- a/mandatory/src/ListeningSocket.cpp
+++ b/mandatory/src/ListeningSocket.cpp
@@ -163,9 +163,9 @@ void ListeningSocket::setCgiEnviroment()
 	this->cgiModule->setEnv(SERVER_ADDR_KEY, server->getHost());
 	this->cgiModule->setEnv(SERVER_NAME_KEY, server->getServerName());
 	this->cgiModule->setEnv(REQUEST_METHOD_KEY, this->request.getMethod());
-	// this->cgiModule->setEnv(PATH_INFO, this->request.getPath());
-	// this->cgiModule->setEnv(PROT, this->request.getProtocol());
-	this->cgiModule->setEnv(SERVER_PORT_KEY, this->request.getAttribute("Host").substr(this->request.getAttribute("Host").find(":")));
+	// this->cgiModule->setEnv(PATH_INFO_KEY, this->request.getPath());
+	// // this->cgiModule->setEnv(PROT, this->request.getProtocol());
+	this->cgiModule->setEnv(SERVER_PORT_KEY, toString(this->port));
 	this->cgiModule->setEnv(CONTENT_LENGTH_KEY, this->request.getAttribute("Content-Lenght"));
 	this->cgiModule->setEnv(CONTENT_TYPE_KEY, this->request.getAttribute("Content-Type"));
 	this->cgiModule->setEnv(HTTP_USER_AGENT_KEY, this->request.getAttribute("User-Agent"));
@@ -192,15 +192,13 @@ void ListeningSocket::loadRequest(std::vector<Server *> servers)
 		this->response = Parser.getResponse();
 		return ;
 	}
-	this->cgiModule->setEnv(SCRIPT_FILENAME_KEY, this->request.getPath());
 	Parser.setCookies();
 	this->request = Parser.getRequest();
+	this->cgiModule->setEnv(PATH_INFO_KEY, this->request.getPath().substr(0, this->request.getPath().rfind("/")));
+	this->cgiModule->setEnv(SCRIPT_FILENAME_KEY, this->request.getPath());
 	this->response = Parser.getResponse();
 	this->setIsAutoIndex(Parser.getIsAutoIndex());
 	this->setIsCGI(Parser.getIsCGI());
-
-	this->setStartRange(Parser.getStartRange());
-	this->setEndRange(Parser.getEndRange());
 	
 	this->setFileName(this->request.getPath(), Parser.getQuery());
 }

From 4ff20e26f931b323c1791e6111ab011af740754a Mon Sep 17 00:00:00 2001
From: eavedill <eavedillo@yahoo.es>
Date: Sun, 30 Jun 2024 13:53:08 +0200
Subject: [PATCH 28/31] add header

---
 mandatory/inc/CGI.hpp                   | 12 ++++++++++++
 mandatory/inc/Environment.hpp           | 12 ++++++++++++
 mandatory/inc/ExtendedString.hpp        | 12 ++++++++++++
 mandatory/inc/FileContent.hpp           | 12 ++++++++++++
 mandatory/inc/Header.hpp                | 12 ++++++++++++
 mandatory/inc/ListDir.hpp               |  4 ++--
 mandatory/inc/ListeningSocket.hpp       | 12 ++++++++++++
 mandatory/inc/Location.hpp              | 12 ++++++++++++
 mandatory/inc/LocationParser.hpp        | 12 ++++++++++++
 mandatory/inc/Parser.hpp                | 12 ++++++++++++
 mandatory/inc/Receive.hpp               | 12 ++++++++++++
 mandatory/inc/Server.hpp                | 12 ++++++++++++
 mandatory/inc/StatusCode.hpp            | 12 ++++++++++++
 mandatory/inc/StatusCodesDefinition.hpp | 12 ++++++++++++
 mandatory/inc/utils.hpp                 | 12 ++++++++++++
 mandatory/src/CGI.cpp                   | 12 ++++++++++++
 mandatory/src/Environment.cpp           | 12 ++++++++++++
 mandatory/src/ExtendedString.cpp        | 12 ++++++++++++
 mandatory/src/FileContent.cpp           | 12 ++++++++++++
 mandatory/src/Header.cpp                | 12 ++++++++++++
 mandatory/src/ListDir.cpp               | 12 ++++++++++++
 mandatory/src/ListeningSocket.cpp       | 12 ++++++++++++
 mandatory/src/Location.cpp              |  4 ++--
 mandatory/src/LocationParser.cpp        | 12 ++++++++++++
 mandatory/src/Parser.cpp                | 12 ++++++++++++
 mandatory/src/Recieve.cpp               | 12 ++++++++++++
 mandatory/src/Server.cpp                | 12 ++++++++++++
 mandatory/src/ServerGetters.cpp         | 12 ++++++++++++
 mandatory/src/ServerSetters.cpp         | 12 ++++++++++++
 mandatory/src/StatusCode.cpp            | 12 ++++++++++++
 mandatory/src/WebServer.cpp             | 12 ++++++++++++
 mandatory/src/WebServerLNX.cpp          | 12 ++++++++++++
 mandatory/src/WebServerMAC.cpp          | 12 ++++++++++++
 mandatory/src/WebservParser.cpp         | 12 ++++++++++++
 mandatory/src/main.cpp                  | 12 ++++++++++++
 mandatory/src/utils.cpp                 | 12 ++++++++++++
 36 files changed, 412 insertions(+), 4 deletions(-)

diff --git a/mandatory/inc/CGI.hpp b/mandatory/inc/CGI.hpp
index 493ecbc..48bba02 100644
--- a/mandatory/inc/CGI.hpp
+++ b/mandatory/inc/CGI.hpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   CGI.hpp                                            :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:47:27 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:47:29 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #pragma once
 #include <iostream>
 #include <string>
diff --git a/mandatory/inc/Environment.hpp b/mandatory/inc/Environment.hpp
index afd5719..67cc31b 100644
--- a/mandatory/inc/Environment.hpp
+++ b/mandatory/inc/Environment.hpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   Environment.hpp                                    :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:47:48 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:47:52 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #pragma once
 #include <iostream>
 #include <string>
diff --git a/mandatory/inc/ExtendedString.hpp b/mandatory/inc/ExtendedString.hpp
index 008910e..fea10a2 100644
--- a/mandatory/inc/ExtendedString.hpp
+++ b/mandatory/inc/ExtendedString.hpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ExtendedString.hpp                                 :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:47:57 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:47:58 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #pragma once
 #include <sstream>
 #include <string>
diff --git a/mandatory/inc/FileContent.hpp b/mandatory/inc/FileContent.hpp
index 7e8f9b4..05cf750 100644
--- a/mandatory/inc/FileContent.hpp
+++ b/mandatory/inc/FileContent.hpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   FileContent.hpp                                    :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:48:24 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:48:25 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #pragma once
 #include <iostream>
 #include <fstream>
diff --git a/mandatory/inc/Header.hpp b/mandatory/inc/Header.hpp
index e9e0509..ded226b 100644
--- a/mandatory/inc/Header.hpp
+++ b/mandatory/inc/Header.hpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   Header.hpp                                         :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:48:01 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:48:02 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #pragma once
 #include <string>
 #include <map>
diff --git a/mandatory/inc/ListDir.hpp b/mandatory/inc/ListDir.hpp
index 964c3be..4e4ee6e 100644
--- a/mandatory/inc/ListDir.hpp
+++ b/mandatory/inc/ListDir.hpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   ListDir.hpp                                        :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/07 19:03:57 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/29 12:32:21 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 13:48:17 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/mandatory/inc/ListeningSocket.hpp b/mandatory/inc/ListeningSocket.hpp
index 08ba1c5..175ddd5 100644
--- a/mandatory/inc/ListeningSocket.hpp
+++ b/mandatory/inc/ListeningSocket.hpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ListeningSocket.hpp                                :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:48:33 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:48:34 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #pragma once
 #include <iostream>
 #include <netinet/in.h>
diff --git a/mandatory/inc/Location.hpp b/mandatory/inc/Location.hpp
index fbdeb54..1ad7d44 100644
--- a/mandatory/inc/Location.hpp
+++ b/mandatory/inc/Location.hpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   Location.hpp                                       :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:48:41 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:48:42 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #ifndef LOCATION_HPP
 #define LOCATION_HPP
 
diff --git a/mandatory/inc/LocationParser.hpp b/mandatory/inc/LocationParser.hpp
index f845ccc..e7df33a 100644
--- a/mandatory/inc/LocationParser.hpp
+++ b/mandatory/inc/LocationParser.hpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   LocationParser.hpp                                 :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:48:49 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:48:50 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #pragma once
 #include <string>
 #include <map>
diff --git a/mandatory/inc/Parser.hpp b/mandatory/inc/Parser.hpp
index a9a1b84..bcf8a3e 100644
--- a/mandatory/inc/Parser.hpp
+++ b/mandatory/inc/Parser.hpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   Parser.hpp                                         :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:48:59 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:49:00 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #pragma once
 # include <iostream>
 # include <string>
diff --git a/mandatory/inc/Receive.hpp b/mandatory/inc/Receive.hpp
index 6ce5bee..fbf5385 100644
--- a/mandatory/inc/Receive.hpp
+++ b/mandatory/inc/Receive.hpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   Receive.hpp                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:49:11 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:49:12 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #pragma once
 #include <iostream>
 #include <fstream>
diff --git a/mandatory/inc/Server.hpp b/mandatory/inc/Server.hpp
index 6d7b554..373a1ae 100644
--- a/mandatory/inc/Server.hpp
+++ b/mandatory/inc/Server.hpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   Server.hpp                                         :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:49:18 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:49:19 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #ifndef SERVER_HPP
 # define SERVER_HPP
 # include <vector>
diff --git a/mandatory/inc/StatusCode.hpp b/mandatory/inc/StatusCode.hpp
index b36f50e..2b7eb5d 100644
--- a/mandatory/inc/StatusCode.hpp
+++ b/mandatory/inc/StatusCode.hpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   StatusCode.hpp                                     :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:49:24 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:49:24 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #pragma once
 #include <map>
 #include <string>
diff --git a/mandatory/inc/StatusCodesDefinition.hpp b/mandatory/inc/StatusCodesDefinition.hpp
index 149cbd9..fa9c517 100644
--- a/mandatory/inc/StatusCodesDefinition.hpp
+++ b/mandatory/inc/StatusCodesDefinition.hpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   StatusCodesDefinition.hpp                          :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:49:29 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:49:29 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #define DEFAULT_ERROR_FILE "./Templates/ErrorTemplate.html"
 #define CONTINUE_CODE 100
 #define SWITCHING_PROTOCOLS_CODE 101
diff --git a/mandatory/inc/utils.hpp b/mandatory/inc/utils.hpp
index c380178..9123d75 100644
--- a/mandatory/inc/utils.hpp
+++ b/mandatory/inc/utils.hpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   utils.hpp                                          :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:49:35 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:49:39 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #pragma once
 #include <iostream>
 #include <string>
diff --git a/mandatory/src/CGI.cpp b/mandatory/src/CGI.cpp
index 3b7400d..f057228 100644
--- a/mandatory/src/CGI.cpp
+++ b/mandatory/src/CGI.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   CGI.cpp                                            :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:49:55 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:49:56 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "../inc/CGI.hpp"
 
 CGI::CGI() : Environment()
diff --git a/mandatory/src/Environment.cpp b/mandatory/src/Environment.cpp
index 28955d0..ede41de 100644
--- a/mandatory/src/Environment.cpp
+++ b/mandatory/src/Environment.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   Environment.cpp                                    :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:50:02 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:50:03 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "../inc/Environment.hpp"
 #include <cstring>
 
diff --git a/mandatory/src/ExtendedString.cpp b/mandatory/src/ExtendedString.cpp
index 48f1864..1d0d023 100644
--- a/mandatory/src/ExtendedString.cpp
+++ b/mandatory/src/ExtendedString.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ExtendedString.cpp                                 :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:50:11 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:50:11 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "../inc/ExtendedString.hpp"
 
 ExtendedString::ExtendedString() : std::string() {}
diff --git a/mandatory/src/FileContent.cpp b/mandatory/src/FileContent.cpp
index 3733ff5..4b0e282 100644
--- a/mandatory/src/FileContent.cpp
+++ b/mandatory/src/FileContent.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   FileContent.cpp                                    :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:50:28 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:50:29 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "../inc/FileContent.hpp"
 
 // FileContent::FileContent(Server *srv) : StatusCode()
diff --git a/mandatory/src/Header.cpp b/mandatory/src/Header.cpp
index 61dbb97..22bc4c1 100644
--- a/mandatory/src/Header.cpp
+++ b/mandatory/src/Header.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   Header.cpp                                         :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:52:00 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:52:00 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 
 #include "../inc/Header.hpp"
 
diff --git a/mandatory/src/ListDir.cpp b/mandatory/src/ListDir.cpp
index 1f609c5..41e50d4 100644
--- a/mandatory/src/ListDir.cpp
+++ b/mandatory/src/ListDir.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ListDir.cpp                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:51:56 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:51:56 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 
 #include "../inc/ListDir.hpp"
 
diff --git a/mandatory/src/ListeningSocket.cpp b/mandatory/src/ListeningSocket.cpp
index 5d063bf..fe0db09 100644
--- a/mandatory/src/ListeningSocket.cpp
+++ b/mandatory/src/ListeningSocket.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ListeningSocket.cpp                                :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:51:47 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:51:52 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "../inc/ListeningSocket.hpp"
 
 ListeningSocket::ListeningSocket(int myPort, Server *srv): FileContent()
diff --git a/mandatory/src/Location.cpp b/mandatory/src/Location.cpp
index d4d8446..1d8e44a 100644
--- a/mandatory/src/Location.cpp
+++ b/mandatory/src/Location.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Location.cpp                                       :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: jcheel-n <jcheel-n@student.42barcelona.    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/29 17:38:18 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/27 13:39:19 by jcheel-n         ###   ########.fr       */
+/*   Updated: 2024/06/30 13:51:43 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/mandatory/src/LocationParser.cpp b/mandatory/src/LocationParser.cpp
index e982ab5..1e5e173 100644
--- a/mandatory/src/LocationParser.cpp
+++ b/mandatory/src/LocationParser.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   LocationParser.cpp                                 :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:51:38 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:51:38 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "../inc/LocationParser.hpp"
 
 static std::string getMimeType(std::string contentType)
diff --git a/mandatory/src/Parser.cpp b/mandatory/src/Parser.cpp
index 1dffdcf..7f96f59 100644
--- a/mandatory/src/Parser.cpp
+++ b/mandatory/src/Parser.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   Parser.cpp                                         :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:51:31 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:51:31 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "../inc/Parser.hpp"
 #include <dirent.h>
 
diff --git a/mandatory/src/Recieve.cpp b/mandatory/src/Recieve.cpp
index 6c7f646..8305453 100644
--- a/mandatory/src/Recieve.cpp
+++ b/mandatory/src/Recieve.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   Recieve.cpp                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:51:26 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:51:26 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "../inc/Receive.hpp"
 #include <iostream>
 #include <fstream>
diff --git a/mandatory/src/Server.cpp b/mandatory/src/Server.cpp
index 0a31276..7878fea 100644
--- a/mandatory/src/Server.cpp
+++ b/mandatory/src/Server.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   Server.cpp                                         :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:51:20 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:51:20 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "../inc/Server.hpp"
 
 std::map<std::string, int> var_names_server()
diff --git a/mandatory/src/ServerGetters.cpp b/mandatory/src/ServerGetters.cpp
index 39912e6..4041693 100644
--- a/mandatory/src/ServerGetters.cpp
+++ b/mandatory/src/ServerGetters.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ServerGetters.cpp                                  :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:51:14 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:51:14 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "../inc/Server.hpp"
 
 
diff --git a/mandatory/src/ServerSetters.cpp b/mandatory/src/ServerSetters.cpp
index 51c5b0a..80c2565 100644
--- a/mandatory/src/ServerSetters.cpp
+++ b/mandatory/src/ServerSetters.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ServerSetters.cpp                                  :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:51:10 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:51:11 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "../inc/Server.hpp"
 
 void Server::setHost(std::string const &host) { this->Host = host; }
diff --git a/mandatory/src/StatusCode.cpp b/mandatory/src/StatusCode.cpp
index e46be16..98b3fac 100644
--- a/mandatory/src/StatusCode.cpp
+++ b/mandatory/src/StatusCode.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   StatusCode.cpp                                     :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:51:07 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:51:08 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "../inc/StatusCode.hpp"
 
 StatusCode::StatusCode()
diff --git a/mandatory/src/WebServer.cpp b/mandatory/src/WebServer.cpp
index 4a7f254..b1ddb83 100644
--- a/mandatory/src/WebServer.cpp
+++ b/mandatory/src/WebServer.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   WebServer.cpp                                      :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:50:54 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:50:59 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "../inc/WebServer.hpp"
 
 WebServer::WebServer()
diff --git a/mandatory/src/WebServerLNX.cpp b/mandatory/src/WebServerLNX.cpp
index 788785d..01b544d 100644
--- a/mandatory/src/WebServerLNX.cpp
+++ b/mandatory/src/WebServerLNX.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   WebServerLNX.cpp                                   :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:50:51 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:50:51 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #ifdef __linux__
 #include "../inc/WebServer.hpp"
 
diff --git a/mandatory/src/WebServerMAC.cpp b/mandatory/src/WebServerMAC.cpp
index 0ff6662..7fde14d 100644
--- a/mandatory/src/WebServerMAC.cpp
+++ b/mandatory/src/WebServerMAC.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   WebServerMAC.cpp                                   :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:50:44 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:50:44 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #ifdef __APPLE__
 #include "../inc/WebServer.hpp"
 
diff --git a/mandatory/src/WebservParser.cpp b/mandatory/src/WebservParser.cpp
index ff18163..8095250 100644
--- a/mandatory/src/WebservParser.cpp
+++ b/mandatory/src/WebservParser.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   WebservParser.cpp                                  :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:50:32 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:50:39 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 # include "../inc/WebServer.hpp"
 
 std::string removeComments(std::string &str)
diff --git a/mandatory/src/main.cpp b/mandatory/src/main.cpp
index f03a3af..5e71001 100644
--- a/mandatory/src/main.cpp
+++ b/mandatory/src/main.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   main.cpp                                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:51:34 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:51:34 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "../inc/WebServer.hpp"
 
 int main(int av, char **ac)
diff --git a/mandatory/src/utils.cpp b/mandatory/src/utils.cpp
index 9c2eea7..e5acde7 100644
--- a/mandatory/src/utils.cpp
+++ b/mandatory/src/utils.cpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   utils.cpp                                          :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/30 13:51:03 by eavedill          #+#    #+#             */
+/*   Updated: 2024/06/30 13:51:03 by eavedill         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "../inc/utils.hpp"
 
 template <typename T>

From aa43510152182d3988d8d02c427b4b4ba078ed7a Mon Sep 17 00:00:00 2001
From: "ernesto.avedillo" <eavedillo@yahoo.es>
Date: Sun, 30 Jun 2024 15:31:25 +0200
Subject: [PATCH 29/31] Norm

---
 mandatory/inc/Attributes.hpp      |   8 +--
 mandatory/inc/CGI.hpp             |  54 +++++++--------
 mandatory/inc/Environment.hpp     |  10 +--
 mandatory/inc/ExtendedString.hpp  |  44 ++++++------
 mandatory/inc/FileContent.hpp     | 107 +++++++++++++++---------------
 mandatory/inc/Header.hpp          |  63 +++++++++---------
 mandatory/inc/ListDir.hpp         |  52 ++++++++-------
 mandatory/inc/ListeningSocket.hpp |  70 ++++---------------
 mandatory/inc/LocationParser.hpp  |  52 +++++++--------
 mandatory/inc/Parser.hpp          |  35 +++++-----
 mandatory/inc/Receive.hpp         |  67 +++++++++----------
 mandatory/inc/Server.hpp          | 103 ++++++++++++++--------------
 mandatory/inc/colors.h            |   6 +-
 mandatory/inc/utils.hpp           |  42 ++++++------
 mandatory/src/Attributes.cpp      |   6 +-
 mandatory/src/CGI.cpp             |  38 ++++-------
 mandatory/src/Environment.cpp     |   6 +-
 mandatory/src/ExtendedString.cpp  |  32 ++-------
 mandatory/src/FileContent.cpp     |  25 +------
 mandatory/src/Header.cpp          |  22 +-----
 mandatory/src/ListDir.cpp         |  11 +--
 mandatory/src/ListeningSocket.cpp |  29 +-------
 mandatory/src/Location.cpp        |  40 +++--------
 mandatory/src/LocationParser.cpp  |  44 +-----------
 mandatory/src/Parser.cpp          |  21 +-----
 mandatory/src/Recieve.cpp         |  11 +--
 mandatory/src/Server.cpp          |  16 ++---
 mandatory/src/ServerSetters.cpp   |   7 +-
 mandatory/src/StatusCode.cpp      |   7 +-
 mandatory/src/WebServer.cpp       |   5 +-
 mandatory/src/WebServerLNX.cpp    |   6 +-
 mandatory/src/WebServerMAC.cpp    |   6 +-
 mandatory/src/WebservParser.cpp   |  15 +----
 mandatory/src/main.cpp            |   5 +-
 mandatory/src/utils.cpp           |  31 +++------
 35 files changed, 405 insertions(+), 691 deletions(-)

diff --git a/mandatory/inc/Attributes.hpp b/mandatory/inc/Attributes.hpp
index 1ffc60b..8178ba0 100644
--- a/mandatory/inc/Attributes.hpp
+++ b/mandatory/inc/Attributes.hpp
@@ -6,7 +6,7 @@
 /*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/07 18:22:35 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/15 14:34:07 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 14:29:47 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -31,10 +31,10 @@ class Attributes
 		Attributes();
 		Attributes(const std::string& filename);
 		~Attributes();
-		void setAttributesFromFile(const std::string& filename);
-			
+
+		void		setAttributesFromFile(const std::string& filename);	
 		std::string getName() ;
-		bool getIsDir() ;
+		bool		getIsDir() ;
 		std::string getSize() ;
 		std::string getDevice() ;
 		std::string getCreated() ;
diff --git a/mandatory/inc/CGI.hpp b/mandatory/inc/CGI.hpp
index 48bba02..775c28d 100644
--- a/mandatory/inc/CGI.hpp
+++ b/mandatory/inc/CGI.hpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   CGI.hpp                                            :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:47:27 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:47:29 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:00:16 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -29,39 +29,33 @@
 class CGI : public Environment
 {
 	private:
-		std::string CGIFolder;
-		std::string fileName;
-		std::string fileArgs;
-		bool isCGI;
-		std::vector <ExtendedString> args;
-		std::map<std::string, std::string> CGIExtensions;
+		std::string							CGIFolder;
+		std::string							fileName;
+		std::string							fileArgs;
+		bool								isCGI;
+		std::vector <ExtendedString>		args;
+		std::map<std::string, std::string>	CGIExtensions;
 
 	public:
 		CGI();
 		CGI(const std::string &, const std::string &);
 		CGI(const CGI &);
 		~CGI();
-		//------ Setters and Getters ------//
-		//setters
-		void setCGIFolder(const std::string &);
-		void setFileName(const std::string&, const std::string&);
-		void setIsCGI(bool);
-		bool setIdentifyCGIFromFileName(const std::string &str); 
-		bool getIsCGI();
-		//bool setIsCGI(const std::string &str);
-		void setArgs(const std::string &);
-		void setCGIMapExtensions(std::string const &cgi_extension);
-		//getters
-		std::string getFileName();
-		std::string getCGIFolder();
-		std::vector <ExtendedString> getArgs();
-		std::string getCGIExtension(const std::string &);
-		std::string getFileExtension();
+		void							setCGIFolder(const std::string &);
+		void							setFileName(const std::string&, const std::string&);
+		void							setIsCGI(bool);
+		bool							setIdentifyCGIFromFileName(const std::string &str); 
+		bool							getIsCGI();
+		void							setArgs(const std::string &);
+		void							setCGIMapExtensions(std::string const &cgi_extension);
+		std::string						getFileName();
+		std::string						getCGIFolder();
+		std::vector <ExtendedString>	getArgs();
+		std::string						getCGIExtension(const std::string &);
+		std::string						getFileExtension();
+		std::string						execute();
+		CGI 							*clone();
+		static int						ChildPID;
+		static void						alarm_handler(int);
 		std::map<std::string, std::string>::iterator findCGIExtension(const std::string &);
-		//------ OTHER Methods ------//
-		std::string execute();
-		CGI *clone();
-
-		static int ChildPID;
-		static void alarm_handler(int);
 };
diff --git a/mandatory/inc/Environment.hpp b/mandatory/inc/Environment.hpp
index 67cc31b..59d32ab 100644
--- a/mandatory/inc/Environment.hpp
+++ b/mandatory/inc/Environment.hpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Environment.hpp                                    :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:47:48 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:47:52 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 14:57:33 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -50,7 +50,7 @@ class Environment
 	public:
 		Environment();
 		~Environment();
-		void setEnv(const std::string $key, const std::string $value);
-		std::vector<char*>getEnv();
-		std::string getEnv(std::string key);
+		void				setEnv(const std::string $key, const std::string $value);
+		std::vector<char*>	getEnv();
+		std::string			getEnv(std::string key);
 };
diff --git a/mandatory/inc/ExtendedString.hpp b/mandatory/inc/ExtendedString.hpp
index fea10a2..1431fde 100644
--- a/mandatory/inc/ExtendedString.hpp
+++ b/mandatory/inc/ExtendedString.hpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   ExtendedString.hpp                                 :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:47:57 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:47:58 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 14:56:55 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,27 +17,23 @@
 #include <vector>
 #include "utils.hpp"
 
-class ExtendedString : public std::string {
-public:
-	//using std::string::string; // Inherit constructors from std::string
-	ExtendedString();
-	ExtendedString(const std::string &str);
-	~ExtendedString();
-	ExtendedString &operator=(const std::string &str);
-
-	bool isNumber() const;
-	bool firstCharIsSign() const;
-	void replaceString(const std::string& , const std::string& );
-	bool validIPAddress();
-	size_t stringToSizeT();
-	std::vector<ExtendedString> splitString(char );
-	//***To be used in case do not want to modify the original string
-	//ExtendedString removeCharFromString(char);
-	void removeCharFromString(char);
-	//***To be used in case do not want to modify the original string
-	// ExtendedString removeBlanksAndTabs() ;
-	void removeBlanksAndTabs() ;
-	int count_chars(char c);
-	void replaceFirstString(const std::string& searchString, const std::string& replaceString);
+class ExtendedString : public std::string 
+{
+	public:
+		ExtendedString();
+		ExtendedString(const std::string &str);
+		~ExtendedString();
+		ExtendedString	&operator=(const std::string &str);
+		
+		bool						isNumber() const;
+		bool						firstCharIsSign() const;
+		void						replaceString(const std::string& , const std::string& );
+		bool						validIPAddress();
+		size_t						stringToSizeT();
+		std::vector<ExtendedString>	splitString(char );
+		void 						removeCharFromString(char);
+		void 						removeBlanksAndTabs() ;
+		int							count_chars(char c);
+		void						replaceFirstString(const std::string& searchString, const std::string& replaceString);
 
 };
\ No newline at end of file
diff --git a/mandatory/inc/FileContent.hpp b/mandatory/inc/FileContent.hpp
index 05cf750..a240c36 100644
--- a/mandatory/inc/FileContent.hpp
+++ b/mandatory/inc/FileContent.hpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   FileContent.hpp                                    :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:48:24 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:48:25 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 14:55:08 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -33,60 +33,59 @@
 class FileContent : public StatusCode
 {
 	protected:
-		CGI *cgiModule;
+		CGI 		*cgiModule;
 	private:
-		std::string fileName;
-		std::string indexName;
-		std::vector <std::string> args;
-		ExtendedString content;
-		std::ifstream file;
-		bool isFistFragment;
-		bool isFileOpen;
-		bool sendComplete;
-		bool isAutoIndex;
-		std::string homeFolder;
-		struct stat fileStat;
-		long long startRange;
-		long long currentSendingPosition;
-		long long lastSendingPosition;
-		ListDir *listDir;
-		size_t completeContentSize;
-		std::string splitFileFromArgs(const std::string &);
-		bool FileOrFolerExtists(const std::string &);
-		size_t endRange;
+		std::string					fileName;
+		std::string					indexName;
+		std::vector <std::string>	args;
+		ExtendedString				content;
+		std::ifstream				file;
+		bool						isFistFragment;
+		bool						isFileOpen;
+		bool						sendComplete;
+		bool						isAutoIndex;
+		std::string					homeFolder;
+		struct stat					fileStat;
+		long long					startRange;
+		long long					currentSendingPosition;
+		long long					lastSendingPosition;
+		ListDir						*listDir;
+		size_t						completeContentSize;
+		size_t						endRange;
+
+		std::string					splitFileFromArgs(const std::string &);
+		bool						FileOrFolerExtists(const std::string &);
 	public:
 		FileContent();
 		~FileContent();
-		int openFile();
-		bool setFileName(const std::string &, const std::string &);
-		void setIsCGI(bool isCgi);
-		void setStartRange(long long);
-		void setEndRange(long long);
-		long long getStartRange();
-		std::string getFileName();
-		std::string getContent();
-		void setIsFileOpen(bool);
-		void setIsSendComplete(bool);
-		bool getIsSendComplete();
-		void setIsCgi(bool );
-		bool getIsCgi();
-
-		bool getIsFileOpen();
-		void setFirstFragment(bool);
-		bool getFirstFragment();
-		std::string getLastModified();
-		size_t getCompleteContentSize();
-		void setCompleteContentSize(size_t);
-		bool isInputDirectory();
-		void setRange(size_t );
-		void setIsAutoIndex(bool);
-		bool getIsAutoIndex();
-		void setIndexName(const std::string &);
-		std::string getIndexName();
-		void setHomeFolder(const std::string &);
-		std::string getHomeFolder();
-		void setCGIModule(CGI *);
-		long long getFileSize();
-		long long getCurrentSendingPosition();
-		long long getLastSendingPosition();
+		int			openFile();
+		bool		setFileName(const std::string &, const std::string &);
+		void		setIsCGI(bool isCgi);
+		void		setStartRange(long long);
+		void		setEndRange(long long);
+		long long	getStartRange();
+		std::string	getFileName();
+		std::string	getContent();
+		void		setIsFileOpen(bool);
+		void		setIsSendComplete(bool);
+		bool		getIsSendComplete();
+		void		setIsCgi(bool );
+		bool		getIsFileOpen();
+		void		setFirstFragment(bool);
+		bool		getFirstFragment();
+		std::string	getLastModified();
+		size_t		getCompleteContentSize();
+		void		setCompleteContentSize(size_t);
+		bool		isInputDirectory();
+		void		setRange(size_t );
+		void		setIsAutoIndex(bool);
+		bool		getIsAutoIndex();
+		void		setIndexName(const std::string &);
+		std::string	getIndexName();
+		void		setHomeFolder(const std::string &);
+		std::string	getHomeFolder();
+		void		setCGIModule(CGI *);
+		long long	getFileSize();
+		long long	getCurrentSendingPosition();
+		long long	getLastSendingPosition();
 };
diff --git a/mandatory/inc/Header.hpp b/mandatory/inc/Header.hpp
index ded226b..383c50a 100644
--- a/mandatory/inc/Header.hpp
+++ b/mandatory/inc/Header.hpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Header.hpp                                         :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:48:01 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:48:02 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 14:50:34 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -23,41 +23,38 @@ class Header
 {
 	private:
 		/* Receive Header*/
-		std::string method;
-		ExtendedString path;
-		
-		std::string protocol;
-		std::string status;
-		std::string server;
-		std::string date;
-		std::string lastModified;
-		size_t contentLength;
-		std::string contentType;
-		std::map<std::string, std::string> attributes;
-		std::multimap<std::string, std::string> cookies;
+		std::string								method;
+		ExtendedString							path;
+		std::string								protocol;
+		std::string								status;
+		std::string								server;
+		std::string								date;
+		std::string								lastModified;
+		size_t									contentLength;
+		std::string								contentType;
+		std::map<std::string, std::string>		attributes;
+		std::multimap<std::string, std::string>	cookies;
 
 	public:
 		Header();
 		Header(std::string receiveHeader);
 		~Header();
-		std::string generateHeader() const;
-		void setVersion(std::string version);
-		void setStatus(std::string status);
-		void setServer(std::string server);
-		void setDate();
-		void setLastModified(std::string lastModified);
-		void setContentLength(size_t contentLength);
-		void setContentType(std::string contentType);
-		void setAttribute(std::string key, std::string value);
-		void setMethod(std::string method);
-		void setPath(std::string path);
-		void setProtocol(std::string protocol);
-		std::string getMethod();
-		ExtendedString getPath();
-		std::string getProtocol();
+		std::string							generateHeader() const;
+		void								setStatus(std::string status);
+		void								setServer(std::string server);
+		void								setDate();
+		void								setLastModified(std::string lastModified);
+		void								setContentLength(size_t contentLength);
+		void								setContentType(std::string contentType);
+		void								setAttribute(std::string key, std::string value);
+		void								setPath(std::string path);
+		void								setProtocol(std::string protocol);
+		std::string							getMethod();
+		ExtendedString						getPath();
+		std::string							getProtocol();
+		std::string							getContentType();
+		std::string							getAttribute(std::string key);
+		void								printReceivedHeader();
+		void								setCookie(std::string value);
 		std::map<std::string, std::string> getAttributes();
-		std::string getContentType();
-		std::string getAttribute(std::string key);
-		void printReceivedHeader();
-		void setCookie(std::string value);
 };
diff --git a/mandatory/inc/ListDir.hpp b/mandatory/inc/ListDir.hpp
index 4e4ee6e..acb1ffa 100644
--- a/mandatory/inc/ListDir.hpp
+++ b/mandatory/inc/ListDir.hpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   ListDir.hpp                                        :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/07 19:03:57 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:48:17 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 14:47:57 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,30 +21,32 @@
 #include "utils.hpp"
 #include "colors.h"
 #define TEMPLATE_LIST_DIR "./Templates/dir_list.html"
+
 class ListDir
 {
-    private:
-        std::ifstream file;
-        std::string path;
-        std::string homePath;
-        std::string contentToSend;
-        std::size_t      posToSend;
-        std::map<std::string, Attributes *> files;
-        bool        isSendComplete;
-    public:
-        ListDir();
-        ListDir(const std::string &, const std::string &);
-        ~ListDir();
-        void setListOfFiles();
-        std::map <std::string, Attributes *>::iterator getBeginOfFiles();
-        std::map <std::string, Attributes *>::iterator getEndOfFiles();
-        std::string getDirFileList();
-        void setContentToList();
-        void setIsSendComlete();
-        bool getIsSendComlete();
-        void openMasterListFile();
-        std::string getContentToSend();
-        size_t getSizeToSend();
-        void setSubdirectory(const std::string &);
+	private:
+		std::ifstream						file;
+		std::string							path;
+		std::string							homePath;
+		std::string							contentToSend;
+		std::size_t							posToSend;
+		std::map<std::string, Attributes *>	files;
+		bool								isSendComplete;
+
+	public:
+		ListDir();
+		ListDir(const std::string &, const std::string &);
+		~ListDir();
+		std::map <std::string, Attributes *>::iterator getBeginOfFiles();
+		std::map <std::string, Attributes *>::iterator getEndOfFiles();
+		void 		setListOfFiles();
+		std::string	getDirFileList();
+		void		setContentToList();
+		void		setIsSendComlete();
+		bool		getIsSendComlete();
+		void		openMasterListFile();
+		std::string	getContentToSend();
+		size_t		getSizeToSend();
+		void		setSubdirectory(const std::string &);
 };
 
diff --git a/mandatory/inc/ListeningSocket.hpp b/mandatory/inc/ListeningSocket.hpp
index 175ddd5..311df75 100644
--- a/mandatory/inc/ListeningSocket.hpp
+++ b/mandatory/inc/ListeningSocket.hpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   ListeningSocket.hpp                                :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:48:33 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:48:34 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 14:46:10 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,13 +21,11 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-
 #ifdef __APPLE__
-#include <sys/event.h>
+	#include <sys/event.h>
 #else
-#include <sys/epoll.h>
+	#include <sys/epoll.h>
 #endif
-
 #include <unistd.h>
 #include <map>
 #include <err.h>
@@ -41,50 +39,12 @@
 #include "Header.hpp"
 #include "LocationParser.hpp"
 #include "Environment.hpp"
-// SCRIPT_FILENAME
-// QUERY_STRING
-// REQUEST_METHOD
-// CONTENT_TYPE
-
-// CONTENT_LENGTH
-
-// GATEWAY_INTERFACE CGI/1.1
-// SERVER_SOFTWARE	webservcheelave
-
-// REMOTE_ADDR 127.0.0.1
-// REMOTE_PORT 8080
-
-// SERVER_ADDR localhost
-// SERVER_PORT 8080	
-// The name of the authentication scheme used to protect the servlet. For example, BASIC, SSL, or null if the servlet was not protected.
-
-// CONTENT_LENGTH
-
-// The length of the request body in bytes made available by the input stream or -1 if the length is not known. For HTTP servlets, the value returned is the same as the value of the CGI variable CONTENT_LENGTH.
-
-// CONTENT_TYPE
-
-// The MIME type of the body of the request, or null if the type is not known. For HTTP servlets, the value returned is the same as the value of the CGI variable CONTENT_TYPE.
-
-// SERVER_NAME webserver
-// HTTP_HOST
-// HTTP_USER_AGENT
-// HTTP_ACCEPT
-// HTTP_ACCEPT_LANGUAGE
-// HTTP_ACCEPT_ENCODING
-// HTTP_COOKIE
-// HTTP_CONNECTION
-// HTTP_UPGRADE_INSECURE_REQUESTS
-
-
 #define MAX_CONNECTIONS 10
 
 class Server;
 
 class Receive;
 
-
-// #define MAX_EVENTS 10
 class ListeningSocket : public FileContent
 {
 private:
@@ -95,21 +55,19 @@ class ListeningSocket : public FileContent
 	Header response;
 	Header request;
 
-	//void handleConnection(int clientSocketFd);
-
 public:
 	ListeningSocket(int port, Server *srv);
 	ListeningSocket(Server *srv);
 	~ListeningSocket();
 
-	bool startListening();
-	void stopListening();
-	int getFd();
-	bool sendData(int);
-	void loadRequest(std::vector<Server *> servers);
-	ListeningSocket *clone(int fd);
-	std::string getAnswerToSend();
-	bool receive();
-	void matchServerName(std::vector<Server *> servers);
-	void setCgiEnviroment();
+	bool			startListening();
+	void			stopListening();
+	int				getFd();
+	bool			sendData(int);
+	void			loadRequest(std::vector<Server *> servers);
+	ListeningSocket	*clone(int fd);
+	std::string		getAnswerToSend();
+	bool			receive();
+	void			matchServerName(std::vector<Server *> servers);
+	void			setCgiEnviroment();
 };
diff --git a/mandatory/inc/LocationParser.hpp b/mandatory/inc/LocationParser.hpp
index e7df33a..4d67010 100644
--- a/mandatory/inc/LocationParser.hpp
+++ b/mandatory/inc/LocationParser.hpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   LocationParser.hpp                                 :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:48:49 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:48:50 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 14:43:58 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -41,31 +41,31 @@ class Server;
 class LocationParser
 {
 	private:
-		Header request;
-		Header response;
-		Server *server;
-		Receive *receiver;
-		std::vector<std::string> cookies;
-		std::string query;
-		bool isAutoIndex;
-		bool isCGI;
-		bool isCookie;
-		size_t startRange;
-		size_t endRange;
-		std::string cgiPath;
-		// std::string
+		Header						request;
+		Header						response;
+		Server						*server;
+		Receive						*receiver;
+		std::vector<std::string>	cookies;
+		std::string					query;
+		bool						isAutoIndex;
+		bool						isCGI;
+		bool						isCookie;
+		size_t 						startRange;
+		size_t 						endRange;
+		std::string					cgiPath;
+		
 	public:
 		LocationParser(Header request, Server *server, Receive *receiver);
 		~LocationParser();
-		int matchingLocation();
-		int isAllowedMethod(Location *location);
-		Header getRequest();
-		Header getResponse();
-		bool getIsAutoIndex();
-		bool getIsCGI();
-		void checks();
-		void setCookies();
-		size_t getStartRange();
-		size_t getEndRange();
-		std::string getQuery();
+		int			matchingLocation();
+		int			isAllowedMethod(Location *location);
+		Header		getRequest();
+		Header		getResponse();
+		bool		getIsAutoIndex();
+		bool		getIsCGI();
+		void		checks();
+		void		setCookies();
+		size_t		getStartRange();
+		size_t		getEndRange();
+		std::string	getQuery();
 };
\ No newline at end of file
diff --git a/mandatory/inc/Parser.hpp b/mandatory/inc/Parser.hpp
index bcf8a3e..e2b04b3 100644
--- a/mandatory/inc/Parser.hpp
+++ b/mandatory/inc/Parser.hpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Parser.hpp                                         :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:48:59 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:49:00 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 14:41:40 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -28,21 +28,20 @@ class Parser
 {
 	private:
 	public:
-		static bool checkPorts(std::vector<std::string> const &ports);
-		static bool checkPort(std::string port);
-		static bool checkHost(std::string host);
-		static bool checkServerName(std::string serverName);
-		static bool checkErrorPage(std::string errorPage);
-		static bool checkRoot(std::string root);
-		static bool checkPath(std::string root, std::string attributeName);
-		static bool checkIndex(std::string index, std::string root);
+		static bool			checkPorts(std::vector<std::string> const &ports);
+		static bool			checkPort(std::string port);
+		static bool			checkHost(std::string host);
+		static bool			checkServerName(std::string serverName);
+		static bool			checkErrorPage(std::string errorPage);
+		static bool			checkRoot(std::string root);
+		static bool			checkPath(std::string root, std::string attributeName);
+		static bool			checkIndex(std::string index, std::string root);
 		static in_addr_t	isValidHost(std::string hostname);
-		static long long checkClientBodySize(std::string maxClientBodySize);
-
-		static bool checkAutoIndex(std::string autoindex);
-		static int checkLocationName(std::string name);
-		static int checkRootAliasReturn(std::string root, std::string alias, std::string return_);
-		static bool checkReturnIgnore(std::string allowMethods, std::string autoindex, std::string index);
-		static bool checkCgi(std::string cgiExtension);
-		static bool checkAllowedMethods(std::string allowMethods);
+		static long long 	checkClientBodySize(std::string maxClientBodySize);
+		static bool			checkAutoIndex(std::string autoindex);
+		static int			checkLocationName(std::string name);
+		static int			checkRootAliasReturn(std::string root, std::string alias, std::string return_);
+		static bool			checkReturnIgnore(std::string allowMethods, std::string autoindex, std::string index);
+		static bool			checkCgi(std::string cgiExtension);
+		static bool			checkAllowedMethods(std::string allowMethods);
 };
\ No newline at end of file
diff --git a/mandatory/inc/Receive.hpp b/mandatory/inc/Receive.hpp
index fbf5385..04b4003 100644
--- a/mandatory/inc/Receive.hpp
+++ b/mandatory/inc/Receive.hpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Receive.hpp                                        :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:49:11 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:49:12 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 14:37:50 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,39 +16,38 @@
 #include <string>
 #include <sys/socket.h>
 #include <cstdlib>
+#define MAX_MSG_SIZE 8192
 
-
-#define MAX_MSG_SIZE 8192//2 4 8 16 32 64 128 256 512 1024 2048 4096 8192 16384 32768 65536
 class Receive {
-    private:
-        std::string buffer;
-        std::string request;
-        std::string body;
-        bool isbody;
-        size_t maxSize;
-        size_t sizeSent;
-        std::ofstream file;
-        std::string boundary;
-        bool isform;
-        std::string postHeader;
+	private:
+		std::string		buffer;
+		std::string		request;
+		std::string		body;
+		bool			isbody;
+		size_t			maxSize;
+		size_t			sizeSent;
+		std::ofstream	file;
+		std::string		boundary;
+		bool			isform;
+		std::string		postHeader;
 
-    public:
-        Receive();
-        ~Receive();
-        Receive(Receive const &copy);
-        Receive &operator=(Receive const &copy);
-        
-        bool receiveHeader(int fd);
-        bool receiveBody(int fd);
-        bool receive(int fd);
-        void        setBuffer(std::string buffer);
-        void        setRequest(std::string request);
-        void        setBody(std::string body);
-        void        setmaxSize(size_t size);
-        
-        std::string getBuffer();
-        std::string getRequest();
-        std::string getBody();
-        bool        getisform();
-        std::string getPostHeader();
+	public:
+		Receive();
+		~Receive();
+		Receive(Receive const &copy);
+		Receive &operator=(Receive const &copy);
+		
+		bool		receiveHeader(int fd);
+		bool		receiveBody(int fd);
+		bool		receive(int fd);
+		void		setBuffer(std::string buffer);
+		void		setRequest(std::string request);
+		void		setBody(std::string body);
+		void		setmaxSize(size_t size);
+		
+		std::string	getBuffer();
+		std::string	getRequest();
+		std::string	getBody();
+		bool		getisform();
+		std::string	getPostHeader();
 };
\ No newline at end of file
diff --git a/mandatory/inc/Server.hpp b/mandatory/inc/Server.hpp
index 373a1ae..79dd3ad 100644
--- a/mandatory/inc/Server.hpp
+++ b/mandatory/inc/Server.hpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Server.hpp                                         :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:49:18 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:49:19 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 14:35:38 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -26,15 +26,15 @@
 # include "Parser.hpp"
 # include "ExtendedString.hpp"
 
-#define VAR_PORT	"port"
-#define VAR_HOST	"host"
-#define VAR_SERVER_NAME	"server_name"
-#define VAR_ERROR_PAGE	"error_page"
-#define VAR_ROOT	"root"
-#define VAR_INDEX	"index"
+#define VAR_PORT					"port"
+#define VAR_HOST					"host"
+#define VAR_SERVER_NAME				"server_name"
+#define VAR_ERROR_PAGE				"error_page"
+#define VAR_ROOT					"root"
+#define VAR_INDEX					"index"
 #define VAR_CLIENT_MAX_BODY_SIZE	"client_max_body_size"
-#define VAR_LOCATIONS	"location"
-#define VAR_AUTOINDEX	"autoindex"
+#define VAR_LOCATIONS				"location"
+#define VAR_AUTOINDEX				"autoindex"
 
 #ifdef __APPLE__
 	#define READ_EVENT EVFILT_READ
@@ -53,30 +53,27 @@ class ListeningSocket;
 class Server 
 {
 	protected:
-		bool		isDefault;
-		std::map<int, ListeningSocket *> port;
-		std::vector<std::string> ports;
-		long long			maxBodySize;
-		std::string		maxBodySizeStr;
-		std::string	Host;
-		std::string	serverName;
-		ExtendedString errorPage;
-		std::string root;
-		std::string index;
-		std::string autoIndexStr;
-		bool autoIndex;
-		std::vector<Location *> locations;
-		CGI *cgiModule;
-		in_addr_t hostAddr;
-		// void	setDefaultData();
+		bool								isDefault;
+		std::map<int, ListeningSocket *>	port;
+		std::vector<std::string>			ports;
+		long long							maxBodySize;
+		std::string							maxBodySizeStr;
+		std::string							Host;
+		std::string							serverName;
+		ExtendedString 						errorPage;
+		std::string 						root;
+		std::string 						index;
+		std::string 						autoIndexStr;
+		bool 								autoIndex;
+		std::vector<Location *>				locations;
+		CGI 								*cgiModule;
+		in_addr_t 							hostAddr;
 
 	public:
-		// Server();
 		Server(std::string  &);
 		~Server();
 		Server(Server const &);
-		Server &operator=(Server const &);
-		//---- Server Methods ------//
+		Server	&operator=(Server const &);
 		//---- Server Methods ------//
 		int		loadData(std::string const &);
 		CGI		*cgiModuleClone();
@@ -95,34 +92,30 @@ class Server
 		void	setPorts(std::string const &ports);
 		void    setHostAddr(in_addr_t Addr);
 		void	setAutoindex(std::string const &);
-
 		//---- Server getters ------//
-		ListeningSocket *getListening(int i);
-		std::vector<std::string> getPorts();
-		std::vector<int> getServerFds();
-
-		ListeningSocket *		getPort(int i);
-		bool getIsDefault();
-		std::string	getHost();
-		std::string	getServerName();
-		std::string	getErrorPage();
-		std::string	getRoot();
-		std::string	getIndex();
-		std::string	getCGIExtension(const std::string &);
-		std::string	getCGIFolder();
-		in_addr_t	getHostAddr();
-		std::string	getMaxClientBodySizeStr();
-		long long		getMaxClientBodySize();
-		std::vector<Location *> getLocations();
-		bool getAutoIndex();
-		void	print();
-		void createListeningSockets();
-		void checkVariables();
-
-		//std::vector<class Location> getLocations();
+		ListeningSocket 			*getListening(int i);
+		std::vector<std::string>	getPorts();
+		std::vector<int>			getServerFds();
+		ListeningSocket *			getPort(int i);
+		bool						getIsDefault();
+		std::string					getHost();
+		std::string					getServerName();
+		std::string					getErrorPage();
+		std::string					getRoot();
+		std::string					getIndex();
+		std::string					getCGIExtension(const std::string &);
+		std::string					getCGIFolder();
+		in_addr_t					getHostAddr();
+		std::string					getMaxClientBodySizeStr();
+		long long					getMaxClientBodySize();
+		std::vector<Location *>		getLocations();
+		bool						getAutoIndex();
+		void						print();
+		void						createListeningSockets();
+		void						checkVariables();
 };
 
-typedef void (Server::*server)(std::string);
-typedef std::map<std::string, server> server_methods_t;
+typedef void	(Server::*server)(std::string);
+typedef 		std::map<std::string, server> server_methods_t;
 
 #endif
diff --git a/mandatory/inc/colors.h b/mandatory/inc/colors.h
index 059d8f7..2b8072b 100644
--- a/mandatory/inc/colors.h
+++ b/mandatory/inc/colors.h
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   colors.h                                           :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/05/06 11:16:47 by eavedill          #+#    #+#             */
-/*   Updated: 2024/02/09 11:18:46 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 14:58:03 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,7 +14,6 @@
 # define COLORS_H
 // Standard color
 # define RESET	"\033[0m"
-//# define RESET	""
 // Background colors over black
 # define BCK_BLACK	"\033[0;40m"
 # define BCK_RED	"\033[0;41m"
@@ -33,7 +32,6 @@
 # define CHR_MGENTA	"\033[0;35m"
 # define CHR_CYAN	"\033[0;36m"
 # define CHR_WHITE	"\033[0;37m"
-
 # define BLACK	"\033[30m"
 # define RED	"\033[31m"
 # define GREEN	"\033[32m"
diff --git a/mandatory/inc/utils.hpp b/mandatory/inc/utils.hpp
index 9123d75..f455030 100644
--- a/mandatory/inc/utils.hpp
+++ b/mandatory/inc/utils.hpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   utils.hpp                                          :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:49:35 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:49:39 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:03:42 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -30,41 +30,22 @@
 #include <sstream>
 #include <ctime>
 #include <algorithm>
-#define MAX_SENT_BYTES 16048 //8024
+#define MAX_SENT_BYTES 16048
 
 
 template <typename T>
 bool isrange(T value, T min, T max);
-bool isNumber(std::string str);
-bool validIPAddress(std::string ip);
-bool isDirPermissions(std::string path, int mode);
-int isFilePermissions(std::string path, int mode);
 
 template <typename T>
 std::string toString (T n)
 {
 	std::string str;
 	std::stringstream ss;
-	
 	ss << n;
 	ss >> str;
-
 	return  str;
 }
 
-std::string removeBlanksAndTabs(const std::string& input);
-std::string removeCharFromString(const std::string& input, char c);
-std::vector<std::string> splitString(const std::string &str, char delimiter);
-size_t stringToSizeT(const std::string& str);
-std::map<std::string, std::string> create_filetypes();
-void replaceString(std::string &mainString, const std::string &searchString, const std::string &replaceString);
-int count_chars(const std::string &str, char c);
-
-std::string getTime();
-std::string getLocalTime();
-void printLog(std::string type ,std::string message);
-std::string decodeURL(const std::string& url);
-
 template <typename T>
 T minimum(T a, T b)
 {
@@ -79,4 +60,19 @@ T maximum(T a, T b)
 	if (a > b)
 		return a;
 	return b;
-};
\ No newline at end of file
+};
+
+bool								isNumber(std::string str);
+bool								validIPAddress(std::string ip);
+bool								isDirPermissions(std::string path, int mode);
+int									isFilePermissions(std::string path, int mode);
+std::string							removeBlanksAndTabs(const std::string& input);
+std::string							removeCharFromString(const std::string& input, char c);
+std::vector<std::string>			splitString(const std::string &str, char delimiter);
+size_t 								stringToSizeT(const std::string& str);
+std::map<std::string, std::string>	create_filetypes();
+void								replaceString(std::string &mainString, const std::string &searchString, const std::string &replaceString);
+int									count_chars(const std::string &str, char c);
+std::string 						getLocalTime();
+void								printLog(std::string type ,std::string message);
+std::string							decodeURL(const std::string& url);
diff --git a/mandatory/src/Attributes.cpp b/mandatory/src/Attributes.cpp
index b832a8a..042e9cf 100644
--- a/mandatory/src/Attributes.cpp
+++ b/mandatory/src/Attributes.cpp
@@ -6,7 +6,7 @@
 /*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/07 18:22:26 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/15 14:34:16 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:10:47 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -24,7 +24,8 @@ Attributes::Attributes(const std::string& filename)
 	this->setAttributesFromFile(filename);
 }
 
-Attributes::~Attributes() {
+Attributes::~Attributes() 
+{
 }
 
 void Attributes::setAttributesFromFile(const std::string& filename) 
@@ -65,7 +66,6 @@ std::string Attributes::getCreated()
 std::string Attributes::getModified() 
 {
 	std::tm *timeInfo = std::gmtime(&this->attributes.st_mtime);
-
 	char buffer[80];
 	std::strftime(buffer, sizeof(buffer), "%A, %d-%b-%y %H:%M:%S GMT", timeInfo);
 	return buffer;
diff --git a/mandatory/src/CGI.cpp b/mandatory/src/CGI.cpp
index f057228..a44673b 100644
--- a/mandatory/src/CGI.cpp
+++ b/mandatory/src/CGI.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   CGI.cpp                                            :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:49:55 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:49:56 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:28:58 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -53,15 +53,6 @@ void CGI::setFileName(const std::string &Name, const std::string &Args)
 	fileName = Name;
 	this->setArgs(Args);
 	tmp = splitString(Args, '&');
-	// std::map<std::string, std::string>::iterator it = this->findCGIExtension(this->getFileExtension());
-	// if (it != this->CGIExtensions.end())
-	// {
-	// 	if (it->second.size() != 0)
-	// 	{
-	// 		fileName =it->second;
-	// 		this->setArgs(tmp[1]);
-	// 	}
-	// }
 }
 
 void CGI::setIsCGI(bool valCGI)
@@ -112,9 +103,15 @@ std::vector <ExtendedString> CGI::getArgs()
 	return args;
 }
 
-std::map<std::string, std::string>::iterator CGI::findCGIExtension(const std::string &str) { return this->CGIExtensions.find(str); }
+std::map<std::string, std::string>::iterator CGI::findCGIExtension(const std::string &str) 
+{
+	return this->CGIExtensions.find(str); 
+}
 
-std::string CGI::getCGIExtension(const std::string &str) { return this->CGIExtensions[str]; }
+std::string CGI::getCGIExtension(const std::string &str) 
+{
+	return this->CGIExtensions[str]; 
+}
 
 std::string CGI::getFileExtension()
 {
@@ -144,40 +141,31 @@ std::string CGI::execute()
 	}
 	pid_t pid = fork();
 	if (pid == -1) {
-		// Handle error forking process
 		throw INTERNAL_SERVER_ERROR_CODE;
 		return "";
 	}
 	if (pid == 0) {
-		// Child process
 		dup2(fd[1], STDOUT_FILENO);
 		close(fd[0]);
-		// Convert the arguments vector to a null-terminated array
-		// Execute the file with its parameters
 		std::vector<char*> envp = this->getEnv();
- 
- 
 		if (execve(Executable.c_str(), ExecArray.data(), envp.data()) == -1)
 		{
-			// Handle error executing file
 			std::cerr << "Error: " << errno << std::endl;
 			exit(errno);
 		}
 	} 
-	// Parent process
 	close(fd[1]);
 	CGI::ChildPID = pid;
 	alarm(timeout);
 	int status;
 	waitpid(pid, &status, 0);
-
 	std::string output;
 	if (WIFEXITED(status) && WEXITSTATUS(status) == 0) 
 	{
-		// Read the output from the file descriptor
 		char buffer[1024];
 		ssize_t bytesRead;
-		while ((bytesRead = read(fd[0], buffer, sizeof(buffer))) > 0) {
+		while ((bytesRead = read(fd[0], buffer, sizeof(buffer))) > 0) 
+		{
 			output += std::string(buffer, bytesRead);
 		}
 		close(fd[0]);
@@ -217,7 +205,7 @@ void CGI::setCGIMapExtensions(std::string const &cgi_extension)
 		}
 		else if (n == 0)
 		{
-			this->CGIExtensions[aux[i]] = ""; // Si no hay programa de ejecución, se asume que es un CGI ejecutable.
+			this->CGIExtensions[aux[i]] = "";
 		}
 		else
 		{
diff --git a/mandatory/src/Environment.cpp b/mandatory/src/Environment.cpp
index ede41de..86dcdc2 100644
--- a/mandatory/src/Environment.cpp
+++ b/mandatory/src/Environment.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Environment.cpp                                    :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:50:02 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:50:03 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:27:37 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -44,9 +44,7 @@ std::vector<char*> Environment::getEnv()
         itb++;
     }
     _envArray.push_back(NULL);
-
     return _envArray;
-
 }
 
 std::string Environment::getEnv(std::string key)
diff --git a/mandatory/src/ExtendedString.cpp b/mandatory/src/ExtendedString.cpp
index 1d0d023..92edb7c 100644
--- a/mandatory/src/ExtendedString.cpp
+++ b/mandatory/src/ExtendedString.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   ExtendedString.cpp                                 :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:50:11 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:50:11 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:27:27 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -37,7 +37,8 @@ bool ExtendedString::isNumber() const {
     return true;
 }
 
-bool ExtendedString::firstCharIsSign() const {
+bool ExtendedString::firstCharIsSign() const 
+{
     return this->at(0) == '-' || this->at(0) == '+';
 }
 
@@ -64,7 +65,6 @@ bool ExtendedString::validIPAddress()
 	size_t pos = 0;
 	ExtendedString token;
 	int count = 0;
-	
 	while ((pos = this->find('.')) != std::string::npos)
 	{
 		token = this->substr(0, pos);
@@ -73,10 +73,8 @@ bool ExtendedString::validIPAddress()
 		this->erase(0, pos + 1);
 		count++;
 	}
-	
 	if (count != 4 || !this->isNumber() || !isrange(std::atoi(this->c_str()), 0, 255))
 		return false;
-	
 	return count == 4;
 }
 
@@ -100,17 +98,6 @@ std::vector<ExtendedString> ExtendedString::splitString(char delimiter) {
 	return result;
 }
 
-//***To be used in case do not want to modify the original string
-// ExtendedString ExtendedString::removeCharFromString(char charToRemove) {
-// 	ExtendedString result;
-// 	for (size_t i = 0; i < this->size(); i++) {
-// 		if (this->at(i) != charToRemove) {
-// 			result += this->at(i);
-// 		}
-// 	}
-// 	return result;
-// }
-
 void ExtendedString::removeCharFromString(char charToRemove) {
     size_t pos = 0;
     while ((pos = this->find(charToRemove, pos)) != std::string::npos) {
@@ -118,17 +105,6 @@ void ExtendedString::removeCharFromString(char charToRemove) {
     }
 }
 
-//***To be used in case do not want to modify the original string
-// ExtendedString ExtendedString::removeBlanksAndTabs() {
-// 	ExtendedString result;
-// 	for (size_t i = 0; i < this->size(); i++) {
-// 		if (this->at(i) != ' ' && this->at(i) != '\t') {
-// 			result += this->at(i);
-// 		}
-// 	}
-// 	return result;
-// }
-
 void ExtendedString::removeBlanksAndTabs() {
     size_t pos = 0;
     while ((pos = this->find(' ', pos)) != std::string::npos) {
diff --git a/mandatory/src/FileContent.cpp b/mandatory/src/FileContent.cpp
index 4b0e282..bbcaadf 100644
--- a/mandatory/src/FileContent.cpp
+++ b/mandatory/src/FileContent.cpp
@@ -3,16 +3,15 @@
 /*                                                        :::      ::::::::   */
 /*   FileContent.cpp                                    :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:50:28 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:50:29 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:26:47 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "../inc/FileContent.hpp"
 
-// FileContent::FileContent(Server *srv) : StatusCode()
 FileContent::FileContent() : StatusCode()
 {
 	fileName = "";
@@ -78,12 +77,10 @@ std::string FileContent::getContent()
 
 			if (this->startRange != 0 && this->getFirstFragment())
 			{
-				//file.seekg(0, std::ios::beg);
 				file.seekg(startRange, std::ios::beg);
 				lastSendingPosition = currentSendingPosition;
 				file.read(buffer, MAX_SENT_BYTES);
 				content.append(buffer, file.gcount());
-				//this->setIsSendComplete(true);
 			}
 			else
 			{
@@ -94,7 +91,6 @@ std::string FileContent::getContent()
 			currentSendingPosition = file.tellg();
 			if (file.eof())
 			{
-//				std::cout << "Cierro fichero " << fileName << std::endl;
 				file.close();
 				this->setIsSendComplete(true);
 			}
@@ -110,7 +106,6 @@ std::string FileContent::getContent()
 
 bool FileContent::setFileName(const std::string &file_name, const std::string &fileArgs)
 {
-	std::cout << file_name << std::endl;
 	bool fileOrFolderExists = this->FileOrFolerExtists(file_name);
 	if (fileOrFolderExists)
 	{
@@ -123,30 +118,17 @@ bool FileContent::setFileName(const std::string &file_name, const std::string &f
 			listDir->setSubdirectory(file_name);
 			listDir->setContentToList();
 		}
-		// else if (cgiModule->setIdentifyCGIFromFileName(file_name))
-		// else if (this->isCgi)
 		else if (cgiModule->getIsCGI() )
 		{
-			std::cout << "CGI" << std::endl;
 			cgiModule->setFileName(file_name, fileArgs);
 			this->setIsFileOpen(true);
 		}
 		else
 		{
-			// if (this->isInputDirectory())
-			// {
-			// 	fileName = homeFolder + indexName;
-			// }
-			// else
-			// {
-				fileName = file_name;
-			// }
+			fileName = file_name;
 			stat(fileName.c_str(), &fileStat);
 			completeContentSize = fileStat.st_size;
 			this->setIsFileOpen(this->openFile());
-			// isFileOpen = true;
-			// if (this->getIsFileOpen())
-			// 		file.seekg(startRange, std::ios::beg);
 		}
 	}
 	return this->getIsFileOpen();
@@ -195,7 +177,6 @@ std::string FileContent::getLastModified()
 		return "";
 	}
 	char buffer[80];
-
 	strftime(buffer, sizeof(buffer), "%A, %d-%b-%y %H:%M:%S GMT", localtime(&fileStat.st_mtime));
 	return buffer;
 }
diff --git a/mandatory/src/Header.cpp b/mandatory/src/Header.cpp
index 22bc4c1..64c6de8 100644
--- a/mandatory/src/Header.cpp
+++ b/mandatory/src/Header.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Header.cpp                                         :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:52:00 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:52:00 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:26:03 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -26,7 +26,6 @@ Header::Header(std::string receiveHeader)
 {
 	std::istringstream iss(receiveHeader);
 	std::string line;
-
 	while (std::getline(iss, line))
 	{
 		size_t colonPos = line.find(':');
@@ -55,11 +54,6 @@ Header::Header(std::string receiveHeader)
 			}
 		}
 	}
-	// std::cout << "HEADER" << std::endl;
-	// for (std::map<std::string, std::string>::const_iterator it = attributes.begin(); it != attributes.end(); ++it)
-	// {
-	// 	std::cout << it->first << " => " << it->second << std::endl;
-	// }
 }
 
 void Header::setAttribute(std::string key, std::string value)
@@ -96,8 +90,6 @@ void Header::setPath(std::string path)
 std::string Header::generateHeader() const
 {
 	std::string header;
-	
-	// std::cout << "Version: $" << Version << "$" << std::endl;
 	header = protocol + " " + status + "\r\n"; 
 	header += "Server: " + server + "\r\n";
 	header += "Date: " + date + "\r\n";
@@ -110,7 +102,6 @@ std::string Header::generateHeader() const
 		header += it->first + ": " + it->second + "\r\n";
 	for (std::multimap<std::string, std::string>::const_iterator it = cookies.begin(); it != cookies.end(); ++it)
 		header += it->first + ": " + it->second + "\r\n";
-	// response.setAttribute("Set-Cookie", "id=123; name=Joseph; lastname=Cheel; theme=light;");
 	header += "\r\n";
 	
 	return header;
@@ -143,15 +134,10 @@ void Header::setServer(std::string server)
 
 void Header::setDate()
 {
-	// Get the current time
 	std::time_t currentTime = std::time(NULL);
-
-	// Convert the current time to a string in the desired format
 	std::tm* timeInfo = std::gmtime(&currentTime);
 	char buffer[80];
 	std::strftime(buffer, sizeof(buffer), "%A, %d-%b-%y %H:%M:%S GMT", timeInfo);
-
-	// Set the date in the header
 	this->date = buffer;
 }
 
@@ -175,15 +161,11 @@ void Header::setContentType(std::string contentType)
 {
 	size_t point = contentType.find_last_of(".");
 	std::string extension = contentType.substr(point + 1, contentType.size());
-
-	/* Create once only */
 	std::map<std::string, std::string> Mimetype = create_filetypes();
-
 	if (Mimetype.find(extension) != Mimetype.end())
 		this->contentType = Mimetype[extension];
 	else
 		this->contentType = "text/html";
-
 }
 
 void Header::printReceivedHeader()
diff --git a/mandatory/src/ListDir.cpp b/mandatory/src/ListDir.cpp
index 41e50d4..e08e376 100644
--- a/mandatory/src/ListDir.cpp
+++ b/mandatory/src/ListDir.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   ListDir.cpp                                        :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:51:56 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:51:56 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:25:36 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -74,14 +74,12 @@ std::string ListDir::getDirFileList()
 {
 	std::string content = "";
 	std::map <std::string, Attributes *>::iterator itb = files.begin();
-	//do not add ./ and ../
 	itb++;
 	itb++;
 	std::map<std::string, Attributes *>::iterator ite = files.end();
 	while (itb != ite)
 	{
 		content = content + "<script>\n";
-		//addRow(".dockerignore",".dockerignore",0,52,"52 B",521717927779,"2024-06-09 12:09:39");
 		content = content + "addRow(\" " + itb->first + "\",";
 		content = content + "\"" + itb->first + "\",";
 		content = content + (itb->second->getIsDir()? "1" : "0") + ",";
@@ -98,17 +96,14 @@ std::string ListDir::getDirFileList()
 void ListDir::setContentToList() 
 {
 	contentToSend = "";
-
 	char buffer[MAX_SENT_BYTES];
 	while(file.read(buffer, MAX_SENT_BYTES))
 	{
 		contentToSend.append(buffer, file.gcount());
 	}
 	contentToSend.append(buffer, file.gcount());
-	//replaceString(contentToSend, "LOCATION", path);
 	if (homePath != path)
 	{
-		std::cout << "verificando si tiene parent directory "<< homePath << " " << path << std::endl;
 		contentToSend += ("<script>start(\"" + path + "\");</script>\n");
 		contentToSend += "<script>onHasParentDirectory();</script>\n";
 	}
@@ -123,7 +118,7 @@ void ListDir::setIsSendComlete()
 
 bool ListDir::getIsSendComlete()
 {
-		return isSendComplete;
+	return isSendComplete;
 }
 
 void ListDir::openMasterListFile() 
diff --git a/mandatory/src/ListeningSocket.cpp b/mandatory/src/ListeningSocket.cpp
index fe0db09..c027891 100644
--- a/mandatory/src/ListeningSocket.cpp
+++ b/mandatory/src/ListeningSocket.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   ListeningSocket.cpp                                :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:51:47 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:51:52 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:25:07 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,10 +16,7 @@ ListeningSocket::ListeningSocket(int myPort, Server *srv): FileContent()
 {
 	this->port = myPort;
 	this->server = srv;
-	// this->client = new Client(srv);
 	this->receiver = new Receive();
-	// this->fileContent = new FileContent();
-	
 	this->socketFd = -1;
 	if (this->startListening())
 	{
@@ -35,9 +32,7 @@ ListeningSocket::ListeningSocket(int myPort, Server *srv): FileContent()
 
 ListeningSocket::ListeningSocket(Server *srv): FileContent()
 {
-	// this->client = new Client(srv);
 	this->receiver = new Receive();
-	// this->fileContent = new FileContent();
 	this->server = srv;
 	this->loadErrorPageFromDir(srv->getErrorPage());
 	this->setIsAutoIndex(srv->getAutoIndex());
@@ -50,7 +45,6 @@ ListeningSocket::~ListeningSocket()
 {
 	stopListening();
 	delete this->receiver;
-	// delete this->fileContent;
 }
 
 bool ListeningSocket::startListening()
@@ -61,13 +55,11 @@ bool ListeningSocket::startListening()
 		std::cerr << "Failed to create socket" << std::endl;
 		return false;
 	}
-
 	if (fcntl(socketFd, F_SETFL, O_NONBLOCK) < 0)
 	{
 		std::cerr << CHR_RED"Error" << std::endl;
 		exit(1);
 	}
-
 	int enable = 1;
 	setsockopt(socketFd, SOL_SOCKET, SO_KEEPALIVE, &enable, sizeof(enable));
 	if (setsockopt(socketFd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int)) < 0)
@@ -75,21 +67,15 @@ bool ListeningSocket::startListening()
 		std::cerr << "setsockopt(SO_REUSEADDR) failed" << std::endl;
 		exit(1);
 	}
-
-	// Set up the server address
 	sockaddr_in serverAddress;
 	serverAddress.sin_family = AF_INET;
 	serverAddress.sin_addr.s_addr = this->server->getHostAddr();
 	serverAddress.sin_port = htons(port);
-
-	// Bind the socket to the server address
 	if (bind(socketFd, (struct sockaddr *)&serverAddress, sizeof(serverAddress)) < 0)
 	{
 		printLog("ERROR", "Failed to bind socket to address of port " CHR_RED + toString(port) + RESET);
 		return false;
 	}
-
-	// Start listening for incoming connections
 	if (listen(socketFd, SOMAXCONN) < 0)
 	{
 		std::cerr << "Failed to start listening of port " << port << std::endl;
@@ -115,8 +101,6 @@ int ListeningSocket::getFd()
 bool ListeningSocket::sendData(int clientSocketFd)
 {
 	ExtendedString answer = this->getAnswerToSend();
-	// std::cout << "answer: " << answer.size() << std::endl;
-	// std::cout << "My answer: " << answer << std::endl;
 	int ret;
 	if ((ret = send(clientSocketFd, answer.c_str(), answer.size(), 0)) < 0)
 		std::cerr << "Failed to write to client" << std::endl;
@@ -140,17 +124,13 @@ ListeningSocket *ListeningSocket::clone(int fd)
 
 std::string ListeningSocket::getAnswerToSend()
 {
-	// long long sendingValue;
 	std::string answer;
 	std::string filePath = this->getFileName();
 	std::string file_content = this->getContent();
-
 	if (this->getFirstFragment())
 	{
 		answer = response.generateHeader() + file_content;
 		this->setFirstFragment(false);
-		// std::cout << "Answer: " << answer.substr(0, 200) << std::endl;
-		// std::cout << "------------------------------------------------" << std::endl;
 	}
 	else
 		answer = file_content;
@@ -178,16 +158,12 @@ void ListeningSocket::setCgiEnviroment()
 	this->cgiModule->setEnv(SERVER_ADDR_KEY, server->getHost());
 	this->cgiModule->setEnv(SERVER_NAME_KEY, server->getServerName());
 	this->cgiModule->setEnv(REQUEST_METHOD_KEY, this->request.getMethod());
-	// this->cgiModule->setEnv(PATH_INFO_KEY, this->request.getPath());
-	// // this->cgiModule->setEnv(PROT, this->request.getProtocol());
 	this->cgiModule->setEnv(SERVER_PORT_KEY, toString(this->port));
 	this->cgiModule->setEnv(CONTENT_LENGTH_KEY, this->request.getAttribute("Content-Lenght"));
 	this->cgiModule->setEnv(CONTENT_TYPE_KEY, this->request.getAttribute("Content-Type"));
 	this->cgiModule->setEnv(HTTP_USER_AGENT_KEY, this->request.getAttribute("User-Agent"));
-	// this->cgiModule->setEnv(, this->request.getAttribute("Host"));
 	this->cgiModule->setEnv(SERVER_SOFTWARE_KEY, "ws_cheelave/1.0");
 	this->cgiModule->setEnv(GATEWAY_INTERFACE_KEY, "CGI/1.1");
-	// this->cgiModule->setEnv(QUERY_STRING_KEY,this->);
 }
 
 void ListeningSocket::loadRequest(std::vector<Server *> servers)
@@ -214,6 +190,5 @@ void ListeningSocket::loadRequest(std::vector<Server *> servers)
 	this->response = Parser.getResponse();
 	this->setIsAutoIndex(Parser.getIsAutoIndex());
 	this->setIsCGI(Parser.getIsCGI());
-	
 	this->setFileName(this->request.getPath(), Parser.getQuery());
 }
diff --git a/mandatory/src/Location.cpp b/mandatory/src/Location.cpp
index 1d8e44a..68fc9b8 100644
--- a/mandatory/src/Location.cpp
+++ b/mandatory/src/Location.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Location.cpp                                       :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/29 17:38:18 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:51:43 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:24:13 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -47,7 +47,6 @@ std::map<std::string, void (Location::*)(const std::string&)> getLocationMethods
 	return locationMethods;
 }
 
-
 Location::Location() 
 {
 	name = "";
@@ -63,6 +62,7 @@ Location::Location()
 	isCookie = false;
 	cookiesStr = "";
 }
+
 Location::Location(std::string const &content)
 {
 	this->isCgi = false;
@@ -84,10 +84,8 @@ Location::Location(const Location& other)
 	setAlias(other.alias);
 }
 
-
 Location::~Location() {}
 
-// Getter methods
 const std::string &Location::getName() const { return name; }
 const std::string &Location::getRoot() const { return root; }
 const std::string &Location::getReturn() const { return return_; }
@@ -103,7 +101,6 @@ enum LocationType Location::getLocationType() { return this->LocationType; }
 bool Location::getIsCgi() const { return isCgi; }
 bool Location::getIsCookie() const { return isCookie; }
 std::vector<std::string>  Location::getCookies() const { return cookies; }
-// Setter methods
 void Location::setName(const std::string &n) { name = n; }
 void Location::setRoot(const std::string &r) { root = r; }
 void Location::setReturn(const std::string &ret) { return_ = ret; }
@@ -111,11 +108,10 @@ void Location::setIndex(const std::string &idx) { index = idx; }
 void Location::setAllowMethodsStr(const std::string &allow) { allowMethodsStr = allow; }
 void Location::setAutoindex(const std::string &autoidx) { autoindexStr = autoidx; }
 void Location::setAlias(const std::string &als) { alias = als; }
-void Location::setCgiEnabledStr(const std::string &cgiEnabled) {
-	this->cgiEnabledStr = cgiEnabled;
-}
+void Location::setCgiEnabledStr(const std::string &cgiEnabled) {this->cgiEnabledStr = cgiEnabled;}
 void Location::setSessionIdStr(const std::string &name){ this->isSessionId = true ; this->sessionIdStr = name; }
 void Location::setCookieStr(const std::string &cookie) {this->isCookie = true ; this->cookiesStr = cookie; }
+
 bool Location::setCgiEnabled()
 {
 	if (this->cgiEnabledStr == "true")
@@ -131,6 +127,7 @@ bool Location::setCgiEnabled()
 		isCgi = false;
 	return isCgi;
 }
+
 void Location::setCgiExtensionStr(const std::string &extensions) { this->cgiExtensionStr = extensions; }
 
 void Location::setAllowMethods(const std::string& methods)
@@ -141,7 +138,7 @@ void Location::setAllowMethods(const std::string& methods)
 	{
 		if (line.length() == 0)
 			continue;
-		if (line == "GET")// || line == "POST" || line == "DELETE")
+		if (line == "GET")
 		{
 			this->allowMethods.push_back(line);
 			this->isGetAllowed = true;
@@ -178,14 +175,12 @@ void Location ::setCgiExtension(const std::string &extensions)
 	}
 }
 
-// Load data from a string configuration
 int Location::loadData(const std::string &content)
 {
 	std::string start_string = STR_START;
 	std::string line;
 	std::string straux;
 	std::map<std::string, int> varnames = var_names_location();
-
 	std::istringstream fileContentStream(content);
 	while (std::getline(fileContentStream, line, ';'))
 	{
@@ -252,7 +247,6 @@ void Location::checkVariables(bool serverAutoIndex)
 		if (!Parser::checkCgi(this->cgiExtensionStr))
 			exit(1);
 	}
-	
 	switch (Parser::checkRootAliasReturn(this->root, this->alias,this->return_))
 	{
 		case ROOT:
@@ -273,7 +267,6 @@ void Location::checkVariables(bool serverAutoIndex)
 		default:
 			break;
 	}
-
 	switch (Parser::checkAutoIndex(this->getAutoIndexStr()))
 	{
 		case true:
@@ -291,7 +284,6 @@ void Location::checkVariables(bool serverAutoIndex)
 				this->autoindex = false;
 			break;
 	}
-	
 	this->setAllowMethods(this->allowMethodsStr);
 	if (!Parser::checkAllowedMethods(this->allowMethodsStr))
 		this->isGetAllowed = true;
@@ -307,20 +299,10 @@ void Location::checkVariables(bool serverAutoIndex)
 	}
 	else if (this->isCookie && !this->cookiesStr.empty())
 		this->setCookies(this->cookiesStr);
-
-// 	if (this->isSessionId && this->sessionIdStr.empty())
-// 	{
-// 		printLog("WARNING", "set-sesion-id\t\t\tnot defined.");
-// 		this->isSessionId = false;
-// 	}
-// 	else if (this->isSessionId && !this->sessionIdStr.empty())
-// 	{
-
-// 	}
 }
 
-	std::vector<std::string> Location::getCgiExtension()
-	{
-		return this->cgiExtension;
-	}
+std::vector<std::string> Location::getCgiExtension()
+{
+	return this->cgiExtension;
+}
 	
\ No newline at end of file
diff --git a/mandatory/src/LocationParser.cpp b/mandatory/src/LocationParser.cpp
index 1e5e173..375ca00 100644
--- a/mandatory/src/LocationParser.cpp
+++ b/mandatory/src/LocationParser.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   LocationParser.cpp                                 :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:51:38 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:51:38 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:22:31 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,8 +16,6 @@ static std::string getMimeType(std::string contentType)
 {
 	size_t point = contentType.find_last_of(".");
 	std::string extension = contentType.substr(point + 1, contentType.size());
-
-	/* Create once only */
 	std::map<std::string, std::string> Mimetype = create_filetypes();
 	if (Mimetype.find(extension) != Mimetype.end())
 		return(Mimetype[extension]);
@@ -62,7 +60,6 @@ int LocationParser::isAllowedMethod(Location *location)
 			response.setStatus("405 Method Not Allowed");
 			return NOT_ALLOWED;
 		}
-
 	}
 	else if (this->request.getMethod() == "DELETE")
 	{
@@ -84,7 +81,6 @@ int LocationParser::matchingLocation()
 		{
 			if (isAllowedMethod(locations[i]) == NOT_ALLOWED)
 				return NOT_ALLOWED;
-			
 			std::string rawPath = this->request.getPath();
 			this->isAutoIndex = locations[i]->getAutoIndex();
 			if ((this->isCookie = locations[i]->getIsCookie()) == true)
@@ -96,7 +92,6 @@ int LocationParser::matchingLocation()
 					extension = rawPath.substr(rawPath.rfind(".") + 1, rawPath.size());
 				for (size_t y = 0; y < locations[i]->getCgiExtension().size(); y++)
 				{
-
 					if (locations[i]->getCgiExtension()[y] == extension)
 						this->isCGI = true;
 				}		
@@ -127,7 +122,6 @@ int LocationParser::matchingLocation()
 		}
 	}
 	return NO_LOCATION;
-
 }
 
 off_t getFileSize(const std::string &filename)
@@ -165,7 +159,6 @@ bool isBadRequest(std::string request)
 	std::istringstream iss(request);
 	std::string line;
 	bool firstLine = true;
-
     while (std::getline(iss, line))
 	{   
 		if (firstLine)
@@ -247,12 +240,11 @@ void LocationParser::checks()
 		case REDIRECT:
 			return ;
 	}
-
 	this->request.setPath(decodeURL(this->request.getPath()));
 	ExtendedString tmp = this->request.getPath();
 	tmp.replaceFirstString("//", "/");
 	this->request.setPath(tmp);
-	if (isBadRequest(receiver->getRequest()))//|| isURIMalformed(this->request.getPath())
+	if (isBadRequest(receiver->getRequest()))
 	{
 		response.setStatus("400 Bad Request");
 		throw BAD_REQUEST_CODE;
@@ -280,31 +272,6 @@ void LocationParser::checks()
 	{
 		if (getMimeType(this->request.getPath()).find("video") != std::string::npos)
 		{
-			// std::string attr = request.getAttribute("Range");
-			// int tt = isFilePermissions(this->request.getPath(), F_OK | R_OK);
-			// (void)tt;
-			// if (isFilePermissions(this->request.getPath(), F_OK | R_OK) == 1 && request.getAttribute("Range") != "")
-			// {
-			
-			// 	response.setStatus("206 Partial Content");
-			// 	response.setContentType(this->request.getPath());
-				
-			// 	if (this->request.getAttribute("Range") != "")
-			// 	{
-			// 		this->startRange = stringToSizeT(this->request.getAttribute("Range").substr(6, this->request.getAttribute("Range").find("-")));
-			// 		std::cout << "STARTRANGE " << this->startRange << std::endl;
-			// 		std::string endRangeStr = this->request.getAttribute("Range").substr(this->request.getAttribute("Range").find("-") + 1, this->request.getAttribute("Range").size());
-			// 		std::cout << "ENDRANGE " << endRangeStr << std::endl;
-			// 		if (endRangeStr.empty())
-			// 		{
-			// 			this->endRange = getFileSize(this->request.getPath());
-			// 		}
-			// 		else
-			// 		{
-			// 			this->endRange = stringToSizeT(endRangeStr);
-			// 		}
-			// 	}
-			// }
 			if (isFilePermissions(this->request.getPath(), F_OK | R_OK) == 1)
 			{
 				response.setContentType(this->request.getPath());
@@ -335,7 +302,6 @@ void LocationParser::checks()
 	}
 	else if (this->request.getMethod() == "POST")
 	{
-		
 		std::string body = receiver->getBody();
 		if (body.size() > (size_t)this->server->getMaxClientBodySize())
 		{
@@ -386,8 +352,6 @@ void LocationParser::checks()
 		else if (receiver->getisform())
 		{
 			this->query = decodeURL(body);
-			std::cout << this->query << std::endl;
-
 			response.setStatus("201 Created");
 			throw CREATED_CODE;
 		}
@@ -435,8 +399,6 @@ LocationParser::LocationParser(Header request_, Server *server_, Receive *receiv
 
 LocationParser::~LocationParser()
 {
-
-
 }
 
 Header LocationParser::getResponse()
diff --git a/mandatory/src/Parser.cpp b/mandatory/src/Parser.cpp
index 7f96f59..016384c 100644
--- a/mandatory/src/Parser.cpp
+++ b/mandatory/src/Parser.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Parser.cpp                                         :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:51:31 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:51:31 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:20:52 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -60,13 +60,11 @@ in_addr_t Parser::isValidHost(std::string hostname)
 	struct addrinfo hints, *res;
     struct sockaddr_in *addr;	
 	in_addr_t in_addr;
-
 	std::memset(&hints, 0, sizeof(hints));
     std::memset(&in_addr, 0, sizeof(in_addr));
 	hints.ai_family = AF_INET;
 	hints.ai_socktype = SOCK_STREAM;
 	hints.ai_flags = AI_PASSIVE;
-	
 	int status = getaddrinfo(hostname.c_str(), NULL, &hints, &res);
 	if (status != 0)
 		return 0;
@@ -106,8 +104,6 @@ bool Parser::checkErrorPage(std::string errorPage)
 		printLog("WARNING", "error_page\t<" + errorPage + ">\tnot a valid directory." );
 		return false;
 	}
-	
-
 	std::vector<std::string> foundFiles;
 	DIR *errorDirectory = opendir(errorPage.c_str());
 	struct dirent *entry;
@@ -122,13 +118,10 @@ bool Parser::checkErrorPage(std::string errorPage)
                 break;
             }
         }
-
 	}
 	closedir(errorDirectory);
-
 	std::sort(foundFiles.begin(), foundFiles.end());
 	std::cout << CHR_GREEN << getLocalTime() << " [" << "NOTICE" << "]" RESET << "\t\terror_pages found\t" << RESET ;
-
 	if (foundFiles.size() == 0)
 	{
 		printLog("WARNING", "error_page\t<" + errorPage + ">\tno error files found." );
@@ -177,7 +170,6 @@ bool Parser::checkIndex(std::string index, std::string root)
 {
 	if (index.length() == 0)
 		return true;
-
 	switch (isFilePermissions(root + "/" + index, R_OK))
 	{
 		case -1:
@@ -198,7 +190,7 @@ bool Parser::checkIndex(std::string index, std::string root)
 	return true;
 }
 
-const long long MAX_BYTES = 1099511627776; // 1 Terabyte for example
+const long long MAX_BYTES = 1099511627776;
 
 long long convertToBytes(const std::string& sizeStr)
 {
@@ -206,7 +198,6 @@ long long convertToBytes(const std::string& sizeStr)
     while (pos < sizeStr.size() && (std::isdigit(sizeStr[pos]) || sizeStr[pos] == '.')) {
         pos++;
     }
-
     if (pos == 0) {
         throw std::invalid_argument("Invalid size format");
     }
@@ -217,13 +208,11 @@ long long convertToBytes(const std::string& sizeStr)
     for (size_t i = 0; i < unit.size(); ++i) {
         unit[i] = std::tolower(unit[i]);
     }
-
     const long long BYTES_IN_KB = 1024;
     const long long BYTES_IN_MB = BYTES_IN_KB * 1024;
     const long long BYTES_IN_GB = BYTES_IN_MB * 1024;
     const long long BYTES_IN_TB = BYTES_IN_GB * 1024;
     const long long BITS_IN_BYTE = 8;
-
     long long bytes;
     if (unit.empty() || unit == "b") {
         bytes = static_cast<long long>(sizeValue);
@@ -248,11 +237,9 @@ long long convertToBytes(const std::string& sizeStr)
     } else {
         throw std::invalid_argument("Unknown size unit");
     }
-
     if (bytes > MAX_BYTES) {
         throw std::overflow_error("Size exceeds the maximum allowed bytes");
     }
-
     return bytes;
 }
 
@@ -287,7 +274,6 @@ long long	Parser::checkClientBodySize(std::string maxClientBodySize)
 	return nbr;
 }
 
-
 bool Parser::checkAutoIndex(std::string autoindex)
 {
 	if (autoindex.length() == 0)
@@ -372,7 +358,6 @@ bool Parser::checkCgi(std::string cgiExtension)
 		printLog("ERROR", "cgi_extension\t\t\tis not defined.");
 		return false;
 	}
-	
 	return true;
 }
 
diff --git a/mandatory/src/Recieve.cpp b/mandatory/src/Recieve.cpp
index 8305453..2004ef7 100644
--- a/mandatory/src/Recieve.cpp
+++ b/mandatory/src/Recieve.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Recieve.cpp                                        :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:51:26 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:51:26 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:19:01 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,12 +19,10 @@
 
 Receive::Receive() : buffer(""), request(""), body(""), isbody(false), maxSize(0), sizeSent(0), isform(false)
 {
-    // std::cerr << "Receive created" << std::endl;
 }
 
 Receive::~Receive()
 {
-    // std::cerr << "Receive destroyed" << std::endl;
 }
 
 Receive::Receive(Receive const &copy)
@@ -43,13 +41,11 @@ Receive &Receive::operator=(Receive const &copy)
     return *this;
 }
 
- /* Setters */
 void Receive::setBuffer(std::string buffer) { this->buffer = buffer; }
 void Receive::setRequest(std::string request) { this->request = request; }
 void Receive::setBody(std::string body) { this->body = body; }
 void Receive::setmaxSize(size_t size) { this->maxSize = size; }
 
- /* Getters */
 std::string Receive::getBuffer() { return this->buffer; }
 std::string Receive::getRequest() { return this->request; }
 std::string Receive::getBody() { return this->body; }
@@ -114,7 +110,7 @@ bool Receive::receiveHeader(int fd)
         std::memset(buf, 0, MAX_MSG_SIZE);
     }
     
-    if (ret < 0) // This is not handle as an error 
+    if (ret < 0) 
         return false;
     else if (ret == 0)
     {
@@ -128,7 +124,6 @@ bool Receive::receiveBody(int fd)
 {
     char buf[MAX_MSG_SIZE] = {0};
     int ret = 0;
-
     while ((ret = recv(fd, buf, MAX_MSG_SIZE, 0)) > 0)
     {
         this->sizeSent += ret;
diff --git a/mandatory/src/Server.cpp b/mandatory/src/Server.cpp
index 7878fea..4962fb8 100644
--- a/mandatory/src/Server.cpp
+++ b/mandatory/src/Server.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Server.cpp                                         :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:51:20 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:51:20 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:17:30 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -66,11 +66,13 @@ Server::~Server()
 		delete this->locations[i];
 }
 
-Server::Server(Server const &copy) {
+Server::Server(Server const &copy) 
+{
 	*this = copy;
 }
 
-Server &Server::operator=(Server const &copy) {
+Server &Server::operator=(Server const &copy) 
+{
 	if (this != &copy) {
 		this->isDefault = copy.isDefault;
 		this->port = copy.port;
@@ -85,11 +87,11 @@ Server &Server::operator=(Server const &copy) {
 	return *this;
 }
 
-int Server::loadData(std::string const &content) {
+int Server::loadData(std::string const &content) 
+{
 	std::string line;
 	std::string straux;
 	std::map<std::string, int> varnames = var_names_server();
-
 	std::istringstream fileContentStream(content.substr(8, content.length() - 1));
 	while (std::getline(fileContentStream, line,';'))
 	{
@@ -154,7 +156,6 @@ void Server::createListeningSockets()
 	}
 }
 
-
 void Server::checkVariables()
 {
 	if (Parser::checkPorts(this->getPorts()) == false)
@@ -185,6 +186,5 @@ void Server::checkVariables()
 		printLog("NOTICE", "OK! Location " + toString(i + 1));
 		std::cout << CHR_MGENTA"------------------------------" RESET << std::endl;
 	}
-	
 	std::cout << std::endl;
 }
\ No newline at end of file
diff --git a/mandatory/src/ServerSetters.cpp b/mandatory/src/ServerSetters.cpp
index 80c2565..ca4de88 100644
--- a/mandatory/src/ServerSetters.cpp
+++ b/mandatory/src/ServerSetters.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   ServerSetters.cpp                                  :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:51:10 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:51:11 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:16:21 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,9 +21,7 @@ void Server::setRoot(std::string const &root) { this->root = root; }
 void Server::setIndex(std::string const &index) { this->index = index; }
 void Server::setCGIFolder(std::string const &str) { this->cgiModule->setCGIFolder(str); }
 void Server::addLocation(std::string const &content) { this->locations.push_back(new Location(content)); }
-
 void Server::setHostAddr(in_addr_t Addr) { this->hostAddr = Addr; }
-
 void Server::setCGIExtension(std::string const &str) 
 {
 	this->cgiModule->setCGIMapExtensions(str);
@@ -75,7 +73,6 @@ void Server::setPorts(std::string const &portsLine)
 			{
 				this->ports.push_back(toString(i));
 			}
-			
 		}
 		else
 		{
diff --git a/mandatory/src/StatusCode.cpp b/mandatory/src/StatusCode.cpp
index 98b3fac..7a13dfd 100644
--- a/mandatory/src/StatusCode.cpp
+++ b/mandatory/src/StatusCode.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   StatusCode.cpp                                     :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:51:07 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:51:08 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:15:28 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -77,7 +77,6 @@ void StatusCode::setFileContentForStatusCode(int CodeNumber, const std::string &
 	ExtendedString content("");
 	std::ifstream fileStream;
 	fileStream.open(CodeFileContent.c_str(), std::ios::out | std::ios::binary); //| std::ios::app | std::ios::ate
-
 	if(fileStream.is_open())
 	{
 		char buffer[MAX_SENT_BYTES];
@@ -89,7 +88,6 @@ void StatusCode::setFileContentForStatusCode(int CodeNumber, const std::string &
 	{
 		printLog("WARNING", CodeFileContent + " File does not exist.\t Set error page to default " CHR_GREEN "GET" RESET " value");
 	}
-
 	mapCodesFileContent[CodeNumber] = content;
 }
 
@@ -132,7 +130,6 @@ void StatusCode::loadErrorPageFromDir(const ExtendedString &dir)
 	}
 	while ((dirp = readdir(dp)) != NULL)
 	{
-		// std::cout << "dir " << dir << std::endl;
 		if (dirp->d_type == DT_REG)
 		{
 			std::string fileName = dir + "/" + dirp->d_name;
diff --git a/mandatory/src/WebServer.cpp b/mandatory/src/WebServer.cpp
index b1ddb83..d572a49 100644
--- a/mandatory/src/WebServer.cpp
+++ b/mandatory/src/WebServer.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   WebServer.cpp                                      :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:50:54 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:50:59 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:14:05 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -65,7 +65,6 @@ void WebServer::launchServers()
 {
 	std::cout << CHR_YELLOW "Launching servers..." RESET << std::endl << std::endl;
 	std::cout << "\e[4;37m    Date & time    \t\t\t\t\t\t\tport\tfd" << RESET << std::endl;
-
 	this->createListeningSockets();
 	std::cout << std::endl;
 	try
diff --git a/mandatory/src/WebServerLNX.cpp b/mandatory/src/WebServerLNX.cpp
index 01b544d..cfb6abb 100644
--- a/mandatory/src/WebServerLNX.cpp
+++ b/mandatory/src/WebServerLNX.cpp
@@ -31,7 +31,7 @@ void	WebServer::addEventSet()
 		{
 			struct epoll_event event;
 			memset(&event, 0, sizeof(event));
-			event.events = EPOLLIN | EPOLLET; // Edge-triggered mode
+			event.events = EPOLLIN | EPOLLET;
 			event.data.fd = serverFds[j];
 			if (epoll_ctl(this->kq, EPOLL_CTL_ADD, serverFds[j], &event) == -1)
 			{
@@ -50,8 +50,6 @@ int WebServer::waitEvent(struct epoll_event *evList)
 
 void WebServer::modifEvent(struct epoll_event eventList, int type)
 {
-	// struct epoll_event evSet;
-
 	eventList.events = type;
 	if (epoll_ctl(this->kq, EPOLL_CTL_MOD, eventList.data.fd, &eventList) == -1)
 	{
@@ -95,7 +93,6 @@ int WebServer::acceptNewEvent(int curfd)
 		std::cerr << "Error listening" << std::endl;
 		exit(1);
 	}
-
 	while (1)
 	{
 		struct sockaddr_storage addr;
@@ -117,5 +114,4 @@ int WebServer::acceptNewEvent(int curfd)
 	}
 	return fd;
 }
-
 #endif
diff --git a/mandatory/src/WebServerMAC.cpp b/mandatory/src/WebServerMAC.cpp
index 7fde14d..cdbd5a9 100644
--- a/mandatory/src/WebServerMAC.cpp
+++ b/mandatory/src/WebServerMAC.cpp
@@ -30,8 +30,6 @@ void	WebServer::addEventSet()
 		for (size_t j = 0; j < serverFds.size(); j++)
 		{
 			struct kevent evSet;
-			
-			// EV_SET(&evSet, serverFds[j], EVFILT_READ, EV_ADD | EV_CLEAR, NOTE_WRITE, 0, NULL);
 			EV_SET(&evSet, serverFds[j], EVFILT_READ, EV_ADD | EV_CLEAR, 0, 0, NULL);
 			if (kevent(this->kq, &evSet, 1, NULL, 0, NULL) == -1)
 			{
@@ -53,7 +51,6 @@ void WebServer::modifEvent(struct kevent event, int typeRem, int typeAdd)
 	struct kevent evSet;
 	(void) typeRem;
 	EV_SET(&evSet, event.ident, typeAdd, EV_ADD, 0, 0, NULL);
-	//removeEventFd(event.ident, typeRem);
 	if (kevent(this->kq, &evSet, 1, NULL, 0, NULL) == -1)
 	{
 		std::cerr << "Error: could not add event" << std::endl;
@@ -100,7 +97,7 @@ int WebServer::acceptNewEvent(int curfd)
 			else
 			{
 				std::cerr << "Error accepting connection" << std::endl;
-				return fd; // Continue to the next event
+				return fd;
 			}
 		}		
 		fcntl(curfd, F_SETFL, O_NONBLOCK, FD_CLOEXEC);
@@ -111,5 +108,4 @@ int WebServer::acceptNewEvent(int curfd)
 	}
 	return fd;
 }
-
 #endif
diff --git a/mandatory/src/WebservParser.cpp b/mandatory/src/WebservParser.cpp
index 8095250..7c44a3a 100644
--- a/mandatory/src/WebservParser.cpp
+++ b/mandatory/src/WebservParser.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   WebservParser.cpp                                  :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:50:32 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:50:39 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:11:42 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,7 +18,6 @@ std::string removeComments(std::string &str)
 	std::string 		aux;
 	std::istringstream	fileContentStream(str);
 	std::string 		serverContentConfig = "";
-	
 	while (std::getline(fileContentStream, line))
 	{
 		line = line.substr(0, line.find_first_of("#"));
@@ -57,10 +56,8 @@ static bool mismatchedBraces(std::string fileString)
 static bool endWithSemicolon(std::string &fileString)
 {
 	std::string			line;
-
 	fileString = removeComments(fileString);
 	fileString = removeBlanksAndTabs(fileString);
-
 	std::istringstream fileStream(fileString);
 	while (std::getline(fileStream, line))
 	{
@@ -94,7 +91,6 @@ static bool hasDoublePoints(std::string &fileString)
 	std::istringstream fileStream(fileString);
 	while (std::getline(fileStream, line))
 	{
-
 		if ((line.length() == 0 || line == "{" || line == "}" || line == "};") || (!line.empty() && (line.find(":") != std::string::npos)))
 			continue;
 		else
@@ -110,16 +106,12 @@ bool WebServer::checkSyntax()
 {
 	if (!isServerBlock(this->configFileString))
 		return false;
-
 	if (!mismatchedBraces(this->configFileString))
 		return false;
-	
 	if (!endWithSemicolon(this->configFileString))
 		return false;
-
 	if (!hasDoublePoints(this->configFileString))
 		return false;
-
 	return true;
 }
 
@@ -163,7 +155,6 @@ void WebServer::processConfigFile()
 
 	while (this->configFileString.find("server:{") != std::string::npos)
 	{
-		
 		configFileString.erase(std::remove(configFileString.begin(), configFileString.end(), '\n'), configFileString.end());
 		pos = this->configFileString.find("server:{", 8);
 		if(pos == std::string::npos)
@@ -187,11 +178,9 @@ bool WebServer::parseInfo()
 	{
 		std::cout << CHR_CYAN"-------------Checking Server [" << i + 1  << "]------------" RESET<< std::endl;
 		this->servers[i]->checkVariables();
-		// this->servers[i]->print(); // print all Server parameters for debug
 		printLog("NOTICE", "OK! Server " + toString(i + 1));
 		std::cout << CHR_CYAN"--------------------------------------------" RESET<< std::endl;
 	}
-
 	std::vector<std::string> ports;
 	for (size_t i = 0; i < this->servers.size(); i++)
 	{
diff --git a/mandatory/src/main.cpp b/mandatory/src/main.cpp
index 5e71001..2f4c189 100644
--- a/mandatory/src/main.cpp
+++ b/mandatory/src/main.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   main.cpp                                           :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:51:34 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:51:34 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:21:02 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -23,7 +23,6 @@ int main(int av, char **ac)
 	webServer.loadConfigFile(ac[1]);
 	if (!webServer.checkSyntax())
 		return 1;
-
 	webServer.processConfigFile();
 	if (!webServer.parseInfo())
 		return 1;
diff --git a/mandatory/src/utils.cpp b/mandatory/src/utils.cpp
index e5acde7..cbefb01 100644
--- a/mandatory/src/utils.cpp
+++ b/mandatory/src/utils.cpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   utils.cpp                                          :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: eavedill <eavedill@student.42barcelona>    +#+  +:+       +#+        */
+/*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:51:03 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 13:51:03 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:15:09 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -40,7 +40,6 @@ bool validIPAddress(std::string ip)
 	size_t pos = 0;
 	std::string token;
 	int count = 0;
-	
 	while ((pos = ip.find('.')) != std::string::npos)
 	{
 		token = ip.substr(0, pos);
@@ -49,10 +48,8 @@ bool validIPAddress(std::string ip)
 		ip.erase(0, pos + 1);
 		count++;
 	}
-	
 	if (count != 4 || !isNumber(ip) || !isrange(std::atoi(ip.c_str()), 0, 255))
 		return false;
-	
 	return count == 4;
 }
 
@@ -87,7 +84,8 @@ int isFilePermissions(std::string path, int mode)
 	return 1;
 }
 
-size_t stringToSizeT(const std::string& str) {
+size_t stringToSizeT(const std::string& str) 
+{
 	std::stringstream ss(str);
 	size_t result = 0;
 	ss >> result;
@@ -98,14 +96,10 @@ size_t stringToSizeT(const std::string& str) {
 std::vector<std::string> splitString(const std::string& str, char delimiter) {
 	std::vector<std::string> result;
 	std::string token;
-	// std::cout << "str: " << str << std::endl;
 	std::istringstream tokenStream(str);
-
 	while (std::getline(tokenStream, token, delimiter)) {
-		// if (token != "")
-			result.push_back(token);
+		result.push_back(token);
 	}
-
 	return result;
 }
 
@@ -129,7 +123,8 @@ std::string removeBlanksAndTabs(const std::string& input) {
 	return result;
 }
 
-void replaceString(std::string& mainString, const std::string& searchString, const std::string& replaceString) {
+void replaceString(std::string& mainString, const std::string& searchString, const std::string& replaceString) 
+{
 	size_t pos = 0;
 	while ((pos = mainString.find(searchString, pos)) != std::string::npos) {
 		mainString.replace(pos, searchString.length(), replaceString);
@@ -137,7 +132,8 @@ void replaceString(std::string& mainString, const std::string& searchString, con
 	}
 }
 
-int count_chars(const std::string& str, char c) {
+int count_chars(const std::string& str, char c) 
+{
 	int count = 0;
 	for (size_t i = 0; i < str.size(); i++) {
 		if (str[i] == c) {
@@ -150,11 +146,9 @@ int count_chars(const std::string& str, char c) {
 std::string getLocalTime()
 {
     std::time_t currentTime = std::time(NULL);
-
     std::tm* timeInfo = std::localtime(&currentTime);
     char buffer[20];
     std::strftime(buffer, sizeof(buffer), "%Y/%m/%d %H:%M:%S", timeInfo);
-
     return std::string(buffer);
 }
 
@@ -173,10 +167,8 @@ void printLog(std::string type ,std::string message)
 static int hexStringToInt(const std::string& hexStr) {
     int value;
     std::stringstream ss;
-
     ss << std::hex << hexStr;
     ss >> value;
-
     return value;
 }
 
@@ -203,7 +195,8 @@ std::string decodeURL(const std::string& url)
 	return decoded;
 }
 
-void replaceFirstString(std::string& mainString, const std::string& searchString, const std::string& replaceString) {
+void replaceFirstString(std::string& mainString, const std::string& searchString, const std::string& replaceString) 
+{
 	size_t pos = 0;
 	if ((pos = mainString.find(searchString, pos)) != std::string::npos) {
 		mainString.replace(pos, searchString.length(), replaceString);
@@ -218,8 +211,6 @@ std::string getRandomHash(int lenght)
 	std::string hash;
 	int x;
     std::srand(static_cast<unsigned>(std::time(0)) ^ reinterpret_cast<unsigned long>(&x));
-
-	// std::srand(static_cast<unsigned>(std::time(0)) ^ static_cast<unsigned>(getpid()));
 	for (int i = 0 ; i < lenght; i++)
 		hash += characters[rand() % characters.size()];
 	return hash;

From 40edf39d535bd3c41b5874bb8b64e3476cfc7722 Mon Sep 17 00:00:00 2001
From: "ernesto.avedillo" <eavedillo@yahoo.es>
Date: Sun, 30 Jun 2024 15:40:45 +0200
Subject: [PATCH 30/31] copy port number in clone

---
 mandatory/src/ListeningSocket.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mandatory/src/ListeningSocket.cpp b/mandatory/src/ListeningSocket.cpp
index c027891..b9c7c82 100644
--- a/mandatory/src/ListeningSocket.cpp
+++ b/mandatory/src/ListeningSocket.cpp
@@ -6,7 +6,7 @@
 /*   By: eavedill <eavedill@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/30 13:51:47 by eavedill          #+#    #+#             */
-/*   Updated: 2024/06/30 15:25:07 by eavedill         ###   ########.fr       */
+/*   Updated: 2024/06/30 15:38:42 by eavedill         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -118,6 +118,7 @@ bool ListeningSocket::receive()
 ListeningSocket *ListeningSocket::clone(int fd)
 {
 	ListeningSocket *newSocket = new ListeningSocket(this->server);
+	newSocket->port = this->port;
 	newSocket->socketFd = fd;
 	return newSocket;
 }

From f17db99eb8418af08a21947a32125a3e8bd81dcf Mon Sep 17 00:00:00 2001
From: Joseph Cheel nakashima <jcheel-n@car1s4.42barcelona.com>
Date: Sun, 30 Jun 2024 16:11:14 +0200
Subject: [PATCH 31/31] post short body fixed

---
 mandatory/inc/LocationParser.hpp |  2 -
 mandatory/src/LocationParser.cpp | 89 +++-----------------------------
 mandatory/src/Recieve.cpp        |  5 +-
 mandatory/src/WebservParser.cpp  |  2 +-
 4 files changed, 9 insertions(+), 89 deletions(-)

diff --git a/mandatory/inc/LocationParser.hpp b/mandatory/inc/LocationParser.hpp
index f845ccc..cf1310c 100644
--- a/mandatory/inc/LocationParser.hpp
+++ b/mandatory/inc/LocationParser.hpp
@@ -53,7 +53,5 @@ class LocationParser
 		bool getIsCGI();
 		void checks();
 		void setCookies();
-		size_t getStartRange();
-		size_t getEndRange();
 		std::string getQuery();
 };
\ No newline at end of file
diff --git a/mandatory/src/LocationParser.cpp b/mandatory/src/LocationParser.cpp
index e982ab5..4a975d7 100644
--- a/mandatory/src/LocationParser.cpp
+++ b/mandatory/src/LocationParser.cpp
@@ -13,25 +13,11 @@ static std::string getMimeType(std::string contentType)
 		 return ("text/html");
 }
 
-bool LocationParser::getIsAutoIndex()
-{
-	return this->isAutoIndex;
-}
-
-bool LocationParser::getIsCGI()
-{
-	return this->isCGI;
-}
-
-size_t LocationParser::getStartRange()
-{
-	return this->startRange;
-}
-
-size_t LocationParser::getEndRange()
-{
-	return this->endRange;
-}
+bool LocationParser::getIsAutoIndex() { return this->isAutoIndex; }
+bool LocationParser::getIsCGI(){ return this->isCGI; }
+Header LocationParser::getResponse() { return this->response; }
+Header LocationParser::getRequest() { return this->request; }
+std::string LocationParser::getQuery() { return this->query; }
 
 int LocationParser::isAllowedMethod(Location *location)
 {
@@ -125,27 +111,6 @@ off_t getFileSize(const std::string &filename)
 	return rc == 0 ? stat_buf.st_size : -1;
 }
 
-std::string escapeNonPrintableChars(const std::string& str) {
-    std::string escapedStr;
-    for (size_t i = 0; i < str.size(); ++i) {
-        switch (str[i]) {
-            case '\n':
-                escapedStr += "\\n";
-                break;
-            case '\r':
-                escapedStr += "\\r";
-                break;
-            case '\t':
-                escapedStr += "\\t";
-                break;
-            default:
-                escapedStr += str[i];
-                break;
-        }
-    }
-    return escapedStr;
-}
-
 bool isBadRequest(std::string request)
 {
 	if (request.empty())
@@ -268,31 +233,6 @@ void LocationParser::checks()
 	{
 		if (getMimeType(this->request.getPath()).find("video") != std::string::npos)
 		{
-			// std::string attr = request.getAttribute("Range");
-			// int tt = isFilePermissions(this->request.getPath(), F_OK | R_OK);
-			// (void)tt;
-			// if (isFilePermissions(this->request.getPath(), F_OK | R_OK) == 1 && request.getAttribute("Range") != "")
-			// {
-			
-			// 	response.setStatus("206 Partial Content");
-			// 	response.setContentType(this->request.getPath());
-				
-			// 	if (this->request.getAttribute("Range") != "")
-			// 	{
-			// 		this->startRange = stringToSizeT(this->request.getAttribute("Range").substr(6, this->request.getAttribute("Range").find("-")));
-			// 		std::cout << "STARTRANGE " << this->startRange << std::endl;
-			// 		std::string endRangeStr = this->request.getAttribute("Range").substr(this->request.getAttribute("Range").find("-") + 1, this->request.getAttribute("Range").size());
-			// 		std::cout << "ENDRANGE " << endRangeStr << std::endl;
-			// 		if (endRangeStr.empty())
-			// 		{
-			// 			this->endRange = getFileSize(this->request.getPath());
-			// 		}
-			// 		else
-			// 		{
-			// 			this->endRange = stringToSizeT(endRangeStr);
-			// 		}
-			// 	}
-			// }
 			if (isFilePermissions(this->request.getPath(), F_OK | R_OK) == 1)
 			{
 				response.setContentType(this->request.getPath());
@@ -374,10 +314,8 @@ void LocationParser::checks()
 		else if (receiver->getisform())
 		{
 			this->query = decodeURL(body);
-			std::cout << this->query << std::endl;
-
 			response.setStatus("201 Created");
-			throw CREATED_CODE;
+			return ;
 		}
 		response.setServer(server->getServerName());
 	}
@@ -425,19 +363,4 @@ LocationParser::~LocationParser()
 {
 
 
-}
-
-Header LocationParser::getResponse()
-{
-	return this->response;
-}
-
-Header LocationParser::getRequest()
-{
-	return this->request;
-}
-
-std::string LocationParser::getQuery()
-{
-	return this->query;
 }
\ No newline at end of file
diff --git a/mandatory/src/Recieve.cpp b/mandatory/src/Recieve.cpp
index 6c7f646..845716c 100644
--- a/mandatory/src/Recieve.cpp
+++ b/mandatory/src/Recieve.cpp
@@ -86,10 +86,9 @@ bool Receive::receiveHeader(int fd)
                     this->isform = true;
                 else
                 {
-                     this->body += this->buffer.substr(0, this->buffer.rfind(this->boundary) - 4);
-                    this->body = this->body.substr(0, this->body.find(this->boundary) - 4);
-                    this->postHeader = this->body.substr(this->body.find(this->boundary) + this->boundary.size() + 4, this->body.find("\r\n\r\n"));
+                    this->postHeader = this->body.substr(this->boundary.size() + 4, this->body.find("\r\n\r\n") - this->boundary.size() - 4);
                     this->body = this->body.substr(this->body.find("\r\n\r\n") + 4);
+                    this->body = this->body.substr(0, this->body.rfind(this->boundary) - 2);
                 }
                 this->isbody = false;
                 return true;
diff --git a/mandatory/src/WebservParser.cpp b/mandatory/src/WebservParser.cpp
index ff18163..74aae4f 100644
--- a/mandatory/src/WebservParser.cpp
+++ b/mandatory/src/WebservParser.cpp
@@ -59,7 +59,7 @@ static bool endWithSemicolon(std::string &fileString)
 			continue;
 		else
 		{
-			printLog("ERROR", "Missing semicolon " CHR_YELLOW ":" RESET " at the end: \"" YELLOW + line + RESET"\"");
+			printLog("ERROR", "Missing semicolon " CHR_YELLOW ";" RESET " at the end: \"" YELLOW + line + RESET"\"");
 			return false;
 		}
 	}