Ignore IPv6 zone IDs from hosts file

Author: clue

src/Config/HostsFile.php

@@ -101,6 +101,11 @@ public function getIpsForHost($name)
             $parts = preg_split('/\s+/', $line);
             $ip = array_shift($parts);
             if ($parts && array_search($name, $parts) !== false) {
+                // remove IPv6 zone ID (`fe80::1%lo0` => `fe80:1`)
+                if (strpos($ip, ':') !== false && ($pos = strpos($ip, '%')) !== false) {
+                    $ip= substr($ip, 0, $pos);
+                }
+
                 $ips[] = $ip;
             }
         }
@@ -122,8 +127,14 @@ public function getHostsForIp($ip)
         $names = array();
         foreach (preg_split('/\r?\n/', $this->contents) as $line) {
             $parts = preg_split('/\s+/', $line);
+            $addr = array_shift($parts);
+
+            // remove IPv6 zone ID (`fe80::1%lo0` => `fe80:1`)
+            if (strpos($addr, ':') !== false && ($pos = strpos($addr, '%')) !== false) {
+                $addr = substr($addr, 0, $pos);
+            }
 
-            if (inet_pton(array_shift($parts)) === $ip) {
+            if (@inet_pton($addr) === $ip) {
                 foreach ($parts as $part) {
                     $names[] = $part;
                 }

tests/Config/HostsFileTest.php

@@ -41,6 +41,13 @@ public function testContainsSingleLocalhostEntry()
         $this->assertEquals(array(), $hosts->getIpsForHost('example.com'));
     }
 
+    public function testIgnoresIpv6ZoneId()
+    {
+        $hosts = new HostsFile('fe80::1%lo0 localhost');
+
+        $this->assertEquals(array('fe80::1'), $hosts->getIpsForHost('localhost'));
+    }
+
     public function testSkipsComments()
     {
         $hosts = new HostsFile('# start' . PHP_EOL .'#127.0.0.1 localhost' . PHP_EOL . '127.0.0.2 localhost # example.com');
@@ -115,6 +122,13 @@ public function testReverseLookupChecksNormalizedIpv6()
         $this->assertEquals(array('localhost'), $hosts->getHostsForIp('fe80::A1'));
     }
 
+    public function testReverseLookupIgnoresIpv6ZoneId()
+    {
+        $hosts = new HostsFile('fe80::1%lo0 localhost');
+
+        $this->assertEquals(array('localhost'), $hosts->getHostsForIp('fe80::1'));
+    }
+
     public function testReverseLookupReturnsMultipleHostsOverSingleLine()
     {
         $hosts = new HostsFile("::1 ip6-localhost ip6-loopback");