Skip to content

[stable22] Ignore subdomain for soa queries #27825

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
MichaIng merged 1 commit into from
Jul 9, 2021
Merged

[stable22] Ignore subdomain for soa queries #27825

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 28 additions & 13 deletions lib/private/Http/Client/DnsPinMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,28 @@ public function __construct(
$this->localAddressChecker = $localAddressChecker;
}

/**
* Fetch soa record for a target
*
* @param string $target
* @return array|null
*/
private function soaRecord(string $target): ?array {
$labels = explode('.', $target);

$top = count($labels) >= 2 ? array_pop($labels) : '';
$second = array_pop($labels);

$hostname = $second . '.' . $top;
$responses = dns_get_record($hostname, DNS_SOA);

if ($responses === false || count($responses) === 0) {
return null;
}

return reset($responses);
}

private function dnsResolve(string $target, int $recursionCount) : array {
if ($recursionCount >= 10) {
return [];
Expand All @@ -49,24 +71,19 @@ private function dnsResolve(string $target, int $recursionCount) : array {
$recursionCount = $recursionCount++;
$targetIps = [];

$soaDnsEntry = dns_get_record($target, DNS_SOA);
if (isset($soaDnsEntry[0]) && isset($soaDnsEntry[0]['minimum-ttl'])) {
$dnsNegativeTtl = $soaDnsEntry[0]['minimum-ttl'];
} else {
$dnsNegativeTtl = null;
}
$soaDnsEntry = $this->soaRecord($target);
$dnsNegativeTtl = $soaDnsEntry['minimum-ttl'] ?? null;

$dnsTypes = [DNS_A, DNS_AAAA, DNS_CNAME];
foreach ($dnsTypes as $key => $dnsType) {
foreach ($dnsTypes as $dnsType) {
if ($this->negativeDnsCache->isNegativeCached($target, $dnsType)) {
unset($dnsTypes[$key]);
continue;
}

$dnsResponses = dns_get_record($target, $dnsType);
$canHaveCnameRecord = true;
if (count($dnsResponses) > 0) {
foreach ($dnsResponses as $key => $dnsResponse) {
foreach ($dnsResponses as $dnsResponse) {
if (isset($dnsResponse['ip'])) {
$targetIps[] = $dnsResponse['ip'];
$canHaveCnameRecord = false;
Expand All @@ -78,10 +95,8 @@ private function dnsResolve(string $target, int $recursionCount) : array {
$canHaveCnameRecord = true;
}
}
} else {
if ($dnsNegativeTtl !== null) {
$this->negativeDnsCache->setNegativeCacheForDnsType($target, $dnsType, $dnsNegativeTtl);
}
} elseif ($dnsNegativeTtl !== null) {
$this->negativeDnsCache->setNegativeCacheForDnsType($target, $dnsType, $dnsNegativeTtl);
}
}

Expand Down