danog/dns-over-https
1
0
Fork 0
mirror of https://github.com/danog/dns-over-https.git synced 2024-11-30 04:19:11 +01:00
Code Issues Projects Releases Wiki Activity

Provide fallback

Browse Source
This commit is contained in:
Daniil Gentili 2019-06-12 13:48:57 +02:00
parent 2e79953e46
commit e5938d0fbe
7 changed files with 108 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/custom-config.php
View File

@ -7,6 +7,7 @@ use Amp\DoH;
use Amp\Loop;
use Amp\Promise;
// Used only by the subresolver for resolving the DoH nameserver URL
$customConfigLoader = new class implements Dns\ConfigLoader {
public function loadConfig(): Promise
{
@ -22,7 +23,16 @@ $customConfigLoader = new class implements Dns\ConfigLoader {
};
// Set default resolver to DNS-over-https resolver
$DohConfig = new DoH\DoHConfig([new DoH\Nameserver('https://mozilla.cloudflare-dns.com/dns-query')], null, null, $customConfigLoader);
$DohConfig = new DoH\DoHConfig(
[
new DoH\Nameserver('https://daniil.it/dns-query'),
new DoH\Nameserver('https://mozilla.nonexistant-dns.com/dns-query'),
new DoH\Nameserver('https://mozilla.cloudflare-dns.com/dns-query'), // Will fallback to this
],
null,
null,
$customConfigLoader
);
Dns\resolver(new DoH\Rfc8484StubResolver($DohConfig));
Loop::run(function () {

10
lib/DoHException.php Normal file
View File

@ -0,0 +1,10 @@
<?php
namespace Amp\DoH;
/**
* Throw when DoH resolution fails.
*/
class DoHException extends \Exception
{
}

5
lib/Internal/HttpsSocket.php
View File

@ -2,10 +2,9 @@
namespace Amp\DoH\Internal;
use Amp;
use Amp\Artax\Client;
use Amp\Artax\Request;
use Amp\Dns\DnsException;
use Amp\DoH\DoHException;
use Amp\DoH\JsonDecoderFactory;
use Amp\DoH\Nameserver;
use Amp\DoH\QueryEncoderFactory;
@ -84,7 +83,7 @@ final class HttpsSocket extends Socket
return call(function () use ($response, $id) {
$response = yield $response;
if ($response->getStatus() !== 200) {
throw new DnsException("HTTP result !== 200: ".$response->getReason());
throw new DoHException("HTTP result !== 200: ".$response->getStatus()." ".$response->getReason(), $response->getStatus());
}
$response = yield $response->getBody();

3
lib/Internal/Socket.php
View File

@ -9,6 +9,7 @@ use Amp\ByteStream\StreamException;
use Amp\Deferred;
use Amp\Dns\DnsException;
use Amp\Dns\TimeoutException;
use Amp\DoH\DoHException;
use Amp\DoH\Nameserver;
use Amp\Promise;
use LibDNS\Messages\Message;
@ -142,7 +143,7 @@ abstract class Socket
return;
}
if (!$exception instanceof DnsException) {
if (!$exception instanceof DnsException && !$exception instanceof DoHException) {
$message = "Unexpected error during resolution: ".$exception->getMessage();
$exception = new DnsException($message, 0, $exception);
}

16
lib/Rfc8484StubResolver.php
View File

@ -259,7 +259,23 @@ final class Rfc8484StubResolver implements Resolver
$attemptDescription[] = $nameserver;
/** @var Message $response */
try {
$response = yield $socket->ask($question, $this->config->getTimeout());
} catch (DoHException $e) {
// Defer call, because it might interfere with the unreference() call in Internal\Socket otherwise
$i = ++$attempt % \count($nameservers);
$nameserver = $nameservers[$i];
$socket = $this->getSocket($nameserver);
continue;
} catch (NoRecordException $e) {
// Defer call, because it might interfere with the unreference() call in Internal\Socket otherwise
$i = ++$attempt % \count($nameservers);
$nameserver = $nameservers[$i];
$socket = $this->getSocket($nameserver);
continue;
}
$this->assertAcceptableResponse($response);
if ($response->isTruncated()) {

64
test/IntegrationTest.php
View File

@ -17,11 +17,13 @@ class IntegrationTest extends TestCase
* @group internet
* @dataProvider provideServersAndHostnames
*/
public function testResolve($hostname, $nameserver)
public function testResolve($hostname, $nameservers)
{
foreach ($nameservers as &$nameserver) {
$nameserver = new Nameserver(...$nameserver);
Loop::run(function () use ($hostname, $nameserver) {
$DohConfig = new DoH\DoHConfig([$nameserver]);
}
Loop::run(function () use ($hostname, $nameservers) {
$DohConfig = new DoH\DoHConfig($nameservers);
Dns\resolver(new DoH\Rfc8484StubResolver($DohConfig));
$result = yield Dns\resolve($hostname);
@ -39,11 +41,13 @@ class IntegrationTest extends TestCase
* @group internet
* @dataProvider provideServersAndHostnames
*/
public function testWorksAfterConfigReload($hostname, $nameserver)
public function testWorksAfterConfigReload($hostname, $nameservers)
{
foreach ($nameservers as &$nameserver) {
$nameserver = new Nameserver(...$nameserver);
Loop::run(function () use ($hostname, $nameserver) {
$DohConfig = new DoH\DoHConfig([$nameserver]);
}
Loop::run(function () use ($hostname, $nameservers) {
$DohConfig = new DoH\DoHConfig($nameservers);
Dns\resolver(new DoH\Rfc8484StubResolver($DohConfig));
yield Dns\resolve($hostname);
@ -56,11 +60,13 @@ class IntegrationTest extends TestCase
* @group internet
* @dataProvider provideServers
*/
public function testResolveIPv4only($nameserver)
public function testResolveIPv4only($nameservers)
{
foreach ($nameservers as &$nameserver) {
$nameserver = new Nameserver(...$nameserver);
Loop::run(function () use ($nameserver) {
$DohConfig = new DoH\DoHConfig([$nameserver]);
}
Loop::run(function () use ($nameservers) {
$DohConfig = new DoH\DoHConfig($nameservers);
Dns\resolver(new DoH\Rfc8484StubResolver($DohConfig));
$records = yield Dns\resolve("google.com", Record::A);
@ -81,11 +87,13 @@ class IntegrationTest extends TestCase
* @group internet
* @dataProvider provideServers
*/
public function testResolveIPv6only($nameserver)
public function testResolveIPv6only($nameservers)
{
foreach ($nameservers as &$nameserver) {
$nameserver = new Nameserver(...$nameserver);
Loop::run(function () use ($nameserver) {
$DohConfig = new DoH\DoHConfig([$nameserver]);
}
Loop::run(function () use ($nameservers) {
$DohConfig = new DoH\DoHConfig($nameservers);
Dns\resolver(new DoH\Rfc8484StubResolver($DohConfig));
$records = yield Dns\resolve("google.com", Record::AAAA);
@ -106,11 +114,13 @@ class IntegrationTest extends TestCase
* @group internet
* @dataProvider provideServers
*/
public function testPtrLookup($nameserver)
public function testPtrLookup($nameservers)
{
foreach ($nameservers as &$nameserver) {
$nameserver = new Nameserver(...$nameserver);
Loop::run(function () use ($nameserver) {
$DohConfig = new DoH\DoHConfig([$nameserver]);
}
Loop::run(function () use ($nameservers) {
$DohConfig = new DoH\DoHConfig($nameservers);
Dns\resolver(new DoH\Rfc8484StubResolver($DohConfig));
$result = yield Dns\query("8.8.4.4", Record::PTR);
@ -171,12 +181,24 @@ class IntegrationTest extends TestCase
public function provideServers()
{
return [
[['https://mozilla.cloudflare-dns.com/dns-query']],
[['https://mozilla.cloudflare-dns.com/dns-query', Nameserver::RFC8484_POST]],
[['https://mozilla.cloudflare-dns.com/dns-query', Nameserver::RFC8484_GET]],
[['https://mozilla.cloudflare-dns.com/dns-query', Nameserver::GOOGLE_JSON]],
[['https://google.com/resolve', Nameserver::GOOGLE_JSON, ["Host" => "dns.google.com"]]],
$nameservers = [
['https://mozilla.cloudflare-dns.com/dns-query'],
['https://mozilla.cloudflare-dns.com/dns-query', Nameserver::RFC8484_POST],
['https://mozilla.cloudflare-dns.com/dns-query', Nameserver::RFC8484_GET],
['https://mozilla.cloudflare-dns.com/dns-query', Nameserver::GOOGLE_JSON],
['https://google.com/resolve', Nameserver::GOOGLE_JSON, ["Host" => "dns.google.com"]],
];
$result = [];
for ($start = 0; $start < count($nameservers); $start++) {
$temp = [];
for ($i = 0; $i < count($nameservers); $i++) {
$i = ($start + $i) % count($nameservers);
$temp[] = $nameservers[$i];
}
$result[] = [$temp];
}
return $result;
}
}

17
test/Rfc8484StubResolverTest.php
View File

@ -66,4 +66,21 @@ class Rfc8484StubResolverTest extends TestCase
new Rfc8484StubResolver($DohConfig);
});
}
public function testInvalidNameserverFallback()
{
Loop::run(function () {
$DohConfig = new DoH\DoHConfig(
[
new DoH\Nameserver('https://google.com/wrong-uri'),
new DoH\Nameserver('https://google.com/wrong-uri'),
new DoH\Nameserver('https://nonexistant-dns.com/dns-query'),
new DoH\Nameserver('https://mozilla.cloudflare-dns.com/dns-query'),
]
);
$resolver = new Rfc8484StubResolver($DohConfig);
$this->assertInstanceOf(Rfc8484StubResolver::class, $resolver);
yield $resolver->resolve('google.com');
});
}
}