Merge pull request ossec#2200 from atomicturtle/issue747

Issue747

Author: atomicturtle

install.sh

@@ -379,8 +379,8 @@ ConfigureClient()
         while [ 1 ]; do
             $ECHO "  3.1- ${serveraddr}: "
                 read ADDRANSWER
-            # Is it an IP?
-            echo $ADDRANSWER | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" > /dev/null 2>&1
+            # Is it an IP (v4 or v6)?
+            echo $ADDRANSWER | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$|^[0-9a-fA-F:]+:[0-9a-fA-F:]+$" > /dev/null 2>&1
             if [ $? = 0 ]; then
                     echo ""
                 IP=$ADDRANSWER
@@ -859,7 +859,7 @@ AddWhite()
                 for ip in ${IPS};
                 do
                     if [ ! "X${ip}" = "X" ]; then
-                        echo $ip | grep -Ei "^[0-9a-f.:/]{5,20}$" > /dev/null 2>&1
+                        echo $ip | grep -Ei "^[0-9a-f.:/]{2,48}$" > /dev/null 2>&1
                         if [ $? = 0 ]; then
                         echo "    <allow_list>${ip}</allow_list>" >>$NEWCONFIG
                         fi

src/config/global-config.c

@@ -374,11 +374,7 @@ int Read_Global(XML_NODE node, void *configp, void *mailp)
             /* Windows do not need it */
 #ifndef WIN32
 
-            const char *ip_address_regex =
-                "^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}/?"
-                "([0-9]{0,2}|[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3})$";
-
-            if (Config && OS_PRegex(node[i]->content, ip_address_regex)) {
+            if (Config && OS_IsValidIP(node[i]->content, NULL)) {
                 allow_size++;
                 Config->allow_list = (os_ip **)
                                      realloc(Config->allow_list, sizeof(os_ip *)*allow_size);