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

(1)ip地址协议drop时增加一列ICMP，值为1

Browse Source
This commit is contained in:
wangxin
2018-08-01 14:21:24 +08:00
parent 2c07f0e82d
commit 8e6e27dd99
8 changed files with 209 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -58,6 +58,8 @@ public class IpController extends CommonController{
model.addAttribute("requiresPermissionPrefix","iplist");
if(specialFunctionId!=null && "ipsec".equals(specialFunctionId)) {
return "/cfg/ipsec/ipForm";
}else if(specialFunctionId!=null && "ipaddr".equals(specialFunctionId)) {
return "/cfg/ipaddr/ipForm";
}
return "/cfg/common/ipForm";
}

2
src/main/resources/sql/update_ip_addr.sql Normal file
View File

@@ -0,0 +1,2 @@
INSERT INTO sys_data_dictionary_item (item_code,item_value,item_desc,item_sort,STATUS,TYPE,dictionary_id) VALUES (5,'ipaddr','ip地址',0,1,1,66)
INSERT INTO sys_data_dictionary_item (item_code,item_value,item_desc,item_sort,STATUS,TYPE,dictionary_id) VALUES (1,'ICMP','ICMP',0,1,1,63)

4
src/main/webapp/WEB-INF/include/form/ipInfo.jsp
View File

@@ -31,9 +31,7 @@
<select name="protocol" class="selectpicker show-tick form-control required">
<c:choose>
<c:when test="${specialProtocol!=null and specialProtocol eq 'ipsec'}">
<c:forEach items="${fns:getDictList('IPSEC_PROTOCOL')}" var="protocolC">
<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
</c:forEach>
</c:when>
<c:otherwise>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">

196
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp Normal file
View File

@@ -0,0 +1,196 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<title><spring:message code="${cfgName}"></spring:message></title>
<script type="text/javascript">
$(function(){
if($("input[name='action']:checked").val()==0x20||$("input[name='action']:checked").val()==0x60){
$("#cfgRegionCode").val($("#cfgRegionCodeCallback").val());
$("#cfgType").val($("#cfgTypeCallback").val());
}else{
$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());
$("#cfgType").val($("#cfgTypeMaat").val());
}
$("#cancel").on("click",function(){
window.history.back();
});
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));
if($(this).val()==0x20||$(this).val()==0x60){
$("#cfgRegionCode").val($("#cfgRegionCodeCallback").val());
$("#cfgType").val($("#cfgTypeCallback").val());
$("input[name='isAreaEffective']").each(function(){
if($(this).val()==0){
$(this).click();
}
})
}else{
$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());
$("#cfgType").val($("#cfgTypeMaat").val());
}
});
if('${fn:length(serviceList)}'>1){
$("#serviceId").val($(".action:checked").attr("serviceId"));
$("#protocolId").val($(".action:checked").attr("protocolId"));
}
if($("[name='action']:checked").val()=="${dropAction}"){
$("[name='protocol']").append('<option class="icmp" value="1" <c:if test="${_cfg.protocol==1}">selected</c:if>><spring:message code="ICMP"/></option>');
$("[name='protocol']").selectpicker("render");
$("[name='protocol']").selectpicker("refresh");
}
$("[name='action']").on("click",function(){
if($(this).val()=="${dropAction}"){
$("[name='protocol']").append('<option class="icmp" value="1" <c:if test="${_cfg.protocol==1}">selected</c:if>><spring:message code="ICMP"/></option>');
}else{
if($("[name='protocol'] option[value='1']")){
if($("[name='protocol'] option[value='1']").is(":selected")){
$("[name='protocol'] option[value='1']").removeAttr("selected");
$("[name='protocol']").val(0);
}
$("[name='protocol'] option[value='1']").remove();
}
}
$("[name='protocol']").selectpicker("render");
$("[name='protocol']").selectpicker("refresh");
});
$("#ipCfgFrom").validate({
errorPlacement: function(error,element){
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
},
submitHandler: function(form){
if($("#dnsStrategyId")){
$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());
$("#cfgType").val($("#cfgTypeMaat").val());
}
loading('<spring:message code="onloading"/>');
form.submit();
},
errorContainer: "#messageBox"
});
});
</script>
</head>
<body>
<div class="page-content">
<h3 class="page-title">
<spring:message code="${cfgName}"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i>
<c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
</div>
</div>
<div class="portlet-body form">
<!-- BEGIN FORM-->
<form id="ipCfgFrom" action="${ctx}${urlPrefix}/saveOrUpdate" method="post" class="form-horizontal">
<div class="form-body row">
<input name="cfgName" type="hidden" value="${cfgName}"/>
<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
<input type="hidden" name="compileId" value="${_cfg.compileId}">
<input type="hidden" name="functionId" value="${_cfg.functionId}">
<input type="hidden" id="cfgType" name="cfgType" value="${_cfg.cfgType}">
<input type="hidden" id="cfgRegionCode" name="cfgRegionCode" value="${_cfg.cfgRegionCode}">
<c:if test="${fn:length(serviceList)==1}">
<c:forEach items="${serviceList}" var="service">
<input type="hidden" name="action" value="${service.action }">
<input type="hidden" id="serviceId" name="serviceId" value="${service.serviceId}">
<input type="hidden" id="protocolId" name="protocolId" value="${service.protocolId}">
</c:forEach>
</c:if>
<c:if test="${fn:length(serviceList)>1}">
<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
<input type="hidden" id="protocolId" name="protocolId" value="${_cfg.protocolId}">
</c:if>
<!-- 配置域类型 -->
<c:forEach items="${regionList}" var="region">
<c:if test="${_cfg.functionId eq region.functionId}">
<c:if test="${region.isMaat==1}"><!-- is maat -->
<input type="hidden" id="cfgTypeMaat" value="${region.configRegionValue}">
<input type="hidden" id="cfgRegionCodeMaat" value="${region.configRegionCode}">
</c:if>
<c:if test="${region.isMaat==0}">
<input type="hidden" id="cfgTypeCallback" value="${region.configRegionValue}">
<input type="hidden" id="cfgRegionCodeCallback" value="${region.configRegionCode}">
</c:if>
</c:if>
</c:forEach>
<div class="form-body">
<!-- desc and action -->
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div>
</div>
</div>
<c:if test="${fn:length(serviceList)>1}">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="action"/></label>
<div class="col-md-6">
<c:forEach items="${serviceList}" var="service"
varStatus="satus">
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq service.action }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</c:if>
</label>
</c:forEach>
</div>
<div for="action"></div>
</div>
</div>
</c:if>
</div>
<!-- desc and action -->
<c:forEach items="${fns:getDictList('SPECIAL_FUNCTION_ID')}" var="sfi">
<c:if test="${sfi.itemCode==_cfg.functionId}">
<c:set var="specialProtocol" value="${sfi.itemValue}"/>
</c:if>
</c:forEach>
<%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
<%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
</div>
<div class="form-actions">
<div class="row">
<div class="col-md-6">
<div class="row">
<div class="col-md-offset-3 col-md-8">
<button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
<button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
</div>
</div>
</div>
<div class="col-md-6"> </div>
</div>
</div>
</form>
<!-- END FORM-->
</div>
</div>
</div>
</div>
</div>
</body>
</html>

4
src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
View File

@@ -2,7 +2,7 @@
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<title><spring:message code="domain_control_white"></spring:message></title>
<title><spring:message code="domain_whitelist"></spring:message></title>
<script type="text/javascript">
$(function(){
switchIpType($("select[name$='ipType']"));
@@ -64,7 +64,7 @@ $(function(){
<div class="page-content">
<h3 class="page-title">
<spring:message code="domain_control_white"></spring:message>
<spring:message code="domain_whitelist"></spring:message>
</h3>
<div class="row">

4
src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
View File

@@ -2,7 +2,7 @@
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<title><spring:message code="domain_control_white"></spring:message></title>
<title><spring:message code="domain_whitelist"></spring:message></title>
<script>
$(document).ready(function() {
//搜索框提示语初始化
@@ -49,7 +49,7 @@
</div>
<h3 class="page-title">
<spring:message code="domain_control_white"></spring:message>
<spring:message code="domain_whitelist"></spring:message>
<small><spring:message code="date_list"/></small>
</h3>
<h5 class="page-header"></h5>

4
src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
View File

@@ -2,7 +2,7 @@
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<title><spring:message code="ip_control_white"></spring:message></title>
<title><spring:message code="ip_whitelist"></spring:message></title>
<script type="text/javascript">
$(function(){
switchIpInfo($("select[name$='ipType']"),"ipType");
@@ -67,7 +67,7 @@ $(function(){
<body>
<div class="page-content">
<h3 class="page-title">
<spring:message code="ip_control_white"></spring:message>
<spring:message code="ip_whitelist"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">

4
src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
View File

@@ -2,7 +2,7 @@
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<title><spring:message code="ip_control_white"></spring:message></title>
<title><spring:message code="ip_whitelist"></spring:message></title>
<script>
$(document).ready(function() {
//搜索框提示语初始化
@@ -70,7 +70,7 @@
</shiro:hasPermission>
</div>
<h3 class="page-title">
<spring:message code="ip_control_white"></spring:message>
<spring:message code="ip_whitelist"></spring:message>
<small><spring:message code="date_list"/></small>
</h3>
<h5 class="page-header"></h5>