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

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 }"
configDoLog="${service.configDoLog }"
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:if test="${(dict.itemCode eq service.action) && (service.action eq 2) }">
<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"
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>
&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 for="client_cert_req"></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="form-group">
<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">
<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">
<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>
</select>
</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="bootstrap-switch">
<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 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='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='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='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'/>");
@@ -459,6 +460,7 @@
<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_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_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>
@@ -571,6 +573,7 @@
<td data-column="cert_transparency" ></td>
<td data-column="client_cert_req" ></td>
<td data-column="pinning" ></td>
<td data-column="protocol_errors" ></td>
<td data-column="cn" ></td>
<td data-column="issuer" ></td>
<td data-column="self-signed" ></td>