Skip to content

Commit

Permalink
fix: do not query CNAME if A succeeded already
Browse files Browse the repository at this point in the history
Signed-off-by: georglauterbach <44545919+georglauterbach@users.noreply.github.com>
  • Loading branch information
georglauterbach committed Nov 6, 2024
1 parent de30fad commit 387cd8b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
6 changes: 5 additions & 1 deletion lib/private/Http/Client/DnsPinMiddleware.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,21 @@ private function dnsResolve(string $target, int $recursionCount) : array {

$soaDnsEntry = $this->soaRecord($target);
$dnsNegativeTtl = $soaDnsEntry['minimum-ttl'] ?? null;
$canHaveCnameRecord = true;

$dnsTypes = \defined('AF_INET6') || @inet_pton('::1')
? [DNS_A, DNS_AAAA, DNS_CNAME]
: [DNS_A, DNS_CNAME];
foreach ($dnsTypes as $dnsType) {
if ($canHaveCnameRecord === false && $dnsType === DNS_CNAME) {
continue;
}

if ($this->negativeDnsCache->isNegativeCached($target, $dnsType)) {
continue;
}

$dnsResponses = $this->dnsGetRecord($target, $dnsType);
$canHaveCnameRecord = true;
if ($dnsResponses !== false && count($dnsResponses) > 0) {
foreach ($dnsResponses as $dnsResponse) {
if (isset($dnsResponse['ip'])) {
Expand Down
5 changes: 3 additions & 2 deletions tests/lib/Http/Client/DnsPinMiddlewareTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -537,10 +537,11 @@ static function (RequestInterface $request, array $options) {
['nextcloud' => ['allow_local_address' => false]]
);

$this->assertCount(4, $dnsQueries);
$this->assertCount(3, $dnsQueries);
$this->assertContains('example.com' . DNS_SOA, $dnsQueries);
$this->assertContains('subsubdomain.subdomain.example.com' . DNS_A, $dnsQueries);
$this->assertContains('subsubdomain.subdomain.example.com' . DNS_AAAA, $dnsQueries);
$this->assertContains('subsubdomain.subdomain.example.com' . DNS_CNAME, $dnsQueries);
// CNAME should not be queried if A or AAAA succeeded already
$this->assertNotContains('subsubdomain.subdomain.example.com' . DNS_CNAME, $dnsQueries);
}
}

0 comments on commit 387cd8b

Please sign in to comment.