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

InterceptPolicy：添加protocol errors参数、且修正默认参数

Browse Source
This commit is contained in:
wangwei
2019-06-20 17:59:50 +08:00
parent cf6d462feb
commit 8217770d6d
11 changed files with 155 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nis/domain/configuration/BaseIpCfg.java
View File

@@ -405,6 +405,7 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
protected Integer certTransparency; protected Integer certTransparency;
protected Integer clientCertReq; protected Integer clientCertReq;
protected Integer pinning; protected Integer pinning;
protected Integer protocolErrors;
protected Integer cn; protected Integer cn;
protected Integer issuer; protected Integer issuer;
protected Integer selfSigned; protected Integer selfSigned;
@@ -446,6 +447,12 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
} }
public void setPinning(Integer pinning) { public void setPinning(Integer pinning) {
this.pinning = pinning; this.pinning = pinning;
}
public Integer getProtocolErrors() {
return protocolErrors;
}
public void setProtocolErrors(Integer protocolErrors) {
this.protocolErrors = protocolErrors;
} }
public Integer getCn() { public Integer getCn() {
return cn; return cn;

7
src/main/java/com/nis/domain/configuration/BaseStringCfg.java
View File

@@ -294,6 +294,7 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
protected Integer certTransparency; protected Integer certTransparency;
protected Integer clientCertReq; protected Integer clientCertReq;
protected Integer pinning; protected Integer pinning;
protected Integer protocolErrors;
protected Integer cn; protected Integer cn;
protected Integer issuer; protected Integer issuer;
protected Integer selfSigned; protected Integer selfSigned;
@@ -335,6 +336,12 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
} }
public void setPinning(Integer pinning) { public void setPinning(Integer pinning) {
this.pinning = pinning; this.pinning = pinning;
}
public Integer getProtocolErrors() {
return protocolErrors;
}
public void setProtocolErrors(Integer protocolErrors) {
this.protocolErrors = protocolErrors;
} }
public Integer getCn() { public Integer getCn() {
return cn; return cn;

30
src/main/java/com/nis/domain/configuration/PxyInterceptCfg.java
View File

@@ -18,27 +18,29 @@ public class PxyInterceptCfg extends CfgIndexInfo {
private String clientCertReq; private String clientCertReq;
@ExcelField(title="exclusions_pinning",dictType="SYS_YES_NO",sort=12) @ExcelField(title="exclusions_pinning",dictType="SYS_YES_NO",sort=12)
private String pinning; private String pinning;
@ExcelField(title="cert_verify_approach_cn",dictType="SYS_YES_NO",sort=13) @ExcelField(title="exclusions_protocol_errors",dictType="SYS_YES_NO",sort=13)
private String protocolErrors;
@ExcelField(title="cert_verify_approach_cn",dictType="SYS_YES_NO",sort=14)
private String cn; private String cn;
@ExcelField(title="cert_verify_approach_issuer",dictType="SYS_YES_NO",sort=14) @ExcelField(title="cert_verify_approach_issuer",dictType="SYS_YES_NO",sort=15)
private String issuer; private String issuer;
@ExcelField(title="cert_verify_approach_self_signed",dictType="SYS_YES_NO",sort=15) @ExcelField(title="cert_verify_approach_self_signed",dictType="SYS_YES_NO",sort=16)
private String selfSigned; private String selfSigned;
@ExcelField(title="cert_verify_approach_expiration",dictType="SYS_YES_NO",sort=16) @ExcelField(title="cert_verify_approach_expiration",dictType="SYS_YES_NO",sort=17)
private String expiration; private String expiration;
@ExcelField(title="cert_verify_fail_method",dictType="FAIL_METHOD",sort=17) @ExcelField(title="cert_verify_fail_method",dictType="FAIL_METHOD",sort=18)
private String failMethod; private String failMethod;
@ExcelField(title="ssl_ver_min",dictType="SSL_VERSION",sort=18) @ExcelField(title="ssl_ver_min",dictType="SSL_VERSION",sort=19)
private String min; private String min;
@ExcelField(title="ssl_ver_max",dictType="SSL_VERSION",sort=19) @ExcelField(title="ssl_ver_max",dictType="SSL_VERSION",sort=20)
private String max; private String max;
@ExcelField(title="ssl_ver_mirror_client",dictType="SYS_YES_NO",sort=20) @ExcelField(title="ssl_ver_mirror_client",dictType="SYS_YES_NO",sort=21)
private String mirrorClient; private String mirrorClient;
@ExcelField(title="ssl_ver_allow_http2",dictType="SYS_YES_NO",sort=21) @ExcelField(title="ssl_ver_allow_http2",dictType="SYS_YES_NO",sort=22)
private String allowHttp2; private String allowHttp2;
@ExcelField(title="decrypt_mirror_enable",dictType="SYS_YES_NO",sort=22) @ExcelField(title="decrypt_mirror_enable",dictType="SYS_YES_NO",sort=23)
private String enable; private String enable;
@ExcelField(title="decrypt_mirror_mirror_profile",sort=23) @ExcelField(title="decrypt_mirror_mirror_profile",sort=24)
private String mirrorProfile; private String mirrorProfile;
private String userRegion1; private String userRegion1;
private String userRegion2; private String userRegion2;
@@ -74,6 +76,12 @@ public class PxyInterceptCfg extends CfgIndexInfo {
} }
public void setPinning(String pinning) { public void setPinning(String pinning) {
this.pinning = pinning; this.pinning = pinning;
}
public String getProtocolErrors() {
return protocolErrors;
}
public void setProtocolErrors(String protocolErrors) {
this.protocolErrors = protocolErrors;
} }
public String getCn() { public String getCn() {
return cn; return cn;

31
src/main/java/com/nis/domain/configuration/template/InterceptDomainTemplate.java
View File

@@ -13,6 +13,8 @@ public class InterceptDomainTemplate extends StringAllNotDoLogTemplate {
private Integer pinning; private Integer pinning;
private Integer protocolErrors;
private Integer cn; private Integer cn;
private Integer issuer; private Integer issuer;
@@ -70,77 +72,84 @@ public class InterceptDomainTemplate extends StringAllNotDoLogTemplate {
public void setPinning(Integer pinning) { public void setPinning(Integer pinning) {
this.pinning = pinning; this.pinning = pinning;
} }
@ExcelField(title="cert_verify_approach_cn",align=2,sort=22) @ExcelField(title="protocol_errors",align=2,sort=22)
public Integer getProtocolErrors() {
return protocolErrors;
}
public void setProtocolErrors(Integer protocolErrors) {
this.protocolErrors = protocolErrors;
}
@ExcelField(title="cert_verify_approach_cn",align=2,sort=23)
public Integer getCn() { public Integer getCn() {
return cn; return cn;
} }
public void setCn(Integer cn) { public void setCn(Integer cn) {
this.cn = cn; this.cn = cn;
} }
@ExcelField(title="cert_verify_approach_issuer",align=2,sort=23) @ExcelField(title="cert_verify_approach_issuer",align=2,sort=24)
public Integer getIssuer() { public Integer getIssuer() {
return issuer; return issuer;
} }
public void setIssuer(Integer issuer) { public void setIssuer(Integer issuer) {
this.issuer = issuer; this.issuer = issuer;
} }
@ExcelField(title="cert_verify_approach_self_signed",align=2,sort=24) @ExcelField(title="cert_verify_approach_self_signed",align=2,sort=25)
public Integer getSelfSigned() { public Integer getSelfSigned() {
return selfSigned; return selfSigned;
} }
public void setSelfSigned(Integer selfSigned) { public void setSelfSigned(Integer selfSigned) {
this.selfSigned = selfSigned; this.selfSigned = selfSigned;
} }
@ExcelField(title="cert_verify_approach_expiration",align=2,sort=25) @ExcelField(title="cert_verify_approach_expiration",align=2,sort=26)
public Integer getExpiration() { public Integer getExpiration() {
return expiration; return expiration;
} }
public void setExpiration(Integer expiration) { public void setExpiration(Integer expiration) {
this.expiration = expiration; this.expiration = expiration;
} }
@ExcelField(title="cert_verify_fail_method",dictType="FAIL_METHOD",align=2,sort=26) @ExcelField(title="cert_verify_fail_method",dictType="FAIL_METHOD",align=2,sort=27)
public String getFailMethod() { public String getFailMethod() {
return failMethod; return failMethod;
} }
public void setFailMethod(String failMethod) { public void setFailMethod(String failMethod) {
this.failMethod = failMethod; this.failMethod = failMethod;
} }
@ExcelField(title="ssl_ver_min",dictType="SSL_VERSION",align=2,sort=27) @ExcelField(title="ssl_ver_min",dictType="SSL_VERSION",align=2,sort=28)
public String getMin() { public String getMin() {
return min; return min;
} }
public void setMin(String min) { public void setMin(String min) {
this.min = min; this.min = min;
} }
@ExcelField(title="ssl_ver_max",dictType="SSL_VERSION",align=2,sort=28) @ExcelField(title="ssl_ver_max",dictType="SSL_VERSION",align=2,sort=29)
public String getMax() { public String getMax() {
return max; return max;
} }
public void setMax(String max) { public void setMax(String max) {
this.max = max; this.max = max;
} }
@ExcelField(title="ssl_ver_mirror_client",align=2,sort=29) @ExcelField(title="ssl_ver_mirror_client",align=2,sort=30)
public Integer getMirrorClient() { public Integer getMirrorClient() {
return mirrorClient; return mirrorClient;
} }
public void setMirrorClient(Integer mirrorClient) { public void setMirrorClient(Integer mirrorClient) {
this.mirrorClient = mirrorClient; this.mirrorClient = mirrorClient;
} }
@ExcelField(title="ssl_ver_allow_http2",align=2,sort=30) @ExcelField(title="ssl_ver_allow_http2",align=2,sort=31)
public Integer getAllowHttp2() { public Integer getAllowHttp2() {
return allowHttp2; return allowHttp2;
} }
public void setAllowHttp2(Integer allowHttp2) { public void setAllowHttp2(Integer allowHttp2) {
this.allowHttp2 = allowHttp2; this.allowHttp2 = allowHttp2;
} }
@ExcelField(title="decrypt_mirror_enable",align=2,sort=31) @ExcelField(title="decrypt_mirror_enable",align=2,sort=32)
public Integer getEnable() { public Integer getEnable() {
return enable; return enable;
} }
public void setEnable(Integer enable) { public void setEnable(Integer enable) {
this.enable = enable; this.enable = enable;
} }
@ExcelField(title="decrypt_mirror_mirror_profile",align=2,sort=32) @ExcelField(title="decrypt_mirror_mirror_profile",align=2,sort=33)
public Integer getMirrorProfile() { public Integer getMirrorProfile() {
return mirrorProfile; return mirrorProfile;
} }

31
src/main/java/com/nis/domain/configuration/template/InterceptIpTemplate.java
View File

@@ -14,6 +14,8 @@ public class InterceptIpTemplate extends IpAllNotDoLogTemplate {
private Integer pinning; private Integer pinning;
private Integer protocolErrors;
private Integer cn; private Integer cn;
private Integer issuer; private Integer issuer;
@@ -71,77 +73,84 @@ public class InterceptIpTemplate extends IpAllNotDoLogTemplate {
public void setPinning(Integer pinning) { public void setPinning(Integer pinning) {
this.pinning = pinning; this.pinning = pinning;
} }
@ExcelField(title="cert_verify_approach_cn",align=2,sort=22) @ExcelField(title="exclusions_protocol_errors",align=2,sort=22)
public Integer getProtocolErrors() {
return protocolErrors;
}
public void setProtocolErrors(Integer protocolErrors) {
this.protocolErrors = protocolErrors;
}
@ExcelField(title="cert_verify_approach_cn",align=2,sort=23)
public Integer getCn() { public Integer getCn() {
return cn; return cn;
} }
public void setCn(Integer cn) { public void setCn(Integer cn) {
this.cn = cn; this.cn = cn;
} }
@ExcelField(title="cert_verify_approach_issuer",align=2,sort=23) @ExcelField(title="cert_verify_approach_issuer",align=2,sort=24)
public Integer getIssuer() { public Integer getIssuer() {
return issuer; return issuer;
} }
public void setIssuer(Integer issuer) { public void setIssuer(Integer issuer) {
this.issuer = issuer; this.issuer = issuer;
} }
@ExcelField(title="cert_verify_approach_self_signed",align=2,sort=24) @ExcelField(title="cert_verify_approach_self_signed",align=2,sort=25)
public Integer getSelfSigned() { public Integer getSelfSigned() {
return selfSigned; return selfSigned;
} }
public void setSelfSigned(Integer selfSigned) { public void setSelfSigned(Integer selfSigned) {
this.selfSigned = selfSigned; this.selfSigned = selfSigned;
} }
@ExcelField(title="cert_verify_approach_expiration",align=2,sort=25) @ExcelField(title="cert_verify_approach_expiration",align=2,sort=26)
public Integer getExpiration() { public Integer getExpiration() {
return expiration; return expiration;
} }
public void setExpiration(Integer expiration) { public void setExpiration(Integer expiration) {
this.expiration = expiration; this.expiration = expiration;
} }
@ExcelField(title="cert_verify_fail_method",dictType="FAIL_METHOD",align=2,sort=26) @ExcelField(title="cert_verify_fail_method",dictType="FAIL_METHOD",align=2,sort=27)
public String getFailMethod() { public String getFailMethod() {
return failMethod; return failMethod;
} }
public void setFailMethod(String failMethod) { public void setFailMethod(String failMethod) {
this.failMethod = failMethod; this.failMethod = failMethod;
} }
@ExcelField(title="ssl_ver_min",dictType="SSL_VERSION",align=2,sort=27) @ExcelField(title="ssl_ver_min",dictType="SSL_VERSION",align=2,sort=28)
public String getMin() { public String getMin() {
return min; return min;
} }
public void setMin(String min) { public void setMin(String min) {
this.min = min; this.min = min;
} }
@ExcelField(title="ssl_ver_max",dictType="SSL_VERSION",align=2,sort=28) @ExcelField(title="ssl_ver_max",dictType="SSL_VERSION",align=2,sort=29)
public String getMax() { public String getMax() {
return max; return max;
} }
public void setMax(String max) { public void setMax(String max) {
this.max = max; this.max = max;
} }
@ExcelField(title="ssl_ver_mirror_client",align=2,sort=29) @ExcelField(title="ssl_ver_mirror_client",align=2,sort=30)
public Integer getMirrorClient() { public Integer getMirrorClient() {
return mirrorClient; return mirrorClient;
} }
public void setMirrorClient(Integer mirrorClient) { public void setMirrorClient(Integer mirrorClient) {
this.mirrorClient = mirrorClient; this.mirrorClient = mirrorClient;
} }
@ExcelField(title="ssl_ver_allow_http2",align=2,sort=30) @ExcelField(title="ssl_ver_allow_http2",align=2,sort=31)
public Integer getAllowHttp2() { public Integer getAllowHttp2() {
return allowHttp2; return allowHttp2;
} }
public void setAllowHttp2(Integer allowHttp2) { public void setAllowHttp2(Integer allowHttp2) {
this.allowHttp2 = allowHttp2; this.allowHttp2 = allowHttp2;
} }
@ExcelField(title="decrypt_mirror_enable",align=2,sort=31) @ExcelField(title="decrypt_mirror_enable",align=2,sort=32)
public Integer getEnable() { public Integer getEnable() {
return enable; return enable;
} }
public void setEnable(Integer enable) { public void setEnable(Integer enable) {
this.enable = enable; this.enable = enable;
} }
@ExcelField(title="decrypt_mirror_mirror_profile",align=2,sort=32) @ExcelField(title="decrypt_mirror_mirror_profile",align=2,sort=33)
public Integer getMirrorProfile() { public Integer getMirrorProfile() {
return mirrorProfile; return mirrorProfile;
} }

24
src/main/java/com/nis/util/excel/ExportExcel.java
View File

@@ -717,6 +717,28 @@ public class ExportExcel {
index++; index++;
} }
} }
//pinning
if("exclusions_protocol_errors".equals(headerStr)) {
commentStr="";
commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++;
commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n";
index++;
commentStr+=0+"（"+msgProp.getProperty("no")+"）\n";
index++;
if(StringUtil.isEmpty(headerStr)){
headerStr="";
commentStr="";
}else{
index++;
commentStr=commentStr+"\n"+msgProp.getProperty("rule_desc_tip")+":\n";
index++;
//2、默认值说明
commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":1\n";
index++;
index++;
}
}
//cn //cn
if("cert_verify_approach_cn".equals(headerStr)) { if("cert_verify_approach_cn".equals(headerStr)) {
commentStr=""; commentStr="";
@@ -908,7 +930,7 @@ public class ExportExcel {
//allow_http2 //allow_http2
if("ssl_ver_allow_http2".equals(headerStr)) { if("ssl_ver_allow_http2".equals(headerStr)) {
commentStr=""; commentStr="";
defaultValue="0"; defaultValue="1";
commentStr=msgProp.getProperty("select")+":\n"+commentStr; commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++; index++;
commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n"; commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n";

13
src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java
View File

@@ -575,6 +575,7 @@ public class CheckIpFormatThread implements Callable<String>{
Integer certTransparency=baseIpCfg.getCertTransparency(); Integer certTransparency=baseIpCfg.getCertTransparency();
Integer clientCertReq=baseIpCfg.getClientCertReq(); Integer clientCertReq=baseIpCfg.getClientCertReq();
Integer pinning=baseIpCfg.getPinning(); Integer pinning=baseIpCfg.getPinning();
Integer protocolErrors=baseIpCfg.getProtocolErrors();
Integer cn=baseIpCfg.getCn(); Integer cn=baseIpCfg.getCn();
Integer issuer=baseIpCfg.getIssuer(); Integer issuer=baseIpCfg.getIssuer();
Integer selfSigned=baseIpCfg.getSelfSigned(); Integer selfSigned=baseIpCfg.getSelfSigned();
@@ -649,6 +650,16 @@ public class CheckIpFormatThread implements Callable<String>{
}else { }else {
map.put("pinning", 1); map.put("pinning", 1);
} }
if(protocolErrors!=null) {
if(protocolErrors!=0&&protocolErrors!=1) {
errInfo.append(String.format(prop.getProperty("is_incorrect"),
prop.getProperty("exclusions_protocol_errors","exclusions protocol errors") + " ") + ";");
}else {
map.put("protocol_errors", protocolErrors);
}
}else {
map.put("protocol_errors", 1);
}
userRegionMap.put("exclusions", map); userRegionMap.put("exclusions", map);
map=new HashMap<>(); map=new HashMap<>();
Map<String,Object> map1=new HashMap<>(); Map<String,Object> map1=new HashMap<>();
@@ -724,7 +735,7 @@ public class CheckIpFormatThread implements Callable<String>{
} }
} }
if(allowHttp2==null) { if(allowHttp2==null) {
allowHttp2=0; allowHttp2=1;
map.put("allow_http2", allowHttp2); map.put("allow_http2", allowHttp2);
}else { }else {
if(allowHttp2!=0&&allowHttp2!=1) { if(allowHttp2!=0&&allowHttp2!=1) {

13
src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java
View File

@@ -521,6 +521,7 @@ public class CheckStringFormatThread implements Callable<String>{
Integer certTransparency=baseStringCfg.getCertTransparency(); Integer certTransparency=baseStringCfg.getCertTransparency();
Integer clientCertReq=baseStringCfg.getClientCertReq(); Integer clientCertReq=baseStringCfg.getClientCertReq();
Integer pinning=baseStringCfg.getPinning(); Integer pinning=baseStringCfg.getPinning();
Integer protocolErrors=baseStringCfg.getProtocolErrors();
Integer cn=baseStringCfg.getCn(); Integer cn=baseStringCfg.getCn();
Integer issuer=baseStringCfg.getIssuer(); Integer issuer=baseStringCfg.getIssuer();
Integer selfSigned=baseStringCfg.getSelfSigned(); Integer selfSigned=baseStringCfg.getSelfSigned();
@@ -595,6 +596,16 @@ public class CheckStringFormatThread implements Callable<String>{
}else { }else {
map.put("pinning", 1); map.put("pinning", 1);
} }
if(protocolErrors!=null) {
if(protocolErrors!=0&&protocolErrors!=1) {
errInfo.append(String.format(prop.getProperty("is_incorrect"),
prop.getProperty("exclusions_protocol_errors","exclusions protocol errors") + " ") + ";");
}else {
map.put("protocol_errors", protocolErrors);
}
}else {
map.put("protocol_errors", 1);
}
userRegionMap.put("exclusions", map); userRegionMap.put("exclusions", map);
map=new HashMap<>(); map=new HashMap<>();
Map<String,Object> map1=new HashMap<>(); Map<String,Object> map1=new HashMap<>();
@@ -670,7 +681,7 @@ public class CheckStringFormatThread implements Callable<String>{
} }
} }
if(allowHttp2==null) { if(allowHttp2==null) {
allowHttp2=0; allowHttp2=1;
map.put("allow_http2", allowHttp2); map.put("allow_http2", allowHttp2);
}else { }else {
if(allowHttp2!=0&&allowHttp2!=1) { if(allowHttp2!=0&&allowHttp2!=1) {

9
src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
View File

@@ -141,6 +141,7 @@ public class InterceptController extends CommonController {
String cert_transparency = request.getParameter("cert_transparency"); String cert_transparency = request.getParameter("cert_transparency");
String client_cert_req = request.getParameter("client_cert_req"); String client_cert_req = request.getParameter("client_cert_req");
String pinning = request.getParameter("pinning"); String pinning = request.getParameter("pinning");
String protocol_errors = request.getParameter("protocol_errors");
if(StringUtils.isNotBlank(ev_cert)){ if(StringUtils.isNotBlank(ev_cert)){
map.put("ev_cert", Integer.parseInt(ev_cert.trim())); map.put("ev_cert", Integer.parseInt(ev_cert.trim()));
}else { }else {
@@ -156,6 +157,11 @@ public class InterceptController extends CommonController {
}else { }else {
map.put("pinning", 0); map.put("pinning", 0);
} }
if(StringUtils.isNotBlank(protocol_errors)){
map.put("protocol_errors", Integer.parseInt(protocol_errors.trim()));
}else {
map.put("protocol_errors", 0);
}
if(StringUtils.isNotBlank(client_cert_req)){ if(StringUtils.isNotBlank(client_cert_req)){
map.put("client_cert_req", Integer.parseInt(client_cert_req.trim())); map.put("client_cert_req", Integer.parseInt(client_cert_req.trim()));
}else { }else {
@@ -526,6 +532,9 @@ public class InterceptController extends CommonController {
if(((Map<String,Object>)userregion.get("exclusions")).containsKey("ev_cert")) { if(((Map<String,Object>)userregion.get("exclusions")).containsKey("ev_cert")) {
pxyInterceptCfg.setPinning(((Map<String,Object>)userregion.get("exclusions")).get("ev_cert").toString()); pxyInterceptCfg.setPinning(((Map<String,Object>)userregion.get("exclusions")).get("ev_cert").toString());
} }
if(((Map<String,Object>)userregion.get("exclusions")).containsKey("ev_cert")) {
pxyInterceptCfg.setProtocolErrors(((Map<String,Object>)userregion.get("exclusions")).get("ev_cert").toString());
}
if(((Map<String,Object>)((Map<String,Object>)userregion.get("cert_verify")).get("approach")).containsKey("cn")) { if(((Map<String,Object>)((Map<String,Object>)userregion.get("cert_verify")).get("approach")).containsKey("cn")) {
pxyInterceptCfg.setCn(((Map<String,Object>)((Map<String,Object>)userregion.get("cert_verify")).get("approach")).get("cn").toString()); pxyInterceptCfg.setCn(((Map<String,Object>)((Map<String,Object>)userregion.get("cert_verify")).get("approach")).get("cn").toString());
} }

26
src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
View File

@@ -584,7 +584,7 @@ legend{padding:.5em;border:0;width:auto;font-family: "Open Sans", sans-serif;col
protocolId="${service.protocolId }" protocolId="${service.protocolId }"
configDoLog="${service.configDoLog }" configDoLog="${service.configDoLog }"
value="${service.action }" class="required action" value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>> <c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==1)}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict"> <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${(dict.itemCode eq service.action) && (service.action eq 2) }"> <c:if test="${(dict.itemCode eq service.action) && (service.action eq 2) }">
<spring:message code="intercept"/> <spring:message code="intercept"/>
@@ -713,10 +713,30 @@ legend{padding:.5em;border:0;width:auto;font-family: "Open Sans", sans-serif;col
<input type="checkbox" id="client_cert_req" name="client_cert_req" class="switch userRegion" <input type="checkbox" id="client_cert_req" name="client_cert_req" class="switch userRegion"
value="${_cfg.cfgId eq null?1:_cfg.userRegion.exclusions.client_cert_req }" <c:if test="${_cfg.cfgId eq null or _cfg.userRegion.exclusions.client_cert_req eq 1}">checked</c:if>/> value="${_cfg.cfgId eq null?1:_cfg.userRegion.exclusions.client_cert_req }" <c:if test="${_cfg.cfgId eq null or _cfg.userRegion.exclusions.client_cert_req eq 1}">checked</c:if>/>
</div> </div>
&nbsp;<span title="<spring:message code="Turn off will block applications that use client certificate request."/>"
data-icon="&#xe08b;" style="cursor:default"></span>
</div> </div>
<div for="client_cert_req"></div> <div for="client_cert_req"></div>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">
<spring:message code="on_protocol_errors" />
</label>
<div class="col-md-6">
<div class="bootstrap-switch">
<input type="checkbox" id=protocol_errors name="protocol_errors" class="switch userRegion"
value="${_cfg.cfgId eq null?1:_cfg.userRegion.exclusions.protocol_errors }" <c:if test="${_cfg.cfgId eq null or _cfg.userRegion.exclusions.protocol_errors eq 1}">checked</c:if>/>
</div>
&nbsp;<span title="<spring:message code="Protocol errors are unsupported ciphers, communication exceptions and etc., enable this option will increase network availabilities."/>"
data-icon="&#xe08b;" style="cursor:default"></span>
</div>
<div for="protocol_errors"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"> <label class="control-label col-md-3">
@@ -819,7 +839,7 @@ legend{padding:.5em;border:0;width:auto;font-family: "Open Sans", sans-serif;col
<div class="col-md-6"> <div class="col-md-6">
<select id="fail_method" name="fail_method" data-live-search="true" class="selectpicker form-control required"> <select id="fail_method" name="fail_method" data-live-search="true" class="selectpicker form-control required">
<c:forEach items="${fns:getDictList('FAIL_METHOD')}" var="dictC"> <c:forEach items="${fns:getDictList('FAIL_METHOD')}" var="dictC">
<option value="${dictC.itemCode}" <c:if test="${(_cfg.userRegion.cert_verify.fail_method eq null and dictC.itemCode eq 'pass-through') or (_cfg.userRegion.cert_verify.fail_method eq dictC.itemCode)}">selected</c:if>><spring:message code="${dictC.itemValue}"/></option> <option value="${dictC.itemCode}" <c:if test="${(_cfg.userRegion.cert_verify.fail_method eq null and dictC.itemCode eq 'fail-close') or (_cfg.userRegion.cert_verify.fail_method eq dictC.itemCode)}">selected</c:if>><spring:message code="${dictC.itemValue}"/></option>
</c:forEach> </c:forEach>
</select> </select>
</div> </div>
@@ -888,7 +908,7 @@ legend{padding:.5em;border:0;width:auto;font-family: "Open Sans", sans-serif;col
<div class="col-md-6"> <div class="col-md-6">
<div class="bootstrap-switch"> <div class="bootstrap-switch">
<input type="checkbox" id="allow_http2" name="allow_http2" class="switch userRegion" <input type="checkbox" id="allow_http2" name="allow_http2" class="switch userRegion"
value="${_cfg.userRegion.ssl_ver.allow_http2 }" <c:if test="${_cfg.userRegion.ssl_ver.allow_http2 eq 1}">checked</c:if>/> value="${_cfg.userRegion.ssl_ver.allow_http2 eq null?1:_cfg.userRegion.ssl_ver.allow_http2}" <c:if test="${_cfg.cfgId eq null or _cfg.userRegion.ssl_ver.allow_http2 eq 1}">checked</c:if>/>
</div> </div>
</div> </div>
<div for="allow_http2"></div> <div for="allow_http2"></div>

3
src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
View File

@@ -102,6 +102,7 @@
$(obj).parent().find("td[data-column='cert_transparency']").text(jsonObj.exclusions.cert_transparency==1?"<spring:message code='yes'/>":"<spring:message code='no'/>"); $(obj).parent().find("td[data-column='cert_transparency']").text(jsonObj.exclusions.cert_transparency==1?"<spring:message code='yes'/>":"<spring:message code='no'/>");
$(obj).parent().find("td[data-column='client_cert_req']").text(jsonObj.exclusions.client_cert_req==1?"<spring:message code='yes'/>":"<spring:message code='no'/>"); $(obj).parent().find("td[data-column='client_cert_req']").text(jsonObj.exclusions.client_cert_req==1?"<spring:message code='yes'/>":"<spring:message code='no'/>");
$(obj).parent().find("td[data-column='pinning']").text(jsonObj.exclusions.pinning==1?"<spring:message code='yes'/>":"<spring:message code='no'/>"); $(obj).parent().find("td[data-column='pinning']").text(jsonObj.exclusions.pinning==1?"<spring:message code='yes'/>":"<spring:message code='no'/>");
$(obj).parent().find("td[data-column='protocol_errors']").text(jsonObj.exclusions.protocol_errors==1?"<spring:message code='yes'/>":"<spring:message code='no'/>");
$(obj).parent().find("td[data-column='cn']").text(jsonObj.cert_verify.approach.cn==1?"<spring:message code='yes'/>":"<spring:message code='no'/>"); $(obj).parent().find("td[data-column='cn']").text(jsonObj.cert_verify.approach.cn==1?"<spring:message code='yes'/>":"<spring:message code='no'/>");
$(obj).parent().find("td[data-column='issuer']").text(jsonObj.cert_verify.approach.issuer==1?"<spring:message code='yes'/>":"<spring:message code='no'/>"); $(obj).parent().find("td[data-column='issuer']").text(jsonObj.cert_verify.approach.issuer==1?"<spring:message code='yes'/>":"<spring:message code='no'/>");
$(obj).parent().find("td[data-column='self-signed']").text(jsonObj.cert_verify.approach['self-signed']==1?"<spring:message code='yes'/>":"<spring:message code='no'/>"); $(obj).parent().find("td[data-column='self-signed']").text(jsonObj.cert_verify.approach['self-signed']==1?"<spring:message code='yes'/>":"<spring:message code='no'/>");
@@ -459,6 +460,7 @@
<th column="exclusions_cert_transparency" ><spring:message code="exclusions_cert_transparency"/></th> <th column="exclusions_cert_transparency" ><spring:message code="exclusions_cert_transparency"/></th>
<th column="exclusions_client_cert_req" ><spring:message code="exclusions_client_cert_req"/></th> <th column="exclusions_client_cert_req" ><spring:message code="exclusions_client_cert_req"/></th>
<th column="exclusions_pinning" ><spring:message code="exclusions_pinning"/></th> <th column="exclusions_pinning" ><spring:message code="exclusions_pinning"/></th>
<th column="exclusions_protocol_errors" ><spring:message code="exclusions_protocol_errors"/></th>
<th column="cert_verify_approach_cn" ><spring:message code="cert_verify_approach_cn"/></th> <th column="cert_verify_approach_cn" ><spring:message code="cert_verify_approach_cn"/></th>
<th column="cert_verify_approach_issuer" ><spring:message code="cert_verify_approach_issuer"/></th> <th column="cert_verify_approach_issuer" ><spring:message code="cert_verify_approach_issuer"/></th>
<th column="cert_verify_approach_self_signed" ><spring:message code="cert_verify_approach_self_signed"/></th> <th column="cert_verify_approach_self_signed" ><spring:message code="cert_verify_approach_self_signed"/></th>
@@ -571,6 +573,7 @@
<td data-column="cert_transparency" ></td> <td data-column="cert_transparency" ></td>
<td data-column="client_cert_req" ></td> <td data-column="client_cert_req" ></td>
<td data-column="pinning" ></td> <td data-column="pinning" ></td>
<td data-column="protocol_errors" ></td>
<td data-column="cn" ></td> <td data-column="cn" ></td>
<td data-column="issuer" ></td> <td data-column="issuer" ></td>
<td data-column="self-signed" ></td> <td data-column="self-signed" ></td>