Throwing on invalid ip address

etr · etr · commit ce1bb5682014 · 2018-12-23T07:29:38.000Z
diff --git a/src/http_utils.cpp b/src/http_utils.cpp
@@ -243,41 +243,41 @@ std::string get_ip_str(
     socklen_t maxlen
 )
 {
-    std::string result;
+    if (!sa) throw new std::invalid_argument("socket pointer is null");
 
-    if(sa)
+    char to_ret[NI_MAXHOST];
+    if (AF_INET6 == sa->sa_family)
     {
-        char to_ret[NI_MAXHOST];
-        if (AF_INET6 == sa->sa_family)
-        {
-            inet_ntop(AF_INET6, &(((sockaddr_in6*) sa)->sin6_addr), to_ret, INET6_ADDRSTRLEN);
-            result = to_ret;
-        }
-        else
-        {
-            inet_ntop(AF_INET, &(((sockaddr_in*) sa)->sin_addr), to_ret, INET_ADDRSTRLEN);
-            result = to_ret;
-        }
+        inet_ntop(AF_INET6, &(((sockaddr_in6*) sa)->sin6_addr), to_ret, INET6_ADDRSTRLEN);
+        return to_ret;
+    }
+    else if (AF_INET == sa->sa_family)
+    {
+        inet_ntop(AF_INET, &(((sockaddr_in*) sa)->sin_addr), to_ret, INET_ADDRSTRLEN);
+        return to_ret;
+    }
+    else
+    {
+        throw new std::invalid_argument("IP family must be either AF_INET or AF_INET6");
     }
-
-    return result;
 }
 
 unsigned short get_port(const struct sockaddr* sa)
 {
-    if(sa)
+    if (!sa) throw new std::invalid_argument("socket pointer is null");
+
+    if (sa->sa_family == AF_INET)
     {
-        switch(sa->sa_family)
-        {
-            case AF_INET:
-                return ((struct sockaddr_in*) sa)->sin_port;
-            case AF_INET6:
-                return ((struct sockaddr_in6*) sa)->sin6_port;
-            default:
-                return 0;
-        }
+        return ((struct sockaddr_in*) sa)->sin_port;
+    }
+    else if (sa->sa_family == AF_INET6)
+    {
+        return ((struct sockaddr_in6*) sa)->sin6_port;
+    }
+    else
+    {
+        throw new std::invalid_argument("IP family must be either AF_INET or AF_INET6");
     }
-    return 0;
 }
 
 size_t http_unescape(char *val)
diff --git a/test/unit/http_utils_test.cpp b/test/unit/http_utils_test.cpp
@@ -108,6 +108,34 @@ LT_BEGIN_AUTO_TEST(http_utils_suite, ip_to_str6)
     LT_CHECK_EQ(port, htons(3490));
 LT_END_AUTO_TEST(ip_to_str6)
 
+LT_BEGIN_AUTO_TEST(http_utils_suite, ip_to_str_invalid_family)
+    struct sockaddr_in ip4addr;
+
+    ip4addr.sin_family = 55;
+    ip4addr.sin_port = htons(3490);
+    ip4addr.sin_addr.s_addr = inet_addr("127.0.0.1");
+
+    LT_CHECK_THROW(http::get_ip_str((struct sockaddr*) &ip4addr));
+LT_END_AUTO_TEST(ip_to_str_invalid_family)
+
+LT_BEGIN_AUTO_TEST(http_utils_suite, ip_to_str_null)
+    LT_CHECK_THROW(http::get_ip_str((struct sockaddr*) 0x0));
+LT_END_AUTO_TEST(ip_to_str_null)
+
+LT_BEGIN_AUTO_TEST(http_utils_suite, get_port_invalid_family)
+    struct sockaddr_in ip4addr;
+
+    ip4addr.sin_family = 55;
+    ip4addr.sin_port = htons(3490);
+    ip4addr.sin_addr.s_addr = inet_addr("127.0.0.1");
+
+    LT_CHECK_THROW(http::get_port((struct sockaddr*) &ip4addr));
+LT_END_AUTO_TEST(get_port_invalid_family)
+
+LT_BEGIN_AUTO_TEST(http_utils_suite, get_port_null)
+    LT_CHECK_THROW(http::get_port((struct sockaddr*) 0x0));
+LT_END_AUTO_TEST(get_port_null)
+
 LT_BEGIN_AUTO_TEST_ENV()
     AUTORUN_TESTS()
 LT_END_AUTO_TEST_ENV()
