Allow >1 underscore in hostnames, closes #510

validatorjs · Feb 29, 2016 · a1c8dab · a1c8dab
1 parent a7bc8b4
commit a1c8dab
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 12 deletions.
diff --git a/lib/isFQDN.js b/lib/isFQDN.js
@@ -39,9 +39,6 @@ function isFDQN(str, options) {
   for (var part, i = 0; i < parts.length; i++) {
     part = parts[i];
     if (options.allow_underscores) {
-      if (part.indexOf('__') >= 0) {
-        return false;
-      }
       part = part.replace(/_/g, '');
     }
     if (!/^[a-z\u00a1-\uffff0-9-]+$/i.test(part)) {

diff --git a/src/lib/isFQDN.js b/src/lib/isFQDN.js
@@ -25,9 +25,6 @@ export default function isFDQN(str, options) {
   for (let part, i = 0; i < parts.length; i++) {
     part = parts[i];
     if (options.allow_underscores) {
-      if (part.indexOf('__') >= 0) {
-        return false;
-      }
       part = part.replace(/_/g, '');
     }
     if (!/^[a-z\u00a1-\uffff0-9-]+$/i.test(part)) {

diff --git a/test/validators.js b/test/validators.js
@@ -266,10 +266,9 @@ describe('Validators', function () {
       valid: [
         'http://foo_bar.com',
         'http://pr.example_com.294.example.com/',
-      ],
-      invalid: [
         'http://foo__bar.com',
       ],
+      invalid: [],
     });
   });
 

diff --git a/validator.js b/validator.js
@@ -148,9 +148,6 @@
         for (var part, i = 0; i < parts.length; i++) {
           part = parts[i];
           if (options.allow_underscores) {
-            if (part.indexOf('__') >= 0) {
-              return false;
-            }
             part = part.replace(/_/g, '');
           }
           if (!/^[a-z\u00a1-\uffff0-9-]+$/i.test(part)) {

diff --git a/validator.min.js b/validator.min.js