Skip to content

fix(DnsPinning): Ensure to always lookup based on FQDN #59147

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

Open
DerDreschner wants to merge 1 commit into
base: master
Choose a base branch
from
+35 −20
Open

fix(DnsPinning): Ensure to always lookup based on FQDN #59147

Show file tree
Hide file tree
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
19 changes: 17 additions & 2 deletions lib/private/Http/Client/DnsPinMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,21 @@ public function __construct(
) {
}

/**
* DNS lookups must end with a dot to be marked as
* FQDN. Otherwise, a record without answer may trigger
* a lookup on the local domain name. See GitHub
* issue #56489 for details.
*
* @param string $hostname
* @return string
*/
private function enforceFqdn(string $hostname): string {
$trimmedHostname = rtrim($hostname, '.');

return "$trimmedHostname.";
}

/**
* Fetch soa record for a target
*/
Expand All @@ -35,7 +50,7 @@ private function soaRecord(string $target): ?array {
$second = array_pop($labels);

$hostname = $second . '.' . $top;
$responses = $this->dnsGetRecord($hostname, DNS_SOA);
$responses = $this->dnsGetRecord($this->enforceFqdn($hostname), DNS_SOA);

if ($responses === false || count($responses) === 0) {
return null;
Expand Down Expand Up @@ -68,7 +83,7 @@ private function dnsResolve(string $target, int $recursionCount) : array {
continue;
}

$dnsResponses = $this->dnsGetRecord($target, $dnsType);
$dnsResponses = $this->dnsGetRecord($this->enforceFqdn($target), $dnsType);
if ($dnsResponses !== false && count($dnsResponses) > 0) {
foreach ($dnsResponses as $dnsResponse) {
if (isset($dnsResponse['ip'])) {
Expand Down
36 changes: 18 additions & 18 deletions tests/lib/Http/Client/DnsPinMiddlewareTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ static function (RequestInterface $request, array $options) {
->method('dnsGetRecord')
->willReturnCallback(function (string $hostname, int $type) {
// example.com SOA
if ($hostname === 'example.com') {
if ($hostname === 'example.com.') {
return match ($type) {
DNS_SOA => [
[
Expand All @@ -76,7 +76,7 @@ static function (RequestInterface $request, array $options) {
}

// example.com A, AAAA, CNAME
if ($hostname === 'www.example.com') {
if ($hostname === 'www.example.com.') {
return match ($type) {
DNS_A => [],
DNS_AAAA => [],
Expand All @@ -93,7 +93,7 @@ static function (RequestInterface $request, array $options) {
}

// example.net SOA
if ($hostname === 'example.net') {
if ($hostname === 'example.net.') {
return match ($type) {
DNS_SOA => [
[
Expand All @@ -108,7 +108,7 @@ static function (RequestInterface $request, array $options) {
}

// example.net A, AAAA, CNAME
if ($hostname === 'www.example.net') {
if ($hostname === 'www.example.net.') {
return match ($type) {
DNS_A => [
[
Expand Down Expand Up @@ -154,7 +154,7 @@ static function (RequestInterface $request, array $options) {
->method('dnsGetRecord')
->willReturnCallback(function (string $hostname, int $type) {
// example.com SOA
if ($hostname === 'example.com') {
if ($hostname === 'example.com.') {
return match ($type) {
DNS_SOA => [
[
Expand All @@ -169,7 +169,7 @@ static function (RequestInterface $request, array $options) {
}

// example.com A, AAAA, CNAME
if ($hostname === 'www.example.com') {
if ($hostname === 'www.example.com.') {
return match ($type) {
DNS_A => [],
DNS_AAAA => [],
Expand All @@ -186,7 +186,7 @@ static function (RequestInterface $request, array $options) {
}

// example.net SOA
if ($hostname === 'example.net') {
if ($hostname === 'example.net.') {
return match ($type) {
DNS_SOA => [
[
Expand All @@ -201,7 +201,7 @@ static function (RequestInterface $request, array $options) {
}

// example.net A, AAAA, CNAME
if ($hostname === 'www.example.net') {
if ($hostname === 'www.example.net.') {
return match ($type) {
DNS_A => [
[
Expand Down Expand Up @@ -378,7 +378,7 @@ static function (RequestInterface $request, array $options): void {
->method('dnsGetRecord')
->willReturnCallback(function (string $hostname, int $type) {
// example.com SOA
if ($hostname === 'example.com') {
if ($hostname === 'example.com.') {
return match ($type) {
DNS_SOA => [
[
Expand All @@ -393,7 +393,7 @@ static function (RequestInterface $request, array $options): void {
}

// example.com A, AAAA, CNAME
if ($hostname === 'www.example.com') {
if ($hostname === 'www.example.com.') {
return match ($type) {
DNS_A => [],
DNS_AAAA => [],
Expand All @@ -410,7 +410,7 @@ static function (RequestInterface $request, array $options): void {
}

// example.net SOA
if ($hostname === 'example.net') {
if ($hostname === 'example.net.') {
return match ($type) {
DNS_SOA => [
[
Expand All @@ -425,7 +425,7 @@ static function (RequestInterface $request, array $options): void {
}

// example.net A, AAAA, CNAME
if ($hostname === 'www.example.net') {
if ($hostname === 'www.example.net.') {
return match ($type) {
DNS_A => [
[
Expand Down Expand Up @@ -496,7 +496,7 @@ static function (RequestInterface $request, array $options): void {
$dnsQueries[] = $hostname . $type;

// example.com SOA
if ($hostname === 'example.com') {
if ($hostname === 'example.com.') {
return match ($type) {
DNS_SOA => [
[
Expand All @@ -511,7 +511,7 @@ static function (RequestInterface $request, array $options): void {
}

// example.net A, AAAA, CNAME
if ($hostname === 'subsubdomain.subdomain.example.com') {
if ($hostname === 'subsubdomain.subdomain.example.com.') {
return match ($type) {
DNS_A => [
[
Expand Down Expand Up @@ -540,10 +540,10 @@ static function (RequestInterface $request, array $options): void {
);

$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('example.com.' . DNS_SOA, $dnsQueries);
$this->assertContains('subsubdomain.subdomain.example.com.' . DNS_A, $dnsQueries);
$this->assertContains('subsubdomain.subdomain.example.com.' . DNS_AAAA, $dnsQueries);
// CNAME should not be queried if A or AAAA succeeded already
$this->assertNotContains('subsubdomain.subdomain.example.com' . DNS_CNAME, $dnsQueries);
$this->assertNotContains('subsubdomain.subdomain.example.com.' . DNS_CNAME, $dnsQueries);
}
}
Loading