Return IPv6 addresses for type AAAA queries

Author: clue

src/Query/HostsFileExecutor.php

@@ -27,11 +27,12 @@ public function __construct(HostsFile $hosts, ExecutorInterface $fallback)
 
     public function query($nameserver, Query $query)
     {
-        if ($query->class === Message::CLASS_IN && $query->type === Message::TYPE_A) {
+        if ($query->class === Message::CLASS_IN && ($query->type === Message::TYPE_A || $query->type === Message::TYPE_AAAA)) {
             $records = array();
+            $expectsColon = $query->type === Message::TYPE_AAAA;
             foreach ($this->hosts->getIpsForHost($query->name) as $ip) {
-                // ensure this is an IPv4 address
-                if (strpos($ip, ':') === false) {
+                // ensure this is an IPv4/IPV6 address according to query type
+                if ((strpos($ip, ':') !== false) === $expectsColon) {
                     $records[] = new Record($query->name, $query->type, $query->class, 0, $ip);
                 }
             }

src/Resolver/Factory.php

@@ -60,7 +60,7 @@ private function decorateHostsFileExecutor(ExecutorInterface $executor)
         // To compensate for this, we explicitly use hard-coded defaults for localhost
         if (DIRECTORY_SEPARATOR === '\\') {
             $executor = new HostsFileExecutor(
-                new HostsFile("127.0.0.1 localhost"),
+                new HostsFile("127.0.0.1 localhost\n::1 localhost"),
                 $executor
             );
         }

tests/Query/HostsFileExecutorTest.php

@@ -51,4 +51,20 @@ public function testFallsBackIfNoIpv4Matches()
 
         $ret = $this->executor->query('8.8.8.8', new Query('google.com', Message::TYPE_A, Message::CLASS_IN, 0));
     }
+
+    public function testReturnsResponseMessageIfIpv6AddressesWereFound()
+    {
+        $this->hosts->expects($this->once())->method('getIpsForHost')->willReturn(array('::1'));
+        $this->fallback->expects($this->never())->method('query');
+
+        $ret = $this->executor->query('8.8.8.8', new Query('google.com', Message::TYPE_AAAA, Message::CLASS_IN, 0));
+    }
+
+    public function testFallsBackIfNoIpv6Matches()
+    {
+        $this->hosts->expects($this->once())->method('getIpsForHost')->willReturn(array('127.0.0.1'));
+        $this->fallback->expects($this->once())->method('query');
+
+        $ret = $this->executor->query('8.8.8.8', new Query('google.com', Message::TYPE_AAAA, Message::CLASS_IN, 0));
+    }
 }