feat: display client IP

Author: gotz1480

include/unix_socket.hpp

@@ -3,6 +3,7 @@
 #define UNIX_SOCKET_H_
 
 #include <iostream>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -22,16 +23,18 @@ namespace tpt
         unsigned int port;
         unsigned int max_connections;
         std::string ip_address;
+        std::string client_ip;
 
     public:
         UnixSocket();
         UnixSocket(unsigned int port);
         UnixSocket(std::string ip_address, unsigned int port);
         UnixSocket(std::string ip_address, unsigned int port, unsigned int max_connections);
         ~UnixSocket();
+        std::string getClientIp();
         virtual void bindSocket() override;
         virtual void listenToConnections() override;
-        virtual void acceptConnection(SOCKET&client_socket, void *client_address) override;
+        virtual void acceptConnection(SOCKET &client_socket, void *client_address) override;
         virtual ssize_t receiveData(SOCKET client_socket, char *buffer, unsigned int buffer_size) override;
         virtual void sendData(SOCKET client_socket, const void *buffer, unsigned int buffer_size, int flags) override;
         virtual void closeSocket() override;

src/main.cpp

@@ -8,6 +8,7 @@ int main(int argc, char *argv[])
         std::cout << "Fatal error - please provide a port number!" << std::endl;
         return EXIT_FAILURE;
     }
+
     tpt::Teapot server = tpt::Teapot(atoi(argv[1]));
     tpt::CORSMiddleware cors_middleware = tpt::CORSMiddleware("*", "*", "*", 86400, true);
     tpt::SecurityMiddleware security_middleware;

src/teapot.cpp

@@ -83,7 +83,7 @@ void Teapot::mainEventLoop(SOCKET client_socket)
         std::string method = request->getMethod();
         content_type = determineContentType(uri); // Determine content type early based on URI
 
-        std::cout << "[" << request->getDate() << "] " << method << " " << uri << " HTTP/1.1 ";
+        std::cout << "[" << request->getDate() << "] " << this->socket.getClientIp() + " " << method << " " << uri << " HTTP/1.1 ";
 
         if (method == "GET")
         {

src/unix_socket.cpp

@@ -109,14 +109,38 @@ void UnixSocket::listenToConnections()
 
 void UnixSocket::acceptConnection(SOCKET &client_socket, void *client_address)
 {
-    socklen_t client_addr_size = sizeof(client_address);
-    client_socket = accept(this->server_socket, (struct sockaddr *)&client_address, &client_addr_size);
+    struct sockaddr_storage client_addr_storage;
+    socklen_t client_addr_size = sizeof(client_addr_storage);
+
+    client_socket = accept(this->server_socket, (struct sockaddr *)&client_addr_storage, &client_addr_size);
     if (client_socket < 0)
     {
         perror("Accept failed");
-        std::cout << "Error code: " + std::to_string(errno) << std::endl;
+        std::cout << "Error code: " << std::to_string(errno) << std::endl;
         exit(EXIT_FAILURE);
     }
+
+    // Assuming client_address is meant to store the result
+    if (client_address != nullptr)
+    {
+        std::memcpy(client_address, &client_addr_storage, client_addr_size);
+    }
+
+    char ip_str[INET6_ADDRSTRLEN] = {0}; // Large enough for both IPv4 and IPv6
+    if (client_addr_storage.ss_family == AF_INET)
+    {
+        // IPv4
+        struct sockaddr_in *addr_in = (struct sockaddr_in *)&client_addr_storage;
+        inet_ntop(AF_INET, &addr_in->sin_addr, ip_str, INET_ADDRSTRLEN);
+    }
+    else if (client_addr_storage.ss_family == AF_INET6)
+    {
+        // IPv6
+        struct sockaddr_in6 *addr_in6 = (struct sockaddr_in6 *)&client_addr_storage;
+        inet_ntop(AF_INET6, &addr_in6->sin6_addr, ip_str, INET6_ADDRSTRLEN);
+    }
+
+    this->client_ip = std::string(ip_str);
 }
 
 ssize_t UnixSocket::receiveData(SOCKET client_socket, char *buffer, unsigned int buffer_size)
@@ -163,6 +187,11 @@ void UnixSocket::closeSocket(SOCKET client_socket)
     close(client_socket);
 }
 
+std::string UnixSocket::getClientIp()
+{
+    return this->client_ip;
+}
+
 UnixSocket::~UnixSocket() {}
 
 #endif

src/utils.cpp

@@ -5,7 +5,7 @@ using namespace tpt;
 std::string Utils::readFileToBuffer(std::string filename)
 {
     // Use std::filesystem to handle paths correctly across different OSes
-    std::filesystem::path filePath{ filename };
+    std::filesystem::path filePath{filename};
 
     std::ifstream file(filePath); // Open the input file using the filesystem path
 
@@ -125,4 +125,4 @@ std::string Utils::sanitizePath(const std::string &path)
         sanitized.erase(pos, 3);
     }
     return sanitized;
-}
+}