Merge pull request #90 from hostep/extra-error-handling-for-DnsGetRec…

…ord-handler Improved handling of errors when dns_get_record function fails.
spatie · Mar 24, 2022 · cdddc27 · cdddc27
2 parents 1293dc4 + f886dc2
commit cdddc27
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/src/Exceptions/CouldNotFetchDns.php b/src/Exceptions/CouldNotFetchDns.php
@@ -18,4 +18,13 @@ public static function digReturnedWithError(Process $process): self
 
         return new static("Dig command failed with message: `{$output}`");
     }
+
+    public static function dnsGetRecordReturnedWithError(string $error): self
+    {
+        if ($error === '') {
+            $error = 'dns_get_record function failed';
+        }
+
+        return new static($error);
+    }
 }
diff --git a/src/Handlers/DnsGetRecord.php b/src/Handlers/DnsGetRecord.php
@@ -2,11 +2,24 @@
 
 namespace Spatie\Dns\Handlers;
 
+use Spatie\Dns\Exceptions\CouldNotFetchDns;
+
 class DnsGetRecord extends Handler
 {
     public function __invoke(string $domain, int $flag, string $type): array
     {
-        $records = dns_get_record($domain, $flag);
+        $records = false;
+        $error = '';
+
+        try {
+            $records = dns_get_record($domain, $flag);
+        } catch (\Throwable $ex) {
+            $error = $ex->getMessage();
+        }
+
+        if ($records === false) {
+            throw CouldNotFetchDns::dnsGetRecordReturnedWithError($error);
+        }
 
         return $this->transform($type, $records);
     }

diff --git a/tests/DnsTest.php b/tests/DnsTest.php
@@ -7,12 +7,14 @@
 use Spatie\Dns\Dns;
 use Spatie\Dns\Exceptions\CouldNotFetchDns;
 use Spatie\Dns\Exceptions\InvalidArgument;
+use Spatie\Dns\Handlers\DnsGetRecord;
 use Spatie\Dns\Records\A;
 use Spatie\Dns\Records\MX;
 use Spatie\Dns\Records\NS;
 use Spatie\Dns\Records\Record;
 use Spatie\Dns\Records\SOA;
 use Spatie\Dns\Support\Collection;
+use Spatie\Dns\Support\Factory;
 use Spatie\Dns\Test\TestClasses\CustomHandler;
 
 class DnsTest extends TestCase
@@ -150,6 +152,18 @@ public function it_throws_exception_on_failed_to_fetch_dns_record()
             ->getRecords('spatie.be', DNS_A);
     }
 
+    /** @test */
+    public function it_throws_exception_on_failed_to_fetch_dns_record_with_dns_get_record_function()
+    {
+        $this->expectException(CouldNotFetchDns::class);
+        $this->expectExceptionMessage('dns_get_record(): A temporary server error occurred.');
+
+        $this->dns
+            ->useHandlers([new DnsGetRecord(new Factory())])
+            ->useNameserver('dns.spatie.be')
+            ->getRecords('non-existing-domain.whatever', DNS_NS);
+    }
+
     /** @test */
     public function it_can_use_custom_handlers()
     {