check dupplicate ports

ggjulio · Nov 2, 2021 · 823ea03 · 823ea03
1 parent 9e1cc04
commit 823ea03
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -180,7 +180,7 @@ re: fclean all
 
 -include $(DEP)
 
-.PHONY: all run debug valgrind norminette bonus show check jest clean fclean re
+.PHONY: all run debug valgrind norminette bonus show check jest jest-sanitize sanitize clean fclean re
 
 
 #******************************************************************************#

diff --git a/README.md b/README.md
@@ -1,6 +1,12 @@
 [![C/C++ CI](https://github.com/Working-From-Home/webserv/actions/workflows/ci.yml/badge.svg)](https://github.com/Working-From-Home/webserv/actions/workflows/ci.yml)
 
-# Webserv - Written in c++98 (The subject force us to use 98)
+# Webserv
+
+#### firsts things first, must install php-cgi at least php-cgi
+###### linux
+- sudo apt install php-cgi
+###### macos
+ - idk, try with brew bro.
 
 ## Documentation
 

diff --git a/includes/config/ServerConfig.hpp b/includes/config/ServerConfig.hpp
@@ -95,6 +95,9 @@ class ServerConfig {
 	void _skipSemiColonNewLine(config::ScannerConfig & scanner);
 	void _throw_SyntaxError(config::Token t, const std::string &error_str, const ft::filesystem::path& file = ft::filesystem::path());
 
+	void _checkNoDupplicatePortListen(ServerBlock& server, config::Token tokenListen);
+
+
 	static ServerConfig*				_singleton;
 	std::vector<ServerBlock>			_servers;
 	ft::filesystem::path				_configFilePath;

diff --git a/src/config/ServerConfig.cpp b/src/config/ServerConfig.cpp
@@ -323,6 +323,21 @@ void ServerConfig::_parse(std::istream & in)
 	}
 }
 
+void ServerConfig::_checkNoDupplicatePortListen(ServerBlock& server, pr::Token tokenListen)
+{
+	std::vector<Host>::iterator it = server.getListens().begin();
+	std::vector<Host>::iterator end = server.getListens().end();
+	std::set<uint32_t> ports;
+
+	while (it != end)
+	{
+		if (ports.count(it->getPort()))
+			_throw_SyntaxError(tokenListen, "listening port defined several times");
+		ports.insert(it->getPort());
+		++it;
+	}
+}
+
 ServerBlock ServerConfig::_parseServer(pr::ScannerConfig & scanner, pr::Token serverToken)
 {
 	ServerBlock result;
@@ -340,7 +355,10 @@ ServerBlock ServerConfig::_parseServer(pr::ScannerConfig & scanner, pr::Token se
 				if (t.value == "server")
 					_throw_SyntaxError(serverToken, "Missing closing bracket at end of server directive");
 				else if (t.value == "listen")
+				{
 					result.addListen(_parseListen(scanner));
+					_checkNoDupplicatePortListen(result, t);
+				}
 				else if (t.value == "root")
 					result.setRoot(_parseRoot(scanner));
 				else if (t.value == "index")