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

DNS reject增加策略分组功能

Browse Source
This commit is contained in:
duandongmei
2018-06-22 15:59:47 +08:00
parent 41024e872c
commit b6d0ece058
22 changed files with 169 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -528,9 +528,10 @@ public abstract class BaseService {
return resStrategy;
}
//ip转换为callback用ip
public InlineIp convertCallBackIp(BaseIpCfg cfg){
public InlineIp convertCallBackIp(BaseIpCfg cfg,Long policyGroup){
IpCfg c=ipConvert(new IpCfg(),cfg);
InlineIp ip=new InlineIp();
ip.setId(cfg.getCompileId());
ip.setCfgId(cfg.getCompileId());
ip.setAction(cfg.getAction());
ip.setService(cfg.getServiceId());
@@ -547,6 +548,7 @@ public abstract class BaseService {
ip.setDirection(cfg.getDirection());
ip.setIsValid(cfg.getIsValid());
ip.setOpTime(cfg.getAuditTime());
ip.setPolicyGroup(policyGroup);
return ip;
}
//区域IPsetAreaEffectiveIds设置

25
src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java
View File

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.nis.domain.Page;
import com.nis.domain.callback.InlineIp;
import com.nis.domain.callback.NtcDnsResStrategy;
import com.nis.domain.configuration.AreaBean;
import com.nis.domain.configuration.AreaIpCfg;
@@ -146,36 +147,36 @@ public class DnsIpCfgService extends BaseService{
String json="";
if(entity.getIsAudit()==1){
List<NtcDnsResStrategy> resStrategyList=new ArrayList<NtcDnsResStrategy>();
//NtcDnsResStrategy resStrategy=convertCallBackIp(entity);
//resStrategyList.add(resStrategy);
List<InlineIp> resStrategyList=new ArrayList<InlineIp>();
InlineIp resStrategy=convertCallBackIp(entity,entity.getDnsStrategyId());
resStrategyList.add(resStrategy);
//调用服务接口下发配置数据
json=gsonToJson(resStrategyList);
logger.info("DNS响应策略配置下发配置参数："+json);
logger.info("DNS欺骗ip配置下发配置参数："+json);
//调用服务接口下发配置
try {
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
if(result!=null){
logger.info("DNS响应策略配置下发响应信息："+result.getMsg());
logger.info("DNS欺骗ip配置下发响应信息："+result.getMsg());
}
} catch (Exception e) {
logger.error("DNS响应策略配置配置下发失败",e);
logger.error("DNS欺骗ip配置下发失败",e);
throw e;
}
}else if(entity.getIsAudit()==3){
List<NtcDnsResStrategy> resStrategyList=new ArrayList<>();
//NtcDnsResStrategy ntcDnsResStrategy=convertCallBackDnsResStrategy(cfg);
//resStrategyList.add(ntcDnsResStrategy);
List<InlineIp> resStrategyList=new ArrayList<>();
InlineIp resStrategy=convertCallBackIp(entity,entity.getDnsStrategyId());
resStrategyList.add(resStrategy);
//调用服务接口取消配置
json=gsonToJson(resStrategyList);
logger.info("DNS响应策略配置配置参数："+json);
logger.info("DNS欺骗ip配置参数："+json);
//调用服务接口取消配置
try {
ToMaatResult result = ConfigServiceUtil.put(json, 2);
logger.info("DNS响应策略配置响应信息："+result.getMsg());
logger.info("DNS欺骗ip配置响应信息："+result.getMsg());
} catch (Exception e) {
e.printStackTrace();
logger.info("DNS响应策略配置配置失败");
logger.info("DNS欺骗ip配置配置失败");
throw e;
}
}

8
src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java
View File

@@ -56,13 +56,13 @@ public class DnsResStrategyService extends BaseService{
page.setList(list);
return page;
}
public List<DnsResStrategy> findDnsResStrategys(Long cfgId,Integer isValid) {
List<DnsResStrategy> list=dnsResStrategyDao.findList(cfgId,isValid);
public List<DnsResStrategy> findDnsResStrategys(Long cfgId,Integer isValid,Integer isAudit) {
List<DnsResStrategy> list=dnsResStrategyDao.findList(cfgId,isValid,isAudit);
return list;
}
public DnsResStrategy getDnsResStrategy(Long id,Integer isValid) {
List<DnsResStrategy> list=dnsResStrategyDao.findList(id,isValid);
List<DnsResStrategy> list=dnsResStrategyDao.findList(id,isValid,null);
DnsResStrategy dnsResStrategy=null;
if(list != null && list.size()>0){
dnsResStrategy=list.get(0);
@@ -73,7 +73,7 @@ public class DnsResStrategyService extends BaseService{
public void saveOrUpdate(DnsResStrategy entity){
Date createTime=new Date();
setAreaEffectiveIds(entity);
List<DnsResStrategy> list=dnsResStrategyDao.findList(entity.getCfgId(),null);
List<DnsResStrategy> list=dnsResStrategyDao.findList(entity.getCfgId(),null,null);
//新增
if(list==null || list.size()==0){
entity.initDefaultValue();

4
src/main/java/com/nis/web/service/configuration/IpCfgService.java
View File

@@ -157,7 +157,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
if(cfg.getIsAudit()==1){
if(Constants.DROP_ACTION==cfg.getAction()||Constants.LOOP_ACTION==cfg.getAction()){
List<InlineIp> ipList=new ArrayList<>();
InlineIp ip=convertCallBackIp(cfg);
InlineIp ip=convertCallBackIp(cfg,null);
ipList.add(ip);
//调用服务接口下发配置数据
json=gsonToJson(ipList);
@@ -215,7 +215,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
}else if(cfg.getIsAudit()==3){
if(Constants.DROP_ACTION==cfg.getAction()||Constants.LOOP_ACTION==cfg.getAction()){
List<InlineIp> ipList=new ArrayList<>();
InlineIp ip=convertCallBackIp(cfg);
InlineIp ip=convertCallBackIp(cfg,null);
ipList.add(ip);
//调用服务接口取消配置
json=gsonToJson(ipList);

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

@@ -867,7 +867,10 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
maatCfg.setGroupNum(groupRelationList.size());
maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(entity.getIsValid());
// dns reject userRegion=;dnsStrategyId;
if(!StringUtil.isEmpty(entity.getDnsStrategyId())){
maatCfg.setUserRegion(Constants.USER_REGION_SPLIT+entity.getDnsStrategyId()+Constants.USER_REGION_SPLIT);
}
configCompileList.add(maatCfg);
maatBean.setConfigCompileList(configCompileList);
maatBean.setAuditTime(entity.getAuditTime());