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

证书增加crl参数的输入，并增加crl的格式校验

Browse Source 
(cherry picked from commit ae283564cb)
This commit is contained in:
duandongmei
2019-01-19 08:56:37 +00:00
committed by 王鑫
parent aa5eccf995
commit 7e1875b384
4 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
View File

@@ -342,6 +342,17 @@ function privateFileValidate(){
<div for="expireAfter"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="CRL"/></label>
<div class="col-md-6">
<input class="form-control required crlCheck" type="text" name="crl" value="${_cfg.crl}">
</div>
<div for="crl"></div>
</div>
</div>
</div>
<div class="row <c:if test="${isAdd }">hidden</c:if>">
<div class="col-md-6 <c:if test="${isAdd }">hidden</c:if>">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="issuer"/></label>
@@ -351,7 +362,6 @@ function privateFileValidate(){
</div>
</div>
</div>
<div class="row <c:if test="${isAdd }">hidden</c:if>">
<div class="col-md-6">
<div class="form-group">
@@ -379,15 +389,7 @@ function privateFileValidate(){
<div for="publicKeyAlgo"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="crl"/></label>
<div class="col-md-6">
<input class="form-control required" type="text" name="crl" value="${_cfg.crl}">
</div>
<div for="crl"></div>
</div>
</div>
</div>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
</div>

7
src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
View File

@@ -297,6 +297,7 @@
<th column="private_key_file" ><spring:message code="private_key_file"/></th>
<th column="public_key_file" ><spring:message code="public_key_file"/></th>
<th column="expire_after" ><spring:message code="expire_after"/></th>
<th column="crl" ><spring:message code="CRL"/></th>
<th column="issuer" ><spring:message code="issuer"/></th>
<th column="certificate_subject" ><spring:message code="certificate_subject"/></th>
<th column="not_before_time" ><spring:message code="not_before_time"/></th>
@@ -345,6 +346,12 @@
</a>
</td>
<td>${cfg.expireAfter }</td>
<td>
<a href="${cfg.crl }" target="_blank" data-original-title="${cfg.crl }"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fn:substring(cfg.crl,0,20) }
</a>
</td>
<td>
<a href="javascript:void(0)" target="_blank" data-original-title="${cfg.issuer }"
class="tooltips" data-flag="false" data-html="true" data-placement="top">

8
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
View File

@@ -208,6 +208,14 @@ jQuery.validator.addMethod("httpCheck",function(value, element) {
}
return false;
});
//证书crl 格式校验
jQuery.validator.addMethod("crlCheck",function(value, element) {
var regexp=/^[hH][tT][tT][pP]:\/\/(\S+\.)+\S{2,}(.)crl$/;
if(this.optional(element)||regexp.test(value)){
return true;
}
return false;
});
/*协议端口校验
* 规则TCP,UDP协议端口可以不为0
* 其他协议端口必须为0

1
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
View File

@@ -68,6 +68,7 @@
hasInvisibleChar:"The tag {0} has invisible character",
haveInvisibleChar:"The tags {0} have invisible character",
httpCheck:"Please enter a correct url(http[s]://xxx.xx)",
crlCheck:"Please enter a correct crl(http://xxx.xx.crl)",
failed:"Failed",
go_back:"Return",
log_5_minutes:"Log For The Last Five Minutes",