Merge branch 'hotfix/232-hostname-subdomain-underscore'

Close #232

Author: weierophinney

CHANGELOG.md

@@ -22,6 +22,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- [#232](https://github.com/zendframework/zend-validator/pull/232) updates the `Hostname` validator to allow underscores in subdomains.
+
 - [#218](https://github.com/zendframework/zend-validator/pull/218) fixes a precision issue with the `Step` validator.
 
 ## 2.10.2 - 2018-02-01

src/Hostname.php

@@ -69,7 +69,7 @@ class Hostname extends AbstractValidator
 
     /**
      * Array of valid top-level-domains
-     * IanaVersion 2018013101
+     * IanaVersion 2018121300
      *
      * @see ftp://data.iana.org/TLD/tlds-alpha-by-domain.txt  List of all TLDs by domain
      * @see http://www.iana.org/domains/root/db/ Official list of supported TLDs
@@ -242,7 +242,6 @@ class Hostname extends AbstractValidator
         'boo',
         'book',
         'booking',
-        'boots',
         'bosch',
         'bostik',
         'boston',
@@ -317,6 +316,7 @@ class Hostname extends AbstractValidator
         'ch',
         'chanel',
         'channel',
+        'charity',
         'chase',
         'chat',
         'cheap',
@@ -599,7 +599,6 @@ class Hostname extends AbstractValidator
         'goldpoint',
         'golf',
         'goo',
-        'goodhands',
         'goodyear',
         'goog',
         'google',
@@ -691,6 +690,7 @@ class Hostname extends AbstractValidator
         'immo',
         'immobilien',
         'in',
+        'inc',
         'industries',
         'infiniti',
         'info',
@@ -718,7 +718,6 @@ class Hostname extends AbstractValidator
         'itau',
         'itv',
         'iveco',
-        'iwc',
         'jaguar',
         'java',
         'jcb',
@@ -728,7 +727,6 @@ class Hostname extends AbstractValidator
         'jetzt',
         'jewelry',
         'jio',
-        'jlc',
         'jll',
         'jm',
         'jmp',
@@ -821,6 +819,7 @@ class Hostname extends AbstractValidator
         'living',
         'lixil',
         'lk',
+        'llc',
         'loan',
         'loans',
         'locker',
@@ -875,7 +874,6 @@ class Hostname extends AbstractValidator
         'memorial',
         'men',
         'menu',
-        'meo',
         'merckmsd',
         'metlife',
         'mg',
@@ -1011,7 +1009,6 @@ class Hostname extends AbstractValidator
         'pa',
         'page',
         'panasonic',
-        'panerai',
         'paris',
         'pars',
         'partners',
@@ -1150,7 +1147,6 @@ class Hostname extends AbstractValidator
         'sandvikcoromant',
         'sanofi',
         'sap',
-        'sapo',
         'sarl',
         'sas',
         'save',
@@ -1246,7 +1242,6 @@ class Hostname extends AbstractValidator
         'starhub',
         'statebank',
         'statefarm',
-        'statoil',
         'stc',
         'stcgroup',
         'stockholm',
@@ -1292,7 +1287,6 @@ class Hostname extends AbstractValidator
         'tech',
         'technology',
         'tel',
-        'telecity',
         'telefonica',
         'temasek',
         'tennis',
@@ -1387,7 +1381,6 @@ class Hostname extends AbstractValidator
         'virgin',
         'visa',
         'vision',
-        'vista',
         'vistaprint',
         'viva',
         'vivo',
@@ -1594,7 +1587,6 @@ class Hostname extends AbstractValidator
         '新加坡',
         'فلسطين',
         '政务',
-        'xperia',
         'xxx',
         'xyz',
         'yachts',
@@ -2090,6 +2082,7 @@ public function isValid($value)
 
                     // Check each hostname part
                     $check = 0;
+                    $lastDomainPart = end($domainParts);
                     foreach ($domainParts as $domainPart) {
                         // Decode Punycode domain names to IDN
                         if (strpos($domainPart, 'xn--') === 0) {
@@ -2118,7 +2111,9 @@ public function isValid($value)
 
                         // Check each domain part
                         $checked = false;
-                        foreach ($regexChars as $regexKey => $regexChar) {
+                        $isSubDomain = $domainPart != $lastDomainPart;
+                        $partRegexChars = $isSubDomain ? ['/^[a-z0-9_\x2d]{1,63}$/i'] + $regexChars : $regexChars;
+                        foreach ($partRegexChars as $regexKey => $regexChar) {
                             $status = preg_match($regexChar, $domainPart);
                             if ($status > 0) {
                                 $length = 63;

test/HostnameTest.php

@@ -119,6 +119,60 @@ public function testDashes()
         }
     }
 
+    /**
+     * @return iterable
+     */
+    public function domainsWithUnderscores()
+    {
+        yield 'subdomain with leading underscore' => [
+            '_subdomain.domain.com',
+            'assertTrue',
+        ];
+
+        yield 'subdomain with trailing underscore' => [
+            'subdomain_.domain.com',
+            'assertTrue',
+        ];
+
+        yield 'subdomain with single underscore' => [
+            'sub_domain.domain.com',
+            'assertTrue',
+        ];
+
+        yield 'subdomain with double underscore' => [
+            'sub__domain.domain.com',
+            'assertTrue',
+        ];
+
+        yield 'root domain with leading underscore' => [
+            '_domain.com',
+            'assertFalse',
+        ];
+
+        yield 'root domain with trailing underscore' => [
+            'domain_.com',
+            'assertFalse',
+        ];
+
+        yield 'root domain with underscore' => [
+            'do_main.com',
+            'assertFalse',
+        ];
+    }
+
+    /**
+     * Ensure the underscore character tests work as expected
+     *
+     * @dataProvider domainsWithUnderscores
+     * @param string $input
+     * @param string $assertion
+     */
+    public function testValidatorHandlesUnderscoresInDomainsCorrectly($input, $assertion)
+    {
+        $validator = new Hostname(Hostname::ALLOW_DNS);
+        $this->$assertion($validator->isValid($input), implode("\n", $validator->getMessages()));
+    }
+
     /**
      * Ensures that getMessages() returns expected default value
      *