Merge pull request #23 from daveearley/ISSUE-22-DNS-check-update

Check for DNS A/AAA records
daveearley · Jun 21, 2020 · e96b638 · e96b638
2 parents 392bb7a + 4b29c05
commit e96b638
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/src/EmailAddress.php b/src/EmailAddress.php
@@ -35,10 +35,10 @@ private function getEmailPart(int $partNumber): string
         return (explode('@', $this->emailAddress))[$partNumber];
     }
 
-    public function getHostPart(): ?string
+    public function getHostPart(bool $returnFqdn = false): ?string
     {
         if ($this->isValidEmailAddressFormat()) {
-            return $this->getEmailPart(self::EMAIL_HOST_PART);
+            return $this->getEmailPart(self::EMAIL_HOST_PART) . ($returnFqdn ? '.' : '');
         }
 
         return null;

diff --git a/src/Validations/MxRecordsValidator.php b/src/Validations/MxRecordsValidator.php
@@ -6,18 +6,26 @@
 
 class MxRecordsValidator extends Validator implements ValidatorInterface
 {
+    private const VALID_DNS_RECORDS = ['MX', 'A', 'AAAA', 'NS'];
+
     public function getValidatorName(): string
     {
         return 'valid_mx_records'; // @codeCoverageIgnore
     }
 
     public function getResultResponse(): bool
     {
-        if ($this->getEmailAddress()->isValidEmailAddressFormat()) {
-            return $this->checkDns($this->getEmailAddress()->getHostPart(), 'MX');
+        if (!$this->getEmailAddress()->isValidEmailAddressFormat()) {
+            return false; // @codeCoverageIgnore
+        }
+
+        $results = [];
+        foreach (self::VALID_DNS_RECORDS as $dns) {
+            $results[] = $this->checkDns($this->getEmailAddress()->getHostPart(true), $dns);
         }
 
-        return false; // @codeCoverageIgnore
+        // To be considered valid we needs an NS record and at least one MX, A or AAA record
+        return count(array_filter($results)) >= 2;
     }
 
     protected function checkDns(string $host, string $type = null): bool

diff --git a/tests/Validations/MxRecordsValidatorTest.php b/tests/Validations/MxRecordsValidatorTest.php
@@ -16,7 +16,12 @@ class MxRecordsValidatorTest extends TestCase
 
     public function testMxRecordIsChecked(): void
     {
-        $this->mxValidator->shouldReceive('checkDns')->with('dave@gmail.com', 'MX');
+        foreach (['MX', 'AAAA', 'NS', 'A'] as $dns) {
+            $this->mxValidator
+                ->shouldReceive('checkDns')
+                ->with('gmail.com.', $dns);
+        }
+
         $this->mxValidator->getResultResponse();
     }
 
@@ -26,6 +31,11 @@ protected function setUp(): void
             new EmailAddress('dave@gmail.com'),
         ])
             ->shouldAllowMockingProtectedMethods()
-            ->makePartial();
+            ->shouldReceive('getResultResponse')
+            ->passthru()
+            ->getMock()
+            ->shouldReceive('getEmailAddress')
+            ->passthru()
+            ->getMock();
     }
 }