gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

配置导入加入对drop action的ICMP协议的判断

Browse Source
This commit is contained in:
wangxin
2018-08-01 15:27:21 +08:00
parent 35a7b360f1
commit 09c704ccf7
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -686,12 +686,19 @@ public class BaseController {
List<SysDataDictionaryItem> ipsecProrocolList = DictUtils.getDictList("IPSEC_PROTOCOL");
List<SysDataDictionaryItem> tunnelProrocolList = DictUtils.getDictList("TUNNEL_PROTOCOL");
List<SysDataDictionaryItem> specialFunctionIdList = DictUtils.getDictList("SPECIAL_FUNCTION_ID");
List<SysDataDictionaryItem> irTypeList = DictUtils.getDictList("IR_TYPE");
String specialItem=null;
for(SysDataDictionaryItem sfuncItem:specialFunctionIdList){
if(functionId==Integer.parseInt(sfuncItem.getItemCode())){
specialItem=sfuncItem.getItemValue();
}
}
if("ipaddr".equals(specialItem)){
List<SysDataDictionaryItem> icmpprotocolList = DictUtils.getDictList("ICMP_PROTOCOL");
if(action==Constants.DROP_ACTION) {
protocolList.addAll(icmpprotocolList);
}
}
StringBuffer msg=new StringBuffer();
int line=1;
for(IpCfgTemplate value:list){
@@ -1000,7 +1007,6 @@ public class BaseController {
}
//group and ir_type check start
if("ipmulitiplex".equals(specialItem)) {
List<SysDataDictionaryItem> irTypeList = DictUtils.getDictList("IR_TYPE");
Integer irType= value.getIrType();
if(irType==null) {
errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("ir_type"))+";");

8
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -104,6 +104,10 @@ public class IpController extends CommonController{
this._importIp(cfgName,redirectAttributes, file,cfg,TunnelIpTemplate.class);
}else if("ipsec".equals(specialFunctionId)) {
this._importIp(cfgName,redirectAttributes, file,cfg,IpsecTemplate.class);
}else if("ipaddr".equals(specialFunctionId)) {
this._importIp(cfgName,redirectAttributes, file,cfg,IpAddrTemplate.class);
}else {
this._importIp(cfgName,redirectAttributes, file,cfg);
}
@@ -127,6 +131,10 @@ public class IpController extends CommonController{
this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,TunnelIpTemplate.class);
}else if("ipsec".equals(specialFunctionId)) {
this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,IpsecTemplate.class);
}else if("ipaddr".equals(specialFunctionId)) {
this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,IpAddrTemplate.class);
}else {
this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode);
}
}
//ip配置导出