Cleanup

node_modules/validator/lib/isIPRange.js

@@ -11,9 +11,12 @@ var _isIP = _interopRequireDefault(require("./isIP"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var subnetMaybe = /^\d{1,2}$/;
+var subnetMaybe = /^\d{1,3}$/;
+var v4Subnet = 32;
+var v6Subnet = 128;
 
 function isIPRange(str) {
+  var version = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   (0, _assertString.default)(str);
   var parts = str.split('/'); // parts[0] -> ip, parts[1] -> subnet
 
@@ -30,7 +33,29 @@ function isIPRange(str) {
     return false;
   }
 
-  return (0, _isIP.default)(parts[0], 4) && parts[1] <= 32 && parts[1] >= 0;
+  var isValidIP = (0, _isIP.default)(parts[0], version);
+
+  if (!isValidIP) {
+    return false;
+  } // Define valid subnet according to IP's version
+
+
+  var expectedSubnet = null;
+
+  switch (String(version)) {
+    case '4':
+      expectedSubnet = v4Subnet;
+      break;
+
+    case '6':
+      expectedSubnet = v6Subnet;
+      break;
+
+    default:
+      expectedSubnet = (0, _isIP.default)(parts[0], '6') ? v6Subnet : v4Subnet;
+  }
+
+  return parts[1] <= expectedSubnet && parts[1] >= 0;
 }
 
 module.exports = exports.default;