Validating port number and adding new Panic function

JustAn0therDev · Jul 25, 2021 · 8e791a1 · 8e791a1
1 parent 21e1fc8
commit 8e791a1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/ServerConfigs/server_configs.hpp b/ServerConfigs/server_configs.hpp
@@ -11,7 +11,7 @@
 
 #ifndef SERVERCONFIGSCPP
 #define SERVERCONFIGSCPP
-class ServerConfigs 
+class ServerConfigs
 {
 public:
 	ServerConfigs();

diff --git a/Util/util.cpp b/Util/util.cpp
@@ -2,7 +2,8 @@
 #include <iostream>
 #include "util.hpp"
 
-int Util::TryCastStringToInt(const std::string& p_str) {
+int Util::TryCastStringToInt(const std::string& p_str)
+{
 	try {
 		return std::stoi(p_str);
 	}
@@ -13,7 +14,8 @@ int Util::TryCastStringToInt(const std::string& p_str) {
 	return 0;
 }
 
-uint16_t Util::TryCastStringToUnsignedShortInt(const std::string& p_str) {
+uint16_t Util::TryCastStringToUnsignedShortInt(const std::string& p_str)
+{
 	try {
 		return static_cast<uint16_t>(std::stoi(p_str));
 	}
@@ -23,3 +25,9 @@ uint16_t Util::TryCastStringToUnsignedShortInt(const std::string& p_str) {
 
 	return 0;
 }
+
+void Util::Panic(const std::string& p_panic_message)
+{
+    std::cout << p_panic_message;
+    exit(1);
+}
diff --git a/Util/util.hpp b/Util/util.hpp
@@ -8,5 +8,7 @@ struct Util {
 	static int TryCastStringToInt(const std::string& p_str);
 	// Tries casting a string to an uint16_t. If not successful returns 0.
 	static uint16_t TryCastStringToUnsignedShortInt(const std::string& p_str);
+    // Writes a message to STDOUT and ends the program's execution.
+    static void Panic(const std::string& p_panic_message);
 };
-#endif
+#endif
diff --git a/main.cpp b/main.cpp
@@ -7,6 +7,7 @@
 #include "BlackMarlin/black_marlin.hpp"
 #include "HTTP/http_request_handler.hpp"
 #include "HTTP/server_connection_info.hpp"
+#include "Util/util.hpp"
 
 constexpr short DEFAULT_PORT = 7000;
 
@@ -48,11 +49,16 @@ ServerConnectionInfo GetIPAndPortFromArgs(int& argc, char** argv)
 		}
 		else
 		{
-			std::cout << "Expected only numbers for port argument. Got: " << port_arg << "\n";
+            Util::Panic("Expected only numbers for port argument. Got: " + std::string(port_arg) + "\n");
 			exit(1);
 		}
 	}
 
+    if (conn.port > USHRT_MAX)
+    {
+        Util::Panic("The port argument exceeds the range of valid ports.");
+    }
+
 	conn.ip = "127.0.0.1";
 
 	return conn;