Merge pull request #123 from Saeven/bugfix/empty-deep-mx-checks

Domains with bad MX configurations should not print warnings to page
laminas · Mar 8, 2022 · bdd503a · bdd503a
2 parents cdea9a8 + 702c7d7
commit bdd503a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -4,6 +4,7 @@
          bootstrap="./vendor/autoload.php"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutTestsThatDoNotTestAnything="true"
+         failOnWarning="true"
          colors="true">
     <testsuites>
         <testsuite name="laminas-validator Test Suite">

diff --git a/src/EmailAddress.php b/src/EmailAddress.php
@@ -24,6 +24,7 @@
 use function preg_match;
 use function strlen;
 use function strpos;
+use function trim;
 
 use const INTL_IDNA_VARIANT_UTS46;
 
@@ -453,6 +454,10 @@ protected function validateMXRecords()
                 $reserved = false;
             }
 
+            if (! is_string($hostname) || ! trim($hostname)) {
+                continue;
+            }
+
             if (
                 ! $res
                 && (checkdnsrr($hostname, 'A')

diff --git a/test/EmailAddressTest.php b/test/EmailAddressTest.php
@@ -924,4 +924,14 @@ public function testCanSetDomainCheckFlag(): void
         $validator->useDomainCheck(false);
         $this->assertFalse($validator->getDomainCheck());
     }
+
+    public function testWillNotCheckEmptyDeepMxChecks(): void
+    {
+        $validator = new EmailAddress([
+            'useMxCheck'     => true,
+            'useDeepMxCheck' => true,
+        ]);
+
+        $this->assertFalse($validator->isValid('jon@example.com'));
+    }
 }