Browse Source

Fix whitelist ip validation

Avetisyan Karen 7 years ago
parent
commit
0070b95b33

BIN
web_interface/dist/wui-6/main.js


BIN
web_interface/dist/wui-8/main.js


+ 1 - 1
web_interface/src/wui-8/main.js

@@ -150,7 +150,7 @@ function ValidateIPaddress(ipaddress, z) {
 function ValidateCIDRIPaddress(ipaddress, z) {
 function ValidateCIDRIPaddress(ipaddress, z) {
   var warn = document.createElement('li');
   var warn = document.createElement('li');
   warn.innerHTML = 'Неправильно задан' + z + '!';
   warn.innerHTML = 'Неправильно задан' + z + '!';
-  if (/^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$/.test(ipaddress.value) || !ipaddress.value) {
+  if (/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\/([0-9]|[1-2][0-9]|3[0-2]))?$/.test(ipaddress.value) || !ipaddress.value) {
     return true;
     return true;
   }
   }
   $('validation-box').appendChild(warn);
   $('validation-box').appendChild(warn);