13.5.2

- patch fixing #1545 #1543 and #1544
- ref PR #1546 by @tux-tn

package.json

@@ -1,7 +1,7 @@
 {
  "name": "validator",
  "description": "String validation and sanitization",
- "version": "13.5.1",
+ "version": "13.5.2",
  "sideEffects": false,
  "homepage": "https:/chriso/validator.js",
  "files": [

src/index.js

@@ -119,7 +119,7 @@ import isStrongPassword from './lib/isStrongPassword';
 
 import isVAT from './lib/isVAT';
 
-const version = '13.5.1';
+const version = '13.5.2';
 
 const validator = {
  version,

src/lib/isFQDN.js

@@ -17,39 +17,52 @@ export default function isFQDN(str, options) {
  str = str.substring(0, str.length - 1);
  }
  const parts = str.split('.');
- for (let i = 0; i < parts.length; i++) {
- if (parts[i].length > 63) {
+ const tld = parts[parts.length - 1];
+
+ if (options.require_tld) {
+ // disallow fqdns without tld
+ if (parts.length < 2) {
  return false;
  }
- }
- if (options.require_tld) {
- const tld = parts.pop();
- if (!parts.length || !/^([a-z\u00a1-\uffff]{2,}|xn[a-z0-9-]{2,})$/i.test(tld)) {
+
+ if (!/^([a-z\u00a1-\uffff]{2,}|xn[a-z0-9-]{2,})$/i.test(tld)) {
  return false;
  }
+
  // disallow spaces && special characers
  if (/[\s\u2002-\u200B\u202F\u205F\u3000\uFEFF\uDB40\uDC20\u00A9\uFFFD]/.test(tld)) {
  return false;
  }
  }
- for (let part, i = 0; i < parts.length; i++) {
- part = parts[i];
- if (!options.allow_numeric_tld && i === parts.length - 1 && /^\d+$/.test(part)) {
- return false; // reject numeric TLDs
+
+ // reject numeric TLDs
+ if (!options.allow_numeric_tld && /^\d+$/.test(tld)) {
+ return false;
+ }
+
+ return parts.every((part) => {
+ if (part.length > 63) {
+ return false;
  }
+
  if (!/^[a-z_\u00a1-\uffff0-9-]+$/i.test(part)) {
  return false;
  }
+
  // disallow full-width chars
  if (/[\uff01-\uff5e]/.test(part)) {
  return false;
  }
- if (part[0] === '-' || part[part.length - 1] === '-') {
+
+ // disallow parts starting or ending with hyphen
+ if (/^-|-$/.test(part)) {
  return false;
  }
+
  if (!options.allow_underscores && /_/.test(part)) {
  return false;
  }
- }
- return true;
+
+ return true;
+ });
 }

test/validators.js

@@ -79,6 +79,7 @@ describe('Validators', () => {
  `${repeat('a', 31)}@gmail.com`,
  '[email protected]',
  '[email protected]',
+ '[email protected]',
  ],
  invalid: [
  'invalidemail@',
@@ -374,6 +375,7 @@ describe('Validators', () => {
  'http://[2010:836B:4179::836B:4179]',
  'http://example.com/example.json#/foo/bar',
  'http://user:@www.foobar.com',
+ 'http://1337.com',
  ],
  invalid: [
  'http://localhost:3000/',
@@ -894,6 +896,7 @@ describe('Validators', () => {
  'foo--bar.com',
  'xn--froschgrn-x9a.com',
  'rebecca.blackfriday',
+ '1337.com',
  ],
  invalid: [
  'abc',

validator.js

@@ -430,31 +430,32 @@ function isFQDN(str, options) {
  }
 
  var parts = str.split('.');
+ var tld = parts[parts.length - 1];
 
- for (var i = 0; i < parts.length; i++) {
- if (parts[i].length > 63) {
+ if (options.require_tld) {
+ // disallow fqdns without tld
+ if (parts.length < 2) {
  return false;
  }
- }
-
- if (options.require_tld) {
- var tld = parts.pop();
 
- if (!parts.length || !/^([a-z\u00a1-\uffff]{2,}|xn[a-z0-9-]{2,})$/i.test(tld)) {
+ if (!/^([a-z\u00a1-\uffff]{2,}|xn[a-z0-9-]{2,})$/i.test(tld)) {
  return false;
  } // disallow spaces && special characers
 
 
  if (/[\s\u2002-\u200B\u202F\u205F\u3000\uFEFF\uDB40\uDC20\u00A9\uFFFD]/.test(tld)) {
  return false;
  }
- }
+ } // reject numeric TLDs
+
 
- for (var part, _i = 0; _i < parts.length; _i++) {
- part = parts[_i];
+ if (!options.allow_numeric_tld && /^\d+$/.test(tld)) {
+ return false;
+ }
 
- if (!options.allow_numeric_tld && _i === parts.length - 1 && /^\d+$/.test(part)) {
- return false; // reject numeric TLDs
+ return parts.every(function (part) {
+ if (part.length > 63) {
+ return false;
  }
 
  if (!/^[a-z_\u00a1-\uffff0-9-]+$/i.test(part)) {
@@ -464,18 +465,19 @@ function isFQDN(str, options) {
 
  if (/[\uff01-\uff5e]/.test(part)) {
  return false;
- }
+ } // disallow parts starting or ending with hyphen
 
- if (part[0] === '-' || part[part.length - 1] === '-') {
+
+ if (/^-|-$/.test(part)) {
  return false;
  }
 
  if (!options.allow_underscores && /_/.test(part)) {
  return false;
  }
- }
 
- return true;
+ return true;
+ });
 }
 
 /**
@@ -4619,7 +4621,7 @@ function isVAT(str, countryCode) {
  throw new Error("Invalid country code: '".concat(countryCode, "'"));
 }
 
-var version = '13.5.0';
+var version = '13.5.2';
 var validator = {
  version: version,
  toDate: toDate,