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

可信证书描述信息增加特殊字符串转移

Browse Source 
crl配置null处理
This commit is contained in:
DuanDongmei
2018-11-23 10:22:44 +08:00
parent 7560d43ba6
commit 21d4ee0f62
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/domain/callback/ProxyObjTrustedCa.java
View File

@@ -3,6 +3,7 @@ package com.nis.domain.callback;
import java.util.Date; import java.util.Date;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.nis.web.service.BaseService;
public class ProxyObjTrustedCa { public class ProxyObjTrustedCa {
@Expose @Expose
private Long id; //compileId private Long id; //compileId
@@ -64,6 +65,7 @@ public class ProxyObjTrustedCa {
return certName; return certName;
} }
public void setCertName(String certName) { public void setCertName(String certName) {
certName=BaseService.keywordsEscape(certName);
this.certName = certName; this.certName = certName;
} }
public String getCertFile() { public String getCertFile() {

2
src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
View File

@@ -777,9 +777,11 @@ public class PxyObjKeyringController extends BaseController {
try { try {
pxyObjKeyringService.trustedCertAudit(isAudit,isValid,functionId,id,auditTime); pxyObjKeyringService.trustedCertAudit(isAudit,isValid,functionId,id,auditTime);
} catch (MaatConvertException e) { } catch (MaatConvertException e) {
e.printStackTrace();
logger.error(e); logger.error(e);
addMessage(redirectAttributes,"error", "request_service_failed"); addMessage(redirectAttributes,"error", "request_service_failed");
}catch (Exception e) { }catch (Exception e) {
e.printStackTrace();
logger.error(e); logger.error(e);
addMessage(redirectAttributes,"error", "audit_failed"); addMessage(redirectAttributes,"error", "audit_failed");
} }

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

@@ -405,7 +405,7 @@ public class PxyObjKeyringService extends BaseService{
crlCfg=pxyObjKeyringDao.getPxyObjTrustedCaCrl(crlCfg); crlCfg=pxyObjKeyringDao.getPxyObjTrustedCaCrl(crlCfg);
//失效配置，将子表的失效来函设置与主表相同 //失效配置，将子表的失效来函设置与主表相同
if(cfg.getIsAudit()==3){ if(cfg.getIsAudit()==3 && crlCfg != null){
//设置配置取消的来函信息 //设置配置取消的来函信息
serviceDictInfoDao.auditCancleRequestInfo(cfg.getCancelRequestId(), serviceDictInfoDao.auditCancleRequestInfo(cfg.getCancelRequestId(),
"pxy_obj_trusted_ca_crl", "pxy_obj_trusted_ca_crl",