Merge branch 'master' of https://github.com/FreddyMSchubert/42_webserv

include/Config.hpp

@@ -22,7 +22,7 @@ typedef struct s_location
 	std::variant<Path, FilePath>					path;				// path in config
 	std::string										root_dir;			// folder to get data from. not a path as it might not be in config root. If empty, use config root
 	std::array<bool, 3>								allowed_methods;	// saved in order of Method enum in Enums.hpp
-	bool											directory_listing;
+	bool											directory_listing = false;
 	std::vector<std::string>						cgi_extensions;
 	std::map<int, Path>								redirections;
 	Path											upload_dir;
@@ -39,9 +39,9 @@ class Config
 		int _port;
 		std::string _root_dir;
 		std::optional<FilePath> _index_file; // optional but will always be present after constructor
-		unsigned int _client_max_body_size; // in bytes
+		unsigned int _client_max_body_size = 1048576; // 1 MB in bytes
 		std::map<int, FilePath> _error_pages;
-		int _client_timeout; // in ms
+		int _client_timeout = 30000; // 30 seconds in ms
 		std::vector<t_location> _locations;
 
 		// Line parsers

src/Config.cpp

@@ -33,6 +33,9 @@ Config::Config(std::string data)
 		if (!foundMatch)
 			throw std::invalid_argument("Invalid directive: \"" + keyword + "\"");
 	}
+	if (_host.empty()) throw std::invalid_argument("No listen directive found");
+	if (_port == 0) throw std::invalid_argument("No listen directive found");
+	if (_root_dir.empty()) throw std::invalid_argument("No root directive found");
 }
 
 /* ------------------------ */
@@ -153,11 +156,11 @@ void Config::parseClientMaxBodySize(const std::string & line)
 		else if (unit == "GB" || unit == "gb")
 			_client_max_body_size = static_cast<unsigned int>(size) * 1024 * 1024 * 1024;
 		else
-			throw std::invalid_argument("Unsupported unit in client_max_body_size");
+			Logger::Log(LogLevel::WARNING, "Invalid unit in client_max_body_size directive. Using default value (1MB).");
 	}
 	else
 	{
-		throw std::invalid_argument("Invalid client_max_body_size directive");
+		Logger::Log(LogLevel::WARNING, "Invalid unit in client_max_body_size directive. Using default value (1MB).");
 	}
 
 	#if LOG_CONFIG_PARSING
@@ -219,7 +222,7 @@ void Config::parseClientTimeout(const std::string & line)
 		}
 	}
 	else
-		throw std::invalid_argument("Invalid client_timeout directive");
+		Logger::Log(LogLevel::WARNING, "Invalid client_timeout directive. Using default value (30s).");
 
 	#if LOG_CONFIG_PARSING
 		Logger::Log(LogLevel::INFO, "Client timeout: " + std::to_string(_client_timeout));
@@ -343,7 +346,7 @@ void Config::parseLocationAutoindex(const std::string & line, t_location & loc)
 			loc.directory_listing = false;
 	}
 	else
-		throw std::invalid_argument("Invalid location autoindex (directory_listing) directive: \"" + line + "\"");
+		Logger::Log(LogLevel::WARNING, "Invalid location autoindex directive. Using default value (off).");
 }
 
 void Config::parseLocationCgiExtensions(const std::string & line, t_location & loc)

src/Socket.cpp

@@ -107,7 +107,8 @@ void Socket::sendData(Response &response)
 std::string Socket::receiveData()
 {
 	std::string data;
-	char buffer[_config.getClientMaxBodySize() + 1];
+	int size = std::min(1024, static_cast<int>(_config.getClientMaxBodySize() + 1));
+	char buffer[size];
 	ssize_t received;
 
 	received = recv(_socket_fd, buffer, sizeof(buffer), 0);