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

Signed-off-by: David Dreschner <david.dreschner@nextcloud.com>

Author: DerDreschner

lib/private/Http/Client/DnsPinMiddleware.php

@@ -52,6 +52,7 @@ private function dnsResolve(string $target, int $recursionCount) : array {
 		$recursionCount++;
 		$targetIps = [];
 
+		$target = str_ends_with($target, '.') ? $target : "$target.";
 		$soaDnsEntry = $this->soaRecord($target);
 		$dnsNegativeTtl = $soaDnsEntry['minimum-ttl'] ?? null;
 		$canHaveCnameRecord = true;

tests/lib/Http/Client/DnsPinMiddlewareTest.php

@@ -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 => [
 							[
@@ -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 => [],
@@ -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 => [
 							[
@@ -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 => [],
@@ -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 => [
 							[
@@ -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 => [],
@@ -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 => [
 							[
@@ -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 => [
 							[