perform AAAA check separately (fixes #301) (#376)

egulias · Oct 6, 2023 · ebaaf5b · ebaaf5b
1 parent d11195e
commit ebaaf5b
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/Validation/DNSCheckValidation.php b/src/Validation/DNSCheckValidation.php
@@ -13,10 +13,6 @@
 
 class DNSCheckValidation implements EmailValidation
 {
-    /**
-     * @var int
-     */
-    protected const DNS_RECORD_TYPES_TO_CHECK = DNS_MX + DNS_A + DNS_AAAA;
 
     /**
      * Reserved Top Level DNS Names (https://tools.ietf.org/html/rfc2606#section-2),
@@ -149,7 +145,7 @@ protected function checkDns($host)
      */
     private function validateDnsRecords($host): bool
     {
-        $dnsRecordsResult = $this->dnsGetRecord->getRecords($host, static::DNS_RECORD_TYPES_TO_CHECK);
+        $dnsRecordsResult = $this->dnsGetRecord->getRecords($host, DNS_A + DNS_MX);
 
         if ($dnsRecordsResult->withError()) {
             $this->error = new InvalidEmail(new UnableToGetDNSRecord(), '');
@@ -158,6 +154,13 @@ private function validateDnsRecords($host): bool
 
         $dnsRecords = $dnsRecordsResult->getRecords();
 
+        // Combined check for A+MX+AAAA can fail with SERVFAIL, even in the presence of valid A/MX records
+        $aaaaRecordsResult = $this->dnsGetRecord->getRecords($host, DNS_AAAA);
+
+        if (! $aaaaRecordsResult->withError()) {
+            $dnsRecords = array_merge($dnsRecords, $aaaaRecordsResult->getRecords());
+        }
+
         // No MX, A or AAAA DNS records
         if ($dnsRecords === []) {
             $this->error = new InvalidEmail(new ReasonNoDNSRecord(), '');