Add ajax-get-host tool IPv6 compatibility

classes/tools.class.php

@@ -131,16 +131,10 @@ class Tools {
   public static function lookup_ip($IP) {
     //TODO: use the G::$Cache
     $Output = explode(' ',shell_exec('host -W 1 '.escapeshellarg($IP)));
-    if (count($Output) == 1 && empty($Output[0])) {
-      //No output at all implies the command failed
-      return '';
-    }
-
-    if (count($Output) != 5) {
-      return false;
-    } else {
-      return trim($Output[4]);
-    }
+    if (count($Output) == 1 && empty($Output[0]))  { return ''; }
+    if (count($Output) != 5)                       { return false; }
+    if ($Output[2].' '.$Output[3] == 'not found:') { return false; }
+    return trim($Output[4]);
   }
 
   /**

sections/tools/services/get_host.php

@@ -10,37 +10,38 @@ header('Last-Modified: '.date('D, d-M-Y H:i:s \U\T\C', time()));
 if (!check_perms('users_view_ips')) {
   die('Access denied.');
 }
+if (empty($_GET['ip'])) {
+  die('No IP given.');
+}
+$IP = $_GET['ip'];
+
+$Delimiter = $IP[strcspn($IP, ':.')];
+$OctOrHextets = explode($Delimiter, $IP);
 
-$Octets = explode('.', $_GET['ip']);
-if (
-  empty($_GET['ip'])
-  || !preg_match('/'.IP_REGEX.'/', $_GET['ip'])
-  || $Octets[0] < 0
-  || $Octets[0] > 255
-  || $Octets[1] < 0
-  || $Octets[1] > 255
-  || $Octets[2] < 0
-  || $Octets[2] > 255
-  || $Octets[3] < 0
-  || $Octets[3] > 255
-  /*
-   * Per RFC 1918, the following CIDR blocks should never be found on the public Internet.
-   *    10.0.0.0/8
-   *    172.16.0.0/12
-   *    192.168.0.0/16
-   *
-   * Per RFC 3330, the block 127.0.0.0/8 should never appear on any network.
-   *
-   */
-  || $Octets[0] == 127
-  || $Octets[0] == 10
-  || ($Octets[0] == 172 && ((16 <= $Octets[1]) && ($Octets[1] <= 31)))
-  || ($Octets[0] == 192 && $Octets[1] == 168)
-) {
-  die('Invalid IPv4 address.');
+
+if ($Delimiter == '.' && sizeof($OctOrHextets) == 4) { // IPv4
+  if ( ($OctOrHextets[0] == 127 || $OctOrHextets[0] == 10)
+    || ($OctOrHextets[0] == 192 && $OctOrHextets[1] == 168)
+    || ($OctOrHextets[0] == 172 && ($OctOrHextets[1] >= 16 && $OctOrHextets[1] <= 32))
+  ) {
+    die('Invalid IPv4 address.');
+  }
+  foreach($OctOrHextets as $Octet) {
+    if ($Octet > 255 || $Octet < 0) {
+      die('Invalid IPv4 address.');
+    }
+  }
+} else if (sizeof($OctOrHextets) <= 8) { // IPv6
+  foreach($OctOrHextets as $Hextet) {
+    if (strlen($Hextet) > 4) {
+      die('Invalid IPv6 address.');
+    }
+  }
+} else {
+  die('Invalid IP address.');
 }
 
-$Host = Tools::lookup_ip($_GET['ip']);
+$Host = Tools::lookup_ip($IP);
 
 if ($Host === '') {
   trigger_error('Tools::get_host_by_ajax() command failed with no output, ensure that the host command exists on your system and accepts the argument -W');