diff --git a/src/main/java/com/nis/domain/basics/AsnIpCfg.java b/src/main/java/com/nis/domain/basics/AsnIpCfg.java index 9517669d0..df1946a46 100644 --- a/src/main/java/com/nis/domain/basics/AsnIpCfg.java +++ b/src/main/java/com/nis/domain/basics/AsnIpCfg.java @@ -20,12 +20,14 @@ public class AsnIpCfg extends BaseCfg { @ExcelField(title="ip_type",dictType="IP_TYPE",sort=6) @SerializedName("ipType") private Integer ipType; - @ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=8) - private Integer ipPattern; + private Integer srcIpPattern; + @ExcelField(title="dest_ip_pattern",dictType="IP_PATTERN",sort=8) + private Integer destIpPattern; private String srcIpAddress; @ExcelField(title="ip",sort=7) private String destIpAddress; - private Integer portPattern; + private Integer srcPortPattern; + private Integer destPortPattern; private String srcPort; private String destPort; //@ExcelField(title="group",sort=2) @@ -117,11 +119,30 @@ public class AsnIpCfg extends BaseCfg { public void setIpType(Integer ipType) { this.ipType = ipType; } - public Integer getIpPattern() { - return ipPattern; + + public Integer getSrcIpPattern() { + return srcIpPattern; } - public void setIpPattern(Integer ipPattern) { - this.ipPattern = ipPattern; + public void setSrcIpPattern(Integer srcIpPattern) { + this.srcIpPattern = srcIpPattern; + } + public Integer getDestIpPattern() { + return destIpPattern; + } + public void setDestIpPattern(Integer destIpPattern) { + this.destIpPattern = destIpPattern; + } + public Integer getSrcPortPattern() { + return srcPortPattern; + } + public void setSrcPortPattern(Integer srcPortPattern) { + this.srcPortPattern = srcPortPattern; + } + public Integer getDestPortPattern() { + return destPortPattern; + } + public void setDestPortPattern(Integer destPortPattern) { + this.destPortPattern = destPortPattern; } public String getSrcIpAddress() { return srcIpAddress; @@ -135,12 +156,6 @@ public class AsnIpCfg extends BaseCfg { public void setDestIpAddress(String destIpAddress) { this.destIpAddress = destIpAddress; } - public Integer getPortPattern() { - return portPattern; - } - public void setPortPattern(Integer portPattern) { - this.portPattern = portPattern; - } public String getSrcPort() { return srcPort; } @@ -176,9 +191,10 @@ public class AsnIpCfg extends BaseCfg { } @Override public String toString() { - return "AsnIpCfg [regionId=" + regionId + ", ratelimit=" + ratelimit + ", ipType=" + ipType + ", ipPattern=" - + ipPattern + ", srcIpAddress=" + srcIpAddress + ", destIpAddress=" + destIpAddress + ", portPattern=" - + portPattern + ", srcPort=" + srcPort + ", destPort=" + destPort + ", asnIpGroupName=" + asnIpGroupName + return "AsnIpCfg [regionId=" + regionId + ", ratelimit=" + ratelimit + ", ipType=" + ipType + ", srcIpPattern=" + + srcIpPattern + ", destIpPattern="+ destIpPattern+ ", srcIpAddress=" + srcIpAddress + ", destIpAddress=" + + destIpAddress + ", srcPortPattern="+ srcPortPattern+", destPortPattern="+ destPortPattern + ", srcPort=" + + srcPort + ", destPort=" + destPort + ", asnIpGroupName=" + asnIpGroupName + ", asnIpGroup=" + asnIpGroup + ", direction=" + direction + ", protocol=" + protocol + ", protocolId=" + protocolId + ", compileId=" + compileId + ", isValid=" + isValid + ", userRegion1=" + userRegion1 + ", userRegion2=" + userRegion2 + ", userRegion3=" + userRegion3 + ", userRegion4=" + userRegion4 diff --git a/src/main/java/com/nis/domain/configuration/AppIpCfg.java b/src/main/java/com/nis/domain/configuration/AppIpCfg.java index b106635e4..dc1b79b82 100644 --- a/src/main/java/com/nis/domain/configuration/AppIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppIpCfg.java @@ -1,8 +1,6 @@ package com.nis.domain.configuration; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; - import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import com.nis.util.excel.ExcelField; @@ -34,11 +32,13 @@ public class AppIpCfg extends BaseCfg { @ExcelField(title="ip_type",dictType="IP_TYPE",sort=3) @SerializedName("ipType") protected Integer ipType; - protected Integer ipPattern; + protected Integer srcIpPattern; + protected Integer destIpPattern; protected String srcIpAddress; @ExcelField(title="server_ip",sort=4) protected String destIpAddress; - protected Integer portPattern; + protected Integer srcPortPattern; + protected Integer destPortPattern; protected String srcPort; @ExcelField(title="server_port",sort=5) protected String destPort; @@ -121,34 +121,7 @@ public class AppIpCfg extends BaseCfg { // this.protocolId = protocolId; // } - /** - * ipPattern - * @return ipPattern - */ - public Integer getIpPattern() { - return ipPattern; - } - /** - * @param ipPattern the ipPattern to set - */ - public void setIpPattern(Integer ipPattern) { - this.ipPattern = ipPattern; - } - /** - * portPattern - * @return portPattern - */ - - public Integer getPortPattern() { - return portPattern; - } - /** - * @param portPattern the portPattern to set - */ - public void setPortPattern(Integer portPattern) { - this.portPattern = portPattern; - } /** * srcIpAddress @@ -158,6 +131,30 @@ public class AppIpCfg extends BaseCfg { public String getSrcIpAddress() { return srcIpAddress; } + public Integer getSrcIpPattern() { + return srcIpPattern; + } + public void setSrcIpPattern(Integer srcIpPattern) { + this.srcIpPattern = srcIpPattern; + } + public Integer getDestIpPattern() { + return destIpPattern; + } + public void setDestIpPattern(Integer destIpPattern) { + this.destIpPattern = destIpPattern; + } + public Integer getSrcPortPattern() { + return srcPortPattern; + } + public void setSrcPortPattern(Integer srcPortPattern) { + this.srcPortPattern = srcPortPattern; + } + public Integer getDestPortPattern() { + return destPortPattern; + } + public void setDestPortPattern(Integer destPortPattern) { + this.destPortPattern = destPortPattern; + } /** * @param srcIpAddress the srcIpAddress to set */ @@ -257,16 +254,10 @@ public class AppIpCfg extends BaseCfg { public String toString() { return "AppIpCfg [compileId=" + compileId + ", ratelimit=" + ratelimit + ", appCode=" + appCode + ", behavCode=" + behavCode + ", specServiceId=" + specServiceId + ", appName=" + appName + ", ipType=" + ipType - + ", ipPattern=" + ipPattern + ", srcIpAddress=" + srcIpAddress + ", destIpAddress=" + destIpAddress - + ", portPattern=" + portPattern + ", srcPort=" + srcPort + ", destPort=" + destPort + ", direction=" - + direction + ", protocol=" + protocol + ", userRegion1=" + userRegion1 + ", userRegion2=" + userRegion2 - + ", userRegion3=" + userRegion3 + ", userRegion4=" + userRegion4 + ", userRegion5=" + userRegion5 - + ", cfgId=" + cfgId + ", cfgDesc=" + cfgDesc + ", action=" + action + ", isValid=" + isValid - + ", isAudit=" + isAudit + ", creatorId=" + creatorId + ", createTime=" + createTime + ", editorId=" - + editorId + ", editTime=" + editTime + ", auditorId=" + auditorId + ", auditTime=" + auditTime - + ", serviceId=" + serviceId + ", requestId=" + requestId + ", cancelRequestId=" + cancelRequestId - + ", isAreaEffective=" + isAreaEffective + ", classify=" + classify + ", attribute=" + attribute - + ", lable=" + lable + ", areaEffectiveIds=" + areaEffectiveIds + ", cfgRegionCode=" + cfgRegionCode - + ", cfgType=" + cfgType + ", functionId=" + functionId + ", doLog=" + doLog + "]"; + + ", srcIpPattern=" + srcIpPattern + ", destIpPattern=" + destIpPattern + ", srcIpAddress=" + + srcIpAddress + ", destIpAddress=" + destIpAddress + ", srcPortPattern=" + srcPortPattern + + ", destPortPattern=" + destPortPattern + ", srcPort=" + srcPort + ", destPort=" + destPort + + ", direction=" + direction + ", protocol=" + protocol + "]"; } + } diff --git a/src/main/java/com/nis/domain/configuration/AreaIpCfg.java b/src/main/java/com/nis/domain/configuration/AreaIpCfg.java index cf8951dcd..0816abd98 100644 --- a/src/main/java/com/nis/domain/configuration/AreaIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/AreaIpCfg.java @@ -59,7 +59,8 @@ public class AreaIpCfg extends BaseIpCfg { this.cfgType=Constants.AREA_REGION; this.cfgRegionCode=1; this.protocol=0; - this.portPattern=1; + this.srcPortPattern=1; + this.destPortPattern=1; this.srcPort="0"; this.destPort="0"; this.direction=0; diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java index a43e094ba..43f0de7c6 100644 --- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java @@ -45,14 +45,18 @@ public class BaseIpCfg extends BaseCfg { @SerializedName("ipType") @ExcelField(title="ip_type",dictType="IP_TYPE",sort=50) protected Integer ipType; - @ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=51) - protected Integer ipPattern; - @ExcelField(title="client_ip",sort=53) + @ExcelField(title="src_ip_pattern",dictType="IP_PATTERN",sort=51) + protected Integer srcIpPattern; + @ExcelField(title="client_ip",sort=52) protected String srcIpAddress; - @ExcelField(title="server_ip",sort=52) + @ExcelField(title="dest_ip_pattern",dictType="IP_PATTERN",sort=53) + protected Integer destIpPattern; + @ExcelField(title="server_ip",sort=54) protected String destIpAddress; - @ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=54) - protected Integer portPattern; + @ExcelField(title="src_port_pattern",dictType="PORT_PATTERN",sort=54) + protected Integer srcPortPattern; + @ExcelField(title="dest_port_pattern",dictType="PORT_PATTERN",sort=54) + protected Integer destPortPattern; @ExcelField(title="client_port",sort=55) protected String srcPort; @ExcelField(title="server_port",sort=56) @@ -269,35 +273,31 @@ public class BaseIpCfg extends BaseCfg { this.protocolId = protocolId; } - /** - * ipPattern - * @return ipPattern - */ - public Integer getIpPattern() { - return ipPattern; + public Integer getSrcIpPattern() { + return srcIpPattern; } - /** - * @param ipPattern the ipPattern to set - */ - public void setIpPattern(Integer ipPattern) { - this.ipPattern = ipPattern; + public void setSrcIpPattern(Integer srcIpPattern) { + this.srcIpPattern = srcIpPattern; } - /** - * portPattern - * @return portPattern - */ - - public Integer getPortPattern() { - return portPattern; + public Integer getDestIpPattern() { + return destIpPattern; } - /** - * @param portPattern the portPattern to set - */ - public void setPortPattern(Integer portPattern) { - this.portPattern = portPattern; + public void setDestIpPattern(Integer destIpPattern) { + this.destIpPattern = destIpPattern; + } + public Integer getSrcPortPattern() { + return srcPortPattern; + } + public void setSrcPortPattern(Integer srcPortPattern) { + this.srcPortPattern = srcPortPattern; + } + public Integer getDestPortPattern() { + return destPortPattern; + } + public void setDestPortPattern(Integer destPortPattern) { + this.destPortPattern = destPortPattern; } - /** * srcIpAddress * @return srcIpAddress diff --git a/src/main/java/com/nis/domain/configuration/template/IpAddrTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpAddrTemplate.java deleted file mode 100644 index 148755b30..000000000 --- a/src/main/java/com/nis/domain/configuration/template/IpAddrTemplate.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.nis.domain.configuration.template; - -/** - * wx 将部分字段的标题改变，或者不需要的字段隐藏 - * 隐藏方法，对于不需要的字段或者方法，Override该字段方法，但是@ExcelField注解不需要加上了 - * @author dell - * - */ -@Deprecated -public class IpAddrTemplate extends IpCfgTemplate { - - - @Override - public Integer getIrType() { - // TODO Auto-generated method stub - return super.getIrType(); - } - - @Override - public Integer getDnsStrategyId() { - // TODO Auto-generated method stub - return super.getDnsStrategyId(); - } - - @Override - public String getRatelimit() { - // TODO Auto-generated method stub - return super.getRatelimit(); - } - -} diff --git a/src/main/java/com/nis/domain/configuration/template/IpAllTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpAllTemplate.java index 860577947..66e4263f2 100644 --- a/src/main/java/com/nis/domain/configuration/template/IpAllTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/IpAllTemplate.java @@ -8,7 +8,6 @@ */ package com.nis.domain.configuration.template; -import com.google.gson.JsonObject; import com.nis.util.excel.ExcelField; /** diff --git a/src/main/java/com/nis/domain/configuration/template/IpCfgTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpCfgTemplate.java deleted file mode 100644 index 06b94dfe2..000000000 --- a/src/main/java/com/nis/domain/configuration/template/IpCfgTemplate.java +++ /dev/null @@ -1,310 +0,0 @@ -/** - *@Title: BaseStringConfig.java - *@Package com.nis.domain.restful - *@Description TODO - *@author dell - *@date 2018年2月5日 下午5:26:02 - *@version 版本号 - */ -package com.nis.domain.configuration.template; - -import com.nis.util.excel.ExcelField; - -/** - * @Description: excel导入IP类配置 - */ -@Deprecated -public class IpCfgTemplate { - - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - - - private Long cfgId; - private Integer ipType;//1 - private Integer ipPattern;//2 - private String srcIpAddress; //3 - private String destIpAddress; //4 - private Integer portPattern; //5 - private String srcPort; //6 - private String destPort;//7 - private Integer protocol;//8 - protected Integer direction;//9 - private String cfgDesc;//10 - private Integer requestId;//11 - private String requestName;//12 - private Integer isAreaEffective;//13 - private String classify;//14 - private String attribute;//15 - private String lable;//16 - private String classifyName;//17 - private String attributeName;//18 - private String lableName;//19 - private String areaEffectiveIds;//20 - private String ratelimit;//21 - private Integer dnsStrategyId;//22 - private Integer irType;//23 - private String userRegion1;//77 - private String userRegion2;//78 - private String userRegion3;//79 - private String userRegion4;//80 - private String userRegion5;//81 - - /** - * userRegion1 - * @return userRegion1 - */ -// @ExcelField(title="userregion1",align=2,sort=77) - public String getUserRegion1() { - return userRegion1; - } - /** - * @param userRegion1 the userRegion1 to set - */ - public void setUserRegion1(String userRegion1) { - this.userRegion1 = userRegion1; - } - /** - * userRegion2 - * @return userRegion2 - */ -// @ExcelField(title="userregion2",align=2,sort=78) - public String getUserRegion2() { - return userRegion2; - } - /** - * @param userRegion2 the userRegion2 to set - */ - public void setUserRegion2(String userRegion2) { - this.userRegion2 = userRegion2; - } - /** - * userRegion3 - * @return userRegion3 - */ -// @ExcelField(title="userregion3",align=2,sort=79) - public String getUserRegion3() { - return userRegion3; - } - /** - * @param userRegion3 the userRegion3 to set - */ - public void setUserRegion3(String userRegion3) { - this.userRegion3 = userRegion3; - } - /** - * userRegion4 - * @return userRegion4 - */ -// @ExcelField(title="userregion4",align=2,sort=80) - public String getUserRegion4() { - return userRegion4; - } - /** - * @param userRegion4 the userRegion4 to set - */ - public void setUserRegion4(String userRegion4) { - this.userRegion4 = userRegion4; - } - /** - * userRegion5 - * @return userRegion5 - */ -// @ExcelField(title="userregion5",align=2,sort=81) - public String getUserRegion5() { - return userRegion5; - } - /** - * @param userRegion5 the userRegion5 to set - */ - public void setUserRegion5(String userRegion5) { - this.userRegion5 = userRegion5; - } - /** - * ratelimit - * @return ratelimit - */ - @ExcelField(title="ratelimit",align=2,sort=74) - public String getRatelimit() { - return ratelimit; - } - /** - * @param ratelimit the ratelimit to set - */ - public void setRatelimit(String ratelimit) { - this.ratelimit = ratelimit; - } - /** - * irType - * @return irType - */ - @ExcelField(title="ir_type",align=2,sort=76) - public Integer getIrType() { - return irType; - } - /** - * @param irType the irType to set - */ - public void setIrType(Integer irType) { - this.irType = irType; - } - /** - * dnsStrategyId - * @return dnsStrategyId - */ - @ExcelField(title="dns_strategy_id",align=2,sort=75) - public Integer getDnsStrategyId() { - return dnsStrategyId; - } - /** - * @param dnsStrategyId the dnsStrategyId to set - */ - public void setDnsStrategyId(Integer dnsStrategyId) { - this.dnsStrategyId = dnsStrategyId; - } - @ExcelField(title="ip_type",align=2,sort=1) - public Integer getIpType() { - return ipType; - } - public void setIpType(Integer ipType) { - this.ipType = ipType; - } - @ExcelField(title="ip_pattern",align=2,sort=2) - public Integer getIpPattern() { - return ipPattern; - } - public void setIpPattern(Integer ipPattern) { - this.ipPattern = ipPattern; - } - @ExcelField(title="client_ip",align=2,sort=3) - public String getSrcIpAddress() { - return srcIpAddress; - } - public void setSrcIpAddress(String srcIpAddress) { - this.srcIpAddress = srcIpAddress; - } - @ExcelField(title="server_ip",align=2,sort=4) - public String getDestIpAddress() { - return destIpAddress; - } - public void setDestIpAddress(String destIpAddress) { - this.destIpAddress = destIpAddress; - } - @ExcelField(title="port_pattern",align=2,sort=5) - public Integer getPortPattern() { - return portPattern; - } - public void setPortPattern(Integer portPattern) { - this.portPattern = portPattern; - } - @ExcelField(title="client_port",align=2,sort=6) - public String getSrcPort() { - return srcPort; - } - public void setSrcPort(String srcPort) { - this.srcPort = srcPort; - } - @ExcelField(title="server_port",align=2,sort=7) - public String getDestPort() { - return destPort; - } - public void setDestPort(String destPort) { - this.destPort = destPort; - } - public Long getCfgId() { - return cfgId; - } - public void setCfgId(Long cfgId) { - this.cfgId = cfgId; - } - @ExcelField(title="direction",align=2,sort=8) - public Integer getDirection() { - return direction; - } - public void setDirection(Integer direction) { - this.direction = direction; - } - @ExcelField(title="config_describe",align=2,sort=11) - public String getCfgDesc() { - return cfgDesc; - } - public void setCfgDesc(String cfgDesc) { - this.cfgDesc = cfgDesc; - } - @ExcelField(title="letter",align=2,sort=13) - public Integer getRequestId() { - return requestId; - } - public void setRequestId(Integer requestId) { - this.requestId = requestId; - } - public String getRequestName() { - return requestName; - } - public void setRequestName(String requestName) { - this.requestName = requestName; - } - public Integer getIsAreaEffective() { - return isAreaEffective; - } - public void setIsAreaEffective(Integer isAreaEffective) { - this.isAreaEffective = isAreaEffective; - } - @ExcelField(title="classification",align=2,sort=71) - public String getClassify() { - return classify; - } - public void setClassify(String classify) { - this.classify = classify; - } - @ExcelField(title="attribute",align=2,sort=72) - public String getAttribute() { - return attribute; - } - public void setAttribute(String attribute) { - this.attribute = attribute; - } - @ExcelField(title="label",align=2,sort=73) - public String getLable() { - return lable; - } - public void setLable(String lable) { - this.lable = lable; - } - public String getClassifyName() { - return classifyName; - } - public void setClassifyName(String classifyName) { - this.classifyName = classifyName; - } - public String getAttributeName() { - return attributeName; - } - public void setAttributeName(String attributeName) { - this.attributeName = attributeName; - } - public String getLableName() { - return lableName; - } - public void setLableName(String lableName) { - this.lableName = lableName; - } -// @ExcelField(title="area_effective",align=2,sort=70) - public String getAreaEffectiveIds() { - return areaEffectiveIds; - } - public void setAreaEffectiveIds(String areaEffectiveIds) { - this.areaEffectiveIds = areaEffectiveIds; - } - @ExcelField(title="protocol",align=2,sort=9) - public Integer getProtocol() { - return protocol; - } - public void setProtocol(Integer protocol) { - this.protocol = protocol; - } -} diff --git a/src/main/java/com/nis/domain/configuration/template/IpMultiplexPolicyTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpMultiplexPolicyTemplate.java deleted file mode 100644 index 543019390..000000000 --- a/src/main/java/com/nis/domain/configuration/template/IpMultiplexPolicyTemplate.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.nis.domain.configuration.template; - -import com.nis.util.excel.ExcelField; -/** - * wx 将部分字段的标题改变，或者不需要的字段隐藏 - * 隐藏方法，对于不需要的字段或者方法，Override该字段方法，但是@ExcelField注解不需要加上了 - * @author dell - * - */ -@Deprecated -public class IpMultiplexPolicyTemplate extends IpCfgTemplate { - @Override - @ExcelField(title="IP",align=2,sort=3) - public String getSrcIpAddress() { - return super.getSrcIpAddress(); - } - @ExcelField(title="port",align=2,sort=6) - @Override - public String getSrcPort() { - // TODO Auto-generated method stub - return super.getSrcPort(); - } - - @Override - @ExcelField(title="group_name",align=2,sort=75) - public Integer getDnsStrategyId() { - // TODO Auto-generated method stub - return super.getDnsStrategyId(); - } - - @Override - public String getRatelimit() { - // TODO Auto-generated method stub - return super.getRatelimit(); - } - @Override - public String getDestPort() { - // TODO Auto-generated method stub - return super.getDestPort(); - } - @Override - public String getDestIpAddress() { - // TODO Auto-generated method stub - return super.getDestIpAddress(); - } - -} diff --git a/src/main/java/com/nis/domain/configuration/template/IpsecTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpsecTemplate.java deleted file mode 100644 index 5805e99ad..000000000 --- a/src/main/java/com/nis/domain/configuration/template/IpsecTemplate.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.nis.domain.configuration.template; - -/** - * wx 将部分字段的标题改变，或者不需要的字段隐藏 - * 隐藏方法，对于不需要的字段或者方法，Override该字段方法，但是@ExcelField注解不需要加上了 - * @author dell - * - */ -@Deprecated -public class IpsecTemplate extends IpCfgTemplate { - - - @Override - public Integer getIrType() { - // TODO Auto-generated method stub - return super.getIrType(); - } - - @Override - public Integer getDnsStrategyId() { - // TODO Auto-generated method stub - return super.getDnsStrategyId(); - } - - @Override - public String getRatelimit() { - // TODO Auto-generated method stub - return super.getRatelimit(); - } - -} diff --git a/src/main/java/com/nis/domain/configuration/template/TunnelIpTemplate.java b/src/main/java/com/nis/domain/configuration/template/TunnelIpTemplate.java deleted file mode 100644 index c2cde9b73..000000000 --- a/src/main/java/com/nis/domain/configuration/template/TunnelIpTemplate.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.nis.domain.configuration.template; - -/** - * wx 将部分字段的标题改变，或者不需要的字段隐藏 - * 隐藏方法，对于不需要的字段或者方法，Override该字段方法，但是@ExcelField注解不需要加上了 - * @author dell - * - */ -@Deprecated -public class TunnelIpTemplate extends IpCfgTemplate { - - - @Override - public Integer getIrType() { - // TODO Auto-generated method stub - return super.getIrType(); - } - - @Override - public Integer getDnsStrategyId() { - // TODO Auto-generated method stub - return super.getDnsStrategyId(); - } - - @Override - public String getRatelimit() { - // TODO Auto-generated method stub - return super.getRatelimit(); - } - - @Override - public Integer getProtocol() { - // TODO Auto-generated method stub - return 0; - } - -} diff --git a/src/main/java/com/nis/domain/configuration/template/WhiteListIpTemplate.java b/src/main/java/com/nis/domain/configuration/template/WhiteListIpTemplate.java deleted file mode 100644 index 63167ab56..000000000 --- a/src/main/java/com/nis/domain/configuration/template/WhiteListIpTemplate.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.nis.domain.configuration.template; - -/** - * wx 将部分字段的标题改变，或者不需要的字段隐藏 - * 隐藏方法，对于不需要的字段或者方法，Override该字段方法，但是@ExcelField注解不需要加上了 - * @author dell - * - */ -@Deprecated -public class WhiteListIpTemplate extends IpCfgTemplate { - - @Override - public Integer getDirection() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public Integer getProtocol() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public Integer getIrType() { - // TODO Auto-generated method stub - return super.getIrType(); - } - - @Override - public Integer getDnsStrategyId() { - // TODO Auto-generated method stub - return super.getDnsStrategyId(); - } - - @Override - public Integer getRequestId() { - // TODO Auto-generated method stub - return super.getRequestId(); - } - - @Override - public String getClassify() { - // TODO Auto-generated method stub - return super.getClassify(); - } - - @Override - public String getAttribute() { - // TODO Auto-generated method stub - return super.getAttribute(); - } - - @Override - public String getLable() { - // TODO Auto-generated method stub - return super.getLable(); - } - - @Override - public String getRatelimit() { - // TODO Auto-generated method stub - return super.getRatelimit(); - } - -} diff --git a/src/main/java/com/nis/domain/specific/SpecificServiceHostCfg.java b/src/main/java/com/nis/domain/specific/SpecificServiceHostCfg.java index b775736b0..b957e7548 100644 --- a/src/main/java/com/nis/domain/specific/SpecificServiceHostCfg.java +++ b/src/main/java/com/nis/domain/specific/SpecificServiceHostCfg.java @@ -30,13 +30,15 @@ public class SpecificServiceHostCfg extends BaseEntity{ @Expose private Integer protocol; //protocol 协议 int N 6表示tcp,17表示udp，0表示任意 @Expose - private Integer ipPattern; //ip格式 + private Integer srcIpPattern; //ip格式 + private Integer destIpPattern; //ip格式 @Expose private String srcIpAddress; //源（客户端）IP地址 @Expose private String destIpAddress; //目的（服务器）IP地址 @Expose - private Integer portPattern; //端口格式 + private Integer srcPortPattern; //端口格式 + private Integer destPortPattern; //端口格式 @Expose private String srcPort; //源（客户端）端口 @Expose @@ -114,19 +116,33 @@ public class SpecificServiceHostCfg extends BaseEntity{ public void setDestPort(String destPort) { this.destPort = destPort; } - @ExcelField(title="ip_pattern",align=2,sort=21,fieldType=Integer.class) - public Integer getIpPattern() { - return ipPattern; + @ExcelField(title="src_ip_pattern",align=2,sort=21,fieldType=Integer.class) + public Integer getSrcIpPattern() { + return srcIpPattern; } - public void setIpPattern(Integer ipPattern) { - this.ipPattern = ipPattern; + public void setSrcIpPattern(Integer srcIpPattern) { + this.srcIpPattern = srcIpPattern; } - @ExcelField(title="port_pattern",align=2,sort=40,fieldType=Integer.class) - public Integer getPortPattern() { - return portPattern; + @ExcelField(title="dest_ip_pattern",align=2,sort=22,fieldType=Integer.class) + public Integer getDestIpPattern() { + return destIpPattern; } - public void setPortPattern(Integer portPattern) { - this.portPattern = portPattern; + public void setDestIpPattern(Integer destIpPattern) { + this.destIpPattern = destIpPattern; + } + @ExcelField(title="src_port_pattern",align=2,sort=40,fieldType=Integer.class) + public Integer getSrcPortPattern() { + return srcPortPattern; + } + public void setSrcPortPattern(Integer srcPortPattern) { + this.srcPortPattern = srcPortPattern; + } + @ExcelField(title="dest_port_pattern",align=2,sort=41,fieldType=Integer.class) + public Integer getDestPortPattern() { + return destPortPattern; + } + public void setDestPortPattern(Integer destPortPattern) { + this.destPortPattern = destPortPattern; } @ExcelField(title="direction",align=2,sort=110) public Integer getDirection() { diff --git a/src/main/java/com/nis/util/ConfigConvertUtil.java b/src/main/java/com/nis/util/ConfigConvertUtil.java index c39e733ea..9bdb0d5fc 100644 --- a/src/main/java/com/nis/util/ConfigConvertUtil.java +++ b/src/main/java/com/nis/util/ConfigConvertUtil.java @@ -395,7 +395,7 @@ public class ConfigConvertUtil { */ public static List ipConvert(IpCfg dstIp, BaseIpCfg srcIp) { List ipConvertList = Lists.newArrayList(); - boolean isRange = ((srcIp.getIpPattern() != null && srcIp.getIpPattern() == 2) + boolean isRange = (((srcIp.getSrcIpPattern() != null && srcIp.getSrcIpPattern() == 2)||(srcIp.getDestIpPattern()) != null && srcIp.getDestIpPattern() == 2) || (srcIp.getSrcIpAddress() != null && srcIp.getSrcIpAddress().indexOf("-") > -1) || (srcIp.getDestIpAddress() != null && srcIp.getDestIpAddress().indexOf("-") > -1)); if (isRange) { diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java index 7ad8c9b30..961e68aac 100644 --- a/src/main/java/com/nis/util/ConfigServiceUtil.java +++ b/src/main/java/com/nis/util/ConfigServiceUtil.java @@ -133,6 +133,7 @@ public class ConfigServiceUtil { result=response.readEntity(String.class); } } catch (Exception e) { + logger.error("request_service_failed",e); throw new MaatConvertException(""); } if(response != null && response.getStatus() == 200){ diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index 78e925289..f4a1ac786 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -39,6 +39,7 @@ import org.apache.poi.xssf.usermodel.XSSFClientAnchor; import org.apache.poi.xssf.usermodel.XSSFRichTextString; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.util.Assert; import com.google.common.collect.Lists; import com.nis.domain.FunctionRegionDict; @@ -583,25 +584,28 @@ public class ExportExcel { commentStr=""; } }else{ + String[] ipPatterns=region.getConfigIpPattern().split(";"); if("client_ip".equals(headerStr)){ + Assert.isTrue(ipPatterns.length==2); + String srcIpPattern=ipPatterns[0]; if(((","+region.getConfigIpPortShow()+",").indexOf(",1,") > -1) ){ commentStr=""; if((","+region.getConfigIpType()+",").indexOf(",4,") > -1){ - if((","+region.getConfigIpPattern()+",").indexOf(",3,") > -1){ + if((","+srcIpPattern+",").indexOf(",3,") > -1){ commentStr=commentStr+Constants.IPV4_DEFAULT_IP_VALUE+"（IPv4）"+"\n"; if(StringUtil.isEmpty(defaultValue)){ defaultValue=Constants.IPV4_DEFAULT_IP_VALUE; } index++; } - if((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1){ + if((","+srcIpPattern+",").indexOf(",2,") > -1){ commentStr=commentStr+Constants.IPV4_DEFAULT_IP_RANGE_VALUE+"（"+msgProp.getProperty("ipv4_range_tip")+"）"+"\n"; if(StringUtil.isEmpty(defaultValue)){ defaultValue=Constants.IPV4_DEFAULT_IP_RANGE_VALUE; } index++; } - if((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1){ + if((","+srcIpPattern+",").indexOf(",1,") > -1){ commentStr=commentStr+Constants.IPV4_DEFAULT_IP_SUBNET_VALUE+"（"+msgProp.getProperty("ipv4_subnet_tip")+"）"+"\n"; if(StringUtil.isEmpty(defaultValue)){ defaultValue=Constants.IPV4_DEFAULT_IP_SUBNET_VALUE; @@ -610,21 +614,21 @@ public class ExportExcel { } } if((","+region.getConfigIpType()+",").indexOf(",6,") > -1){ - if((","+region.getConfigIpPattern()+",").indexOf(",3,") > -1){ + if((","+srcIpPattern+",").indexOf(",3,") > -1){ commentStr=commentStr+Constants.IPV6_DEFAULT_IP_VALUE+"（IPv6）"+"\n"; if(StringUtil.isEmpty(defaultValue)){ defaultValue=Constants.IPV6_DEFAULT_IP_VALUE; } index++; } - if((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1){ + if((","+srcIpPattern+",").indexOf(",2,") > -1){ commentStr=commentStr+Constants.IPV6_DEFAULT_IP_RANGE_VALUE+"（"+msgProp.getProperty("ipv6_range_tip")+"）"+"\n"; if(StringUtil.isEmpty(defaultValue)){ defaultValue=Constants.IPV6_DEFAULT_IP_RANGE_VALUE; } index++; } - if((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1){ + if((","+srcIpPattern+",").indexOf(",1,") > -1){ commentStr=commentStr+Constants.IPV6_DEFAULT_IP_SUBNET_VALUE+"（"+msgProp.getProperty("ipv6_subnet_tip")+"）"+"\n\n"; if(StringUtil.isEmpty(defaultValue)){ defaultValue=Constants.IPV6_DEFAULT_IP_SUBNET_VALUE; @@ -673,12 +677,12 @@ public class ExportExcel { ,msgProp.getProperty("serverip"))+"\n"; index++; index++; - commentStr=commentStr+"▶"+String.format(msgProp.getProperty("the_same_ip_type_pattern"))+"\n"; + commentStr=commentStr+"▶"+String.format(msgProp.getProperty("the_same_ip_type"))+"\n"; index++; index++; } //4、IP Range 开始IP和结束IP必须在同一网段 - if(((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1)){ + if(((","+srcIpPattern+",").indexOf(",2,") > -1)){ commentStr=commentStr+"▶"+msgProp.getProperty("ip_range")+","+msgProp.getProperty("ip_range_bit_field")+"\n"; index++; index++; @@ -689,7 +693,7 @@ public class ExportExcel { } //6、IPv4 Mask 掩码范围16-32 - if(((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1)){ + if(((","+srcIpPattern+",").indexOf(",1,") > -1)){ if(((","+region.getConfigIpType()+",").indexOf(",4,") > -1)){ commentStr=commentStr+"▶"+msgProp.getProperty("ipv4_subnet_tip")+","+msgProp.getProperty("ipv4_mask_range_tip")+"\n"; index++; @@ -705,24 +709,25 @@ public class ExportExcel { } if("server_ip".equals(headerStr)){ + String destIpPattern=ipPatterns[1]; if((","+region.getConfigIpPortShow()+",").indexOf(",3,") > -1){ commentStr=""; if((","+region.getConfigIpType()+",").indexOf(",4,") > -1){ - if((","+region.getConfigIpPattern()+",").indexOf(",3,") > -1){ + if((","+destIpPattern+",").indexOf(",3,") > -1){ commentStr=commentStr+Constants.IPV4_DEFAULT_IP_VALUE+"（IPv4）"+"\n"; if(StringUtil.isEmpty(defaultValue)){ defaultValue=Constants.IPV4_DEFAULT_IP_VALUE; } index++; } - if((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1){ + if((","+destIpPattern+",").indexOf(",2,") > -1){ commentStr=commentStr+Constants.IPV4_DEFAULT_IP_RANGE_VALUE+"（"+msgProp.getProperty("ipv4_range_tip")+"）"+"\n"; if(StringUtil.isEmpty(defaultValue)){ defaultValue=Constants.IPV4_DEFAULT_IP_RANGE_VALUE; } index++; } - if((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1){ + if((","+destIpPattern+",").indexOf(",1,") > -1){ commentStr=commentStr+Constants.IPV4_DEFAULT_IP_SUBNET_VALUE+"（"+msgProp.getProperty("ipv4_subnet_tip")+"）"+"\n"; if(StringUtil.isEmpty(defaultValue)){ defaultValue=Constants.IPV4_DEFAULT_IP_SUBNET_VALUE; @@ -731,21 +736,21 @@ public class ExportExcel { } } if((","+region.getConfigIpType()+",").indexOf(",6,") > -1){ - if((","+region.getConfigIpPattern()+",").indexOf(",3,") > -1){ + if((","+destIpPattern+",").indexOf(",3,") > -1){ commentStr=commentStr+Constants.IPV6_DEFAULT_IP_VALUE+"（IPv6）"+"\n"; if(StringUtil.isEmpty(defaultValue)){ defaultValue=Constants.IPV6_DEFAULT_IP_VALUE; } index++; } - if((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1){ + if((","+destIpPattern+",").indexOf(",2,") > -1){ commentStr=commentStr+Constants.IPV6_DEFAULT_IP_RANGE_VALUE+"（"+msgProp.getProperty("ipv6_range_tip")+"）"+"\n"; if(StringUtil.isEmpty(defaultValue)){ defaultValue=Constants.IPV6_DEFAULT_IP_RANGE_VALUE; } index++; } - if((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1){ + if((","+destIpPattern+",").indexOf(",1,") > -1){ commentStr=commentStr+Constants.IPV6_DEFAULT_IP_SUBNET_VALUE+"（"+msgProp.getProperty("ipv6_subnet_tip")+"）"+"\n\n"; if(StringUtil.isEmpty(defaultValue)){ defaultValue=Constants.IPV6_DEFAULT_IP_SUBNET_VALUE; @@ -778,12 +783,12 @@ public class ExportExcel { ,msgProp.getProperty("serverip"))+"\n"; index++; index++; - commentStr=commentStr+"▶"+String.format(msgProp.getProperty("the_same_ip_type_pattern"))+"\n"; + commentStr=commentStr+"▶"+String.format(msgProp.getProperty("the_same_ip_type"))+"\n"; index++; index++; } //4、IP Range 开始IP和结束IP必须在同一网段 - if(((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1)){ + if(((","+destIpPattern+",").indexOf(",2,") > -1)){ commentStr=commentStr+"▶"+msgProp.getProperty("ip_range")+","+msgProp.getProperty("ip_range_bit_field")+"\n"; index++; index++; @@ -794,7 +799,7 @@ public class ExportExcel { } //6、IPv4 Mask 掩码范围16-32 - if(((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1)){ + if(((","+destIpPattern+",").indexOf(",1,") > -1)){ if(((","+region.getConfigIpType()+",").indexOf(",4,") > -1)){ commentStr=commentStr+"▶"+msgProp.getProperty("ipv4_subnet_tip")+","+msgProp.getProperty("ipv4_mask_range_tip")+"\n"; index++; @@ -820,17 +825,20 @@ public class ExportExcel { }else{ protocol=region.getConfigProtocol(); } + String[] portPatterns=region.getConfigPortPattern().split(";"); + Assert.isTrue(portPatterns.length==2); if("client_port".equals(headerStr)){ + String srcPortPattern=portPatterns[0]; if(((","+region.getConfigIpPortShow()+",").indexOf(",2,") > -1)){ commentStr=""; - if((","+region.getConfigPortPattern()+",").indexOf(",1,") > -1){ + if((","+srcPortPattern+",").indexOf(",1,") > -1){ commentStr=commentStr+Constants.PORT_DEFAULT+"（Port）"+"\n"; if(StringUtil.isEmpty(defaultValue)){ defaultValue=Constants.PORT_DEFAULT; } index++; } - if((","+region.getConfigPortPattern()+",").indexOf(",2,") > -1){ + if((","+srcPortPattern+",").indexOf(",2,") > -1){ commentStr=commentStr+Constants.PORT_MASK_DEFAULT+"（Port/"+msgProp.getProperty("port_mask")+"）"+"\n\n"; if(StringUtil.isEmpty(defaultValue)){ defaultValue=Constants.PORT_MASK_DEFAULT; @@ -856,11 +864,11 @@ public class ExportExcel { index++; } //2、源端口、目的端口格式必须一致 - if(((","+region.getConfigIpPortShow()+",").indexOf(",2,") > -1) && ((","+region.getConfigIpPortShow()+",").indexOf(",4,") > -1)){ - commentStr=commentStr+"▶"+msgProp.getProperty("the_same_port_pattern")+"\n"; - index++; - index++; - } +// if(((","+region.getConfigIpPortShow()+",").indexOf(",2,") > -1) && ((","+region.getConfigIpPortShow()+",").indexOf(",4,") > -1)){ +// commentStr=commentStr+"▶"+msgProp.getProperty("the_same_port_pattern")+"\n"; +// index++; +// index++; +// } //3、端口和端口掩码范围0-65535 commentStr=commentStr+"▶"+msgProp.getProperty("port_mask_comment_tip")+"\n"; index++; @@ -895,16 +903,17 @@ public class ExportExcel { } } if("server_port".equals(headerStr)){ + String destPortPattern=portPatterns[1]; if((","+region.getConfigIpPortShow()+",").indexOf(",4,") > -1){ commentStr=""; - if((","+region.getConfigPortPattern()+",").indexOf(",1,") > -1){ + if((","+destPortPattern+",").indexOf(",1,") > -1){ commentStr=commentStr+Constants.PORT_DEFAULT+"（Port）"+"\n"; if(StringUtil.isEmpty(defaultValue)){ defaultValue=Constants.PORT_DEFAULT; } index++; } - if((","+region.getConfigPortPattern()+",").indexOf(",2,") > -1){ + if((","+destPortPattern+",").indexOf(",2,") > -1){ commentStr=commentStr+Constants.PORT_MASK_DEFAULT+"（Port/"+msgProp.getProperty("port_mask")+"）"+"\n\n"; if(StringUtil.isEmpty(defaultValue)){ defaultValue=Constants.PORT_MASK_DEFAULT; @@ -930,11 +939,11 @@ public class ExportExcel { index++; } //2、源端口、目的端口格式必须一致 - if(((","+region.getConfigIpPortShow()+",").indexOf(",2,") > -1) && ((","+region.getConfigIpPortShow()+",").indexOf(",4,") > -1)){ - commentStr=commentStr+"▶"+msgProp.getProperty("the_same_port_pattern")+"\n"; - index++; - index++; - } +// if(((","+region.getConfigIpPortShow()+",").indexOf(",2,") > -1) && ((","+region.getConfigIpPortShow()+",").indexOf(",4,") > -1)){ +// commentStr=commentStr+"▶"+msgProp.getProperty("the_same_port_pattern")+"\n"; +// index++; +// index++; +// } //3、端口和端口掩码范围0-65535 commentStr=commentStr+"▶"+msgProp.getProperty("port_mask_comment_tip")+"\n"; index++; diff --git a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java index 7fc55e9ec..954bf972a 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java @@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.jets3t.service.ServiceException; import org.springframework.beans.BeanUtils; +import org.springframework.util.Assert; import com.beust.jcommander.internal.Lists; import com.nis.domain.FunctionRegionDict; @@ -27,6 +28,7 @@ import com.nis.domain.configuration.template.IpRateLimitTemplate; //import com.nis.util.AsnCacheUtils; import com.nis.util.Constants; import com.nis.util.DictUtils; +import com.nis.util.IPUtil; import com.nis.util.StringUtil; public class CheckIpFormatThread implements Callable{ @@ -92,14 +94,20 @@ public class CheckIpFormatThread implements Callable{ } boolean canIPv4 = ipType.indexOf("4") > -1; boolean canIPv6 = ipType.indexOf("6") > -1; - String ipPattern = regionDict.getConfigIpPattern(); - if (StringUtils.isBlank(ipPattern)) { + String[] ipPattern = regionDict.getConfigIpPattern().split(";"); + Assert.isTrue(ipPattern!=null&&ipPattern.length==2); + String srcIpPattern = ipPattern[0]; + String destIpPattern = ipPattern[1]; + if (StringUtils.isBlank(srcIpPattern)||StringUtils.isBlank(destIpPattern)) { throw new RuntimeException("Found IP region,but ipPattern is Empty"); } boolean canIPFormat = ipType.indexOf("3") > -1; boolean canIPSubnetFormat = ipType.indexOf("1") > -1; boolean canIPRangeFormat = ipType.indexOf("2") > -1; - String portPattern = regionDict.getConfigPortPattern(); + String[] portPattern = regionDict.getConfigPortPattern().split(";"); + Assert.isTrue(ipPattern!=null&&ipPattern.length==2); + String srcPortPattern=portPattern[0]; + String destPortPattern=portPattern[1]; String protocol = regionDict.getConfigProtocol(); String direction = regionDict.getConfigDirection(); StringBuffer errTip = new StringBuffer(); @@ -621,74 +629,40 @@ public class CheckIpFormatThread implements Callable{ prop.getProperty("server_ip", "Server IP")) + ";"); } else if (configIpPortShow.indexOf("1") > -1) { String matchType = this.validIPAddress("client_ip", errInfo, baseIpCfg.getSrcIpAddress(), - ipType, ipPattern); + ipType, srcIpPattern); + //设置源IP pattern + if (matchType.endsWith("RANGE")) { + baseIpCfg.setSrcIpPattern(2); + } else if (matchType.endsWith("SUBNET")) { + baseIpCfg.setSrcIpPattern(1); + }else { + baseIpCfg.setSrcIpPattern(3); + } if (matchType.startsWith("IPV6")) { - if (matchType.endsWith("RANGE")) { - // baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress()); - baseIpCfg.setDestIpAddress(Constants.IPV6_DEFAULT_IP_RANGE_VALUE); - baseIpCfg.setIpPattern(2); - if (baseIpCfg.getSrcIpAddress() - .startsWith(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()); - baseIpCfg.setDestIpAddress(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE); - baseIpCfg.setIpPattern(1); - if (baseIpCfg.getSrcIpAddress() - .startsWith(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()); + //设置dest ip值 + if(destIpPattern.indexOf("3")>-1) {//优先设置IP类型，因为拆分的IP较少 baseIpCfg.setDestIpAddress(Constants.IPV6_DEFAULT_IP_VALUE); - baseIpCfg.setIpPattern(3); - if (baseIpCfg.getSrcIpAddress().equals(Constants.IPV6_DEFAULT_IP_VALUE)) { - errInfo.append(prop.getProperty("client_ip")+" " + String.format( - prop.getProperty("can_not_be"), Constants.IPV6_DEFAULT_IP_VALUE) + ";"); - } + baseIpCfg.setDestIpPattern(3); + }else if(destIpPattern.indexOf("1")>-1) { + baseIpCfg.setDestIpAddress(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE); + baseIpCfg.setDestIpPattern(1); + }else { + baseIpCfg.setDestIpAddress(Constants.IPV6_DEFAULT_IP_RANGE_VALUE); + baseIpCfg.setDestIpPattern(2); } + //设置IP类型 baseIpCfg.setIpType(6); } else { - if (matchType.endsWith("RANGE")) { - this.validIPv4Range("client_ip", errInfo, baseIpCfg.getSrcIpAddress()); - // baseIpCfg.setSrcIpAddress("0.0.0.0-"+baseIpCfg.getSrcIpAddress().split("-")[0].substring(0,baseIpCfg.getSrcIpAddress().indexOf("-")+1)+baseIpCfg.getSrcIpAddress().split("-")[1]); - baseIpCfg.setDestIpAddress(Constants.IPV4_DEFAULT_IP_RANGE_VALUE); - baseIpCfg.setIpPattern(2); - if (baseIpCfg.getSrcIpAddress() - .startsWith(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()); - baseIpCfg.setDestIpAddress(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE); - baseIpCfg.setIpPattern(1); - if (baseIpCfg.getSrcIpAddress() - .startsWith(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()); + //设置dest ip值 + if(destIpPattern.indexOf("3")>-1) {//优先设置IP类型，因为拆分的IP较少 baseIpCfg.setDestIpAddress(Constants.IPV4_DEFAULT_IP_VALUE); - baseIpCfg.setIpPattern(3); - if (baseIpCfg.getSrcIpAddress().equals(Constants.IPV4_DEFAULT_IP_VALUE)) { - errInfo.append(prop.getProperty("client_ip")+" " + String.format( - prop.getProperty("can_not_be"), Constants.IPV4_DEFAULT_IP_VALUE) + ";"); - } + baseIpCfg.setDestIpPattern(3); + }else if(destIpPattern.indexOf("1")>-1) { + baseIpCfg.setDestIpAddress(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE); + baseIpCfg.setDestIpPattern(1); + }else { + baseIpCfg.setDestIpAddress(Constants.IPV4_DEFAULT_IP_RANGE_VALUE); + baseIpCfg.setDestIpPattern(2); } baseIpCfg.setIpType(4); } @@ -700,166 +674,169 @@ public class CheckIpFormatThread implements Callable{ prop.getProperty("client_ip", "Client IP")) + ";"); } else if (configIpPortShow.indexOf("3") > -1) { String matchType = this.validIPAddress("server_ip", errInfo, baseIpCfg.getDestIpAddress(), - ipType, ipPattern); + ipType, destIpPattern); + if (matchType.endsWith("RANGE")) { + baseIpCfg.setDestIpPattern(2); + } else if (matchType.endsWith("SUBNET")) { + baseIpCfg.setDestIpPattern(1); + }else { + baseIpCfg.setDestIpPattern(3); + } if (matchType.startsWith("IPV6")) { - if (matchType.endsWith("RANGE")) { - // baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress()); - baseIpCfg.setSrcIpAddress(Constants.IPV6_DEFAULT_IP_RANGE_VALUE); - baseIpCfg.setIpPattern(2); - if (baseIpCfg.getDestIpAddress() - .startsWith(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()); - baseIpCfg.setSrcIpAddress(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE); - baseIpCfg.setIpPattern(1); - if (baseIpCfg.getDestIpAddress() - .startsWith(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()); + if(srcIpPattern.indexOf("3")>-1) { baseIpCfg.setSrcIpAddress(Constants.IPV6_DEFAULT_IP_VALUE); - baseIpCfg.setIpPattern(3); - if (baseIpCfg.getDestIpAddress().equals(Constants.IPV6_DEFAULT_IP_VALUE)) { - errInfo.append(prop.getProperty("server_ip")+" " + String.format( - prop.getProperty("can_not_be"), Constants.IPV6_DEFAULT_IP_VALUE) + ";"); - } + baseIpCfg.setSrcIpPattern(3); + }else if(srcIpPattern.indexOf("1")>-1) { + baseIpCfg.setSrcIpAddress(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE); + baseIpCfg.setSrcIpPattern(1); + }else { + baseIpCfg.setSrcIpAddress(Constants.IPV6_DEFAULT_IP_RANGE_VALUE); + baseIpCfg.setSrcIpPattern(2); } baseIpCfg.setIpType(6); } else { - if (matchType.endsWith("RANGE")) { - this.validIPv4Range("server_ip", errInfo, baseIpCfg.getDestIpAddress()); - // baseIpCfg.setDestIpAddress("0.0.0.0-"+baseIpCfg.getDestIpAddress().split("-")[0] - // .substring(0,baseIpCfg.getDestIpAddress().indexOf("-")+1) - // +baseIpCfg.getDestIpAddress().split("-")[1]); - baseIpCfg.setSrcIpAddress(Constants.IPV4_DEFAULT_IP_RANGE_VALUE); - baseIpCfg.setIpPattern(2); - if (baseIpCfg.getDestIpAddress() - .startsWith(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()); - baseIpCfg.setSrcIpAddress(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE); - baseIpCfg.setIpPattern(1); - if (baseIpCfg.getDestIpAddress() - .startsWith(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()); + if(srcIpPattern.indexOf("3")>-1) { baseIpCfg.setSrcIpAddress(Constants.IPV4_DEFAULT_IP_VALUE); - baseIpCfg.setIpPattern(3); - if (baseIpCfg.getDestIpAddress().equals(Constants.IPV4_DEFAULT_IP_VALUE)) { - errInfo.append(prop.getProperty("server_ip")+" " + String.format( - prop.getProperty("can_not_be"), Constants.IPV4_DEFAULT_IP_VALUE) + ";"); - } + baseIpCfg.setSrcIpPattern(3); + }else if(srcIpPattern.indexOf("1")>-1) { + baseIpCfg.setSrcIpAddress(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE); + baseIpCfg.setSrcIpPattern(1); + }else { + baseIpCfg.setSrcIpAddress(Constants.IPV4_DEFAULT_IP_RANGE_VALUE); + baseIpCfg.setSrcIpPattern(2); } 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") + ";"); + String srcMatchType = this.validIPAddress("client_ip", errInfo, baseIpCfg.getSrcIpAddress(), ipType, + srcIpPattern); + String destMatchType = this.validIPAddress("server_ip", errInfo, baseIpCfg.getDestIpAddress(), ipType, + destIpPattern); + if (StringUtils.isNotBlank(srcMatchType) && StringUtils.isNotBlank(destMatchType) + && ((srcMatchType.startsWith("IPV6")&&destMatchType.startsWith("IPV4")) + ||(srcMatchType.startsWith("IPV4")&&destMatchType.startsWith("IPV6")))) { + errInfo.append(prop.get("the_same_ip_type") + ";"); } // baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress()); // baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress()); - if (matchType.startsWith("IPV6")) { + if (srcMatchType.startsWith("IPV6")) { baseIpCfg.setIpType(6); } else { baseIpCfg.setIpType(4); } - if (matchType.endsWith("RANGE")) { - if (matchType.startsWith("IPV4")) { + if (srcMatchType.endsWith("RANGE")) { + baseIpCfg.setSrcIpPattern(2); + }else if(srcMatchType.endsWith("SUBNET")) { + baseIpCfg.setSrcIpPattern(1); + }else { + baseIpCfg.setSrcIpPattern(3); + } + if (destMatchType.endsWith("RANGE")) { + baseIpCfg.setDestIpPattern(2); + }else if(destMatchType.endsWith("SUBNET")) { + baseIpCfg.setDestIpPattern(1); + }else { + baseIpCfg.setDestIpPattern(3); + } + if(baseIpCfg.getIpType().equals(4)) { + if (srcMatchType.endsWith("RANGE")) { this.validIPv4Range("client_ip", errInfo, baseIpCfg.getSrcIpAddress()); + } + if (destMatchType.endsWith("RANGE")) { 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]) + ";"); + //验证Ip范围 + if(StringUtils.isEmpty(errInfo)&&(srcMatchType.endsWith("RANGE")||destMatchType.endsWith("RANGE"))) { + this.ValidateRangeCross(baseIpCfg.getSrcIpAddress(),baseIpCfg.getDestIpAddress(), errInfo); } - 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]) + ";"); + } + boolean same=false; + if(baseIpCfg.getSrcIpAddress().indexOf("-")>-1) { + if(baseIpCfg.getDestIpAddress().indexOf("-")>-1) { + if(baseIpCfg.getSrcIpAddress().split("-")[0].equals(baseIpCfg.getDestIpAddress().split("-")[0])) { + same=true; + } + }else if(baseIpCfg.getDestIpAddress().indexOf("/")>-1) { + if(baseIpCfg.getSrcIpAddress().split("-")[0].equals(baseIpCfg.getDestIpAddress().split("/")[0])) { + same=true; + } + }else { + if(baseIpCfg.getSrcIpAddress().split("-")[0].equals(baseIpCfg.getDestIpAddress())) { + same=true; + } } - 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")) + ";"); + }else if(baseIpCfg.getSrcIpAddress().indexOf("/")>-1){ + if(baseIpCfg.getDestIpAddress().indexOf("-")>-1) { + if(baseIpCfg.getSrcIpAddress().split("/")[0].equals(baseIpCfg.getDestIpAddress().split("-")[0])) { + same=true; + } + }else if(baseIpCfg.getDestIpAddress().indexOf("/")>-1) { + if(baseIpCfg.getSrcIpAddress().split("/")[0].equals(baseIpCfg.getDestIpAddress().split("/")[0])) { + same=true; + } + }else { + if(baseIpCfg.getSrcIpAddress().split("/")[0].equals(baseIpCfg.getDestIpAddress())) { + same=true; + } } - baseIpCfg.setIpPattern(3); + }else { + if(baseIpCfg.getDestIpAddress().indexOf("-")>-1) { + if(baseIpCfg.getSrcIpAddress().equals(baseIpCfg.getDestIpAddress().split("-")[0])) { + same=true; + } + }else if(baseIpCfg.getDestIpAddress().indexOf("/")>-1) { + if(baseIpCfg.getSrcIpAddress().equals(baseIpCfg.getDestIpAddress().split("/")[0])) { + same=true; + } + }else { + if(baseIpCfg.getSrcIpAddress().equals(baseIpCfg.getDestIpAddress())) { + same=true; + } + } + } + if(same) { + errInfo.append(String.format(prop.getProperty("are_the_same"), + baseIpCfg.getSrcIpAddress().split("-")[0], + baseIpCfg.getDestIpAddress().split("-")[0]) + ";"); } } // TODO 判断源IP和目的IP的值 // TODO 判断源IP和目的IP格式 - if (destPortEmpty) { - if (srcPortEmpty) { + if (srcPortEmpty) { + if(srcPortPattern.indexOf("1")>-1) { baseIpCfg.setSrcPort("0"); - baseIpCfg.setDestPort("0"); - baseIpCfg.setPortPattern(1); - } else { - if (baseIpCfg.getSrcPort().indexOf("/") > -1) { - baseIpCfg.setDestPort("0/0"); - baseIpCfg.setPortPattern(2); - } else { - baseIpCfg.setDestPort("0"); - baseIpCfg.setPortPattern(1); - } - baseIpCfg.setSrcPort(baseIpCfg.getSrcPort().trim()); + baseIpCfg.setSrcPortPattern(1); + }else { + baseIpCfg.setSrcPort("0/0"); + baseIpCfg.setSrcPortPattern(2); } - } else { - if (srcPortEmpty) { - if (baseIpCfg.getDestPort().indexOf("/") > -1) { - baseIpCfg.setSrcPort("0/0"); - baseIpCfg.setPortPattern(2); - } else { - baseIpCfg.setSrcPort("0"); - baseIpCfg.setPortPattern(1); - } - } else { - if (baseIpCfg.getSrcPort().indexOf("/") > -1) { - baseIpCfg.setPortPattern(2); - } else { - baseIpCfg.setPortPattern(1); - } - baseIpCfg.setSrcPort(baseIpCfg.getSrcPort().trim()); - } - baseIpCfg.setDestPort(baseIpCfg.getDestPort().trim()); + }else if(baseIpCfg.getSrcPort().indexOf("/")>-1) { + baseIpCfg.setSrcPortPattern(2); + }else { + baseIpCfg.setSrcPortPattern(1); } - // TODO 判断源端口和目的端口格式 - // TODO 判断源和目的端口的值 - boolean validPort = this.validPort(errInfo, baseIpCfg.getSrcPort(), baseIpCfg.getDestPort(), - portPattern); + baseIpCfg.setSrcPort(baseIpCfg.getSrcPort().trim()); + boolean validSrcPort = this.validPort(errInfo, baseIpCfg.getSrcPort(), + srcPortPattern,"client_port"); + if (destPortEmpty) { + if(destPortPattern.indexOf("1")>-1) { + baseIpCfg.setDestPort("0"); + baseIpCfg.setDestPortPattern(1); + }else { + baseIpCfg.setDestPort("0/0"); + baseIpCfg.setDestPortPattern(2); + } + }else if(baseIpCfg.getDestPort().indexOf("/")>-1) { + baseIpCfg.setDestPortPattern(2); + }else { + baseIpCfg.setDestPortPattern(1); + } + baseIpCfg.setDestPort(baseIpCfg.getDestPort().trim()); + boolean validDestPort = this.validPort(errInfo, baseIpCfg.getSrcPort(), + srcPortPattern,"server_port"); + if (baseIpCfg.getProtocol()==null) { //packet ip reject if(regionDict.getFunctionId().equals(5)&&serviceDict!=null&&serviceDict.getServiceId().equals(16)) { @@ -901,7 +878,7 @@ public class CheckIpFormatThread implements Callable{ } boolean validProtocol = this.validProtocol(errInfo, baseIpCfg.getProtocol(), protocol); // 验证protocol与port是否符合逻辑 - if (validProtocol && validPort) { + if (validProtocol && validSrcPort&&validDestPort) { validProtocolAndPort(errInfo, baseIpCfg.getProtocol(), baseIpCfg.getSrcPort(), baseIpCfg.getDestPort()); } @@ -1030,153 +1007,85 @@ public class CheckIpFormatThread implements Callable{ * @param portPattern * @throws ServiceException */ - public boolean validPort(StringBuffer errInfo, String srcPortStr, String destPortStr, String portPattern) + public boolean validPort(StringBuffer errInfo, String portStr, String portPattern,String portName) throws ServiceException { boolean valid = true; if (portPattern.equals("1")) { try { - Integer srcPort = Integer.parseInt(srcPortStr); + Integer srcPort = Integer.parseInt(portStr); if (srcPort < 0 || srcPort > 65535) { - errInfo.append(prop.getProperty("client_port") + errInfo.append(prop.getProperty(portName) + String.format(prop.getProperty("must_between"), 0, 65535) + ";"); valid = false; } } catch (Exception e) { // TODO: handle exception - errInfo.append(String.format(prop.getProperty("not_number"), prop.getProperty("client_port")) + ";"); - valid = false; - } - try { - Integer destPort = Integer.parseInt(destPortStr); - if (destPort < 0 || destPort > 65535) { - errInfo.append(prop.getProperty("server_port") - + String.format(prop.getProperty("must_between"), 0, 65535) + ";"); - valid = false; - } - } catch (Exception e) { - // TODO: handle exception - errInfo.append(String.format(prop.getProperty("not_number"), prop.getProperty("server_port")) + ";"); + errInfo.append(String.format(prop.getProperty("not_number"), prop.getProperty(portName)) + ";"); valid = false; } + } else if (portPattern.equals("2")) { Pattern p = Constants.PORT_MASK_PATTERN; - Matcher m = p.matcher(srcPortStr); + Matcher m = p.matcher(portStr); if (!m.matches()) { errInfo.append( - String.format(prop.getProperty("is_in_wrong_format"), prop.getProperty("client_port")) + ";"); + String.format(prop.getProperty("is_in_wrong_format"), prop.getProperty(portName)) + ";"); valid = false; } - m = p.matcher(destPortStr); - if (!m.matches()) { - errInfo.append( - String.format(prop.getProperty("is_in_wrong_format"), prop.getProperty("server_port")) + ";"); - valid = false; - } - Integer srcPort = Integer.parseInt(srcPortStr.split("/")[0]); - Integer srcPortMask = Integer.parseInt(srcPortStr.split("/")[1]); - Integer destPort = Integer.parseInt(destPortStr.split("/")[0]); - Integer destPortMask = Integer.parseInt(destPortStr.split("/")[1]); - if (srcPort < 0 || srcPort > 65535) { - errInfo.append(prop.getProperty("client_port") + + Integer port = Integer.parseInt(portStr.split("/")[0]); + Integer portMask = Integer.parseInt(portStr.split("/")[1]); + + if (port < 0 || port > 65535) { + errInfo.append(prop.getProperty(portName) + String.format(prop.getProperty("must_between"), 0, 65535) + ";"); valid = false; } - if (srcPortMask < 0 || srcPortMask > 65535) { - errInfo.append(prop.getProperty("client_port_mask") - + String.format(prop.getProperty("must_between"), 0, 65535) + ";"); - valid = false; - } - if (destPort < 0 || destPort > 65535) { - errInfo.append(prop.getProperty("server_port") - + String.format(prop.getProperty("must_between"), 0, 65535) + ";"); - valid = false; - } - if (destPortMask < 0 || destPortMask > 65535) { - errInfo.append(prop.getProperty("server_port_mask") + if (portMask < 0 || portMask > 65535) { + errInfo.append(prop.getProperty(portName+"_mask") + String.format(prop.getProperty("must_between"), 0, 65535) + ";"); valid = false; } + } else if (portPattern.indexOf("1") > -1 && portPattern.indexOf("2") > -1) { Pattern p = Constants.PORT_MASK_PATTERN; Pattern p1 = Constants.PORT_PATTERN; - Matcher m = p.matcher(srcPortStr);// 源端口是端口掩码格式 - Matcher m1 = p.matcher(destPortStr);// 目的端口是端口掩码格式 - Matcher m2 = p1.matcher(srcPortStr);// 源端口是端口格式 - Matcher m3 = p1.matcher(destPortStr);// 目的端口是端口格式 + Matcher m = p.matcher(portStr);// 源端口是端口掩码格式 + Matcher m2 = p1.matcher(portStr);// 源端口是端口格式 if (m.matches()) { - Integer srcPort = Integer.parseInt(srcPortStr.split("/")[0]); - Integer srcPortMask = Integer.parseInt(srcPortStr.split("/")[1]); + Integer srcPort = Integer.parseInt(portStr.split("/")[0]); + Integer srcPortMask = Integer.parseInt(portStr.split("/")[1]); if (srcPort < 0 || srcPort > 65535) { - errInfo.append(prop.getProperty("client_port") + errInfo.append(prop.getProperty(portName) + String.format(prop.getProperty("must_between"), 0, 65535) + ";"); valid = false; } if (srcPortMask < 0 || srcPortMask > 65535) { - errInfo.append(prop.getProperty("client_port_mask") - + String.format(prop.getProperty("must_between"), 0, 65535) + ";"); - valid = false; - } - } - if (m1.matches()) { - Integer destPort = Integer.parseInt(destPortStr.split("/")[0]); - Integer destPortMask = Integer.parseInt(destPortStr.split("/")[1]); - - if (destPort < 0 || destPort > 65535) { - errInfo.append(prop.getProperty("server_port") - + String.format(prop.getProperty("must_between"), 0, 65535) + ";"); - valid = false; - } - if (destPortMask < 0 || destPortMask > 65535) { - errInfo.append(prop.getProperty("server_port_mask") + errInfo.append(prop.getProperty(portName+"_mask") + String.format(prop.getProperty("must_between"), 0, 65535) + ";"); valid = false; } } if (m2.matches()) { try { - Integer srcPort = Integer.parseInt(srcPortStr); + Integer srcPort = Integer.parseInt(portStr); if (srcPort < 0 || srcPort > 65535) { - errInfo.append(prop.getProperty("client_port") + errInfo.append(prop.getProperty(portName) + String.format(prop.getProperty("must_between"), 0, 65535) + ";"); valid = false; } } catch (Exception e) { // TODO: handle exception errInfo.append( - String.format(prop.getProperty("not_number"), prop.getProperty("client_port")) + ";"); + String.format(prop.getProperty("not_number"), prop.getProperty(portName)) + ";"); valid = false; } } - if (m3.matches()) { - try { - Integer destPort = Integer.parseInt(destPortStr); - if (destPort < 0 || destPort > 65535) { - errInfo.append(prop.getProperty("server_port") - + String.format(prop.getProperty("must_between"), 0, 65535) + ";"); - valid = false; - } - } catch (Exception e) { - // TODO: handle exception - errInfo.append( - String.format(prop.getProperty("not_number"), prop.getProperty("server_port")) + ";"); - valid = false; - } - } - if ((m.matches() && m3.matches()) || (m2.matches() && m1.matches())) { - errInfo.append(prop.getProperty("the_same_port_pattern") + ";"); - valid = false; - } if (!m.matches() && !m2.matches()) { errInfo.append( - String.format(prop.getProperty("is_in_wrong_format"), prop.getProperty("client_port")) + ";"); + String.format(prop.getProperty("is_in_wrong_format"), prop.getProperty(portName)) + ";"); valid = false; } - if (!m1.matches() && !m3.matches()) { - errInfo.append( - String.format(prop.getProperty("is_in_wrong_format"), prop.getProperty("server_port")) + ";"); - valid = false; - } - } return valid; } @@ -1369,7 +1278,44 @@ public class CheckIpFormatThread implements Callable{ } return matchType; } - + public void ValidateRangeCross(String srcIp,String destIp,StringBuffer errInfo) { + long srcStart=0l,srcEnd=0,srcNum=0l,destStart=0l,destEnd=0l,destNum=0l; + if(srcIp.indexOf("-")>-1) { + String[] srcArr=srcIp.split("\\-"); + srcStart=IPUtil.getIpHostDesimal(srcArr[0]); + srcEnd=IPUtil.getIpHostDesimal(srcArr[1]); + }else if(srcIp.indexOf("/")>-1) { + srcNum=IPUtil.getIpHostDesimal(srcIp.split("/")[0]); + }else { + srcNum=IPUtil.getIpHostDesimal(srcIp); + } + if(destIp.indexOf("-")>-1) { + String[] destArr=destIp.split("\\-"); + destStart=IPUtil.getIpHostDesimal(destArr[0]); + destEnd=IPUtil.getIpHostDesimal(destArr[1]); + }else if(destIp.indexOf("/")>-1) { + destNum=IPUtil.getIpHostDesimal(destIp.split("/")[0]); + }else { + destNum=IPUtil.getIpHostDesimal(destIp); + } + if(srcNum==0l) { + if(destNum==0l) { + if(!(destEnd=srcStart&&destNum<=srcEnd) { + errInfo.append(prop.getProperty("range_cross")+";"); + } + } + }else { + if(destNum==0l) { + if(srcNum>=destStart&&srcNum<=destEnd) { + errInfo.append(prop.getProperty("range_cross")+";"); + } + } + } + } public List> getAsnNoMaps() { return asnNoMaps; } @@ -1382,5 +1328,4 @@ public class CheckIpFormatThread implements Callable{ public void setAsnGroupInfos(Map asnGroupInfos) { this.asnGroupInfos = asnGroupInfos; } - } diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 6d4f887cd..1f79afcff 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -64,7 +64,6 @@ import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.CfgIndexInfo; -import com.nis.domain.configuration.ComplexStringCfgTemplate; import com.nis.domain.configuration.ComplexkeywordCfg; import com.nis.domain.configuration.DdosIpCfg; import com.nis.domain.configuration.DnsIpCfg; @@ -75,7 +74,6 @@ import com.nis.domain.configuration.PxyObjKeyring; import com.nis.domain.configuration.PxyObjTrustedCaCert; import com.nis.domain.configuration.PxyObjTrustedCaCrl; import com.nis.domain.configuration.RequestInfo; -import com.nis.domain.configuration.StringCfgTemplate; import com.nis.domain.configuration.template.AppDomainTemplate; import com.nis.domain.configuration.template.AppPayloadTemplate; import com.nis.domain.configuration.template.AsnIpTemplate; @@ -100,7 +98,6 @@ import com.nis.domain.configuration.template.HttpsReplaceIpTemplate; import com.nis.domain.configuration.template.HttpsReplaceTemplate; import com.nis.domain.configuration.template.IpAllNotDoLogTemplate; import com.nis.domain.configuration.template.IpAllTemplate; -import com.nis.domain.configuration.template.IpCfgTemplate; import com.nis.domain.configuration.template.IpPayloadTemplate; import com.nis.domain.configuration.template.IpRateLimitTemplate; import com.nis.domain.configuration.template.IpSpoofingTemplate; @@ -771,75 +768,6 @@ public class BaseController { } return msgProp; } - @Deprecated - public void importCfgTemplate(HttpServletRequest request, HttpServletResponse response, - RedirectAttributes redirectAttributes, Integer functionId, Integer cfgRegionCode) { - Properties msgProp = getMsgProp(); - try { - List dictList = DictUtils.getFunctionRegionDictList(functionId); - for (FunctionRegionDict dict : dictList) { - if (dict.getConfigRegionCode() == cfgRegionCode) { - String fileName = dict.getConfigRegionValue() + ".xlsx"; - if (dict.getRegionType() == 1) { - List list = Lists.newArrayList(); - list.add(new IpCfgTemplate()); - new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null, - IpCfgTemplate.class, 2).setDataList(msgProp, list, null) - .write(request, response, fileName).dispose(); - } else if (dict.getRegionType() == 2) { - List list = Lists.newArrayList(); - list.add(new StringCfgTemplate()); - new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null, - StringCfgTemplate.class, 2).setDataList(msgProp, list, null) - .write(request, response, fileName).dispose(); - } else if (dict.getRegionType() == 3) { - List list = Lists.newArrayList(); - list.add(new ComplexStringCfgTemplate()); - new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null, - ComplexStringCfgTemplate.class, 2).setDataList(msgProp, list, null) - .write(request, response, fileName).dispose(); - } - } - } - - } catch (Exception e) { - msgProp = null; - e.printStackTrace(); - } - } - @Deprecated - public void importCfgTemplate(HttpServletRequest request, HttpServletResponse response, - RedirectAttributes redirectAttributes, Integer functionId, Integer cfgRegionCode, Class clazz) { - Properties msgProp = getMsgProp(); - try { - List dictList = DictUtils.getFunctionRegionDictList(functionId); - for (FunctionRegionDict dict : dictList) { - if (dict.getConfigRegionCode() == cfgRegionCode) { - String fileName = dict.getConfigRegionValue() + ".xlsx"; - if (dict.getRegionType() == 1) { - List list = Lists.newArrayList(); - list.add((IpCfgTemplate) clazz.newInstance()); - new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null, clazz, 2) - .setDataList(msgProp, list, null).write(request, response, fileName).dispose(); - } else if (dict.getRegionType() == 2) { - List list = Lists.newArrayList(); - list.add(new StringCfgTemplate()); - new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null, clazz, 2) - .setDataList(msgProp, list, null).write(request, response, fileName).dispose(); - } else if (dict.getRegionType() == 3) { - List list = Lists.newArrayList(); - list.add(new ComplexStringCfgTemplate()); - new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null, clazz, 2) - .setDataList(msgProp, list, null).write(request, response, fileName).dispose(); - } - } - } - - } catch (Exception e) { - msgProp = null; - e.printStackTrace(); - } - } public void setLogAction(BaseLogEntity log, List serviceList) { if (!StringUtil.isEmpty(serviceList)) { diff --git a/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java index d3c48eaec..7531e8e14 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java @@ -350,7 +350,7 @@ public class AppFeatureCfgController extends BaseController { String ipPortInfoNoExport = ",do_log,block_type,config_describe,valid_identifier,is_audit,creator,creator" + ",config_time,editor,edit_time,auditor,audit_time" + ",letter,whether_area_block,classification,attribute,label" - + ",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,"; + + ",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,client_ip,src_ip_pattern,client_port,src_port_pattern,"; // 时间过滤 if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { diff --git a/src/main/java/com/nis/web/controller/configuration/CommonController.java b/src/main/java/com/nis/web/controller/configuration/CommonController.java index b820c8ba5..c4a004c21 100644 --- a/src/main/java/com/nis/web/controller/configuration/CommonController.java +++ b/src/main/java/com/nis/web/controller/configuration/CommonController.java @@ -8,10 +8,8 @@ */ package com.nis.web.controller.configuration; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; @@ -19,38 +17,22 @@ import java.util.Properties; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.axis2.databinding.types.soapencoding.Array; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.ui.Model; -import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import com.nis.domain.FunctionRegionDict; -import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.basics.ServiceDictInfo; import com.nis.domain.configuration.BaseIpCfg; -import com.nis.domain.configuration.CfgIndexInfo; -import com.nis.domain.configuration.HttpBodyCfg; -import com.nis.domain.configuration.HttpReqHeadCfg; -import com.nis.domain.configuration.HttpResHeadCfg; import com.nis.domain.configuration.HttpUrlCfg; -import com.nis.domain.configuration.template.IpAllTemplate; -import com.nis.domain.configuration.template.IpCfgTemplate; -import com.nis.domain.specific.ConfigGroupInfo; import com.nis.domain.configuration.IpPortCfg; -import com.nis.domain.configuration.NtcSubscribeIdCfg; import com.nis.exceptions.MaatConvertException; import com.nis.util.Constants; import com.nis.util.DateUtils; -import com.nis.util.DictUtils; import com.nis.util.StringUtil; import com.nis.util.excel.ExportExcel; -import com.nis.util.excel.ImportExcel; import com.nis.web.controller.BaseController; -import com.nis.web.dao.configuration.IpCfgDao; -import com.nis.web.security.UserUtils; /** * @ClassName: CommonController.java @@ -288,15 +270,7 @@ public class CommonController extends BaseController { e.printStackTrace(); } }*/ - public void _importFileTemplate(HttpServletRequest request,HttpServletResponse response, - RedirectAttributes redirectAttributes,Integer functionId,Integer cfgRegionCode) { - this.importCfgTemplate(request, response, redirectAttributes, functionId, cfgRegionCode); - } - @Deprecated - public void _importFileTemplate(HttpServletRequest request,HttpServletResponse response, - RedirectAttributes redirectAttributes,Integer functionId,Integer cfgRegionCode,Class clazz) { - this.importCfgTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,clazz); - } + //ip配置导出 public void _exportIp(String columns,Model model,HttpServletRequest request,HttpServletResponse response, IpPortCfg entity,String ids,RedirectAttributes redirectAttributes){ diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java index 6ea10ab4e..8d1f00066 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java @@ -235,7 +235,7 @@ public class DnsIpCfgController extends BaseController { } titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), DnsIpCfg.class); - String cfgIndexInfoNoExport = ",log_total,whether_area_block,client_ip,port_pattern,client_port,server_port,ir_type,direction,protocol,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + String cfgIndexInfoNoExport = ",log_total,whether_area_block,client_ip,src_ip_pattern,src_port_pattern,dest_port_pattern,client_port,server_port,ir_type,direction,protocol,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; // 时间过滤 if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java index f1d8a4bca..3bec1e65d 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java @@ -40,7 +40,6 @@ import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.IpReuseDnatPolicyCfg; import com.nis.domain.configuration.IpReusePolicyCfg; import com.nis.domain.configuration.UserManage; -import com.nis.domain.configuration.template.IpMultiplexPolicyTemplate; import com.nis.exceptions.MaatConvertException; import com.nis.util.ConfigServiceUtil; import com.nis.util.Constants; @@ -120,26 +119,6 @@ public class IpMultiplexController extends CommonController { return "redirect:" + adminPath + "/manipulation/ipmulitiplex/list?functionId=" + cfg.getFunctionId(); } - // ip配置导入 - /* - * @RequestMapping(value = "/import", method=RequestMethod.POST) public - * String importIp(String cfgName,RedirectAttributes redirectAttributes, - * - * @RequestParam("file") MultipartFile file,IpPortCfg cfg) { - * this._importIp(cfgName,redirectAttributes, - * file,cfg,IpMultiplexPolicyTemplate.class); - * redirectAttributes.addAttribute("urlPrefix","/manipulation/ipmulitiplex") - * ; redirectAttributes.addAttribute("requiresPermissionPrefix", - * "ip:mulitiplex"); return "redirect:" + adminPath - * +"/manipulation/ipmulitiplex/list?functionId="+cfg.getFunctionId(); } - */ - // ip模板下载 - @RequestMapping(value = "import/template") - public void importFileTemplate(HttpServletRequest request, HttpServletResponse response, - RedirectAttributes redirectAttributes, Integer functionId, Integer cfgRegionCode) { - this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode, - IpMultiplexPolicyTemplate.class); - } // ip配置导出 @RequestMapping(value = "export") diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java index bd33ae4a9..5b59c84e1 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java @@ -112,20 +112,7 @@ public class RatelimitController extends CommonController { redirectAttributes.addAttribute("requiresPermissionPrefix","domain:ratelimit"); return "redirect:" + adminPath +"/manipulation/ratelimit/domain/list?functionId="+cfg.getFunctionId(); } - //ip配置导入 - /*@RequestMapping(value = "/ip/import", method=RequestMethod.POST) - public String importIp(String cfgName,RedirectAttributes redirectAttributes, - @RequestParam("file") MultipartFile file,IpPortCfg cfg) { - this._importIp(cfgName,redirectAttributes, file,cfg,IpRateLimitTemplate.class); - redirectAttributes.addAttribute("urlPrefix","/manipulation/ratelimit/ip"); - redirectAttributes.addAttribute("requiresPermissionPrefix","ip:ratelimit"); - return "redirect:" + adminPath +"/manipulation/ratelimit/ip/list?functionId="+cfg.getFunctionId(); - }*/ - @RequestMapping(value = "/ip/import/template") - public void importFileTemplate(HttpServletRequest request,HttpServletResponse response, - RedirectAttributes redirectAttributes,Integer functionId,Integer cfgRegionCode) { - this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,IpRateLimitTemplate.class); - } + //ip配置导出 @RequestMapping(value = "/ip/export") public void exportIp(String columns,Model model,HttpServletRequest request,HttpServletResponse response, diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java index d78bbf56a..9e2a9af22 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java @@ -27,7 +27,6 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.FunctionRegionDict; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; -import com.nis.domain.configuration.AppPolicyCfg; import com.nis.domain.configuration.AsnKeywordCfg; import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.IpPortCfg; @@ -66,7 +65,6 @@ import com.nis.domain.configuration.template.SnatTemplate; import com.nis.domain.configuration.template.StringAllNotDoLogTemplate; import com.nis.domain.configuration.template.StringAllTemplate; import com.nis.domain.configuration.template.TopicWebsiteTemplate; -import com.nis.domain.specific.SpecificServiceCfg; import com.nis.exceptions.MaatConvertException; import com.nis.util.Constants; import com.nis.util.DictUtils; diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java index de4ec794b..e71e3d2a5 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java @@ -14,15 +14,11 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.taglibs.standard.functions.Functions; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.FunctionRegionDict; @@ -31,10 +27,6 @@ import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.ComplexkeywordCfg; import com.nis.domain.configuration.DnsResStrategy; -import com.nis.domain.configuration.ComplexStringCfgTemplate; -import com.nis.domain.configuration.template.IpCfgTemplate; -import com.nis.domain.specific.ConfigGroupInfo; -import com.nis.domain.configuration.StringCfgTemplate; import com.nis.domain.configuration.HttpBodyCfg; import com.nis.domain.configuration.HttpReqHeadCfg; import com.nis.domain.configuration.HttpResHeadCfg; @@ -46,7 +38,6 @@ import com.nis.exceptions.MaatConvertException; import com.nis.util.Constants; import com.nis.util.DictUtils; import com.nis.util.StringUtil; -import com.nis.util.excel.ImportExcel; import com.nis.web.controller.BaseController; import com.nis.web.security.UserUtils; @@ -616,13 +607,6 @@ public class WebsiteController extends BaseController { return "redirect:" + adminPath + "/ntc/website/dnsList?functionId=" + functionId; } - @Deprecated - // 下载导入模板 - @RequestMapping(value = "import/template") - public void importFileTemplate(HttpServletRequest request, HttpServletResponse response, - RedirectAttributes redirectAttributes, Integer functionId, Integer cfgRegionCode) { - this.importCfgTemplate(request, response, redirectAttributes, functionId, cfgRegionCode); - } // http配置导入 /* * @RequestMapping(value = "importHttp", method=RequestMethod.POST) public diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java index d41889876..dc3cab997 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java @@ -1,7 +1,6 @@ package com.nis.web.controller.configuration.ntc; import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -26,12 +25,10 @@ import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.NtcSubscribeIdCfg; -import com.nis.domain.configuration.template.WhiteListIpTemplate; import com.nis.exceptions.MaatConvertException; import com.nis.util.Constants; import com.nis.util.StringUtil; import com.nis.web.controller.configuration.CommonController; -import com.nis.web.security.UserUtils; /** * 白名单 @@ -386,24 +383,6 @@ public class WhiteListController extends CommonController { return "redirect:" + adminPath + "/ntc/whitelist/domain/list?functionId=" + functionId; } - // ip配置导入 - /* - * @RequestMapping(value = "ip/import", method=RequestMethod.POST) public - * String importIp(String cfgName,RedirectAttributes redirectAttributes, - * - * @RequestParam("file") MultipartFile file,IpPortCfg cfg) { - * this._importIp(cfgName,redirectAttributes, - * file,cfg,WhiteListIpTemplate.class); return "redirect:" + adminPath - * +"/ntc/whitelist/ip/list?functionId="+cfg.getFunctionId(); } - */ - // ip模板下载 - @RequestMapping(value = "ip/import/template") - public void importFileTemplate(HttpServletRequest request, HttpServletResponse response, - RedirectAttributes redirectAttributes, Integer functionId, Integer cfgRegionCode) { - this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode, - WhiteListIpTemplate.class); - } - // ip配置导出 @RequestMapping(value = "ip/export") public void exportIp(String columns, Model model, HttpServletRequest request, HttpServletResponse response, diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java b/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java index 87e46265b..4076c8aac 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java @@ -120,11 +120,6 @@ public class ControlController extends CommonController { redirectAttributes.addAttribute("requiresPermissionPrefix","control:ip"); return "redirect:" + adminPath +"/proxy/control/ip/list?functionId="+cfg.getFunctionId(); } - @RequestMapping(value = "/ip/import/template") - public void importFileTemplate(HttpServletRequest request,HttpServletResponse response, - RedirectAttributes redirectAttributes,Integer functionId,Integer cfgRegionCode) { - this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode); - } //ip配置导出 @RequestMapping(value = "/ip/export") public void exportIp(String columns,Model model,HttpServletRequest request,HttpServletResponse response, diff --git a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml index fdb188dd6..050f88518 100644 --- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml @@ -5,7 +5,8 @@ - + + @@ -48,7 +49,7 @@ - r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.ip_pattern,r.port_pattern,r.src_port + r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.src_ip_pattern,r.dest_ip_pattern,r.src_port_pattern,r.dest_port_pattern,r.src_port ,r.protocol,r.protocol_id,r.direction,r.cfg_type,r.action,r.dest_port,r.dest_ip_address ,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id ,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id, @@ -91,8 +92,11 @@ AND r.IP_TYPE=#{ipType,jdbcType=INTEGER} - - AND r.IP_PATTERN=#{ipPattern,jdbcType=INTEGER} + + AND r.src_ip_pattern=#{srcIpPattern,jdbcType=INTEGER} + + + AND r.dest_ip_pattern=#{destIpPattern,jdbcType=INTEGER} AND r.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR} @@ -100,8 +104,11 @@ AND r.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR} - - AND r.PORT_PATTERN=#{portPattern,jdbcType=INTEGER} + + AND r.src_port_pattern=#{srcPortPattern,jdbcType=INTEGER} + + + AND r.dest_port_pattern=#{destPortPattern,jdbcType=INTEGER} AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR} @@ -227,8 +234,11 @@ AND r.IP_TYPE=#{ipType,jdbcType=INTEGER} - - AND r.IP_PATTERN=#{ipPattern,jdbcType=INTEGER} + + AND r.src_ip_pattern=#{srcIpPattern,jdbcType=INTEGER} + + + AND r.dest_ip_pattern=#{destIpPattern,jdbcType=INTEGER} AND r.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR} @@ -236,8 +246,11 @@ AND r.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR} - - AND r.PORT_PATTERN=#{portPattern,jdbcType=INTEGER} + + AND r.src_port_pattern=#{srcPortPattern,jdbcType=INTEGER} + + + AND r.dest_port_pattern=#{destPortPattern,jdbcType=INTEGER} AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR} @@ -345,9 +358,7 @@ AREA_EFFECTIVE_IDS, function_id, ip_type, - src_ip_address, - ip_pattern, - port_pattern, + src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN, src_port, protocol, protocol_id, @@ -388,8 +399,8 @@ #{functionId,jdbcType=INTEGER}, #{ipType,jdbcType=INTEGER}, #{srcIpAddress,jdbcType=VARCHAR}, - #{ipPattern,jdbcType=INTEGER}, - #{portPattern,jdbcType=INTEGER}, + #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER}, + #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER}, #{srcPort,jdbcType=VARCHAR}, #{protocol,jdbcType=INTEGER}, #{protocolId,jdbcType=INTEGER}, @@ -473,11 +484,17 @@ src_ip_address = #{srcIpAddress,jdbcType=VARCHAR}, - - ip_pattern = #{ipPattern,jdbcType=INTEGER}, + + src_ip_pattern = #{srcIpPattern,jdbcType=INTEGER}, - - port_pattern = #{portPattern,jdbcType=INTEGER}, + + dest_ip_pattern =#{destIpPattern,jdbcType=INTEGER}, + + + src_port_pattern = #{srcPortPattern,jdbcType=INTEGER}, + + + dest_port_pattern = #{destPortPattern,jdbcType=INTEGER}, src_port = #{srcPort,jdbcType=VARCHAR}, @@ -564,7 +581,7 @@ INSERT INTO asn_ip_cfg (CFG_DESC,ACTION,IS_VALID,IS_AUDIT,CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID, AUDIT_TIME,SERVICE_ID,REQUEST_ID,region_id,compile_id,IS_AREA_EFFECTIVE,CLASSIFY,ATTRIBUTE,LABLE, - AREA_EFFECTIVE_IDS,function_id,ip_type,src_ip_address,ip_pattern,port_pattern,src_port, + AREA_EFFECTIVE_IDS,function_id,ip_type,src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,src_port, protocol,protocol_id,direction,dest_port,dest_ip_address,cfg_type,cfg_region_code, asn_ip_group,user_region1,user_region2,user_region3,user_region4,user_region5,organization,country,detail) VALUES @@ -591,8 +608,10 @@ #{asnIp.functionId,jdbcType=INTEGER}, #{asnIp.ipType,jdbcType=INTEGER}, #{asnIp.srcIpAddress,jdbcType=VARCHAR}, - #{asnIp.ipPattern,jdbcType=INTEGER}, - #{asnIp.portPattern,jdbcType=INTEGER}, + #{asnIp.srcIpPattern,jdbcType=INTEGER}, + #{asnIp.destIpPattern,jdbcType=INTEGER}, + #{asnIp.srcPortPattern,jdbcType=INTEGER}, + #{asnIp.destPortPattern,jdbcType=INTEGER}, #{asnIp.srcPort,jdbcType=VARCHAR}, #{asnIp.protocol,jdbcType=INTEGER}, #{asnIp.protocolId,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml index 3cc5bd7dc..70f1a13fd 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml @@ -43,7 +43,8 @@ - + + @@ -235,7 +236,8 @@ - + + @@ -394,7 +396,7 @@ r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME, r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY, r.ATTRIBUTE,r.LABLE,AREA_EFFECTIVE_IDS,r.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE, - r.IP_TYPE, r.IP_PATTERN, r.SRC_IP_ADDRESS,r.DEST_IP_ADDRESS, r.PORT_PATTERN,r.SRC_PORT,DEST_PORT, + r.IP_TYPE, r.SRC_IP_PATTERN,r.DEST_IP_PATTERN, r.SRC_IP_ADDRESS,r.DEST_IP_ADDRESS, r.SRC_PORT_PATTERN,r.DEST_PORT_PATTERN,r.SRC_PORT,DEST_PORT, r.DIRECTION,r.PROTOCOL,r.DO_LOG,r.USER_REGION1,r.USER_REGION2,r.USER_REGION3,r.USER_REGION4,r.USER_REGION5 @@ -461,7 +463,7 @@ - a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port + a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address ,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id ,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id, @@ -887,8 +889,11 @@ AND r.IP_TYPE=#{ipType,jdbcType=INTEGER} - - AND r.IP_PATTERN=#{ipPattern,jdbcType=INTEGER} + + AND r.src_ip_pattern=#{srcIpPattern,jdbcType=INTEGER} + + + AND r.dest_ip_pattern=#{destIpPattern,jdbcType=INTEGER} AND r.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR} @@ -896,8 +901,11 @@ AND r.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR} - - AND r.PORT_PATTERN=#{portPattern,jdbcType=INTEGER} + + AND r.src_port_pattern=#{srcPortPattern,jdbcType=INTEGER} + + + AND r.dest_port_pattern=#{destPortPattern,jdbcType=INTEGER} AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR} @@ -1823,12 +1831,12 @@ CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME, SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE, - IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT, + IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT, DIRECTION,PROTOCOL,DO_LOG,user_region1,user_region2,user_region3,user_region4,user_region5 )values ( , - #{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR}, - #{portPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, + #{ipType,jdbcType=INTEGER}, #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR}, + #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, #{protocol,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER},#{userRegion1,jdbcType=VARCHAR},#{userRegion2,jdbcType=VARCHAR} ,#{userRegion3,jdbcType=VARCHAR},#{userRegion4,jdbcType=VARCHAR},#{userRegion5,jdbcType=VARCHAR} ) @@ -1839,12 +1847,12 @@ CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME, SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE, - IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT, + IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT, DIRECTION,PROTOCOL,DO_LOG,user_region1,user_region2,user_region3,user_region4,user_region5 )values ( , - #{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR}, - #{portPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, + #{ipType,jdbcType=INTEGER}, #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR}, + #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, #{protocol,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER},#{userRegion1,jdbcType=VARCHAR},#{userRegion2,jdbcType=VARCHAR} ,#{userRegion3,jdbcType=VARCHAR},#{userRegion4,jdbcType=VARCHAR},#{userRegion5,jdbcType=VARCHAR} ) @@ -1855,7 +1863,7 @@ CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME, SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE, - IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT, + IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT, DIRECTION,PROTOCOL,DO_LOG,user_region1,user_region2,user_region3,user_region4,user_region5 )values @@ -1868,9 +1876,10 @@ #{appIp.requestId,jdbcType=INTEGER},#{appIp.compileId,jdbcType=INTEGER},#{appIp.isAreaEffective,jdbcType=INTEGER}, #{appIp.classify,jdbcType=VARCHAR},#{appIp.attribute,jdbcType=VARCHAR},#{appIp.lable,jdbcType=VARCHAR}, #{appIp.areaEffectiveIds,jdbcType=VARCHAR},#{appIp.ratelimit,jdbcType=VARCHAR},#{appIp.functionId,jdbcType=INTEGER}, - #{appIp.cfgType,jdbcType=VARCHAR},#{appIp.cfgRegionCode,jdbcType=INTEGER}, - #{appIp.ipType,jdbcType=INTEGER}, #{appIp.ipPattern,jdbcType=INTEGER},#{appIp.srcIpAddress,jdbcType=VARCHAR},#{appIp.destIpAddress,jdbcType=VARCHAR}, - #{appIp.portPattern,jdbcType=INTEGER},#{appIp.srcPort,jdbcType=VARCHAR},#{appIp.destPort,jdbcType=VARCHAR},#{appIp.direction,jdbcType=INTEGER}, + #{appIp.cfgType,jdbcType=VARCHAR},#{appIp.cfgRegionCode,jdbcType=INTEGER},#{appIp.ipType,jdbcType=INTEGER}, + #{appIp.srcIpPattern,jdbcType=INTEGER},#{appIp.destIpPattern,jdbcType=INTEGER},#{appIp.srcIpAddress,jdbcType=VARCHAR}, + #{appIp.destIpAddress,jdbcType=VARCHAR},#{appIp.srcPortPattern,jdbcType=INTEGER},#{appIp.destPortPattern,jdbcType=INTEGER}, + #{appIp.srcPort,jdbcType=VARCHAR},#{appIp.destPort,jdbcType=VARCHAR},#{appIp.direction,jdbcType=INTEGER}, #{appIp.protocol,jdbcType=INTEGER},#{appIp.doLog,jdbcType=INTEGER},#{appIp.userRegion1,jdbcType=VARCHAR},#{appIp.userRegion2,jdbcType=VARCHAR} ,#{appIp.userRegion3,jdbcType=VARCHAR},#{appIp.userRegion4,jdbcType=VARCHAR},#{appIp.userRegion5,jdbcType=VARCHAR} ) @@ -2057,9 +2066,7 @@ AREA_EFFECTIVE_IDS, function_id, ip_type, - src_ip_address, - ip_pattern, - port_pattern, + src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN, src_port, protocol, protocol_id, @@ -2090,8 +2097,8 @@ #{functionId,jdbcType=INTEGER}, #{ipType,jdbcType=INTEGER}, #{srcIpAddress,jdbcType=VARCHAR}, - #{ipPattern,jdbcType=INTEGER}, - #{portPattern,jdbcType=INTEGER}, + #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER}, + #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER}, #{srcPort,jdbcType=VARCHAR}, #{protocol,jdbcType=INTEGER}, #{protocolId,jdbcType=INTEGER}, @@ -2294,8 +2301,11 @@ IP_TYPE = #{ipType,jdbcType=INTEGER}, - - IP_PATTERN=#{ipPattern,jdbcType=INTEGER}, + + SRC_IP_PATTERN=#{srcIpPattern,jdbcType=INTEGER}, + + + DEST_IP_PATTERN=#{destIpPattern,jdbcType=INTEGER}, SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}, @@ -2303,8 +2313,11 @@ DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}, - - PORT_PATTERN=#{portPattern,jdbcType=INTEGER}, + + SRC_PORT_PATTERN=#{srcPortPattern,jdbcType=INTEGER}, + + + DEST_PORT_PATTERN=#{destPortPattern,jdbcType=INTEGER}, SRC_PORT=#{srcPort,jdbcType=VARCHAR}, diff --git a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml index 05cfddc32..ef4eabc44 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml @@ -42,7 +42,8 @@ - + + @@ -196,7 +197,7 @@ r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME, r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY, r.ATTRIBUTE,r.LABLE,AREA_EFFECTIVE_IDS,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE, - r.IP_TYPE, r.IP_PATTERN, r.SRC_IP_ADDRESS,r.DEST_IP_ADDRESS, r.PORT_PATTERN,r.SRC_PORT,DEST_PORT, + r.IP_TYPE, r.src_ip_pattern,r.dest_ip_pattern, r.SRC_IP_ADDRESS,r.DEST_IP_ADDRESS, r.src_port_pattern,r.dest_port_pattern,r.SRC_PORT,DEST_PORT, r.DIRECTION,r.PROTOCOL,r.DO_LOG,r.USER_REGION1,r.USER_REGION2,r.USER_REGION3,r.USER_REGION4,r.USER_REGION5 @@ -540,13 +541,13 @@ CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME, SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE, - IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT, + IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT, DIRECTION,PROTOCOL,DO_LOG,user_region1,user_region2,user_region3,user_region4,user_region5 )values ( , #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER}, - #{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR}, - #{portPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, + #{ipType,jdbcType=INTEGER}, #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR}, + #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, #{protocol,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER},#{userRegion1,jdbcType=VARCHAR},#{userRegion2,jdbcType=VARCHAR} ,#{userRegion3,jdbcType=VARCHAR},#{userRegion4,jdbcType=VARCHAR},#{userRegion5,jdbcType=VARCHAR} ) diff --git a/src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml index 811ed51f7..ce203593a 100644 --- a/src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml @@ -1,13 +1,14 @@ - + - + + @@ -36,13 +37,13 @@ - CFG_ID,CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT, + CFG_ID,CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT, DEST_PORT,DIRECTION,PROTOCOL,PROTOCOL_ID,ACTION,IS_VALID,IS_AUDIT, CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME, SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,FUNCTION_ID - SELECT FROM area_ip_cfg @@ -76,9 +77,7 @@ AREA_EFFECTIVE_IDS, function_id, ip_type, - src_ip_address, - ip_pattern, - port_pattern, + src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN, src_port, protocol, protocol_id, @@ -109,8 +108,8 @@ #{functionId,jdbcType=INTEGER}, #{ipType,jdbcType=INTEGER}, #{srcIpAddress,jdbcType=VARCHAR}, - #{ipPattern,jdbcType=INTEGER}, - #{portPattern,jdbcType=INTEGER}, + #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER}, + #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER}, #{srcPort,jdbcType=VARCHAR}, #{protocol,jdbcType=INTEGER}, #{protocolId,jdbcType=INTEGER}, @@ -147,9 +146,7 @@ AREA_EFFECTIVE_IDS, function_id, ip_type, - src_ip_address, - ip_pattern, - port_pattern, + src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN, src_port, protocol, protocol_id, @@ -180,8 +177,8 @@ #{functionId,jdbcType=INTEGER}, #{ipType,jdbcType=INTEGER}, #{srcIpAddress,jdbcType=VARCHAR}, - #{ipPattern,jdbcType=INTEGER}, - #{portPattern,jdbcType=INTEGER}, + #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER}, + #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER}, #{srcPort,jdbcType=VARCHAR}, #{protocol,jdbcType=INTEGER}, #{protocolId,jdbcType=INTEGER}, @@ -255,11 +252,17 @@ src_ip_address = #{srcIpAddress,jdbcType=VARCHAR}, - - ip_pattern = #{ipPattern,jdbcType=INTEGER}, + + src_ip_pattern = #{srcIpPattern,jdbcType=INTEGER}, - - port_pattern = #{portPattern,jdbcType=INTEGER}, + + dest_ip_pattern = #{destIpPattern,jdbcType=INTEGER}, + + + src_port_pattern = #{srcPortPattern,jdbcType=INTEGER}, + + + dest_port_pattern = #{destPortPattern,jdbcType=INTEGER}, src_port = #{srcPort,jdbcType=VARCHAR}, diff --git a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml index 748d60b4f..ca2324a91 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml @@ -30,7 +30,8 @@ - + + @@ -94,7 +95,8 @@ - + + @@ -193,7 +195,8 @@ - + + @@ -224,7 +227,7 @@ - a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port + a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address ,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id ,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id, @@ -238,7 +241,7 @@ r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.function_id,r.do_log,r.do_blacklist - r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.ip_pattern,r.port_pattern,r.src_port + r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.src_ip_pattern,r.dest_ip_pattern,r.src_port_pattern,r.dest_port_pattern,r.src_port ,r.protocol,r.protocol_id,r.direction,r.cfg_type,r.action,r.dest_port,r.dest_ip_address ,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id ,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id, @@ -252,7 +255,7 @@ r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,r.cfg_region_code - r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.ip_pattern,r.port_pattern,r.src_port + r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.src_ip_pattern,r.dest_ip_pattern,r.src_port_pattern,r.dest_port_pattern,r.src_port ,r.protocol,r.protocol_id,r.direction,r.cfg_type,r.action,r.dest_port,r.dest_ip_address ,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id ,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id, @@ -816,8 +819,10 @@ function_id, ip_type, src_ip_address, - ip_pattern, - port_pattern, + src_ip_pattern, + dest_ip_pattern, + src_port_pattern, + dest_port_pattern, src_port, protocol, protocol_id, @@ -848,8 +853,10 @@ #{functionId,jdbcType=INTEGER}, #{ipType,jdbcType=INTEGER}, #{srcIpAddress,jdbcType=VARCHAR}, - #{ipPattern,jdbcType=INTEGER}, - #{portPattern,jdbcType=INTEGER}, + #{srcIpPattern,jdbcType=INTEGER}, + #{destIpPattern,jdbcType=INTEGER}, + #{srcPortPattern,jdbcType=INTEGER}, + #{destPortPattern,jdbcType=INTEGER}, #{srcPort,jdbcType=VARCHAR}, #{protocol,jdbcType=INTEGER}, #{protocolId,jdbcType=INTEGER}, @@ -1053,9 +1060,7 @@ AREA_EFFECTIVE_IDS, function_id, ip_type, - src_ip_address, - ip_pattern, - port_pattern, + src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN, src_port, protocol, protocol_id, @@ -1086,8 +1091,8 @@ #{functionId,jdbcType=INTEGER}, #{ipType,jdbcType=INTEGER}, #{srcIpAddress,jdbcType=VARCHAR}, - #{ipPattern,jdbcType=INTEGER}, - #{portPattern,jdbcType=INTEGER}, + #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER}, + #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER}, #{srcPort,jdbcType=VARCHAR}, #{protocol,jdbcType=INTEGER}, #{protocolId,jdbcType=INTEGER}, @@ -1237,11 +1242,17 @@ src_ip_address = #{voipIp.srcIpAddress,jdbcType=VARCHAR}, - - ip_pattern = #{voipIp.ipPattern,jdbcType=INTEGER}, + + src_ip_pattern = #{voipIp.srcIpPattern,jdbcType=INTEGER}, - - port_pattern = #{voipIp.portPattern,jdbcType=INTEGER}, + + dest_ip_pattern = #{voipIp.destIpPattern,jdbcType=INTEGER}, + + + src_port_pattern = #{voipIp.srcPortPattern,jdbcType=INTEGER}, + + + dest_port_pattern = #{voipIp.destPortPattern,jdbcType=INTEGER}, src_port = #{voipIp.srcPort,jdbcType=VARCHAR}, @@ -1652,9 +1663,7 @@ AREA_EFFECTIVE_IDS, function_id, ip_type, - src_ip_address, - ip_pattern, - port_pattern, + src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN, src_port, protocol, protocol_id, @@ -1686,8 +1695,8 @@ #{functionId,jdbcType=INTEGER}, #{ipType,jdbcType=INTEGER}, #{srcIpAddress,jdbcType=VARCHAR}, - #{ipPattern,jdbcType=INTEGER}, - #{portPattern,jdbcType=INTEGER}, + #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER}, + #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER}, #{srcPort,jdbcType=VARCHAR}, #{protocol,jdbcType=INTEGER}, #{protocolId,jdbcType=INTEGER}, @@ -1762,11 +1771,17 @@ src_ip_address = #{srcIpAddress,jdbcType=VARCHAR}, - - ip_pattern = #{ipPattern,jdbcType=INTEGER}, + + src_ip_pattern = #{srcIpPattern,jdbcType=INTEGER}, - - port_pattern = #{portPattern,jdbcType=INTEGER}, + + dest_ip_pattern = #{destIpPattern,jdbcType=INTEGER}, + + + src_port_pattern = #{srcPortPattern,jdbcType=INTEGER}, + + + dest_port_pattern = #{destPortPattern,jdbcType=INTEGER}, src_port = #{srcPort,jdbcType=VARCHAR}, diff --git a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml index 951507015..294ffe75b 100644 --- a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml @@ -30,7 +30,8 @@ - + + @@ -162,7 +163,7 @@ a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log,a.do_blacklist - a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port + a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address ,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id ,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id, @@ -432,9 +433,7 @@ AREA_EFFECTIVE_IDS, function_id, ip_type, - src_ip_address, - ip_pattern, - port_pattern, + src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN, src_port, protocol, protocol_id, @@ -465,8 +464,8 @@ #{functionId,jdbcType=INTEGER}, #{ipType,jdbcType=INTEGER}, #{srcIpAddress,jdbcType=VARCHAR}, - #{ipPattern,jdbcType=INTEGER}, - #{portPattern,jdbcType=INTEGER}, + #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER}, + #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER}, #{srcPort,jdbcType=VARCHAR}, #{protocol,jdbcType=INTEGER}, #{protocolId,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml index 7ef05c720..dd8949cdd 100644 --- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml @@ -74,7 +74,8 @@ - + + @@ -172,7 +173,7 @@ a.do_blacklist - a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port + a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address ,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id ,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id, @@ -489,9 +490,7 @@ AREA_EFFECTIVE_IDS, function_id, ip_type, - src_ip_address, - ip_pattern, - port_pattern, + src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN, src_port, protocol, protocol_id, @@ -527,8 +526,8 @@ #{functionId,jdbcType=INTEGER}, #{ipType,jdbcType=INTEGER}, #{srcIpAddress,jdbcType=VARCHAR}, - #{ipPattern,jdbcType=INTEGER}, - #{portPattern,jdbcType=INTEGER}, + #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER}, + #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER}, #{srcPort,jdbcType=VARCHAR}, #{protocol,jdbcType=INTEGER}, #{protocolId,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml index ad404a85b..52c40b82f 100644 --- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml @@ -80,7 +80,8 @@ - + + @@ -240,7 +241,8 @@ - + + @@ -381,7 +383,8 @@ - + + @@ -701,7 +704,8 @@ - + + @@ -775,12 +779,12 @@ a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time, a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable, - a.area_effective_ids,a.function_id,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port + a.area_effective_ids,a.function_id,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port ,a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.pps_threadshold, a.antiddos_protocol,a.bps_threadshold - a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port, + a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port, a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.compile_id @@ -788,7 +792,7 @@ a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable, a.area_effective_ids,a.function_id,a.do_log,a.dns_strategy_id,a.user_region1,a.user_region2, a.user_region3,a.user_region4,a.user_region5, - a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port, + a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port, a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type @@ -796,11 +800,11 @@ a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable, a.area_effective_ids,a.function_id,a.user_region1,a.user_region2, a.user_region3,a.user_region4,a.user_region5, - a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port, + a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port, a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type - a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port + a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port ,a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.asn_ip_group, a.user_region1,a.region_id @@ -883,7 +887,7 @@ ,a.area_effective_ids,a.function_id,a.cfg_region_code,a.compile_id - a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port + a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address ,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id ,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id, @@ -907,7 +911,7 @@ a.feature_table_type,a.app_code,a.spec_service_id,a.cfg_region_code - a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port + a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port ,a.protocol,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.compile_id @@ -928,7 +932,7 @@ a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME, a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY, a.ATTRIBUTE,a.LABLE,AREA_EFFECTIVE_IDS,a.RATELIMIT,a.FUNCTION_ID,a.CFG_TYPE,a.CFG_REGION_CODE, - a.IP_TYPE, a.IP_PATTERN, a.SRC_IP_ADDRESS,a.DEST_IP_ADDRESS, a.PORT_PATTERN,a.SRC_PORT,DEST_PORT, + a.IP_TYPE, a.src_ip_pattern,a.dest_ip_pattern, a.SRC_IP_ADDRESS,a.DEST_IP_ADDRESS, a.src_port_pattern,a.dest_port_pattern,a.SRC_PORT,DEST_PORT, a.DIRECTION,a.PROTOCOL,a.DO_LOG,a.USER_REGION1,a.USER_REGION2,a.USER_REGION3,a.USER_REGION4,a.USER_REGION5 @@ -1629,7 +1633,7 @@ select r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc,r.CFG_REGION_CODE as cfgRegionCode,r.CFG_TYPE as cfgType, r.IP_TYPE as ipType, - r.IP_PATTERN as ipPattern, r.SRC_IP_ADDRESS as srcIpAddress, r.DEST_IP_ADDRESS as destIpAddress, r.PORT_PATTERN as portPattern,r.SRC_PORT as srcPort,r.DEST_PORT as destPort, + r.src_ip_pattern as srcIpPattern,r.dest_ip_pattern as destIpPattern, r.SRC_IP_ADDRESS as srcIpAddress, r.DEST_IP_ADDRESS as destIpAddress, + r.src_port_pattern as srcPortPattern,r.dest_port_pattern as destPortPattern,r.SRC_PORT as srcPort,r.DEST_PORT as destPort, r.DIRECTION as direction,r.PROTOCOL as protocol,r.PROTOCOL_ID as protocolId,r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit, r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime, r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify, @@ -927,9 +947,7 @@ AREA_EFFECTIVE_IDS, function_id, ip_type, - src_ip_address, - ip_pattern, - port_pattern, + src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN, src_port, protocol, protocol_id, @@ -965,8 +983,10 @@ #{functionId,jdbcType=INTEGER}, #{ipType,jdbcType=INTEGER}, #{srcIpAddress,jdbcType=VARCHAR}, - #{ipPattern,jdbcType=INTEGER}, - #{portPattern,jdbcType=INTEGER}, + #{srcIpPattern,jdbcType=INTEGER}, + #{destIpPattern,jdbcType=INTEGER}, + #{srcPortPattern,jdbcType=INTEGER}, + #{destPortPattern,jdbcType=INTEGER}, #{srcPort,jdbcType=VARCHAR}, #{protocol,jdbcType=INTEGER}, #{protocolId,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml index f51a93e48..af779f182 100644 --- a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml @@ -29,7 +29,8 @@ - + + @@ -124,7 +125,7 @@ a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log,a.do_blacklist - a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port + a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address ,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id ,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id, @@ -384,9 +385,7 @@ AREA_EFFECTIVE_IDS, function_id, ip_type, - src_ip_address, - ip_pattern, - port_pattern, + src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN, src_port, protocol, protocol_id, @@ -417,8 +416,8 @@ #{functionId,jdbcType=INTEGER}, #{ipType,jdbcType=INTEGER}, #{srcIpAddress,jdbcType=VARCHAR}, - #{ipPattern,jdbcType=INTEGER}, - #{portPattern,jdbcType=INTEGER}, + #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER}, + #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER}, #{srcPort,jdbcType=VARCHAR}, #{protocol,jdbcType=INTEGER}, #{protocolId,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml index 91e781bbd..8aa9b44ed 100644 --- a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml @@ -39,7 +39,8 @@ - + + @@ -137,7 +138,7 @@ a.do_blacklist - a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port + a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address ,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id ,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id, @@ -567,9 +568,7 @@ AREA_EFFECTIVE_IDS, function_id, ip_type, - src_ip_address, - ip_pattern, - port_pattern, + src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN, src_port, protocol, protocol_id, @@ -605,8 +604,8 @@ #{functionId,jdbcType=INTEGER}, #{ipType,jdbcType=INTEGER}, #{srcIpAddress,jdbcType=VARCHAR}, - #{ipPattern,jdbcType=INTEGER}, - #{portPattern,jdbcType=INTEGER}, + #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER}, + #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER}, #{srcPort,jdbcType=VARCHAR}, #{protocol,jdbcType=INTEGER}, #{protocolId,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/dao/configuration/XmppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/XmppCfgDao.xml index 3c0e87e07..be24fa94a 100644 --- a/src/main/java/com/nis/web/dao/configuration/XmppCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/XmppCfgDao.xml @@ -29,7 +29,8 @@ - + + @@ -125,7 +126,7 @@ a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,do_log - a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port + a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address ,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id ,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id, @@ -353,9 +354,7 @@ AREA_EFFECTIVE_IDS, function_id, ip_type, - src_ip_address, - ip_pattern, - port_pattern, + src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN, src_port, protocol, protocol_id, @@ -386,8 +385,8 @@ #{functionId,jdbcType=INTEGER}, #{ipType,jdbcType=INTEGER}, #{srcIpAddress,jdbcType=VARCHAR}, - #{ipPattern,jdbcType=INTEGER}, - #{portPattern,jdbcType=INTEGER}, + #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER}, + #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER}, #{srcPort,jdbcType=VARCHAR}, #{protocol,jdbcType=INTEGER}, #{protocolId,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.xml b/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.xml index 0fd203dc3..6b3a6f0a5 100644 --- a/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.xml +++ b/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.xml @@ -7,7 +7,8 @@ - + + @@ -121,9 +122,7 @@ from specific_service_host_cfg s where s.spec_service_id = #{specServiceId} insert into specific_service_host_cfg (spec_service_id,ip_type, - src_ip_address, - ip_pattern, - port_pattern, + src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN, src_port, protocol, direction, @@ -132,8 +131,8 @@ from specific_service_host_cfg s where s.spec_service_id = #{specServiceId} is_valid,is_audit,creator_id,create_time,editor_id,edit_time,auditor_id,audit_time) values(#{specServiceId},#{ipType,jdbcType=INTEGER}, #{srcIpAddress,jdbcType=VARCHAR}, - #{ipPattern,jdbcType=INTEGER}, - #{portPattern,jdbcType=INTEGER}, + #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER}, + #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER}, #{srcPort,jdbcType=VARCHAR}, #{protocol,jdbcType=INTEGER}, #{direction,jdbcType=INTEGER}, @@ -146,10 +145,10 @@ from specific_service_host_cfg s where s.spec_service_id = #{specServiceId} update specific_service_host_cfg s set s.spec_service_id = #{specServiceId}, s.IP_TYPE = #{ipType,jdbcType=INTEGER}, - s.IP_PATTERN=#{ipPattern,jdbcType=INTEGER}, + s.IP_PATTERN=#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER}, s.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}, s.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}, - s.PORT_PATTERN=#{portPattern,jdbcType=INTEGER}, + s.PORT_PATTERN=#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER}, s.SRC_PORT=#{srcPort,jdbcType=VARCHAR}, s.DEST_PORT=#{destPort,jdbcType=VARCHAR}, s.direction = #{direction,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 94c06be31..d54666cc7 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -1044,31 +1044,45 @@ public abstract class BaseService { */ public static List ipConvert(IpCfg dstIp, BaseIpCfg srcIp) { List ipConvertList = Lists.newArrayList(); - boolean isRange = ((srcIp.getIpPattern() != null && srcIp.getIpPattern() == 2) - || (srcIp.getSrcIpAddress() != null && srcIp.getSrcIpAddress().indexOf("-") > -1) - || (srcIp.getDestIpAddress() != null && srcIp.getDestIpAddress().indexOf("-") > -1)); - if (isRange) { - List tempList = Lists.newArrayList(); - List tempList1 = Lists.newArrayList(); - if (srcIp.getIpType().intValue() == 4) { - if (srcIp.getSrcIpAddress() != null) { - String startIpPart = srcIp.getSrcIpAddress().split("-")[0]; - String endIpPart = srcIp.getSrcIpAddress().split("-")[1]; - Integer startNum = Integer.parseInt(startIpPart.split("\\.")[3]); - Integer endNum = Integer.parseInt(endIpPart.split("\\.")[3]); - for (int i = startNum; i <= endNum; i++) { - IpCfg tempIp = new IpCfg(); - BeanUtils.copyProperties(dstIp, tempIp); - tempIp.setSrcIp(startIpPart.substring(0, startIpPart.lastIndexOf(".") + 1) + i); - tempIp.setSrcIpMask("255.255.255.255"); - tempList.add(tempIp); + List tempList = Lists.newArrayList(); + List tempList1 = Lists.newArrayList(); + if (srcIp.getIpType().equals(4)) {// IP V4 + if(srcIp.getSrcIpPattern().equals(2)) {//源IP范围 + if (srcIp.getSrcIpAddress() != null) { + String startIpPart = srcIp.getSrcIpAddress().split("-")[0]; + String endIpPart = srcIp.getSrcIpAddress().split("-")[1]; + Integer startNum = Integer.parseInt(startIpPart.split("\\.")[3]); + Integer endNum = Integer.parseInt(endIpPart.split("\\.")[3]); + for (int i = startNum; i <= endNum; i++) { + IpCfg tempIp = new IpCfg(); + BeanUtils.copyProperties(dstIp, tempIp); + tempIp.setSrcIp(startIpPart.substring(0, startIpPart.lastIndexOf(".") + 1) + i); + tempIp.setSrcIpMask("255.255.255.255"); + tempList.add(tempIp); + } + }else { + dstIp.setSrcIp("0.0.0.0"); + dstIp.setSrcIpMask("255.255.255.255"); + tempList.add(dstIp); } + }else if(srcIp.getSrcIpPattern().equals(1)){ + Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); + if (srcMaskNum == 0) { + dstIp.setSrcIpMask("0.0.0.0"); } else { - dstIp.setSrcIp("0.0.0.0"); - dstIp.setSrcIpMask("255.255.255.255"); - tempList.add(dstIp); + dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); } - if (srcIp.getDestIpAddress() != null) { + dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); + tempList.add(dstIp); + }else if(srcIp.getSrcIpPattern().equals(3)){ + dstIp.setSrcIp(srcIp.getSrcIpAddress()); + dstIp.setSrcIpMask("255.255.255.255"); + tempList.add(dstIp); + }else { + throw new RuntimeException("Unsupported IP Pattern " + srcIp.getSrcIpPattern()); + } + if (srcIp.getDestIpAddress() != null) { + if(srcIp.getDestIpPattern().equals(2)) { String startIpPart = srcIp.getDestIpAddress().split("-")[0]; String endIpPart = srcIp.getDestIpAddress().split("-")[1]; Integer startNum = Integer.parseInt(startIpPart.split("\\.")[3]); @@ -1088,217 +1102,93 @@ public abstract class BaseService { } } tempList.clear(); - } else { + }else if(srcIp.getDestIpPattern().equals(1)) { + Integer dstMaskNum = Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]); for (IpCfg _cfg : tempList) { - _cfg.setDstIp("0.0.0.0"); - _cfg.setSrcIpMask("255.255.255.255"); - convertPortValues(_cfg, srcIp); + IpCfg tempIp = new IpCfg(); + BeanUtils.copyProperties(_cfg, tempIp); + if (dstMaskNum == 0) { + tempIp.setDstIpMask("0.0.0.0"); + } else { + tempIp.setDstIpMask(IpUtil.convertMask(dstMaskNum)); + } + tempIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); + if (!tempIp.getSrcIp().equals(tempIp.getDstIp())) { + // 处理 + convertPortValues(tempIp, srcIp); + tempList1.add(tempIp); + } } + tempList.clear(); + }else { + for (IpCfg _cfg : tempList) { + IpCfg tempIp = new IpCfg(); + BeanUtils.copyProperties(_cfg, tempIp); + tempIp.setDstIp(srcIp.getDestIpAddress()); + if (!tempIp.getSrcIp().equals(tempIp.getDstIp())) { + tempIp.setDstIpMask("255.255.255.255"); + // 处理 + convertPortValues(tempIp, srcIp); + tempList1.add(tempIp); + } + } + tempList.clear(); } - if (tempList1.size() > 0) { - ipConvertList.addAll(tempList1); - } else { - ipConvertList.addAll(tempList); + }else { + for (IpCfg _cfg : tempList) { + _cfg.setDstIp("0.0.0.0"); + _cfg.setSrcIpMask("255.255.255.255"); + convertPortValues(_cfg, srcIp); } - } else if (srcIp.getIpType().intValue() == 6) { - if (srcIp.getSrcIpAddress() != null) { + } + if (tempList1.size() > 0) { + ipConvertList.addAll(tempList1); + } else { + ipConvertList.addAll(tempList); + } + }else if(srcIp.getIpType().equals(6)){// IP V6 + if (srcIp.getSrcIpAddress() != null) { + if(srcIp.getSrcIpPattern().equals(2)) { IPv6Address address1 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[0]); IPv6Address address2 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[1]); IPv6Network network = IPv6Network.fromTwoAddresses(address1, address2); dstIp.setSrcIp(address1.toString()); dstIp.setSrcIpMask(network.getNetmask().asAddress().toString()); - } else { - dstIp.setSrcIp("::"); + }else if(srcIp.getSrcIpPattern().equals(1)){// IP/掩码 + IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress()); + dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); + dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString()); + }else {// IP + dstIp.setSrcIp(srcIp.getSrcIpAddress()); dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); } - if (srcIp.getDestIpAddress() != null) { + } else { + dstIp.setSrcIp("::"); + dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); + } + if (srcIp.getDestIpAddress() != null) { + if(srcIp.getDestIpPattern().equals(2)) { IPv6Address address1 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[0]); IPv6Address address2 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[1]); IPv6Network network = IPv6Network.fromTwoAddresses(address1, address2); dstIp.setDstIp(address1.toString()); dstIp.setDstIpMask(network.getNetmask().asAddress().toString()); - } else { - dstIp.setDstIp("::"); - dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - } - - ipConvertList.add(dstIp); - } else { - throw new RuntimeException("Unsupported IP type " + srcIp.getIpType()); - } - } else { - if (srcIp.getSrcIpAddress() != null) { - if (srcIp.getSrcIpAddress().indexOf("/") != -1) { - if (srcIp.getIpType() == 4 /* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6 - Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); - if (srcMaskNum == 0) { - dstIp.setSrcIpMask("0.0.0.0"); - } else { - dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); - } - - dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); - } else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4 - IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress()); - dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); - dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString()); - } /* - * else { Pattern - * patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); Pattern - * patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); Matcher - * matchernV4Subnet=patternV4Subnet.matcher(srcIp.getSrcIpAddress()); Matcher - * matcherV6Subnet=patternV6Subnet.matcher(srcIp.getSrcIpAddress()); - * if(matchernV4Subnet.matches()) { Integer srcMaskNum = - * Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); if(srcMaskNum==0){ - * dstIp.setSrcIpMask("0.0.0.0"); }else{ - * dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); } - * dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); }else - * if(matcherV6Subnet.matches()){ IPv6Network strangeNetwork = - * IPv6Network.fromString(srcIp.getSrcIpAddress()); - * dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); - * dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString()); }else - * { throw new RuntimeException("Invalid IP/subnet mask format"); } } - */ - else { - throw new RuntimeException("Unsupported IP type " + srcIp.getIpType()); - } - } else { - if (srcIp.getIpType() == 4/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6 - dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("255.255.255.255"); - } else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4 - dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - } /* - * else {//all Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP); - * Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); Matcher - * matcherV4=patternV4.matcher(srcIp.getSrcIpAddress()); Matcher - * matcherV6=patternV6.matcher(srcIp.getSrcIpAddress()); if(matcherV4.matches()) - * { dstIp.setSrcIp(srcIp.getSrcIpAddress()); - * dstIp.setSrcIpMask("255.255.255.255"); }else if(matcherV6.matches()) { - * dstIp.setSrcIp(srcIp.getSrcIpAddress()); - * dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else { throw - * new RuntimeException("Invalid IP format"); } } - */ - else { - throw new RuntimeException("Unsupported IP type " + srcIp.getIpType()); - } - } - } else { - if (srcIp.getIpType() == 4/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6 - dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("255.255.255.255"); - } else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4 - dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - } /* - * else {//all dstIp.setSrcIp(srcIp.getSrcIpAddress()); - * dstIp.setSrcIpMask("255.255.255.255"); } - */ - else { - throw new RuntimeException("Unsupported IP type " + srcIp.getIpType()); - } - } - if (srcIp.getDestIpAddress() != null) { - if (srcIp.getDestIpAddress().indexOf("/") != -1) { - if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4 - Integer dstMaskNum = Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]); - if (dstMaskNum == 0) { - dstIp.setDstIpMask("0.0.0.0"); - } else { - dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum)); - ; - } - dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); - } else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6 - IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress()); - dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); - dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString()); - } /* - * else { Pattern - * patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); Pattern - * patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); Matcher - * matchernV4Subnet=patternV4Subnet.matcher(srcIp.getDestIpAddress()); Matcher - * matcherV6Subnet=patternV6Subnet.matcher(srcIp.getDestIpAddress()); - * if(matchernV4Subnet.matches()) { Integer dstMaskNum = - * Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]); if(dstMaskNum==0){ - * dstIp.setDstIpMask("0.0.0.0"); }else{ - * dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));; } - * dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); }else - * if(matcherV6Subnet.matches()){ IPv6Network strangeNetwork = - * IPv6Network.fromString(srcIp.getDestIpAddress()); - * dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); - * dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString()); }else - * { throw new RuntimeException("Invalid IP/subnet mask format"); } } - */ - else { - throw new RuntimeException("Unsupported IP type " + srcIp.getIpType()); - } - - } else { - if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4 - dstIp.setDstIp(srcIp.getDestIpAddress()); - dstIp.setDstIpMask("255.255.255.255"); - } else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6 - dstIp.setDstIp(srcIp.getDestIpAddress()); - dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - } /* - * else {//all Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP); - * Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); Matcher - * matcherV4=patternV4.matcher(srcIp.getDestIpAddress()); Matcher - * matcherV6=patternV6.matcher(srcIp.getDestIpAddress()); - * if(matcherV4.matches()) { dstIp.setDstIp(srcIp.getDestIpAddress()); - * dstIp.setDstIpMask("255.255.255.255"); }else if(matcherV6.matches()) { - * dstIp.setDstIp(srcIp.getDestIpAddress()); - * dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else { throw - * new RuntimeException("invalid ip format"); } } - */ - else { - throw new RuntimeException("Unsupported IP type " + srcIp.getIpType()); - } - } - } else { - if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4 - dstIp.setDstIp(srcIp.getDestIpAddress()); - dstIp.setDstIpMask("255.255.255.255"); - } else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6 + }else if(srcIp.getDestIpPattern().equals(1)) {// IP/掩码 + IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress()); + dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); + dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString()); + }else {// IP dstIp.setDstIp(srcIp.getDestIpAddress()); dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - } /* - * else {//all dstIp.setDstIp(srcIp.getDestIpAddress()); - * dstIp.setDstIpMask("255.255.255.255"); } - */ - else { - throw new RuntimeException("Unsupported IP type " + srcIp.getIpType()); - } - } - if (srcIp.getSrcPort() != null) { - if (srcIp.getSrcPort().indexOf("/") != -1) { - String srcMaskNum = srcIp.getSrcPort().split("/")[1]; - dstIp.setSrcPortMask(srcMaskNum); - dstIp.setSrcPort(srcIp.getSrcPort().split("/")[0]); - } else { - dstIp.setSrcPort(srcIp.getSrcPort()); - dstIp.setSrcPortMask("65535"); } } else { - dstIp.setSrcPort("0"); - dstIp.setSrcPortMask("65535"); - } - if (srcIp.getDestPort() != null) { - if (srcIp.getDestPort().indexOf("/") != -1) { - String dstMaskNum = srcIp.getDestPort().split("/")[1]; - dstIp.setDstPortMask(dstMaskNum); - dstIp.setDstPort(srcIp.getDestPort().split("/")[0]); - } else { - dstIp.setDstPort(srcIp.getDestPort()); - dstIp.setDstPortMask("65535"); - } - } else { - dstIp.setDstPort("0"); - dstIp.setDstPortMask("65535"); + dstIp.setDstIp("::"); + dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); } + convertPortValues(dstIp, srcIp); ipConvertList.add(dstIp); + }else { + throw new RuntimeException("Unsupported IP type " + srcIp.getIpType()); } return ipConvertList; } @@ -2596,7 +2486,15 @@ public abstract class BaseService { if(_cfg.getAction().equals(Constants.MONIT_ACTION)) { maatCfg.setUserRegion(Constants.INTERCEPT_IP_MONIT_USER_REGION_KEY+"="+Constants.USER_REGION_PLACEHOLDER); }*/ - maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+_cfg.getUserRegion2()); + if(serviceDict!=null&&serviceDict.getAction().equals(Constants.MONIT_ACTION)) {// 监测 需要发keyring_id、拦截强度 + _cfg.setUserRegion1(StringUtil.isEmpty(_cfg.getUserRegion1()) ? "0":_cfg.getUserRegion1()); + _cfg.setUserRegion5(StringUtil.isEmpty(_cfg.getUserRegion5()) ? "1":_cfg.getUserRegion5()); + maatCfg.setUserRegion(Constants.INTERCEPT_IP_MONIT_USER_REGION_KEY+"=0"+";"+Constants.INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY+"="+_cfg.getUserRegion5()); + } + if(serviceDict!=null&&serviceDict.getAction().equals(64)) { + maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+_cfg.getUserRegion2()); + } + }else if(regionDict.getFunctionId()==207 || regionDict.getFunctionId()==208 || regionDict.getFunctionId()==209) {// HTTP(s)阻断、重定向、替换 String userRegion = Constants.USER_REGION_PLACEHOLDER; if(_cfg.getAction().equals(Constants.REJECT_ACTION)) {// 阻断 diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java index b9fbdb340..fe2fb8faa 100644 --- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java @@ -429,7 +429,7 @@ public class AppCfgService extends BaseService { BeanUtils.copyProperties(entity, cfg, new String[] { "cfgRegionCode", "cfgType", "ipType", "isAreaEffective", "areaEffectiveIds", "protocol", "portPattern", "srcPort", "destPort", - "direction", "destIpAddress", "srcIpAddress", "ipPattern" }); + "direction", "destIpAddress", "srcIpAddress", "srcIpPattern", "destIpPattern" }); areaIpCfgDao.saveAreaIpCfg(cfg); } } @@ -453,7 +453,7 @@ public class AppCfgService extends BaseService { BeanUtils.copyProperties(entity, cfg, new String[] { "cfgRegionCode", "cfgType", "ipType", "isAreaEffective", "areaEffectiveIds", "protocol", "portPattern", "srcPort", "destPort", "direction", "destIpAddress", - "srcIpAddress", "ipPattern" }); + "srcIpAddress", "srcIpPattern", "destIpPattern" }); areaIpCfgDao.saveAreaIpCfg(cfg); } } diff --git a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java index 27fd16fcd..1d3051623 100644 --- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java @@ -255,7 +255,6 @@ public class AvContentCfgService extends BaseService{ auditAvVoip(entity,entity.getIsAudit(), Constants.INSERT_ACTION); } - }else{ entity.setEditTime(new Date()); entity.setEditorId(entity.getCurrentUser().getId()); @@ -534,7 +533,6 @@ public class AvContentCfgService extends BaseService{ } } - //构造提交综合服务参数格式，一条配置提交一次综合服务 if(isAudit==1){ maatCfg.initDefaultValue(); @@ -772,9 +770,11 @@ public class AvContentCfgService extends BaseService{ BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode" ,"cfgType" ,"ipType" - ,"ipPattern" + ,"srcIpPattern" + ,"destIpPattern" ,"srcIpAddress" - ,"portPattern" + ,"srcPortPattern" + ,"destPortPattern" ,"srcPort" ,"destPort" ,"protocol" @@ -812,9 +812,11 @@ public class AvContentCfgService extends BaseService{ ,"cfgType" ,"cfgId" ,"ipType" - ,"ipPattern" + ,"srcIpPattern" + ,"destIpPattern" ,"srcIpAddress" - ,"portPattern" + ,"srcPortPattern" + ,"destPortPattern" ,"srcPort" ,"destPort" ,"protocol" @@ -829,9 +831,11 @@ public class AvContentCfgService extends BaseService{ BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode" ,"cfgType" ,"ipType" - ,"ipPattern" + ,"srcIpPattern" + ,"destIpPattern" ,"srcIpAddress" - ,"portPattern" + ,"srcPortPattern" + ,"destPortPattern" ,"srcPort" ,"destPort" ,"protocol" @@ -936,9 +940,11 @@ public class AvContentCfgService extends BaseService{ ,"cfgType" ,"cfgId" ,"ipType" - ,"ipPattern" + ,"srcIpPattern" + ,"destIpPattern" ,"srcIpAddress" - ,"portPattern" + ,"srcPortPattern" + ,"destPortPattern" ,"srcPort" ,"destPort" ,"protocol" @@ -1111,9 +1117,11 @@ public class AvContentCfgService extends BaseService{ BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode" ,"cfgType" ,"ipType" - ,"ipPattern" + ,"srcIpPattern" + ,"destIpPattern" ,"srcIpAddress" - ,"portPattern" + ,"srcPortPattern" + ,"destPortPattern" ,"srcPort" ,"destPort" ,"protocol" @@ -1151,9 +1159,11 @@ public class AvContentCfgService extends BaseService{ ,"cfgType" ,"cfgId" ,"ipType" - ,"ipPattern" + ,"srcIpPattern" + ,"destIpPattern" ,"srcIpAddress" - ,"portPattern" + ,"srcPortPattern" + ,"destPortPattern" ,"srcPort" ,"destPort" ,"protocol" @@ -1168,9 +1178,11 @@ public class AvContentCfgService extends BaseService{ BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode" ,"cfgType" ,"ipType" - ,"ipPattern" + ,"srcIpPattern" + ,"destIpPattern" ,"srcIpAddress" - ,"portPattern" + ,"srcPortPattern" + ,"destPortPattern" ,"srcPort" ,"destPort" ,"protocol" @@ -1275,9 +1287,11 @@ public class AvContentCfgService extends BaseService{ ,"cfgType" ,"cfgId" ,"ipType" - ,"ipPattern" + ,"srcIpPattern" + ,"destIpPattern" ,"srcIpAddress" - ,"portPattern" + ,"srcPortPattern" + ,"destPortPattern" ,"srcPort" ,"destPort" ,"protocol" diff --git a/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java b/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java index a30727730..eb43010aa 100644 --- a/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java @@ -140,11 +140,13 @@ public class DnsIpCfgService extends BaseService{ dnsIp.setFunctionId(401); dnsIp.setCfgRegionCode(1); dnsIp.setCfgType("dns_fake_ip"); - dnsIp.setIpPattern(3); + dnsIp.setSrcIpPattern(3); + dnsIp.setDestIpPattern(3); dnsIp.setSrcIpAddress("0.0.0.0"); dnsIp.setDestPort("0"); dnsIp.setSrcPort("0"); - dnsIp.setPortPattern(1); + dnsIp.setSrcPortPattern(1); + dnsIp.setDestPortPattern(1); dnsIp.setDnsStrategyId(0); dnsIp.setAction(16); dnsIp.setServiceId(64); diff --git a/src/main/java/com/nis/web/service/configuration/DomainService.java b/src/main/java/com/nis/web/service/configuration/DomainService.java index 0c5b93421..5e6791ac0 100644 --- a/src/main/java/com/nis/web/service/configuration/DomainService.java +++ b/src/main/java/com/nis/web/service/configuration/DomainService.java @@ -76,7 +76,7 @@ public class DomainService extends CrudService { c.initDefaultValue(); BeanUtils.copyProperties(cfg, c,new String[]{"cfgId","ipType","direction", "protocol","protocolId","areaEffectiveIds","cfgRegionCode", - "cfgType","ipPattern","srcIpAddress","portPattern","srcPort","destIpAddress","destPort"}); + "cfgType","srcIpPattern","destIpPattern","srcIpAddress","srcPortPattern","destPortPattern","srcPort","destIpAddress","destPort"}); c.setTableName(AreaIpCfg.getTablename()); } this.saveIpBatch(cfg.getAreaCfg()); @@ -106,7 +106,7 @@ public class DomainService extends CrudService { c.initDefaultValue(); BeanUtils.copyProperties(cfg, c,new String[]{"cfgId","ipType","direction", "protocol","protocolId","areaEffectiveIds","cfgRegionCode", - "cfgType","ipPattern","srcIpAddress","portPattern","srcPort","destIpAddress","destPort"}); + "cfgType","srcIpPattern","destIpPattern","srcIpAddress","srcPortPattern","destPortPattern","srcPort","destIpAddress","destPort"}); c.setTableName(AreaIpCfg.getTablename()); c.setCreatorId(cfg.getCurrentUser().getId()); c.setCreateTime(date); @@ -202,9 +202,11 @@ public class DomainService extends CrudService { ,"cfgType" ,"cfgId" ,"ipType" - ,"ipPattern" + ,"srcIpPattern" + ,"destIpPattern" ,"srcIpAddress" - ,"portPattern" + ,"srcPortPattern" + ,"destPortPattern" ,"srcPort" ,"destPort" ,"protocol" diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index 6a9d1d74f..9f85c8f3f 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -99,7 +99,7 @@ public class IpCfgService extends CrudService { c.initDefaultValue(); BeanUtils.copyProperties(cfg, c,new String[]{"cfgId","ipType","direction", "protocol","protocolId","areaEffectiveIds","cfgRegionCode", - "cfgType","ipPattern","srcIpAddress","portPattern","srcPort","destIpAddress","destPort"}); + "cfgType","srcIpPattern","destIpPattern","srcIpAddress","srcPortPattern","destPortPattern","srcPort","destIpAddress","destPort"}); c.setTableName(AreaIpCfg.getTablename()); } this.saveIpBatch(cfg.getAreaCfg()); @@ -349,7 +349,7 @@ public class IpCfgService extends CrudService { c.initDefaultValue(); BeanUtils.copyProperties(cfg, c,new String[]{"cfgId","ipType","direction", "protocol","protocolId","areaEffectiveIds","cfgRegionCode", - "cfgType","ipPattern","srcIpAddress","portPattern","srcPort","destIpAddress","destPort"}); + "cfgType","srcIpPattern","destIpPattern","srcIpAddress","srcPortPattern","destPortPattern","srcPort","destIpAddress","destPort"}); c.setTableName(AreaIpCfg.getTablename()); c.setCreatorId(cfg.getCurrentUser().getId()); c.setCreateTime(date); @@ -371,9 +371,11 @@ public class IpCfgService extends CrudService { ,"cfgType" ,"cfgId" ,"ipType" - ,"ipPattern" + ,"srcIpPattern" + ,"destIpPattern" ,"srcIpAddress" - ,"portPattern" + ,"srcPortPattern" + ,"destPortPattern" ,"srcPort" ,"destPort" ,"protocol" diff --git a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java index 548588aff..443aeaaa5 100644 --- a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java +++ b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java @@ -1,14 +1,11 @@ package com.nis.web.service.configuration; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -16,14 +13,12 @@ import org.springframework.transaction.annotation.Transactional; import com.beust.jcommander.internal.Lists; import com.nis.domain.Page; import com.nis.domain.configuration.BaseIpCfg; -import com.nis.domain.configuration.DdosIpCfg; import com.nis.domain.configuration.IpReuseDnatPolicyCfg; import com.nis.domain.configuration.IpReusePolicyCfg; import com.nis.domain.maat.ToMaatResult; import com.nis.exceptions.MaatConvertException; import com.nis.util.ConfigServiceUtil; import com.nis.util.Constants; -import com.nis.util.StringUtils; import com.nis.web.dao.configuration.IpMultiplexDao; import com.nis.web.security.UserUtils; import com.nis.web.service.BaseService; diff --git a/src/main/java/com/nis/web/service/specific/SpecificServiceHostCfgService.java b/src/main/java/com/nis/web/service/specific/SpecificServiceHostCfgService.java index fb289b477..34cb8d3d8 100644 --- a/src/main/java/com/nis/web/service/specific/SpecificServiceHostCfgService.java +++ b/src/main/java/com/nis/web/service/specific/SpecificServiceHostCfgService.java @@ -17,7 +17,6 @@ import com.nis.domain.Page; import com.nis.domain.SysUser; import com.nis.domain.specific.SpecificServiceCfg; import com.nis.domain.specific.SpecificServiceHostCfg; -import com.nis.util.BasicProvingUtil; import com.nis.util.StringUtil; import com.nis.web.dao.specific.SpecificServiceHostCfgDao; import com.nis.web.security.UserUtils; @@ -58,45 +57,66 @@ public class SpecificServiceHostCfgService extends BaseService{ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void saveOrUpdate(SpecificServiceHostCfg specificServiceHostCfg) { SysUser user = UserUtils.getUser(); - String defaultIp = "0.0.0.0"; //缺省0.0.0.0值表示任意 + String defaultSrcIp = "0.0.0.0"; //缺省0.0.0.0值表示任意 + String defaultDestIp = "0.0.0.0"; //缺省0.0.0.0值表示任意 if(specificServiceHostCfg.getIpType().equals(4)){ - if(specificServiceHostCfg.getIpPattern()==1){ - defaultIp = "0.0.0.0/32"; //0.0.0.0表示任意 - }else if(specificServiceHostCfg.getIpPattern()==2){ - defaultIp = "0.0.0.0-0.0.0.0"; + if(specificServiceHostCfg.getSrcIpPattern()==1){ + defaultSrcIp = "0.0.0.0/32"; //0.0.0.0表示任意 + }else if(specificServiceHostCfg.getSrcIpPattern()==2){ + defaultSrcIp = "0.0.0.0-0.0.0.0"; }else{ - defaultIp = "0.0.0.0"; + defaultSrcIp = "0.0.0.0"; + } + if(specificServiceHostCfg.getDestIpPattern()==1){ + defaultDestIp = "0.0.0.0/32"; //0.0.0.0表示任意 + }else if(specificServiceHostCfg.getDestIpPattern()==2){ + defaultDestIp = "0.0.0.0-0.0.0.0"; + }else{ + defaultDestIp = "0.0.0.0"; } } if(specificServiceHostCfg.getIpType().equals(6)){ - if(specificServiceHostCfg.getIpPattern()==1){ - defaultIp = "::/64"; - }else if(specificServiceHostCfg.getIpPattern()==2){ - defaultIp = "::-::"; + if(specificServiceHostCfg.getSrcIpPattern()==1){ + defaultSrcIp = "::/64"; + }else if(specificServiceHostCfg.getSrcIpPattern()==2){ + defaultSrcIp = "::-::"; }else{ - defaultIp = "::"; + defaultSrcIp = "::"; + } + if(specificServiceHostCfg.getDestIpPattern()==1){ + defaultDestIp = "::/64"; + }else if(specificServiceHostCfg.getDestIpPattern()==2){ + defaultDestIp = "::-::"; + }else{ + defaultDestIp = "::"; } } - String defaultPort = "0"; //0表示任意 - if(specificServiceHostCfg.getPortPattern().equals(1)){ - defaultPort = "0"; + String defaultSrcPort = "0"; //0表示任意 + String defaultDestPort = "0"; //0表示任意 + if(specificServiceHostCfg.getSrcPortPattern().equals(1)){ + defaultSrcPort = "0"; }else{ - defaultPort = "0/0"; + defaultSrcPort = "0/0"; + } + if(specificServiceHostCfg.getDestPortPattern().equals(1)){ + defaultDestPort = "0"; + }else{ + defaultDestPort = "0/0"; } //ip地址默认 缺省0.0.0.0值表示任意 if(StringUtil.isBlank(specificServiceHostCfg.getSrcIpAddress())){ - specificServiceHostCfg.setSrcIpAddress(defaultIp); + specificServiceHostCfg.setSrcIpAddress(defaultSrcIp); } if(StringUtil.isBlank(specificServiceHostCfg.getDestIpAddress())){ - specificServiceHostCfg.setDestIpAddress(defaultIp); + specificServiceHostCfg.setDestIpAddress(defaultDestIp); } //端口掩码默认 if(StringUtil.isBlank(specificServiceHostCfg.getSrcPort())){ - specificServiceHostCfg.setSrcPort(defaultPort); + specificServiceHostCfg.setSrcPort(defaultSrcPort); } if(StringUtil.isBlank(specificServiceHostCfg.getDestPort())){ - specificServiceHostCfg.setDestPort(defaultPort); + specificServiceHostCfg.setDestPort(defaultDestPort); } //方向缺省 if(specificServiceHostCfg.getDirection()==null){ diff --git a/src/main/java/com/nis/web/test/MaatCfgConverTest.java b/src/main/java/com/nis/web/test/MaatCfgConverTest.java index 20feefe85..7be4294a2 100644 --- a/src/main/java/com/nis/web/test/MaatCfgConverTest.java +++ b/src/main/java/com/nis/web/test/MaatCfgConverTest.java @@ -31,20 +31,24 @@ public class MaatCfgConverTest { ToMaatBean maat = new ToMaatBean(); BaseStringCfg str = new BaseStringCfg(); BaseIpCfg ip = new BaseIpCfg(); - ip.setIpPattern(1); + ip.setSrcIpPattern(1); + ip.setDestIpPattern(1); ip.setIpType(4); ip.setSrcIpAddress("192.168.10.0/24"); - ip.setPortPattern(2); + ip.setSrcPortPattern(2); + ip.setDestPortPattern(2); ip.setSrcPort("8080-8089"); ip.setCompileId(123); ip.setProtocol(6); ip.setDirection(2); ipList.add(ip); ip = new BaseIpCfg(); - ip.setIpPattern(2); + ip.setSrcIpPattern(2); + ip.setDestIpPattern(2); ip.setIpType(4); ip.setSrcIpAddress("10.0.6.0-10.0.6.100"); - ip.setPortPattern(1); + ip.setSrcPortPattern(1); + ip.setDestPortPattern(1); ip.setSrcPort("7080/65534"); ip.setCompileId(124); ip.setDirection(1); @@ -67,17 +71,17 @@ public class MaatCfgConverTest { for(BaseIpCfg c:ipList){ IpCfg ipCfg = new IpCfg(); ipCfg.setRegionId(regionId); - if(c.getIpPattern()==1){ + if(c.getSrcIpPattern()==1){ ipCfg.setSrcIp(c.getSrcIpAddress().split("/")[0]); ipCfg.setSrcIpMask(IpUtil.convertMask(Integer.parseInt(c.getSrcIpAddress().split("/")[1]))); - }else if(c.getIpPattern()==2){ + }else if(c.getSrcIpPattern()==2){ ipCfg.setSrcIp(c.getSrcIpAddress().split("-")[0]); ipCfg.setSrcIpMask(IpUtil.getMask(c.getSrcIpAddress().split("-")[0], c.getSrcIpAddress().split("-")[1])); } - if(c.getPortPattern()==1){ + if(c.getSrcPortPattern()==1){ ipCfg.setSrcPort(c.getSrcPort().split("/")[0]); ipCfg.setSrcPortMask(c.getSrcPort().split("/")[1]); - }else if(c.getPortPattern()==2){ + }else if(c.getSrcPortPattern()==2){ ipCfg.setSrcPort(c.getSrcPort().split("-")[0]); Integer portMask = Integer.parseInt(c.getSrcPort().split("-")[1])-Integer.parseInt(c.getSrcPort().split("-")[0]); ipCfg.setSrcPortMask(portMask.toString()); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 95790c319..0c1f5055d 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1509,4 +1509,10 @@ interface_total=Interface Total service_total=Service Total unapproved_all=UnApprove all configurations! delete_all=Delete all configurations! -none_file_tip=Please Choose File! \ No newline at end of file +none_file_tip=Please Choose File! +the_same_ip_type=Client IP and Server IP must have the same IP type +src_ip_pattern=Client IP Pattern +dest_ip_pattern=Server IP Pattern +src_port_pattern=Client Port Pattern +dest_port_pattern=Server Port Pattern +range_cross=Found intersections between Server IP address and Client IP address \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 04cfc4a9e..b07e24315 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1512,4 +1512,10 @@ effective=Effective admin_user_warn=Admin User Warn interface_total=Interface Total service_total=Service Total -none_file_tip=Please Choose File! \ No newline at end of file +none_file_tip=Please Choose File! +the_same_ip_type=IP-\u0430\u0434\u0440\u0435\u0441 \u043A\u043B\u0438\u0435\u043D\u0442\u0430 \u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0434\u043E\u043B\u0436\u043D\u044B \u0438\u043C\u0435\u0442\u044C \u043E\u0434\u0438\u043D \u0438 \u0442\u043E\u0442 \u0436\u0435 \u0442\u0438\u043F. +src_ip_pattern=Client IP Pattern +dest_ip_pattern=Server IP Pattern +src_port_pattern=Client Port Pattern +dest_port_pattern=Server Port Pattern +range_cross=Found intersections between Server IP address and Client IP address \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 8f5e3fb59..a9815630a 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1507,4 +1507,10 @@ interface_total=\u754c\u9762\u603b\u91cf service_total=\u670d\u52a1\u603b\u91cf unapproved_all=\u5ba1\u6838\u4E0D\u901a\u8fc7\u6240\u6709\u914d\u7f6e! delete_all=\u5220\u9664\u6240\u6709\u914d\u7f6e! -none_file_tip=\u8BF7\u9009\u62E9\u6587\u4EF6! \ No newline at end of file +none_file_tip=\u8BF7\u9009\u62E9\u6587\u4EF6! +the_same_ip_type=\u6e90IP\u4e0e\u76ee\u7684IP\u7684IP\u7c7b\u578b\u5fc5\u987b\u76f8\u540c +src_ip_pattern=\u6E90IP\u683C\u5F0F +dest_ip_pattern=\u76EE\u7684IP\u683C\u5F0F +src_port_pattern=\u6E90\u7AEF\u53E3\u683C\u5F0F +dest_port_pattern=\u76EE\u7684\u7AEF\u53E3\u683C\u5F0F +range_cross=\u6E90IP\u4E0E\u76EE\u7684IP\u8303\u56F4\u6709\u4EA4\u53C9 \ No newline at end of file diff --git a/src/main/resources/sql/20190417/extends_ip_port_pattern.sql b/src/main/resources/sql/20190417/extends_ip_port_pattern.sql new file mode 100644 index 000000000..ee6c3d83b --- /dev/null +++ b/src/main/resources/sql/20190417/extends_ip_port_pattern.sql @@ -0,0 +1,104 @@ +--#function_region_dict 对应ip_pattern，port_pattern的字段长度拓展一倍，使用分号分隔源/目的 +ALTER TABLE function_region_dict MODIFY config_ip_pattern VARCHAR(20) COMMENT "ip的格式 1:ip掩码;2:IP范围;3:IP;使用逗号分隔,源ip与目的IP使用;分隔"; +ALTER TABLE function_region_dict MODIFY config_port_pattern VARCHAR(20) COMMENT "端口的格式，1:port;2:port_mask;使用逗号分隔,源端口与目的端口使用;分隔"; +--#各表修改ip_pattern，port_pattern +--#app_ip_cfg +ALTER TABLE app_ip_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式'; +ALTER TABLE app_ip_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式'; +ALTER TABLE app_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式'; +ALTER TABLE app_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式'; +--#app_ip_range_cfg +ALTER TABLE app_ip_range_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式'; +ALTER TABLE app_ip_range_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式'; +ALTER TABLE app_ip_range_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式'; +ALTER TABLE app_ip_range_cfg ADD dest_port_pattern INT COMMENT '目的端口格式'; +--#area_ip_cfg +ALTER TABLE area_ip_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式'; +ALTER TABLE area_ip_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式'; +ALTER TABLE area_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式'; +ALTER TABLE area_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式'; +--#asn_ip_cfg +ALTER TABLE asn_ip_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式'; +ALTER TABLE asn_ip_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式'; +ALTER TABLE asn_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式'; +ALTER TABLE asn_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式'; +--#av_cont_ip_cfg +ALTER TABLE av_cont_ip_cfg change ip_pattern src_ip_pattern int COMMENT '源ip格式'; +ALTER TABLE av_cont_ip_cfg add dest_ip_pattern INT COMMENT '目的ip格式'; +ALTER TABLE av_cont_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式'; +ALTER TABLE av_cont_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式'; +--#av_pic_ip_cfg +ALTER TABLE av_pic_ip_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式'; +ALTER TABLE av_pic_ip_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式'; +ALTER TABLE av_pic_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式'; +ALTER TABLE av_pic_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式'; +--#av_voip_ip_cfg +ALTER TABLE av_voip_ip_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式'; +ALTER TABLE av_voip_ip_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式'; +ALTER TABLE av_voip_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式'; +ALTER TABLE av_voip_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式'; +--#ddos_ip_cfg +ALTER TABLE ddos_ip_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式'; +ALTER TABLE ddos_ip_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式'; +ALTER TABLE ddos_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式'; +ALTER TABLE ddos_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式'; +--#dns_ip_cfg +ALTER TABLE dns_ip_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式'; +ALTER TABLE dns_ip_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式'; +ALTER TABLE dns_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式'; +ALTER TABLE dns_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式'; +--#ip_port_cfg +ALTER TABLE ip_port_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式'; +ALTER TABLE ip_port_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式'; +ALTER TABLE ip_port_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式'; +ALTER TABLE ip_port_cfg ADD dest_port_pattern INT COMMENT '目的端口格式'; +--#ip_reuse_ip_cfg +--ALTER TABLE ip_reuse_ip_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式'; +--ALTER TABLE ip_reuse_ip_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式'; +--ALTER TABLE ip_reuse_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式'; +--ALTER TABLE ip_reuse_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式'; +--#ip_reuse_policy_cfg +--ALTER TABLE ip_reuse_policy_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式'; +--ALTER TABLE ip_reuse_policy_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式'; +--#修改字典的值 +UPDATE function_region_dict SET config_ip_pattern ="1,2,3;1,2,3" WHERE config_ip_pattern="1,2,3"; +UPDATE function_region_dict SET config_ip_pattern ="1;1" WHERE config_ip_pattern="1"; +UPDATE function_region_dict SET config_ip_pattern ="3;3" WHERE config_ip_pattern="3"; +UPDATE function_region_dict SET config_ip_pattern ="1,3;1,3" WHERE config_ip_pattern="1,3"; + +UPDATE function_region_dict SET config_port_pattern ="1;1" WHERE config_port_pattern="1"; +UPDATE function_region_dict SET config_port_pattern ="1,2;1,2" WHERE config_port_pattern="1,2"; +-- Spoofing IP修改只显示目的IP +UPDATE function_region_dict SET config_ip_port_show=3 WHERE function_id=401; +--ASN IP修改只显示目的IP +UPDATE function_region_dict SET config_ip_port_show=3 WHERE function_id=600; +--sql 更新字段语句 +UPDATE app_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) +UPDATE app_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) + +UPDATE app_ip_range_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) +UPDATE app_ip_range_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) + +UPDATE area_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) +UPDATE area_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) + +UPDATE asn_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) +UPDATE asn_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) + +UPDATE av_cont_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) +UPDATE av_cont_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) + +UPDATE av_pic_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) +UPDATE av_pic_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) + +UPDATE av_voip_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) +UPDATE av_voip_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) + +UPDATE ddos_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) +UPDATE ddos_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) + +UPDATE dns_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) +UPDATE dns_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) + +UPDATE ip_port_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) +UPDATE ip_port_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`) \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/include/form/dDosIpInfo.jsp b/src/main/webapp/WEB-INF/include/form/dDosIpInfo.jsp index 84db2f83b..8cc49acdf 100644 --- a/src/main/webapp/WEB-INF/include/form/dDosIpInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/dDosIpInfo.jsp @@ -10,7 +10,36 @@
-
+
+
+ +
+ + +
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
@@ -30,33 +59,67 @@
-
-
- -
- - -
-
-
-
-
-
+
+
- +
- - +
-
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
- - -