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

增加ssl配置功能

Browse Source
This commit is contained in:
zhangwei
2018-05-31 17:07:26 +08:00
parent 6eafbf6f59
commit df4f6e68ae
16 changed files with 545 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,8 +15,8 @@ $(function(){
and regionDistrict.regionType eq 3
and regionValue eq regionDistrict.configRegionValue}">
<!-- regionDistrict.regionType==3表示增强字符串类配置 -->
<input type="hidden" name="${cfgName}[${status.index }].cfgType" value="${regionDistrict.configRegionValue }">
<input type="hidden" name="${cfgName}[${status.index }].cfgRegionCode" value="${regionDistrict.configRegionCode }">
<input type="hidden" name="${cfgName}.cfgType" value="${regionDistrict.configRegionValue }">
<input type="hidden" name="${cfgName}.cfgRegionCode" value="${regionDistrict.configRegionCode }">
</c:if>
</c:forEach>
@@ -32,7 +32,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="district" /></label>
<div class="col-md-6">
<select name="${cfgName}[${status.index }].district"
<select name="${cfgName}.district"
class="selectpicker show-tick form-control required">
<c:forEach items="${regionList}" var="regionDistrict">
<c:if
@@ -46,7 +46,7 @@ $(function(){
</c:forEach>
</select>
</div>
<div for="${cfgName}[${status.index }].district"></div>
<div for="${cfgName}.district"></div>
</div>
</div>
<div class="col-md-6">
@@ -55,10 +55,10 @@ $(function(){
<spring:message code="keywords" /></label>
<div class="col-md-6">
<input class="form-control required" type="text"
name="${cfgName}[${status.index }].cfgKeywords"
name="${cfgName}.cfgKeywords"
value="${complexCfg.cfgKeywords}">
</div>
<div for="${cfgName}[${status.index }].cfgKeywords"></div>
<div for="${cfgName}.cfgKeywords"></div>
</div>
</div>
@@ -70,18 +70,18 @@ $(function(){
<spring:message code="expression_type" /></label>
<div class="col-md-6">
<label class="radio-inline"> <input type="radio"
name="${cfgName}[${status.index }].exprType" value="1"
name="${cfgName}.exprType" value="1"
class="required"
<c:if test="${complexCfg.exprType==1}">checked</c:if>> <spring:message
code="and" />
</label> <label class="radio-inline"> <input type="radio"
name="${cfgName}[${status.index }].exprType" value="0"
name="${cfgName}.exprType" value="0"
class="required"
<c:if test="${complexCfg.exprType==0 || complexCfg.exprType==null}">checked</c:if>>
<spring:message code="null" />
</label>
</div>
<div for="${cfgName}[${status.index }].exprType"></div>
<div for="${cfgName}.exprType"></div>
</div>
</div>
<div class="col-md-6">
@@ -89,7 +89,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="match_method" /></label>
<div class="col-md-6">
<select name="${cfgName}[${status.index }].matchMethod"
<select name="${cfgName}.matchMethod"
class="selectpicker select2 form-control required">
<option value=""><spring:message code="select" /></option>
<option value="0"
@@ -106,7 +106,7 @@ $(function(){
code="exactly_match"></spring:message></option>
</select>
</div>
<div for="${cfgName}[${status.index }].matchMethod"></div>
<div for="${cfgName}.matchMethod"></div>
</div>
</div>
</div>
@@ -116,7 +116,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="whether_hexbinary" /></label>
<div class="col-md-6">
<select name="${cfgName}[${status.index }].isHexbin"
<select name="${cfgName}.isHexbin"
class="selectpicker select2 form-control required">
<option value=""><spring:message code="select" /></option>
<option value="0"
@@ -130,7 +130,7 @@ $(function(){
code="case_sensitive_nohex"></spring:message></option>
</select>
</div>
<div for="${cfgName}[${status.index }].isHexbin"></div>
<div for="${cfgName}.isHexbin"></div>
</div>
</div>
</div>

42
src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
View File

@@ -13,11 +13,11 @@ $(function(){
<c:if
test="${_cfg.functionId eq regionDistrict.functionId and regionDistrict.regionType eq 1}">
<!-- regionDistrict.regionType==1表示IP类配置 -->
<input type="hidden" name="${cfgName}[${status.index }].cfgType" value="${regionDistrict.configRegionValue }">
<input type="hidden" name="${cfgName}[${status.index }].cfgRegionCode" value="${regionDistrict.configRegionCode }">
<input type="hidden" name="${cfgName}.cfgType" value="${regionDistrict.configRegionValue }">
<input type="hidden" name="${cfgName}.cfgRegionCode" value="${regionDistrict.configRegionCode }">
</c:if>
</c:forEach>
<input type="hidden" name="${cfgName}[${status.index }].protocolId" id="protocolId" value="">
<input type="hidden" name="${cfgName}.protocolId" id="protocolId" value="">
<div class="row">
<div class="pull-right">
<span class="glyphicon glyphicon-remove pull-right" title="remove"
@@ -30,7 +30,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="ip_type" /></label>
<div class="col-md-6">
<select name="${cfgName}[${status.index }].ipType"
<select name="${cfgName}.ipType"
class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
<option value="${ipType.itemCode}" <c:if test="${ipPort.ipType==ipType.itemCode}">selected</c:if> >
@@ -39,7 +39,7 @@ $(function(){
</c:forEach>
</select>
</div>
<div for="${cfgName}[${status.index }].ipType"></div>
<div for="${cfgName}.ipType"></div>
</div>
</div>
</div>
@@ -49,7 +49,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="ip_pattern" /></label>
<div class="col-md-6">
<select name="${cfgName}[${status.index }].ipPattern"
<select name="${cfgName}.ipPattern"
class="selectpicker show-tick form-control required">
<option value="1"
<c:if test="${ipPort.ipPattern==1 || ipPort.ipPattern==null}">selected</c:if>><spring:message
@@ -61,7 +61,7 @@ $(function(){
<c:if test="${ipPort.ipPattern==3}">selected</c:if>>IP</option>
</select>
</div>
<div for="${cfgName}[${status.index }].ipPattern"></div>
<div for="${cfgName}.ipPattern"></div>
</div>
</div>
<div class="col-md-6">
@@ -70,10 +70,10 @@ $(function(){
<spring:message code="client_ip" /></label>
<div class="col-md-6">
<input class="form-control required ipCheck" type="text"
name="${cfgName}[${status.index }].srcIpAddress"
name="${cfgName}.srcIpAddress"
value="${ipPort.srcIpAddress}">
</div>
<div for="${cfgName}[${status.index }].srcIpAddress"></div>
<div for="${cfgName}.srcIpAddress"></div>
</div>
</div>
</div>
@@ -83,7 +83,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="port_pattern" /></label>
<div class="col-md-6">
<select name="${cfgName}[${status.index }].portPattern"
<select name="${cfgName}.portPattern"
class="selectpicker show-tick form-control required">
<option value="1"
<c:if test="${ipPort.portPattern==1 || ipPort.portPattern== null}">selected</c:if>>port</option>
@@ -92,7 +92,7 @@ $(function(){
code="subnet" /></option>
</select>
</div>
<div for="${cfgName}[${status.index }].portPattern"></div>
<div for="${cfgName}.portPattern"></div>
</div>
</div>
<div class="col-md-6">
@@ -101,10 +101,10 @@ $(function(){
<spring:message code="client_port" /></label>
<div class="col-md-6">
<input class="form-control required portCheck" type="text"
name="${cfgName}[${status.index }].srcPort"
name="${cfgName}.srcPort"
value="${ipPort.srcPort}">
</div>
<div for="${cfgName}[${status.index }].srcPort"></div>
<div for="${cfgName}.srcPort"></div>
</div>
</div>
</div>
@@ -115,10 +115,10 @@ $(function(){
<spring:message code="server_ip" /></label>
<div class="col-md-6">
<input class="form-control required ipCheck" type="text"
name="${cfgName}[${status.index }].destIpAddress"
name="${cfgName}.destIpAddress"
value="${ipPort.destIpAddress}">
</div>
<div for="${cfgName}[${status.index }].destIpAddress"></div>
<div for="${cfgName}.destIpAddress"></div>
</div>
</div>
<div class="col-md-6">
@@ -127,10 +127,10 @@ $(function(){
<spring:message code="server_port" /></label>
<div class="col-md-6">
<input class="form-control required portCheck" type="text"
name="${cfgName}[${status.index }].destPort"
name="${cfgName}.destPort"
value="${ipPort.destPort}">
</div>
<div for="${cfgName}[${status.index }].destPort"></div>
<div for="${cfgName}.destPort"></div>
</div>
</div>
</div>
@@ -140,7 +140,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="protocol" /></label>
<div class="col-md-6">
<select name="${cfgName}[${status.index }].protocol"
<select name="${cfgName}.protocol"
class="selectpicker show-tick form-control required">
<option value=""><spring:message code="select" /></option>
<option value="6"
@@ -152,7 +152,7 @@ $(function(){
code="arbitrary" /></option>
</select>
</div>
<div for="${cfgName}[${status.index }].protocol"></div>
<div for="${cfgName}.protocol"></div>
</div>
</div>
<div class="col-md-6">
@@ -160,7 +160,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="direction" /></label>
<div class="col-md-6">
<select name="${cfgName}[${status.index }].direction"
<select name="${cfgName}.direction"
class="selectpicker show-tick form-control required">
<option value=""><spring:message code="select" /></option>
<option value="0"
@@ -174,7 +174,7 @@ $(function(){
<spring:message code="degress" /></option>
</select>
</div>
<div for="${cfgName}[${status.index }].direction"></div>
<div for="${cfgName}.direction"></div>
</div>
</div>
</div>

22
src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
View File

@@ -15,8 +15,8 @@ $(function(){
and regionDistrict.regionType eq 2
and regionValue eq regionDistrict.configRegionValue}">
<!-- regionDistrict.regionType==2表示字符串类配置 -->
<input type="hidden" name="${cfgName}[${status.index }].cfgType" value="${regionDistrict.configRegionValue }">
<input type="hidden" name="${cfgName}[${status.index }].cfgRegionCode" value="${regionDistrict.configRegionCode }">
<input type="hidden" name="${cfgName}.cfgType" value="${regionDistrict.configRegionValue }">
<input type="hidden" name="${cfgName}.cfgRegionCode" value="${regionDistrict.configRegionCode }">
</c:if>
</c:forEach>
<div class="row">
@@ -32,10 +32,10 @@ $(function(){
<spring:message code="keywords" /></label>
<div class="col-md-6">
<input class="form-control required" type="text"
name="${cfgName}[${status.index }].cfgKeywords"
name="${cfgName}.cfgKeywords"
value="${strCfg.cfgKeywords}">
</div>
<div for="${cfgName}[${status.index }].cfgKeywords"></div>
<div for="${cfgName}.cfgKeywords"></div>
</div>
</div>
@@ -47,17 +47,17 @@ $(function(){
<spring:message code="expression_type" /></label>
<div class="col-md-6">
<label class="radio-inline"> <input type="radio"
name="${cfgName}[${status.index }].exprType" value="1"
name="${cfgName}.exprType" value="1"
class="required" <c:if test="${strCfg.exprType==1}">checked</c:if>>
<spring:message code="and" />
</label> <label class="radio-inline"> <input type="radio"
name="${cfgName}[${status.index }].exprType" value="0"
name="${cfgName}.exprType" value="0"
class="required"
<c:if test="${strCfg.exprType==0 || strCfg.exprType==null}">checked</c:if>>
<spring:message code="null" />
</label>
</div>
<div for="${cfgName}[${status.index }].exprType"></div>
<div for="${cfgName}.exprType"></div>
</div>
</div>
<div class="col-md-6">
@@ -65,7 +65,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="match_method" /></label>
<div class="col-md-6">
<select name="${cfgName}[${status.index }].matchMethod"
<select name="${cfgName}.matchMethod"
class="selectpicker select2 form-control required">
<option value=""><spring:message code="select" /></option>
<option value="0"
@@ -82,7 +82,7 @@ $(function(){
code="exactly_match"></spring:message></option>
</select>
</div>
<div for="${cfgName}[${status.index }].matchMethod"></div>
<div for="${cfgName}.matchMethod"></div>
</div>
</div>
</div>
@@ -92,7 +92,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="whether_hexbinary" /></label>
<div class="col-md-6">
<select name="${cfgName}[${status.index }].isHexbin"
<select name="${cfgName}.isHexbin"
class="selectpicker select2 form-control required">
<option value=""><spring:message code="select" /></option>
<option value="0"
@@ -106,7 +106,7 @@ $(function(){
code="case_sensitive_nohex"></spring:message></option>
</select>
</div>
<div for="${cfgName}[${status.index }].isHexbin"></div>
<div for="${cfgName}.isHexbin"></div>
</div>
</div>
</div>

33
src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
View File

@@ -188,10 +188,11 @@
class="glyphicon glyphicon-plus ${tabName}Add"
onClick="addContent(this,'${tabName}')" title="add"></span></small>
</h4>
<c:set var="cfgName" value="ipPortList"></c:set>
<c:forEach items="${_cfg.ipPortList}" var="ipPort"
varStatus="status">
<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty ipPort.cfgId}">hidden disabled</c:if>" >
<c:set var="cfgName" value="ipPortList[${status.index}]"></c:set>
<div class="row boxSolid ${tabName}${status.index}" >
<!-- 引入页面动态传参 -->
<%-- <jsp:include page="/WEB-INF/views/cfg/ipCfgForm.jsp" flush="true">
@@ -201,6 +202,7 @@
</jsp:include> --%>
<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
</div>
<c:set var="ipCfgIndex" value="${ipCfgIndex+1}"></c:set>
</c:forEach>
</div>
<!--/ip info-->
@@ -213,11 +215,12 @@
class="glyphicon glyphicon-plus ${tabName}Add"
onClick="addContent(this,'${tabName}')" title="add"></span></small>
</h4>
<c:set var="cfgName" value="httpUrlList"></c:set>
<c:set var="regionValue" value="${_cfg.httpUrl.cfgType}"></c:set>
<c:forEach items="${_cfg.httpUrlList}" var="strCfg"
varStatus="status">
<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty strCfg.cfgId}">hidden disabled</c:if>" >
<c:set var="cfgName" value="httpUrlList[${status.index}]"></c:set>
<div class="row boxSolid ${tabName}${status.index} " >
<!-- 引入页面动态传参 -->
<%-- <jsp:include page="/WEB-INF/views/cfg/stringCfgForm.jsp" flush="true">
<jsp:param value="http_url" name="regionValue"/>
@@ -239,11 +242,12 @@
class="glyphicon glyphicon-plus ${tabName}Add"
onClick="addContent(this,'${tabName}')" title="add"></span></small>
</h4>
<c:set var="cfgName" value="httpReqHdrList"></c:set>
<c:set var="regionValue" value="${_cfg.httpReqHdr.cfgType}"></c:set>
<c:forEach items="${_cfg.httpReqHdrList}" var="complexCfg"
varStatus="status">
<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty complexCfg.cfgId}">hidden disabled</c:if>">
<c:set var="cfgName" value="httpReqHdrList[${status.index}]"></c:set>
<div class="row boxSolid ${tabName}${status.index} ">
<!-- 引入页面动态传参 -->
<%-- <jsp:include page="/WEB-INF/views/cfg/complexCfgForm.jsp" flush="true">
<jsp:param value="http_req_hdr" name="regionValue"/>
@@ -265,11 +269,12 @@
class="glyphicon glyphicon-plus ${tabName}Add"
onClick="addContent(this,'${tabName}')" title="add"></span></small>
</h4>
<c:set var="cfgName" value="httpReqBodyList"></c:set>
<c:set var="regionValue" value="${_cfg.httpReqBody.cfgType}"></c:set>
<c:forEach items="${_cfg.httpReqBodyList}" var="strCfg"
varStatus="status">
<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty strCfg.cfgId}">hidden disabled</c:if>" >
<c:set var="cfgName" value="httpReqBodyList[${status.index}]"></c:set>
<div class="row boxSolid ${tabName}${status.index} " >
<!-- 引入页面动态传参 -->
<%-- <jsp:include page="/WEB-INF/views/cfg/stringCfgForm.jsp" flush="true">
<jsp:param value="http_req_body" name="regionValue"/>
@@ -291,11 +296,12 @@
class="glyphicon glyphicon-plus ${tabName}Add"
onClick="addContent(this,'${tabName}')" title="add"></span></small>
</h4>
<c:set var="cfgName" value="httpResHdrList"></c:set>
<c:set var="regionValue" value="${_cfg.httpResHdr.cfgType}"></c:set>
<c:forEach items="${_cfg.httpResHdrList}" var="complexCfg"
varStatus="status">
<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty complexCfg.cfgId}">hidden disabled</c:if>">
<c:set var="cfgName" value="httpResHdrList[${status.index}]"></c:set>
<div class="row boxSolid ${tabName}${status.index} ">
<%-- <jsp:include page="/WEB-INF/views/cfg/complexCfgForm.jsp" flush="true">
<jsp:param value="http_res_hdr" name="regionValue"/>
<jsp:param value="httpResHdr" name="cfgName"/>
@@ -316,11 +322,12 @@
class="glyphicon glyphicon-plus ${tabName}Add"
onClick="addContent(this,'${tabName}')" title="add"></span></small>
</h4>
<c:set var="cfgName" value="httpResBodyList"></c:set>
<c:set var="regionValue" value="${_cfg.httpResBody.cfgType}"></c:set>
<c:forEach items="${_cfg.httpResBodyList}" var="strCfg"
varStatus="status">
<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty strCfg.cfgId}">hidden disabled</c:if>" >
<c:set var="cfgName" value="httpResBodyList[${status.index}]"></c:set>
<div class="row boxSolid ${tabName}${status.index} " >
<!-- 引入页面动态传参 -->
<%-- <jsp:include page="/WEB-INF/views/cfg/stringCfgForm.jsp" flush="true">
<jsp:param value="http_res_body" name="regionValue"/>
@@ -328,7 +335,7 @@
<jsp:param value="httpResBody${status.index }" name="cfgNameIndex"/>
<jsp:param value="httpResBodyList[${status.index }]" name="propertiesName"/>
</jsp:include> --%>
<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>%>
<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
</div>
</c:forEach>
</div>

2
src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
View File

@@ -105,7 +105,7 @@
</div>
<h3 class="page-title">
<spring:message code="website_http_control"></spring:message>
<spring:message code="http_control"></spring:message>
<small><spring:message code="date_list"/></small>
</h3>
<h5 class="page-header"></h5>

12
src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
View File

@@ -8,18 +8,6 @@
})
</script>
<style type="text/css">
.tabInfo {
width: 150px;
border: 1px solid #c2cad8;
padding: 5px;
border-bottom: 0px
}
.content {
width: 1050px;
background-color: #f6f3f3;
border: 1px solid #c2cad8;
padding: 5px;
}
</style>
</head>
<c:if test="${fn:length(_cfg.ipPortList)>0}">