diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 63365e51f..fcd86fde5 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -22,7 +22,7 @@ public final class Constants { * iP默认值 */ public static String IPV4_DEFAULT_IP_VALUE=Configurations.getStringProperty("ipv4_default_ip_value", "0.0.0.0"); - public static String IPV6_DEFAULT_IP_VALUE=Configurations.getStringProperty("ipv4_default_ip_value", "::"); + public static String IPV6_DEFAULT_IP_VALUE=Configurations.getStringProperty("ipv6_default_ip_value", "::"); public static String IPV4_DEFAULT_IP_SUBNET_VALUE=Configurations.getStringProperty("ipv4_default_ip_subnet_value", "0.0.0.0/32"); public static String IPV6_DEFAULT_IP_SUBNET_VALUE=Configurations.getStringProperty("ipv6_default_ip_subnet_value", "::/128"); public static String IPV4_DEFAULT_IP_RANGE_VALUE=Configurations.getStringProperty("ipv4_default_ip_range_value", "0.0.0.0-0.0.0.0"); diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 758f467e7..2194ee230 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -1142,7 +1142,7 @@ public class BaseController { } if (regionDict.getRegionType().equals(1)) { // 校验必填的IP,端口 - for (String code : configIpPortShow.split(",")) { + /*for (String code : configIpPortShow.split(",")) { if ("1".equals(code)) {// 源IP if (StringUtil.isEmpty(baseIpCfg.getSrcIpAddress())) { errInfo.append(String.format(prop.getProperty("can_not_null"), @@ -1164,48 +1164,58 @@ public class BaseController { prop.getProperty("server_port", "Server Port")) + ";"); } } - } + }*/ boolean srcIpEmpty = false; + boolean destIpEmpty = false; boolean srcPortEmpty = false; + boolean destPortEmpty = false; if (StringUtil.isEmpty(baseIpCfg.getSrcIpAddress())) { srcIpEmpty = true; } if (StringUtil.isEmpty(baseIpCfg.getDestIpAddress())) { - if (srcIpEmpty) {// 全部为空,填值 - if (canIPv4 && canIPFormat) { - baseIpCfg.setSrcIpAddress(Constants.IPV4_DEFAULT_IP_VALUE); - baseIpCfg.setDestIpAddress(Constants.IPV4_DEFAULT_IP_VALUE); - baseIpCfg.setIpType(4); - baseIpCfg.setIpPattern(3); - } else if (canIPv6 && canIPFormat) { - baseIpCfg.setSrcIpAddress(Constants.IPV6_DEFAULT_IP_VALUE); - baseIpCfg.setDestIpAddress(Constants.IPV6_DEFAULT_IP_VALUE); - baseIpCfg.setIpType(6); - baseIpCfg.setIpPattern(3); - } else if (canIPv4 && canIPSubnetFormat) { - baseIpCfg.setSrcIpAddress(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE); - baseIpCfg.setDestIpAddress(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE); - baseIpCfg.setIpType(4); - baseIpCfg.setIpPattern(3); - } else if (canIPv6 && canIPSubnetFormat) { - baseIpCfg.setSrcIpAddress(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE); - baseIpCfg.setDestIpAddress(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE); - baseIpCfg.setIpType(6); - baseIpCfg.setIpPattern(3); - } else if (canIPv4 && canIPRangeFormat) { - baseIpCfg.setSrcIpAddress(Constants.IPV4_DEFAULT_IP_RANGE_VALUE); - baseIpCfg.setDestIpAddress(Constants.IPV4_DEFAULT_IP_RANGE_VALUE); - baseIpCfg.setIpType(4); - baseIpCfg.setIpPattern(3); - } else if (canIPv6 && canIPRangeFormat) { - baseIpCfg.setSrcIpAddress(Constants.IPV6_DEFAULT_IP_RANGE_VALUE); - baseIpCfg.setDestIpAddress(Constants.IPV6_DEFAULT_IP_RANGE_VALUE); - baseIpCfg.setIpType(6); - baseIpCfg.setIpPattern(3); - } - - } else { - // 目的IP为空 + destIpEmpty = true; + } + if (StringUtil.isEmpty(baseIpCfg.getSrcPort())) { + srcPortEmpty = true; + } + if (StringUtil.isEmpty(baseIpCfg.getDestPort())) { + destPortEmpty = true; + } + if(srcIpEmpty&&destIpEmpty) { + if(configIpPortShow.indexOf("1")>-1&&configIpPortShow.indexOf("3")>-1) { + errInfo.append(String.format(prop.getProperty("can_not_null"), + prop.getProperty("client_ip", "Client IP")) + ";"); + }else if(configIpPortShow.indexOf("1")>-1) { + errInfo.append(String.format(prop.getProperty("can_not_null"), + prop.getProperty("client_ip", "Client IP")) + ";"); + }else if(configIpPortShow.indexOf("3")>-1) { + errInfo.append(String.format(prop.getProperty("can_not_null"), + prop.getProperty("server_ip", "Server IP")) + ";"); + } + }else if (destIpEmpty) {// 目的IP为空 + if(configIpPortShow.indexOf("3")>-1&&configIpPortShow.indexOf("1")==-1) {//目的IP必填 + errInfo.append(String.format(prop.getProperty("can_not_null"), + prop.getProperty("server_ip", "Server IP")) + ";"); + }else if(configIpPortShow.indexOf("1")>-1){ + /*if(Constants.IPV6_DEFAULT_IP_RANGE_VALUE.equals(baseIpCfg.getSrcIpAddress())) { + errInfo.append(prop.getProperty("client_ip") + String.format(prop.getProperty("can_not_be"), + "'"+Constants.IPV6_DEFAULT_IP_RANGE_VALUE+"'")+";"); + }else if(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE.equals(baseIpCfg.getSrcIpAddress())) { + errInfo.append(prop.getProperty("client_ip") + String.format(prop.getProperty("can_not_be"), + "'"+Constants.IPV6_DEFAULT_IP_SUBNET_VALUE+"'")+";"); + }else if(Constants.IPV6_DEFAULT_IP_VALUE.equals(baseIpCfg.getSrcIpAddress())) { + errInfo.append(prop.getProperty("client_ip") + String.format(prop.getProperty("can_not_be"), + "'"+Constants.IPV6_DEFAULT_IP_VALUE+"'")+";"); + }else if(Constants.IPV4_DEFAULT_IP_RANGE_VALUE.equals(baseIpCfg.getSrcIpAddress())) { + errInfo.append(prop.getProperty("client_ip") + String.format(prop.getProperty("can_not_be"), + "'"+Constants.IPV4_DEFAULT_IP_RANGE_VALUE+"'")+";"); + }else if(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE.equals(baseIpCfg.getSrcIpAddress())) { + errInfo.append(prop.getProperty("client_ip") + String.format(prop.getProperty("can_not_be"), + "'"+Constants.IPV4_DEFAULT_IP_SUBNET_VALUE+"'")+";"); + }else if(Constants.IPV4_DEFAULT_IP_VALUE.equals(baseIpCfg.getSrcIpAddress())) { + errInfo.append(prop.getProperty("client_ip") + String.format(prop.getProperty("can_not_be"), + "'"+Constants.IPV4_DEFAULT_IP_VALUE+"'")+";"); + }*/ String matchType = this.validIPAddress("client_ip", errInfo, baseIpCfg.getSrcIpAddress(), ipType, ipPattern); if (matchType.startsWith("IPV6")) { @@ -1215,8 +1225,8 @@ public class BaseController { baseIpCfg.setIpPattern(2); if (baseIpCfg.getSrcIpAddress() .startsWith(Constants.IPV6_DEFAULT_IP_RANGE_VALUE.split("-")[0])) { - errInfo.append(prop.getProperty("client_ip") + String.format("can_not_be", - Constants.IPV6_DEFAULT_IP_RANGE_VALUE.split("-")[0])); + errInfo.append(prop.getProperty("client_ip") + String.format(prop.getProperty("can_not_be"), + Constants.IPV6_DEFAULT_IP_RANGE_VALUE.split("-")[0])+";"); } } else if (matchType.endsWith("SUBNET")) { // baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress()); @@ -1224,8 +1234,8 @@ public class BaseController { baseIpCfg.setIpPattern(1); if (baseIpCfg.getSrcIpAddress() .startsWith(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE.split("/")[0])) { - errInfo.append(prop.getProperty("client_ip") + String.format("can_not_be", - Constants.IPV6_DEFAULT_IP_SUBNET_VALUE.split("/")[0])); + errInfo.append(prop.getProperty("client_ip") + String.format(prop.getProperty("can_not_be"), + Constants.IPV6_DEFAULT_IP_SUBNET_VALUE.split("/")[0])+";"); } } else { // baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress()); @@ -1233,7 +1243,7 @@ public class BaseController { baseIpCfg.setIpPattern(3); if (baseIpCfg.getSrcIpAddress().equals(Constants.IPV6_DEFAULT_IP_VALUE)) { errInfo.append(prop.getProperty("client_ip") - + String.format("can_not_be", Constants.IPV6_DEFAULT_IP_VALUE)); + + String.format(prop.getProperty("can_not_be"), Constants.IPV6_DEFAULT_IP_VALUE)+";"); } } baseIpCfg.setIpType(6); @@ -1245,8 +1255,8 @@ public class BaseController { baseIpCfg.setIpPattern(2); if (baseIpCfg.getSrcIpAddress() .startsWith(Constants.IPV4_DEFAULT_IP_RANGE_VALUE.split("-")[0])) { - errInfo.append(prop.getProperty("client_ip") + String.format("can_not_be", - Constants.IPV4_DEFAULT_IP_RANGE_VALUE.split("-")[0])); + errInfo.append(prop.getProperty("client_ip") + String.format(prop.getProperty("can_not_be"), + Constants.IPV4_DEFAULT_IP_RANGE_VALUE.split("-")[0])+";"); } } else if (matchType.endsWith("SUBNET")) { // baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress()); @@ -1254,8 +1264,8 @@ public class BaseController { baseIpCfg.setIpPattern(1); if (baseIpCfg.getSrcIpAddress() .startsWith(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE.split("/")[0])) { - errInfo.append(prop.getProperty("client_ip") + String.format("can_not_be", - Constants.IPV4_DEFAULT_IP_SUBNET_VALUE.split("/")[0])); + errInfo.append(prop.getProperty("client_ip") + String.format(prop.getProperty("can_not_be"), + Constants.IPV4_DEFAULT_IP_SUBNET_VALUE.split("/")[0])+";"); } } else { baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress()); @@ -1263,14 +1273,37 @@ public class BaseController { baseIpCfg.setIpPattern(3); if (baseIpCfg.getSrcIpAddress().equals(Constants.IPV4_DEFAULT_IP_VALUE)) { errInfo.append(prop.getProperty("client_ip") - + String.format("can_not_be", Constants.IPV4_DEFAULT_IP_VALUE)); + + String.format(prop.getProperty("can_not_be"), Constants.IPV4_DEFAULT_IP_VALUE)+";"); } } baseIpCfg.setIpType(4); } } - } else { - if (srcIpEmpty) {// 源IP为空 + + } else if (srcIpEmpty) {// 源IP为空 + if(configIpPortShow.indexOf("1")>-1&&configIpPortShow.indexOf("3")==-1) {//源IP必填 + errInfo.append(String.format(prop.getProperty("can_not_null"), + prop.getProperty("client_ip", "Client IP")) + ";"); + }else if(configIpPortShow.indexOf("3")>-1){ + /*if(Constants.IPV6_DEFAULT_IP_RANGE_VALUE.equals(baseIpCfg.getDestIpAddress())) { + errInfo.append(prop.getProperty("server_ip") + String.format(prop.getProperty("can_not_be"), + "'"+Constants.IPV6_DEFAULT_IP_RANGE_VALUE+"'")+";"); + }else if(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE.equals(baseIpCfg.getDestIpAddress())) { + errInfo.append(prop.getProperty("server_ip") + String.format(prop.getProperty("can_not_be"), + "'"+Constants.IPV6_DEFAULT_IP_SUBNET_VALUE+"'")+";"); + }else if(Constants.IPV6_DEFAULT_IP_VALUE.equals(baseIpCfg.getDestIpAddress())) { + errInfo.append(prop.getProperty("server_ip") + String.format(prop.getProperty("can_not_be"), + "'"+Constants.IPV6_DEFAULT_IP_VALUE+"'")+";"); + }else if(Constants.IPV4_DEFAULT_IP_RANGE_VALUE.equals(baseIpCfg.getDestIpAddress())) { + errInfo.append(prop.getProperty("server_ip") + String.format(prop.getProperty("can_not_be"), + "'"+Constants.IPV4_DEFAULT_IP_RANGE_VALUE+"'")+";"); + }else if(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE.equals(baseIpCfg.getDestIpAddress())) { + errInfo.append(prop.getProperty("server_ip") + String.format(prop.getProperty("can_not_be"), + "'"+Constants.IPV4_DEFAULT_IP_SUBNET_VALUE+"'")+";"); + }else if(Constants.IPV4_DEFAULT_IP_VALUE.equals(baseIpCfg.getDestIpAddress())) { + errInfo.append(prop.getProperty("server_ip") + String.format(prop.getProperty("can_not_be"), + "'"+Constants.IPV4_DEFAULT_IP_VALUE+"'")+";"); + }*/ String matchType = this.validIPAddress("server_ip", errInfo, baseIpCfg.getDestIpAddress(), ipType, ipPattern); if (matchType.startsWith("IPV6")) { @@ -1280,8 +1313,8 @@ public class BaseController { baseIpCfg.setIpPattern(2); if (baseIpCfg.getDestIpAddress() .startsWith(Constants.IPV6_DEFAULT_IP_RANGE_VALUE.split("-")[0])) { - errInfo.append(prop.getProperty("server_ip") + String.format("can_not_be", - Constants.IPV6_DEFAULT_IP_RANGE_VALUE.split("-")[0])); + errInfo.append(prop.getProperty("server_ip") + String.format(prop.getProperty("can_not_be"), + Constants.IPV6_DEFAULT_IP_RANGE_VALUE.split("-")[0])+";"); } } else if (matchType.endsWith("SUBNET")) { // baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress()); @@ -1289,8 +1322,8 @@ public class BaseController { baseIpCfg.setIpPattern(1); if (baseIpCfg.getDestIpAddress() .startsWith(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE.split("/")[0])) { - errInfo.append(prop.getProperty("server_ip") + String.format("can_not_be", - Constants.IPV6_DEFAULT_IP_SUBNET_VALUE.split("/")[0])); + errInfo.append(prop.getProperty("server_ip") + String.format(prop.getProperty("can_not_be"), + Constants.IPV6_DEFAULT_IP_SUBNET_VALUE.split("/")[0])+";"); } } else { // baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress()); @@ -1298,7 +1331,7 @@ public class BaseController { baseIpCfg.setIpPattern(3); if (baseIpCfg.getDestIpAddress().equals(Constants.IPV6_DEFAULT_IP_VALUE)) { errInfo.append(prop.getProperty("server_ip") - + String.format("can_not_be", Constants.IPV6_DEFAULT_IP_VALUE)); + + String.format(prop.getProperty("can_not_be"), Constants.IPV6_DEFAULT_IP_VALUE)+";"); } } baseIpCfg.setIpType(6); @@ -1312,8 +1345,8 @@ public class BaseController { baseIpCfg.setIpPattern(2); if (baseIpCfg.getDestIpAddress() .startsWith(Constants.IPV4_DEFAULT_IP_RANGE_VALUE.split("-")[0])) { - errInfo.append(prop.getProperty("server_ip") + String.format("can_not_be", - Constants.IPV4_DEFAULT_IP_RANGE_VALUE.split("-")[0])); + errInfo.append(prop.getProperty("server_ip") + String.format(prop.getProperty("can_not_be"), + Constants.IPV4_DEFAULT_IP_RANGE_VALUE.split("-")[0])+";"); } } else if (matchType.endsWith("SUBNET")) { // baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress()); @@ -1321,8 +1354,8 @@ public class BaseController { baseIpCfg.setIpPattern(1); if (baseIpCfg.getDestIpAddress() .startsWith(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE.split("/")[0])) { - errInfo.append(prop.getProperty("server_ip") + String.format("can_not_be", - Constants.IPV4_DEFAULT_IP_SUBNET_VALUE.split("/")[0])); + errInfo.append(prop.getProperty("server_ip") + String.format(prop.getProperty("can_not_be"), + Constants.IPV4_DEFAULT_IP_SUBNET_VALUE.split("/")[0])+";"); } } else { // baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress()); @@ -1330,65 +1363,61 @@ public class BaseController { baseIpCfg.setIpPattern(3); if (baseIpCfg.getDestIpAddress().equals(Constants.IPV4_DEFAULT_IP_VALUE)) { errInfo.append(prop.getProperty("server_ip") - + String.format("can_not_be", Constants.IPV4_DEFAULT_IP_VALUE)); + + String.format(prop.getProperty("can_not_be"), Constants.IPV4_DEFAULT_IP_VALUE)+";"); } } baseIpCfg.setIpType(4); } + } + } else {//全不为空 + String matchType = this.validIPAddress("client_ip", errInfo, baseIpCfg.getSrcIpAddress(), + ipType, ipPattern); + String matchType1 = this.validIPAddress("server_ip", errInfo, baseIpCfg.getDestIpAddress(), + ipType, ipPattern); + if (StringUtils.isNotBlank(matchType)&&StringUtils.isNotBlank(matchType1)&& + !matchType.equals(matchType1)) { + errInfo.append(prop.get("the_same_ip_type_pattern") + ";"); + } + // baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress()); + // baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress()); + if (matchType.startsWith("IPV6")) { + baseIpCfg.setIpType(6); } else { - String matchType = this.validIPAddress("client_ip", errInfo, baseIpCfg.getSrcIpAddress(), - ipType, ipPattern); - String matchType1 = this.validIPAddress("server_ip", errInfo, baseIpCfg.getDestIpAddress(), - ipType, ipPattern); - if (StringUtils.isNotBlank(matchType)&&StringUtils.isNotBlank(matchType1)&& - !matchType.equals(matchType1)) { - errInfo.append(prop.get("the_same_ip_type_pattern") + ";"); + baseIpCfg.setIpType(4); + } + if (matchType.endsWith("RANGE")) { + if (matchType.startsWith("IPV4")) { + this.validIPv4Range("client_ip", errInfo, baseIpCfg.getSrcIpAddress()); + this.validIPv4Range("server_ip", errInfo, baseIpCfg.getDestIpAddress()); } - // baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress()); - // baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress()); - if (matchType.startsWith("IPV6")) { - baseIpCfg.setIpType(6); - } else { - baseIpCfg.setIpType(4); - } - if (matchType.endsWith("RANGE")) { - if (matchType.startsWith("IPV4")) { - this.validIPv4Range("client_ip", errInfo, baseIpCfg.getSrcIpAddress()); - this.validIPv4Range("server_ip", errInfo, baseIpCfg.getDestIpAddress()); - } - if (baseIpCfg.getSrcIpAddress().split("-")[0] - .equals(baseIpCfg.getDestIpAddress().split("-")[0])) { - errInfo.append(String.format(prop.getProperty("are_the_same"), - baseIpCfg.getSrcIpAddress().split("-")[0], - baseIpCfg.getDestIpAddress().split("-")[0]) + ";"); - } - baseIpCfg.setIpPattern(2); - } else if (matchType.endsWith("SUBNET")) { - if (baseIpCfg.getSrcIpAddress().split("/")[0] - .equals(baseIpCfg.getDestIpAddress().split("/")[0])) { - errInfo.append(String.format(prop.getProperty("are_the_same"), - baseIpCfg.getSrcIpAddress().split("/")[0], - baseIpCfg.getDestIpAddress().split("/")[0]) + ";"); - } - baseIpCfg.setIpPattern(1); - } else { - if (baseIpCfg.getSrcIpAddress().equals(baseIpCfg.getDestIpAddress())) { - errInfo.append(String.format(prop.getProperty("are_the_same"), - prop.getProperty("client_ip"), prop.getProperty("server_ip")) + ";"); - } - baseIpCfg.setIpPattern(3); + if (baseIpCfg.getSrcIpAddress().split("-")[0] + .equals(baseIpCfg.getDestIpAddress().split("-")[0])) { + errInfo.append(String.format(prop.getProperty("are_the_same"), + baseIpCfg.getSrcIpAddress().split("-")[0], + baseIpCfg.getDestIpAddress().split("-")[0]) + ";"); } + baseIpCfg.setIpPattern(2); + } else if (matchType.endsWith("SUBNET")) { + if (baseIpCfg.getSrcIpAddress().split("/")[0] + .equals(baseIpCfg.getDestIpAddress().split("/")[0])) { + errInfo.append(String.format(prop.getProperty("are_the_same"), + baseIpCfg.getSrcIpAddress().split("/")[0], + baseIpCfg.getDestIpAddress().split("/")[0]) + ";"); + } + baseIpCfg.setIpPattern(1); + } else { + if (baseIpCfg.getSrcIpAddress().equals(baseIpCfg.getDestIpAddress())) { + errInfo.append(String.format(prop.getProperty("are_the_same"), + prop.getProperty("client_ip"), prop.getProperty("server_ip")) + ";"); + } + baseIpCfg.setIpPattern(3); } } // TODO 判断源IP和目的IP的值 // TODO 判断源IP和目的IP格式 - - if (StringUtil.isEmpty(baseIpCfg.getSrcPort())) { - srcPortEmpty = true; - } - if (StringUtil.isEmpty(baseIpCfg.getDestPort())) { + if (destPortEmpty) { if (srcPortEmpty) { baseIpCfg.setSrcPort("0"); baseIpCfg.setDestPort("0"); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 8ffdd5143..9e6bd8d6b 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1256,7 +1256,7 @@ antiddos_protocol=DDOS Protocol bps_threadshold=Traffic Threshold(bps) pps_threadshold=Traffic Threshold(pps) one_more_greater_zero=At Least One Threshold Is Not 0. -can_not_be=Can not be %s +can_not_be= can not be %s the_same_ip_type_pattern=Client IP and Server IP must have the same IP type and the same IP pattern protocol_and_port=Only when TCP protocol or UDP protocol is chosen can port greater than 0,ALL protocol has no limit the_same_port_pattern=Client port and server port must in the same port pattern diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js index dc52afcad..7c1fea269 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js @@ -338,7 +338,10 @@ jQuery.validator.addMethod("ipCheck",function(value, element) { if(value==IPv4RangeDefault){ return true; } - if(startPart0>191&&startPart1>191&&startPart0<224&&startPart1<224){//仅允许C段IP + if((startPart0<128&&startPart1<128)||(startPart0>127&&startPart1>127&&startPart0<192&&startPart1<192) + ||(startPart0>191&&startPart1>191&&startPart0<224&&startPart1<224) + ||(startPart0>223&&startPart1>223&&startPart0<240&&startPart1<240) + ||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许C段IP if(ipToNumber(startIp)<=ipToNumber(endIp)){//比较IP大小 if((startIp.split(".")[0]!=endIp.split(".")[0])|| (startIp.split(".")[1]!=endIp.split(".")[1])|| @@ -459,7 +462,10 @@ jQuery.validator.addMethod("ipCheck",function(value, element) { if(value==IPv4RangeDefault){ return true; } - if(startPart0>191&&startPart1>191&&startPart0<224&&startPart1<224){//仅允许C段IP + if((startPart0<128&&startPart1<128)||(startPart0>127&&startPart1>127&&startPart0<192&&startPart1<192) + ||(startPart0>191&&startPart1>191&&startPart0<224&&startPart1<224) + ||(startPart0>223&&startPart1>223&&startPart0<240&&startPart1<240) + ||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许C段IP if(ipToNumber(startIp)<=ipToNumber(endIp)){//比较IP大小 if((startIp.split(".")[0]!=endIp.split(".")[0])|| (startIp.split(".")[1]!=endIp.split(".")[1])|| @@ -627,7 +633,10 @@ jQuery.validator.addMethod("ipCheck",function(value, element) { if(value==IPv4RangeDefault){ return true; } - if(startPart0>191&&startPart1>191&&startPart0<224&&startPart1<224){//仅允许C段IP + if((startPart0<128&&startPart1<128)||(startPart0>127&&startPart1>127&&startPart0<192&&startPart1<192) + ||(startPart0>191&&startPart1>191&&startPart0<224&&startPart1<224) + ||(startPart0>223&&startPart1>223&&startPart0<240&&startPart1<240) + ||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许C段IP if(ipToNumber(startIp)<=ipToNumber(endIp)){//比较IP大小 if((startIp.split(".")[0]!=endIp.split(".")[0])|| (startIp.split(".")[1]!=endIp.split(".")[1])|| @@ -680,7 +689,10 @@ jQuery.validator.addMethod("ipCheck",function(value, element) { if(value==IPv4RangeDefault){ return true; } - if(startPart0>191&&startPart1>191&&startPart0<224&&startPart1<224){//仅允许C段IP + if((startPart0<128&&startPart1<128)||(startPart0>127&&startPart1>127&&startPart0<192&&startPart1<192) + ||(startPart0>191&&startPart1>191&&startPart0<224&&startPart1<224) + ||(startPart0>223&&startPart1>223&&startPart0<240&&startPart1<240) + ||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许C段IP if(ipToNumber(startIp)<=ipToNumber(endIp)){//比较IP大小 if((startIp.split(".")[0]!=endIp.split(".")[0])|| (startIp.split(".")[1]!=endIp.split(".")[1])||