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

所有日志scenefile和http的req相关内容修改为admin才可展示。

Browse Source 
全量下发及批量下发增加可信证书业务处理
This commit is contained in:
DuanDongmei
2018-12-08 17:54:59 +08:00
parent 178181478f
commit a30bd855dd
44 changed files with 157 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,7 +141,9 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
public List<IpPortCfg> getIpPortList(IpPortCfg entity){
return synchronizationDao.getIpPortListByService(entity);
}
public List<PxyObjTrustedCaCrl> getPxyObjTrustedCrlCfgListByCertId(List certIds){
return synchronizationDao.getPxyObjTrustedCrlCfgListByCertId(certIds);
}
/**
* 回调类配置下发
* @param className
@@ -157,6 +159,9 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
}
if(!StringUtil.isEmpty(ids) && !StringUtil.isEmpty(entity.getTableName())) {
commonPolicyDao.auditCfgBatch( entity.getTableName(), entity,ids,null);
if(entity.getTableName().equals("pxy_obj_trusted_ca_cert")) {
commonPolicyDao.auditCfgBatch("pxy_obj_trusted_ca_crl", entity,ids,null);
}
}
if(entity.getIsAudit()==1){

17
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -1649,6 +1649,7 @@ public class ConfigSynchronizationService extends BaseService{
configCompileList = new ArrayList();
List list = new ArrayList();
List newList = new ArrayList();
List ids = new ArrayList();
if(entity.getServiceId().equals(3)){//ip drop回调类配置用了主表和子表关系
list = configSynchronizationDao.getCfgIndexList(entity);
if(!StringUtil.isEmpty(list)){
@@ -1678,19 +1679,31 @@ public class ConfigSynchronizationService extends BaseService{
newList.add(convertCallBackProxyObjKeyring(cfg));
}
}else if(className.equals("PxyObjTrustedCaCert")){
//TODO 下发cert配置时，需绑定下发crl配置
//下发cert配置时，需绑定下发crl配置
list = configSynchronizationDao.getPxyObjTrustedCertCfgList(entity);
for(int i=0;i<list.size();i++){
PxyObjTrustedCaCert cfg = (PxyObjTrustedCaCert) list.get(i);
newList.addAll(convertCallBackProxyObjTrustedCa(cfg,null));
ids.add(cfg.getCompileId());
}
if(!StringUtil.isEmpty(ids)){
list=new ArrayList<>();
list=configSynchronizationDao.getPxyObjTrustedCrlCfgListByCertId(ids);
for(int i=0;i<list.size();i++){
PxyObjTrustedCaCrl cfg = (PxyObjTrustedCaCrl) list.get(i);
newList.addAll(convertCallBackProxyObjTrustedCa(null,cfg));
}
}
}else if(className.equals("PxyObjTrustedCaCrl")){
//TODO 只允许单独下发certId为空或0的crl配置
ids=new ArrayList<>();
//只允许单独下发certId为空或0的crl配置
list = configSynchronizationDao.getPxyObjTrustedCrlCfgList(entity);
for(int i=0;i<list.size();i++){
PxyObjTrustedCaCrl cfg = (PxyObjTrustedCaCrl) list.get(i);
newList.addAll(convertCallBackProxyObjTrustedCa(null,cfg));
}
}else if(className.equals("DnsResStrategy")){
list = configSynchronizationDao.getDnsStrategyList(entity);
for(int i=0;i<list.size();i++){