fix(isFQDN): allow all-underscore labels with allow_underscores (#1253)

validatorjs · Nov 16, 2020 · 06b1a42 · 06b1a42
1 parent a19ebff
commit 06b1a42
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/lib/isFQDN.js b/src/lib/isFQDN.js
@@ -37,10 +37,7 @@ export default function isFQDN(str, options) {
     if (!options.allow_numeric_tld && i === parts.length - 1 && /^\d+$/.test(part)) {
       return false; // reject numeric TLDs
     }
-    if (options.allow_underscores) {
-      part = part.replace(/_/g, '');
-    }
-    if (!/^[a-z\u00a1-\uffff0-9-]+$/i.test(part)) {
+    if (!/^[a-z_\u00a1-\uffff0-9-]+$/i.test(part)) {
       return false;
     }
     // disallow full-width chars
@@ -50,6 +47,9 @@ export default function isFQDN(str, options) {
     if (part[0] === '-' || part[part.length - 1] === '-') {
       return false;
     }
+    if (!options.allow_underscores && /_/.test(part)) {
+      return false;
+    }
   }
   return true;
 }
diff --git a/test/validators.js b/test/validators.js
@@ -481,6 +481,7 @@ describe('Validators', () => {
         'http://foo_bar.com',
         'http://pr.example_com.294.example.com/',
         'http://foo__bar.com',
+        'http://_.example.com',
       ],
       invalid: [],
     });