Merge pull request #76 from clue-labs/invalid-hosts

Ignore invalid lines from hosts file

Author: WyriHaximus

src/Config/HostsFile.php

@@ -103,10 +103,12 @@ public function getIpsForHost($name)
             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);
+                    $ip = substr($ip, 0, $pos);
                 }
 
-                $ips[] = $ip;
+                if (@inet_pton($ip) !== false) {
+                    $ips[] = $ip;
+                }
             }
         }
 
@@ -123,6 +125,9 @@ public function getHostsForIp($ip)
     {
         // check binary representation of IP to avoid string case and short notation
         $ip = @inet_pton($ip);
+        if ($ip === false) {
+            return array();
+        }
 
         $names = array();
         foreach (preg_split('/\r?\n/', $this->contents) as $line) {

tests/Config/HostsFileTest.php

@@ -41,6 +41,14 @@ public function testContainsSingleLocalhostEntry()
         $this->assertEquals(array(), $hosts->getIpsForHost('example.com'));
     }
 
+    public function testNonIpReturnsNothingForInvalidHosts()
+    {
+        $hosts = new HostsFile('a b');
+
+        $this->assertEquals(array(), $hosts->getIpsForHost('a'));
+        $this->assertEquals(array(), $hosts->getIpsForHost('b'));
+    }
+
     public function testIgnoresIpv6ZoneId()
     {
         $hosts = new HostsFile('fe80::1%lo0 localhost');
@@ -108,6 +116,14 @@ public function testReverseNonIpReturnsNothing()
         $this->assertEquals(array(), $hosts->getHostsForIp('127.0.0.1.1'));
     }
 
+    public function testReverseNonIpReturnsNothingForInvalidHosts()
+    {
+        $hosts = new HostsFile('a b');
+
+        $this->assertEquals(array(), $hosts->getHostsForIp('a'));
+        $this->assertEquals(array(), $hosts->getHostsForIp('b'));
+    }
+
     public function testReverseLookupReturnsLowerCaseHost()
     {
         $hosts = new HostsFile('127.0.0.1 LocalHost');