Skip to content

[stable28] DNS: do not query CNAME if A succeeded already #49279

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
solracsf merged 2 commits into from
Nov 28, 2024
Merged

[stable28] DNS: do not query CNAME if A succeeded already #49279

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4ee439
fix: do not query CNAME if A succeeded already
georglauterbach Oct 13, 2024
72a891d
fix: remove superflous line
georglauterbach Nov 7, 2024
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
Next Next commit
fix: do not query CNAME if A succeeded already 
Signed-off-by: georglauterbach <[email protected]>
  • Loading branch information
@georglauterbach @solracsf
georglauterbach authored and solracsf committed Nov 28, 2024
commit d4ee439d3725c031a890afb99eecbae1a9f9547b
6 changes: 5 additions & 1 deletion lib/private/Http/Client/DnsPinMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,19 @@ private function dnsResolve(string $target, int $recursionCount) : array {

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

$dnsTypes = [DNS_A, DNS_AAAA, 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,10 +554,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);
}
}