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

（1）字符串导入大小写敏感，是否十六进制修复

Browse Source 
（2）http 高级导入，ftp内容关键字导入提交
（3）加入16进制大小写一定不敏感的验证提示
（4）“others”自定义域不允许导入
This commit is contained in:
wangxin
2018-10-31 17:00:40 +08:00
parent 9c41c4e848
commit 1f39824324
6 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1041,8 +1041,10 @@ public class BaseController {
baseStringCfg.setIsHexbin(0);
} else if (isHex.intValue() == 1 && isCaseInsenstive.intValue() == 0) {
baseStringCfg.setIsHexbin(1);
} else if (isHex.intValue() == 1 && isCaseInsenstive.intValue() == 1) {
} else if (isHex.intValue() == 0 && isCaseInsenstive.intValue() == 1) {
baseStringCfg.setIsHexbin(2);
}else {
errInfo.append(prop.getProperty("hex_case_insensitive")+ ";");
}
}
@@ -1119,6 +1121,10 @@ public class BaseController {
errInfo.append(
String.format(prop.getProperty("is_incorrect"), prop.getProperty("district") + " ")
+ ";");
} else if (dirtrictP.indexOf("others")>-1&&district.equals("others")) {
//不允许自定义匹配区域导入
errInfo.append(prop.getProperty("district")+" "+
String.format(prop.getProperty("can_not_be"), " 'others'")+ ";");
}
}
if (mulityKeywordsP.equals("0")) {
@@ -1285,8 +1291,10 @@ public class BaseController {
baseStringCfg.setIsHexbin(0);
} else if (isHex.intValue() == 1 && isCaseInsenstive.intValue() == 0) {
baseStringCfg.setIsHexbin(1);
} else if (isHex.intValue() == 1 && isCaseInsenstive.intValue() == 1) {
} else if (isHex.intValue() == 0 && isCaseInsenstive.intValue() == 1) {
baseStringCfg.setIsHexbin(2);
}else {
errInfo.append(prop.getProperty("hex_case_insensitive")+ ";");
}
}
}
@@ -3346,10 +3354,10 @@ public class BaseController {
if (regionDict.getDictId().intValue() == 167) {
interceptCfgService.saveInterceptCfg(stringCfgs);
}
if (regionDict.getDictId().intValue() == 15 || regionDict.getDictId().intValue() == 596) {
if (regionDict.getDictId().intValue() == 9||regionDict.getDictId().intValue() == 15 || regionDict.getDictId().intValue() == 596) {
websiteCfgService.saveHttpUrlCfg(stringCfgs);
}
if (regionDict.getDictId().intValue() == 36) {
if (regionDict.getDictId().intValue() == 36||regionDict.getDictId().intValue() == 37) {
fileTransferCfgService.saveFtpCfg(stringCfgs);
}
if (regionDict.getFunctionId().equals(510)) { // P2p hash
@@ -3367,10 +3375,8 @@ public class BaseController {
if (regionDict.getFunctionId().intValue() == 34) {
websiteCfgService.saveSslCfg(stringCfgs);
}
if (regionDict.getFunctionId().intValue() == 635) {
if(regionDict.getDictId().intValue()==601||regionDict.getDictId().intValue()==602) {
websiteCfgService.saveHttpBodyCfg(stringCfgs);
}
if(regionDict.getDictId().intValue()==12||regionDict.getDictId().intValue()==13||regionDict.getDictId().intValue()==601||regionDict.getDictId().intValue()==602) {
websiteCfgService.saveHttpBodyCfg(stringCfgs);
}
} else if (regionDict.getRegionType().equals(3)) {
for (ComplexkeywordCfg cfg : complexkeywordCfgs) {
@@ -3427,7 +3433,12 @@ public class BaseController {
if (regionDict.getDictId().intValue() == 30 || regionDict.getDictId().intValue() == 31||regionDict.getDictId().intValue() == 599) {
mailCfgService.saveMailCfg(complexkeywordCfgs);
}
if(regionDict.getDictId().intValue()==10) {
websiteCfgService.saveHttpReqHeadCfg(complexkeywordCfgs);
}
if(regionDict.getDictId().intValue()==11) {
websiteCfgService.saveHttpResHeadCfg(complexkeywordCfgs);
}
}
if (cfgIndexInfos != null && cfgIndexInfos.size() > 0) {
ipCfgService.saveCfgIndexOf(cfgIndexInfos);

14
src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
View File

@@ -172,6 +172,20 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
websiteCfgDao.saveHttpBodyCfg(_cfg);
}
}
public void saveHttpReqHeadCfg(List<ComplexkeywordCfg> cfgs) {
for(ComplexkeywordCfg cfg:cfgs){
HttpReqHeadCfg _cfg=new HttpReqHeadCfg();
BeanUtils.copyProperties(cfg,_cfg);
websiteCfgDao.saveHttpReqHdrCfg(_cfg);
}
}
public void saveHttpResHeadCfg(List<ComplexkeywordCfg> cfgs) {
for(ComplexkeywordCfg cfg:cfgs){
HttpResHeadCfg _cfg=new HttpResHeadCfg();
BeanUtils.copyProperties(cfg,_cfg);
websiteCfgDao.saveHttpResHdrCfg(_cfg);
}
}
public void saveHttpCfg(CfgIndexInfo entity){
//设置区域运营商信息
setAreaEffectiveIds(entity);