(1)端口掩码格式中的端口部分协议非TCP,UDP是加入非0校验

(2)IP校验恢复起始IP不能相同的校验
This commit is contained in:
wangxin
2018-10-18 10:45:18 +08:00
parent e9f7e1370f
commit bfaa681811

View File

@@ -237,6 +237,13 @@ jQuery.validator.addMethod("protocolPort",function(value, element) {
var protocolElement=$("[name='"+name.replace("destPort","protocol")+"']"); var protocolElement=$("[name='"+name.replace("destPort","protocol")+"']");
protocolVal=protocolElement.val(); protocolVal=protocolElement.val();
} }
//端口/掩码格式
if(srcPortVal&&srcPortVal.indexOf("/")>-1){
srcPortVal=srcPortVal.split("/")[0];
}
if(destPortVal&&destPortVal.indexOf("/")>-1){
destPortVal=destPortVal.split("/")[0];
}
if(protocolVal==0){ if(protocolVal==0){
return true; return true;
}else if((protocolVal!=tcp&&protocolVal!=udp&&srcPortVal>0)||(protocolVal!=tcp&&protocolVal!=udp&&destPortVal>0)){ }else if((protocolVal!=tcp&&protocolVal!=udp&&srcPortVal>0)||(protocolVal!=tcp&&protocolVal!=udp&&destPortVal>0)){
@@ -276,13 +283,13 @@ jQuery.validator.addMethod("ipCheck",function(value, element) {
var srcIpIsHidden=srcIpAddressE.is(":hidden"); var srcIpIsHidden=srcIpAddressE.is(":hidden");
var destIpIsHidden=destIpAddressE.is(":hidden"); var destIpIsHidden=destIpAddressE.is(":hidden");
var IPv4RangeDefault="0.0.0.0-0.0.0.0"; var IPv4RangeDefault="0.0.0.0-0.0.0.0";
/*if(ipPattern==1){//ip/掩码格式 if(ipPattern==1){//ip/掩码格式
srcIpAddress=srcIpAddress.indexOf("/") >-1 ?srcIpAddress.split("/")[0] : srcIpAddress; srcIpAddress=srcIpAddress.indexOf("/") >-1 ?srcIpAddress.split("/")[0] : srcIpAddress;
destIpAddress=destIpAddress.indexOf("/") >-1 ?destIpAddress.split("/")[0] : destIpAddress; destIpAddress=destIpAddress.indexOf("/") >-1 ?destIpAddress.split("/")[0] : destIpAddress;
}else if (ipPattern==2){ }else if (ipPattern==2){
srcIpAddress=srcIpAddress.indexOf("-") >-1 ?srcIpAddress.split("-")[0] : srcIpAddress; srcIpAddress=srcIpAddress.indexOf("-") >-1 ?srcIpAddress.split("-")[0] : srcIpAddress;
destIpAddress=destIpAddress.indexOf("-") >-1 ?destIpAddress.split("-")[0] : destIpAddress; destIpAddress=destIpAddress.indexOf("-") >-1 ?destIpAddress.split("-")[0] : destIpAddress;
}*/ }
if(srcIpIsHidden){ if(srcIpIsHidden){
if((srcIpAddress == destIpAddress)){ if((srcIpAddress == destIpAddress)){
$.validator.messages.ipCheck=$.validator.messages.destIpIsNotValue+destIpAddress; $.validator.messages.ipCheck=$.validator.messages.destIpIsNotValue+destIpAddress;