diff options
| author | Côme Chilliet <91878298+come-nc@users.noreply.github.com> | 2024-11-14 14:21:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-14 14:21:01 +0100 |
| commit | 23117a0a042e898b3e3f1dae302268a07a3298cf (patch) | |
| tree | 84b7d52d6cb4659481d3b3bca029ace09f898560 | |
| parent | 031df2eb2ab89ac923337d8bcace7e6e89a12a27 (diff) | |
| parent | 5915d7f7ceaaf39eb6eb7017e72778032a20906e (diff) | |
| download | nextcloud-server-23117a0a042e898b3e3f1dae302268a07a3298cf.tar.gz nextcloud-server-23117a0a042e898b3e3f1dae302268a07a3298cf.zip | |
Merge pull request #49277 from nextcloud/backport/48675/stable30
[stable30] DNS: do not query CNAME if A succeeded already
| -rw-r--r-- | lib/private/Http/Client/DnsPinMiddleware.php | 7 | ||||
| -rw-r--r-- | tests/lib/Http/Client/DnsPinMiddlewareTest.php | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/private/Http/Client/DnsPinMiddleware.php b/lib/private/Http/Client/DnsPinMiddleware.php index fcf0818ebb9..a3d6a64611f 100644 --- a/lib/private/Http/Client/DnsPinMiddleware.php +++ b/lib/private/Http/Client/DnsPinMiddleware.php @@ -57,17 +57,21 @@ class DnsPinMiddleware { $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'])) { @@ -78,7 +82,6 @@ class DnsPinMiddleware { $canHaveCnameRecord = false; } elseif (isset($dnsResponse['target']) && $canHaveCnameRecord) { $targetIps = array_merge($targetIps, $this->dnsResolve($dnsResponse['target'], $recursionCount)); - $canHaveCnameRecord = true; } } } elseif ($dnsNegativeTtl !== null) { diff --git a/tests/lib/Http/Client/DnsPinMiddlewareTest.php b/tests/lib/Http/Client/DnsPinMiddlewareTest.php index d265ce3e71c..7ece5423b89 100644 --- a/tests/lib/Http/Client/DnsPinMiddlewareTest.php +++ b/tests/lib/Http/Client/DnsPinMiddlewareTest.php @@ -537,10 +537,11 @@ class DnsPinMiddlewareTest extends TestCase { ['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); } } |