From 7e1875b38494abb5d6c5aecfbcbfa69eace754c9 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Sat, 19 Jan 2019 08:56:37 +0000
Subject: [PATCH] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E5=A2=9E=E5=8A=A0crl?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=9A=84=E8=BE=93=E5=85=A5=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0crl=E7=9A=84=E6=A0=BC=E5=BC=8F=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit ae283564cb3c2b2cdf08213f93ac0fa066bbc431)
---
 .../views/cfg/intercept/strateagy/form.jsp    | 26 ++++++++++---------
 .../views/cfg/intercept/strateagy/list.jsp    |  7 +++++
 .../1.11.0/jquery.validate.method.js          |  8 ++++++
 .../1.11.0/localization/messages_en.js        |  1 +
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
index 9e24157b2..2274bbda1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
@@ -342,7 +342,18 @@ function privateFileValidate(){
 											    <div for="expireAfter"></div>
 									        </div>
 								    </div>
-								    <div class="col-md-6 <c:if test="${isAdd }">hidden</c:if>">
+								    <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>
 									            <div class="col-md-6">
@@ -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">
@@ -370,7 +380,7 @@ function privateFileValidate(){
 								    </div>
 								</div>
 								<div class="row hidden">
-									<div class="col-md-6">
+									<div class="col-md-6 ">
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="public_key_algo"/></label>
 									            <div class="col-md-6">
@@ -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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
index 99be631ce..296980cb6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
@@ -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">
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
index b4c892e78..b1d3ff4e6 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
@@ -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
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
index 659631c94..45cd4d968 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
@@ -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",