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

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

Browse Source 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	证书颁发机构及 吊销列表功能提交
This commit is contained in:
duandongmei
2018-11-08 19:50:04 +08:00
parent 7a77f0ebcf 837574cd70
commit e59d98499e
181 changed files with 11974 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,8 @@ import com.nis.domain.basics.AsnIpCfg;
import com.nis.domain.callback.InlineIp;
import com.nis.domain.callback.NtcDnsResStrategy;
import com.nis.domain.callback.ProxyObjKeyring;
import com.nis.domain.callback.ProxyObjTrustedCa;
import com.nis.domain.callback.ProxyObjTrustedCaCrl;
import com.nis.domain.configuration.AppIpCfg;
import com.nis.domain.configuration.AreaBean;
import com.nis.domain.configuration.AreaIpCfg;
@@ -35,6 +37,8 @@ import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.DnsResStrategy;
import com.nis.domain.configuration.PxyObjKeyring;
import com.nis.domain.configuration.PxyObjTrustedCaCert;
import com.nis.domain.configuration.PxyObjTrustedCaCrl;
import com.nis.domain.maat.MaatCfg.GroupCfg;
import com.nis.domain.maat.MaatCfg.IpCfg;
import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
@@ -43,6 +47,7 @@ import com.nis.util.ConfigServiceUtil;
import com.nis.util.Configurations;
import com.nis.util.Constants;
import com.nis.util.IpUtil;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils;
/**
@@ -959,6 +964,35 @@ public abstract class BaseService {
proxyObjKeyring.setOpTime(cfg.getAuditTime());
return proxyObjKeyring;
}
//可信证书
public List<ProxyObjTrustedCa> convertCallBackProxyObjTrustedCa(PxyObjTrustedCaCert cfgCert,PxyObjTrustedCaCrl cfgCrl){
List<ProxyObjTrustedCa> proxyObjTrustedCas=new ArrayList<>();
ProxyObjTrustedCa proxyObjTrustedCaCert=new ProxyObjTrustedCa();
if(cfgCert != null && !StringUtil.isEmpty(cfgCert.getCompileId())){
proxyObjTrustedCaCert.setId(Long.valueOf(cfgCert.getCompileId()));
proxyObjTrustedCaCert.setCfgId(cfgCert.getCompileId());
proxyObjTrustedCaCert.setCertId(cfgCert.getCompileId());
proxyObjTrustedCaCert.setCertName(cfgCert.getCfgDesc());
proxyObjTrustedCaCert.setCertFile(cfgCert.getCertFile());
proxyObjTrustedCaCert.setService(cfgCert.getServiceId());
proxyObjTrustedCaCert.setIsValid(cfgCert.getIsValid());
proxyObjTrustedCaCert.setOpTime(cfgCert.getAuditTime());
proxyObjTrustedCas.add(proxyObjTrustedCaCert);
}
if(cfgCrl != null && !StringUtil.isEmpty(cfgCrl.getCompileId())){
proxyObjTrustedCaCert.setId(Long.valueOf(cfgCrl.getCompileId()));
proxyObjTrustedCaCert.setCfgId(cfgCrl.getCompileId());
proxyObjTrustedCaCert.setCertId(cfgCrl.getCertId());
proxyObjTrustedCaCert.setService(cfgCrl.getServiceId());
proxyObjTrustedCaCert.setIsValid(cfgCrl.getIsValid());
proxyObjTrustedCaCert.setOpTime(cfgCrl.getAuditTime());
proxyObjTrustedCaCert.setCrlId(cfgCrl.getCompileId());
proxyObjTrustedCaCert.setCrlFile(cfgCrl.getCrlFile());
proxyObjTrustedCas.add(proxyObjTrustedCaCert);
}
return proxyObjTrustedCas;
}
//ip转换为callback用ip
public NtcDnsResStrategy convertCallBackDnsResStrategy(DnsResStrategy cfg){
NtcDnsResStrategy resStrategy=new NtcDnsResStrategy();

9
src/main/java/com/nis/web/service/basics/AsnIpCfgService.java
View File

@@ -80,8 +80,12 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveAsnIpBatch(Map<String,List<AsnIpCfg>> cfgs,int total) {
//需要通过删除域接口删除的ip集合
List<AsnIpCfg> toDelAsnIpCfgs=Lists.newArrayList();
//需要本地保存的IP集合
List<AsnIpCfg> toSaveAsnIpCfgs=Lists.newArrayList();
//需要通过新增域接口新增的ip集合
List<AsnIpCfg> toAddRegionAsnIpCfgs=Lists.newArrayList();
List<SysDataDictionaryItem> isImportAll=DictUtils.getDictList("IS_ASN_IP_IMPORT_ALL");
List<Integer> idList=ConfigServiceUtil.getId(3, total);
int ind=0;
@@ -103,6 +107,7 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
cfg.setIsValid(Constants.VALID_NO);
else {
cfg.setIsValid(Constants.VALID_YES);
toAddRegionAsnIpCfgs.add(cfg);
}
ind++;
}
@@ -119,8 +124,8 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
if(toDelAsnIpCfgs.size()>0) {
asnIPRegionSendToMaat(toDelAsnIpCfgs,Constants.VALID_NO);
}
if(toSaveAsnIpCfgs.size()>0) {
asnIPRegionSendToMaat(toSaveAsnIpCfgs,Constants.VALID_YES);
if(toAddRegionAsnIpCfgs.size()>0) {
asnIPRegionSendToMaat(toAddRegionAsnIpCfgs,Constants.VALID_YES);
}
}
/**

9
src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java
View File

@@ -311,8 +311,13 @@ public class AppMultiFeatureCfgService extends BaseService {
public Map<String, List> exportFeature(AppFeatureIndex entity){
Map<String, List> dataMap=new HashMap<String, List>();
List<AppIpCfg> ipRangeList = appMultiFeatureCfgDao.getAppIpRangeCfg(entity.getCompileId(),entity.getFunctionId());
List<AppComplexFeatureCfg> appKeyList = appMultiFeatureCfgDao.getAppComplexFeatureCfg(entity.getCompileId(),entity.getFunctionId(),null);
dataMap.put("APP_KEYWORDS", appKeyList);
if(entity.getFunctionId()!=567){
List<AppComplexFeatureCfg> appKeyList = appMultiFeatureCfgDao.getAppComplexFeatureCfg(entity.getCompileId(),entity.getFunctionId(),null);
dataMap.put("APP_KEYWORDS", appKeyList);
}else{
List<AppStringFeatureCfg> appKeyList = appMultiFeatureCfgDao.getAppStringFeatureCfg(entity.getCompileId(),entity.getFunctionId(),null);
dataMap.put("APP_DK_GL", appKeyList);
}
dataMap.put("APP_IP_RANGE", ipRangeList);
return dataMap;
}

280
src/main/java/com/nis/web/service/configuration/PxyObjKeyringService.java
View File

@@ -5,21 +5,29 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.nis.domain.Page;
import com.nis.domain.callback.ProxyObjKeyring;
import com.nis.domain.callback.ProxyObjTrustedCa;
import com.nis.domain.callback.ProxyObjTrustedCaCrl;
import com.nis.domain.configuration.PxyObjKeyring;
import com.nis.domain.configuration.PxyObjTrustedCaCert;
import com.nis.domain.configuration.PxyObjTrustedCaCrl;
import com.nis.domain.maat.ToMaatResult;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.StringUtil;
import com.nis.web.dao.basics.ServiceDictInfoDao;
import com.nis.web.dao.configuration.PxyObjKeyringDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;
import oracle.sql.ARRAY;
/**
@@ -31,6 +39,8 @@ import com.nis.web.service.BaseService;
public class PxyObjKeyringService extends BaseService{
@Autowired
protected PxyObjKeyringDao pxyObjKeyringDao;
@Autowired
private ServiceDictInfoDao serviceDictInfoDao;
/**
@@ -46,6 +56,19 @@ public class PxyObjKeyringService extends BaseService{
page.setList(list);
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
*/
public Page<PxyObjTrustedCaCert> findTrustedCertPage(Page<PxyObjTrustedCaCert> page, PxyObjTrustedCaCert entity) {
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
entity.setPage(page);
List<PxyObjTrustedCaCert> list=pxyObjKeyringDao.findTrustedCertPage(entity);
page.setList(list);
return page;
}
public List<PxyObjKeyring> findPxyObjKeyrings(Long cfgId,Integer isValid,Integer isAudit,String cfgType) {
List<PxyObjKeyring> list=pxyObjKeyringDao.findList(cfgId,isValid,isAudit,cfgType);
return list;
@@ -59,6 +82,9 @@ public class PxyObjKeyringService extends BaseService{
}
return dnsResStrategy;
}
public PxyObjTrustedCaCert getPxyObjTrustedCaCert(Long id) {
return pxyObjKeyringDao.getPxyObjTrustedCaCert(id);
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveOrUpdate(PxyObjKeyring entity){
Date createTime=new Date();
@@ -92,6 +118,163 @@ public class PxyObjKeyringService extends BaseService{
pxyObjKeyringDao.update(entity);
}
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void trustedCertsaveOrUpdate(PxyObjTrustedCaCert entity){
Date createTime=new Date();
setAreaEffectiveIds(entity);
entity.setIsValid(0);
entity.setIsAudit(0);
//新增
if(StringUtil.isEmpty(entity.getCfgId())){
entity.initDefaultValue();
entity.setCreatorId(UserUtils.getUser().getId());
entity.setCreateTime(createTime);
//调用服务接口获取compileId
List<Integer> compileIds = new ArrayList<Integer>();
try {
compileIds = ConfigServiceUtil.getId(1,1);
} catch (Exception e) {
e.printStackTrace();
logger.info("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
if(compileIds != null && compileIds.size() >0 && compileIds.get(0) != 0){
entity.setCompileId(compileIds.get(0));
}
pxyObjKeyringDao.insertPxyObjTrustedCaCert(entity);
//修改
}else{
Date editTime=new Date();
entity.setEditorId(UserUtils.getUser().getId());
entity.setEditTime(editTime);
pxyObjKeyringDao.updatePxyObjTrustedCaCert(entity);
//修改主表cert配置时，需要修改子表crl配置信息
PxyObjTrustedCaCrl crlCfg =new PxyObjTrustedCaCrl();
BeanUtils.copyProperties(entity, crlCfg, new String[]{"cfgId","serviceId","compileId","cfgType"});
entity=pxyObjKeyringDao.getPxyObjTrustedCaCert(entity.getCfgId());
crlCfg.setCertId(entity.getCompileId());
pxyObjKeyringDao.updatePxyObjTrustedCaCrl(crlCfg);
}
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void trustedCrlsaveOrUpdate(PxyObjTrustedCaCrl entity){
if(StringUtil.isEmpty(entity.getCertId())){
entity.setCertId(0);
}
Date createTime=new Date();
Integer oldCrlAudit=0;
Integer oldCompileId=0;
PxyObjTrustedCaCrl oldCrl=pxyObjKeyringDao.getPxyObjTrustedCaCrl(entity);
if(oldCrl != null){
entity.setCfgId(oldCrl.getCfgId());
entity.setCompileId(oldCrl.getCompileId());
oldCrlAudit=oldCrl.getIsAudit();
oldCompileId=oldCrl.getCompileId();
}
//新增
if(StringUtil.isEmpty(entity.getCfgId())){
entity.initDefaultValue();
entity.setCreatorId(UserUtils.getUser().getId());
entity.setCreateTime(createTime);
//调用服务接口获取compileId
List<Integer> compileIds = new ArrayList<Integer>();
try {
compileIds = ConfigServiceUtil.getId(1,1);
} catch (Exception e) {
e.printStackTrace();
logger.info("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
if(compileIds != null && compileIds.size() >0 && compileIds.get(0) != 0){
entity.setCompileId(compileIds.get(0));
}
entity.setCreateTime(createTime);
entity.setCreatorId(UserUtils.getUser().getId());
//主表为审核通过，则直接修改审核信息
if(entity.getIsAudit().equals(1)){
entity.setAuditTime(createTime);
entity.setAuditorId(UserUtils.getUser().getId());
}
pxyObjKeyringDao.insertPxyObjTrustedCaCrl(entity);
}else{
Date editTime=new Date();
//主表为审核通过，则直接修改审核信息
if(entity.getIsAudit() == 1){
entity.setAuditTime(editTime);
entity.setAuditorId(UserUtils.getUser().getId());
//主表为未审核，直接修改修改人员信息
}else{
entity.setEditorId(UserUtils.getUser().getId());
entity.setEditTime(editTime);
}
//如之前crl为生效，则需要重新获取编译id
if(oldCrlAudit==1){
//调用服务接口获取compileId
List<Integer> compileIds = new ArrayList<Integer>();
try {
compileIds = ConfigServiceUtil.getId(1,1);
} catch (Exception e) {
e.printStackTrace();
logger.info("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
if(compileIds != null && compileIds.size() >0 && compileIds.get(0) != 0){
entity.setCompileId(compileIds.get(0));
}
}
pxyObjKeyringDao.updatePxyObjTrustedCaCrl(entity);
}
//主表cert审核通过，crl配置需下发
if(entity.getIsAudit() == 1){
//crl之前为生效状态，需先失效
if(oldCrlAudit==1){
String json="";
List<ProxyObjTrustedCa> resStrategyList=new ArrayList<>();
resStrategyList=convertCallBackProxyObjTrustedCa(null,entity);
if( !StringUtil.isEmpty(resStrategyList)){
resStrategyList.get(0).setCrlId(oldCompileId);
resStrategyList.get(0).setId(Long.valueOf(oldCompileId));
resStrategyList.get(0).setCfgId(oldCompileId);
resStrategyList.get(0).setIsValid(0);
}
//调用服务接口取消配置
json=gsonToJson(resStrategyList);
logger.info("crl配置参数："+json);
//调用服务接口取消配置
try {
ToMaatResult result = ConfigServiceUtil.put(json, 2);
logger.info("crl配置响应信息："+result.getMsg());
} catch (Exception e) {
e.printStackTrace();
logger.info("crl配置失败");
throw e;
}
}
String json="";
List<ProxyObjTrustedCa> ProxyObjTrustedCaList=new ArrayList<ProxyObjTrustedCa>();
ProxyObjTrustedCaList=convertCallBackProxyObjTrustedCa(null,entity);
//调用服务接口下发配置数据
json=gsonToJson(ProxyObjTrustedCaList);
logger.info("crl配置参数："+json);
//调用服务接口下发配置
try {
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
if(result!=null){
logger.info("crl配置下发响应信息："+result.getMsg());
}
} catch (Exception e) {
logger.error("crl配置下发失败",e);
throw e;
}
}
}
/**
*
@@ -168,6 +351,103 @@ public class PxyObjKeyringService extends BaseService{
}
}
}
/**
*
* @param isAudit
* @param isValid
* @param ids compileIds
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void trustedCertDelete(Integer isAudit,Integer isValid,String ids,Integer functionId){
String[] idArray = ids.split(",");
for(String id :idArray){
PxyObjTrustedCaCert entity = new PxyObjTrustedCaCert();
entity.setCfgId(Long.valueOf(id));
entity.setFunctionId(functionId);
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());
entity.setEditTime(new Date());
pxyObjKeyringDao.updatePxyObjTrustedCaCert(entity);
//主表cert配置删除后，需删除crl子表配置
PxyObjTrustedCaCrl crlCfg =new PxyObjTrustedCaCrl();
BeanUtils.copyProperties(entity, crlCfg, new String[]{"cfgId","serviceId","compileId","cfgType"});
entity=pxyObjKeyringDao.getPxyObjTrustedCaCert(entity.getCfgId());
crlCfg.setCertId(entity.getCompileId());
pxyObjKeyringDao.updatePxyObjTrustedCaCrl(crlCfg);
}
}
/**
*
* @param isAudit
* @param isValid
* @param ids cfgId
* @param functionId
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void trustedCertAudit(Integer isAudit,Integer isValid,Integer functionId,String id,Date auditTime){
PxyObjTrustedCaCrl crlCfg=new PxyObjTrustedCaCrl();
PxyObjTrustedCaCert cfg=new PxyObjTrustedCaCert();
cfg.setCfgId(Long.valueOf(id));
cfg.setIsValid(isValid);
cfg.setIsAudit(isAudit);
cfg.setEditTime(auditTime);
cfg.setEditorId(UserUtils.getUser().getId());
cfg.setAuditorId(UserUtils.getUser().getId());
cfg.setAuditTime(auditTime);
//修改主表cert 配置状态
pxyObjKeyringDao.updatePxyObjTrustedCaCert(cfg);
cfg=getPxyObjTrustedCaCert(cfg.getCfgId());
//修改子表crl 配置状态
BeanUtils.copyProperties(cfg, crlCfg, new String[]{"cfgId","serviceId","compileId","cfgType"});
crlCfg.setCertId(cfg.getCompileId());
pxyObjKeyringDao.updatePxyObjTrustedCaCrl(crlCfg);
crlCfg=pxyObjKeyringDao.getPxyObjTrustedCaCrl(crlCfg);
//失效配置，将子表的失效来函设置与主表相同
if(cfg.getIsAudit()==3){
//设置配置取消的来函信息
serviceDictInfoDao.auditCancleRequestInfo(cfg.getCancelRequestId(),
"pxy_obj_trusted_ca_crl",
crlCfg.getCfgId().toString());
}
String json="";
if(cfg.getIsAudit()==1){
List<ProxyObjTrustedCa> trustedCertList=new ArrayList<ProxyObjTrustedCa>();
//可信证书cert回调配置转换
trustedCertList=convertCallBackProxyObjTrustedCa(cfg,crlCfg);
//调用服务接口下发配置数据
json=gsonToJson(trustedCertList);
logger.info("可信证书（cert+crl）配置下发配置参数："+json);
//调用服务接口下发配置
try {
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
if(result!=null){
logger.info("可信证书（cert+crl）配置下发响应信息："+result.getMsg());
}
} catch (Exception e) {
logger.error("可信证书（cert+crl）配置下发失败",e);
throw e;
}
}else if(cfg.getIsAudit()==3){
List<ProxyObjTrustedCa> trustedCertList=new ArrayList<ProxyObjTrustedCa>();
//可信证书cert回调配置转换
trustedCertList=convertCallBackProxyObjTrustedCa(cfg,crlCfg);
//调用服务接口取消配置
json=gsonToJson(trustedCertList);
logger.info("可信证书（cert+crl）配置参数："+json);
//调用服务接口取消配置
try {
ToMaatResult result = ConfigServiceUtil.put(json, 2);
logger.info("可信证书配置响应信息："+result.getMsg());
} catch (Exception e) {
e.printStackTrace();
logger.error("可信证书配置失败");
throw e;
}
}
}
}