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

IPSpoofing配置批量审核操作增加欺骗IP池配置处理，修正图片样例批量审核功能

Browse Source
This commit is contained in:
zhangwenqing
2019-04-22 17:23:03 +08:00
parent 77c7649b6a
commit f773c95c0b
5 changed files with 124 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/main/java/com/nis/web/service/configuration/CommonPolicyService.java
View File

@@ -40,6 +40,7 @@ import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.domain.configuration.PxyObjKeyring;
import com.nis.domain.configuration.PxyObjSpoofingIpPool;
import com.nis.domain.configuration.PxyObjTrustedCaCert;
import com.nis.domain.configuration.PxyObjTrustedCaCrl;
import com.nis.domain.maat.GroupReuseAddBean;
@@ -61,6 +62,7 @@ import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.AreaIpCfgDao;
import com.nis.web.dao.configuration.CommonPolicyDao;
import com.nis.web.dao.configuration.ConfigSynchronizationDao;
import com.nis.web.dao.configuration.PxyObjSpoofingIpPoolDao;
import com.nis.web.dao.configuration.StringCfgDao;
import com.nis.web.dao.configuration.WebsiteCfgDao;
import com.nis.web.security.UserUtils;
@@ -73,6 +75,8 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
protected CommonPolicyDao commonPolicyDao;
@Autowired
protected ConfigSynchronizationDao synchronizationDao;
@Autowired
protected PxyObjSpoofingIpPoolDao pxyObjSpoofingIpPoolDao;
/**
* maat配置批量失效
@@ -101,8 +105,12 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
maatBean = new ToMaatBean();
configCompileList = new ArrayList();
List<Integer> compileIds = new ArrayList();
List<String> spoofingPoolCfgIds = new ArrayList();
for(BaseCfg cfg:list){
compileIds.add(cfg.getCompileId());
if(entity.getServiceId().equals(518)){ // IP_Spoofing
spoofingPoolCfgIds.add(cfg.getUserRegion3());
}
}
if(!StringUtil.isEmpty(compileIds) && !StringUtil.isEmpty(entity.getTableName())) {
@@ -147,9 +155,39 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
if(cfgList!=null){
for(Map<String,Object> m:cfgList){
String tableName = m.get("tableName").toString();
commonPolicyDao.auditCfgBatch( tableName, entity,compileIds,null);
if(tableName.equals("pxy_obj_spoofing_ip_pool")) {
commonPolicyDao.auditCfgBatch( tableName, entity,spoofingPoolCfgIds,null);
}else {
commonPolicyDao.auditCfgBatch( tableName, entity,compileIds,null);
}
}
}
if(entity.getServiceId().equals(518)){// IP仿冒策略
List<PxyObjSpoofingIpPool> poolList = new ArrayList<PxyObjSpoofingIpPool>();
String json="";
for (String cfgId : spoofingPoolCfgIds) {
PxyObjSpoofingIpPool pool = pxyObjSpoofingIpPoolDao.getPxyObjSpoofingIpPool(Long.parseLong(cfgId));
PxyObjSpoofingIpPool cfg = new PxyObjSpoofingIpPool();
cfg.setIsValid(0);
cfg.setCompileId(pool.getCompileId());
cfg.setServiceId(pool.getServiceId());
poolList.add(cfg);
}
// 调用服务接口取消配置
json=gsonToJson(poolList);
logger.info("欺骗IP池配置批量失效参数："+json);
// 调用服务接口取消配置
try {
ToMaatResult result = ConfigServiceUtil.put(json, 2);
logger.info("欺骗IP池配置批量失效响应信息："+result.getMsg());
} catch (Exception e) {
logger.info("欺骗IP池配置批量失效失败");
throw e;
}
}
for(BaseCfg cfg:list){
maatCfg = new MaatCfg();
maatCfg.setCompileId(cfg.getCompileId());
@@ -300,7 +338,7 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
if(entity.getIsAudit()==1){
//调用服务接口下发配置数据
String json=gsonToJson(auditList);
String json=gsonToJson(notAuditList);
//logger.warn("批量下发配置参数："+json);
//调用服务接口下发配置
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
@@ -337,6 +375,7 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
// 1.获取所有配置的编译ID
List<Integer> compileIds = new ArrayList();
List<String> spoofingPoolCfgIds = new ArrayList();
for(BaseCfg cfg:list){
if(entity.getServiceId().equals(1028)) {
compileIds.add(Integer.parseInt(cfg.getUserRegion1()));
@@ -345,6 +384,10 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
}else {
compileIds.add(cfg.getCompileId());
}
if(entity.getServiceId().equals(518)){ // IP_Spoofing
spoofingPoolCfgIds.add(cfg.getUserRegion3());
}
}
// 2.更新配置审核状态（主表）
@@ -358,7 +401,11 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
if(cfgList!=null){
for(Map<String,Object> m:cfgList){
String tableName = m.get("tableName").toString();
commonPolicyDao.auditCfgBatch( tableName, entity,compileIds,null);
if(tableName.equals("pxy_obj_spoofing_ip_pool")) {
commonPolicyDao.auditCfgBatch( tableName, entity,spoofingPoolCfgIds,null);
}else {
commonPolicyDao.auditCfgBatch( tableName, entity,compileIds,null);
}
}
}
@@ -374,6 +421,7 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
List<BaseCfg> list, boolean hasData) {
// 1.获取所有配置的编译ID
List<Integer> compileIds = new ArrayList();
List<String> spoofingPoolCfgIds = new ArrayList();
for(BaseCfg cfg:list){
if(entity.getServiceId().equals(1028)) {
compileIds.add(Integer.parseInt(cfg.getUserRegion1()));
@@ -382,6 +430,11 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
}else {
compileIds.add(cfg.getCompileId());
}
if(entity.getServiceId().equals(518)){ // IP_Spoofing
spoofingPoolCfgIds.add(cfg.getUserRegion3());
}
cfg.setIsValid(-1);
cfg.setIsAudit(0);
}
@@ -397,7 +450,11 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
if(cfgList != null){
for(Map<String,Object> m : cfgList){
String tableName = m.get("tableName").toString();
commonPolicyDao.deleteCfgBatch(tableName, entity, compileIds);
if(tableName.equals("pxy_obj_spoofing_ip_pool")) {
commonPolicyDao.deleteCfgBatch(tableName, entity, spoofingPoolCfgIds);
}else {
commonPolicyDao.deleteCfgBatch(tableName, entity, compileIds);
}
}
}