For login allow list add support for IPv6 (#18046)

1 files changed, 12 insertions, 0 deletions

diff --git a/config/global.php b/config/global.php
index 4be44c4dbd..cc02edc8d4 100644
--- a/config/global.php
+++ b/config/global.php
@@ -162,12 +162,24 @@ return array(
         $ipsResolved = array();
 
         foreach ($ips as $ip) {
+            $ip = trim($ip);
             if (filter_var($ip, FILTER_VALIDATE_IP)) {
                 $ipsResolved[] = $ip;
             } else {
                 $ipFromHost = @gethostbyname($ip);
                 if (!empty($ipFromHost)) {
+                    // we don't check using filter_var if it's an IP as "gethostbyname" will return the $ip if it's not a hostname
+                    // and we then assume it is an IP range. Otherwise IP ranges would not be added. Ideally would above check if it is an
+                    // IP range before trying to get host by name.
                     $ipsResolved[] = $ipFromHost;
+                } 
+                
+                if (function_exists('dns_get_record')) {
+                    $entry = @dns_get_record($ip, DNS_AAAA);
+                    if (!empty($entry['0']['ipv6'])
+                        && filter_var($entry['0']['ipv6'], FILTER_VALIDATE_IP)) {
+                        $ipsResolved[] = $entry['0']['ipv6'];
+                    }
                 }
             }
         }