Skip to content

Support resolving from default hosts file #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WyriHaximus merged 10 commits into from
Aug 18, 2017
Merged

Support resolving from default hosts file #75

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1712012
Add HostsFile configuration loader and parser
clue Aug 15, 2017
1bc2f40
Add HostsFileExecutor to explicitly take hosts file into account
clue Aug 15, 2017
21c7238
Load hosts file by default
clue Aug 15, 2017
61b603c
Windows uses hard-coded defaults for localhost instead of hosts file
clue Aug 15, 2017
d8554e5
Properly filter to only return IPv4 addresses for type A queries
clue Aug 15, 2017
b1b4b8c
Return IPv6 addresses for type AAAA queries
clue Aug 15, 2017
036d6ca
Support reverse lookups from hosts file
clue Aug 16, 2017
5a3e0fa
Ignore IPv6 zone IDs from hosts file
clue Aug 16, 2017
de8e83d
Support reverse DNS lookups for HostsFileExecutor
clue Aug 16, 2017
df7f4e1
Ignore errors for invalid hex codes and legacy PHP
clue Aug 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Query/HostsFileExecutor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private function getIpFromHost($host)
return inet_ntop(strrev($ip));
} elseif (substr($host, -9) === '.ip6.arpa') {
// IPv6: replace dots, reverse nibbles and interpret as hexadecimal string
$ip = @inet_ntop(hex2bin(strrev(str_replace('.', '', substr($host, 0, -9)))));
$ip = @inet_ntop(pack('H*', strrev(str_replace('.', '', substr($host, 0, -9)))));
Comment thread
clue marked this conversation as resolved.
if ($ip === false) {
return null;
}
Expand Down
10 changes: 9 additions & 1 deletion tests/Query/HostsFileExecutorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,19 @@ public function testReverseFallsBackForInvalidIpv4Address()
$this->executor->query('8.8.8.8', new Query('::1.in-addr.arpa', Message::TYPE_PTR, Message::CLASS_IN, 0));
}

public function testReverseFallsBackForInvalidIpv6Address()
public function testReverseFallsBackForInvalidLengthIpv6Address()
{
$this->hosts->expects($this->never())->method('getHostsForIp');
$this->fallback->expects($this->once())->method('query');

$this->executor->query('8.8.8.8', new Query('abcd.ip6.arpa', Message::TYPE_PTR, Message::CLASS_IN, 0));
}

public function testReverseFallsBackForInvalidHexIpv6Address()
{
$this->hosts->expects($this->never())->method('getHostsForIp');
$this->fallback->expects($this->once())->method('query');

$this->executor->query('8.8.8.8', new Query('zZz.ip6.arpa', Message::TYPE_PTR, Message::CLASS_IN, 0));
}
}