Use PHP methods to validate domain and hostname

utopia-php · Jan 29, 2024 · eae1a61 · eae1a61
1 parent b401650
commit eae1a61
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/src/Domains/Domain.php b/src/Domains/Domain.php
@@ -65,21 +65,10 @@ class Domain
      */
     public function __construct(string $domain)
     {
-        if ((strpos($domain, 'http://') === 0) || (strpos($domain, 'https://') === 0)) {
+        if ((strpos($domain, 'http://') === 0) || (strpos($domain, 'https://') === 0 || !filter_var($domain, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME))) {
             throw new Exception("'{$domain}' must be a valid domain or hostname");
         }
 
-        if (strpos($domain, ' ') !== false || strpos($domain, ';') !== false || strpos($domain, '|') !== false || strpos($domain, '&') !== false || strpos($domain, '>') !== false || strpos($domain, '<') !== false) {
-            throw new Exception("Spaces and shell metacharacters not allowed in {$domain} domain");
-        }
-
-        $labels = explode('.', $domain);
-        foreach ($labels as $label) {
-            if (strpos($label, '-') === 0 || strpos($label, '-') === strlen($label) - 1) {
-                throw new Exception("Hyphens not allowed at label edges in domain {$domain}");
-            }
-        }
-
         $this->domain = \mb_strtolower($domain);
         $this->parts = \explode('.', $this->domain);
 

diff --git a/tests/DomainTest.php b/tests/DomainTest.php
@@ -216,21 +216,21 @@ public function testHTTPSException2(): void
     public function testDomainWithSpaces(): void
     {
         $this->expectException('Exception');
-        $this->expectExceptionMessage("Spaces and shell metacharacters not allowed in rm -f -r * domain");
+        $this->expectExceptionMessage("'rm -f -r *' must be a valid domain or hostname");
         $domain = new Domain('rm -f -r *');
     }
 
     public function testDomainWithShellMetaCharacters(): void
     {
         $this->expectException('Exception');
-        $this->expectExceptionMessage("Spaces and shell metacharacters not allowed in ls; cat /etc/passwd domain");
+        $this->expectExceptionMessage("'ls; cat /etc/passwd' must be a valid domain or hostname");
         $domain = new Domain('ls; cat /etc/passwd');
     }
 
     public function testDomainWithHypens(): void
     {
         $this->expectException('Exception');
-        $this->expectExceptionMessage("Hyphens not allowed at label edges in domain -my--domain.com");
+        $this->expectExceptionMessage("'-my--domain.com' must be a valid domain or hostname");
         $domain = new Domain('-my--domain.com');
     }