Merge pull request #118 from tomschlick/master

removed strict hostname validator for Question::setName
Badcow · Aug 6, 2024 · 75a504e · 75a504e
2 parents d829350 + 3678b11
commit 75a504e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/lib/Question.php b/lib/Question.php
@@ -48,7 +48,7 @@ public function getName(): string
      */
     public function setName($name): void
     {
-        if (!Validator::fullyQualifiedDomainName($name)) {
+        if (!Validator::fullyQualifiedDomainName($name, false)) {
             throw new InvalidArgumentException(sprintf('"%s" is not a fully qualified domain name.', $name));
         }
 

diff --git a/lib/Validator.php b/lib/Validator.php
@@ -42,19 +42,32 @@ public static function hostName(string $name): bool
         ]);
     }
 
+    /**
+     * Validate the string as a valid domain name, without the strict character checking of hostName().
+     */
+    public static function domainName(string $name): bool
+    {
+        return (bool) filter_var($name, FILTER_VALIDATE_DOMAIN);
+    }
+
     /**
      * Validate the string is a Fully Qualified Domain Name.
      */
-    public static function fullyQualifiedDomainName(string $name): bool
+    public static function fullyQualifiedDomainName(string $name, bool $strictHostValidation = true): bool
     {
         if ('.' === $name) {
             return true;
         }
+
         if ('.' !== substr($name, -1, 1)) {
             return false;
         }
 
-        return self::hostName($name);
+        if ($strictHostValidation) {
+            return self::hostName($name);
+        }
+
+        return self::domainName($name);
     }
 
     /**

diff --git a/tests/ValidatorTest.php b/tests/ValidatorTest.php
@@ -300,6 +300,8 @@ public function getTestFqdnDataProvider(): array
             ['alt2.aspmx.l.google.com.', true],
             ['www.eXAMple.cOm.', true],
             ['3xample.com.', true],
+            ['_sip._tcp.example.com.', true, false],
+            ['_sip._tcp.example.com.', false, true],
             ['_example.com.', false],
             ['-example.com.', false],
             ['example.com', false],
@@ -310,9 +312,9 @@ public function getTestFqdnDataProvider(): array
     /**
      * @dataProvider getTestFqdnDataProvider
      */
-    public function testFqdn(string $domain, bool $isValid): void
+    public function testFqdn(string $domain, bool $isValid, bool $strictHostValidation = true): void
     {
-        $this->assertEquals($isValid, Validator::fullyQualifiedDomainName($domain));
+        $this->assertEquals($isValid, Validator::fullyQualifiedDomainName($domain, $strictHostValidation));
     }
 
     public function testHostName(): void