Excluded colon from domain field validation

silverstripe · Sep 11, 2017 · 32385e5 · 32385e5
1 parent 784c3fc
commit 32385e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Forms/WildcardDomainField.php b/src/Forms/WildcardDomainField.php
@@ -36,7 +36,7 @@ public function validate($validator)
      */
     public function checkHostname($hostname)
     {
-        return (bool)preg_match('/^([a-z0-9\*]+[\-\.])*([a-z0-9\*]+)$/', $hostname);
+        return (bool)preg_match('/^([a-z0-9\*]+[\-\.\:])*([a-z0-9\*]+)$/', $hostname);
     }
 
     public function Type()

diff --git a/tests/php/WildcardDomainFieldTest.php b/tests/php/WildcardDomainFieldTest.php
@@ -54,7 +54,9 @@ public function validDomains()
             ['domain7'],
             ['mysite.co.n-z'],
             ['subdomain.my-site.com'],
-            ['subdomain.mysite']
+            ['subdomain.mysite'],
+            ['subdomain.mysite.com:80'],
+            ['mysite:80']
         ];
     }
 
@@ -70,7 +72,8 @@ public function invalidDomains()
             ['.mysite.*'],
             ['mys..ite.*'],
             ['*.mysite-'],
-            ['*.mysite.']
+            ['*.mysite.'],
+            [':1234']
         ];
     }