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

修改spoofing

Browse Source 
group分解为snat组和dnat组，仿冒IP池引用snat组direction=2,引用dnat组direction=1
This commit is contained in:
zhangwei
2018-12-18 03:09:48 +06:00
parent fadf57b51d
commit deb7532de9
5 changed files with 69 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml
View File

@@ -173,7 +173,8 @@
group_id,
compile_Id,
cfg_region_code,
user_region
user_region,
port
)values (
#{cfgId,jdbcType=VARCHAR},
#{cfgDesc,jdbcType=VARCHAR},
@@ -202,8 +203,8 @@
#{groupId, jdbcType=INTEGER},
#{compileId,jdbcType=INTEGER},
#{cfgRegionCode,jdbcType=INTEGER},
#{userRegion,jdbcType=VARCHAR}
#{userRegion,jdbcType=VARCHAR},
#{port,jdbcType=VARCHAR}
)
</insert>
<update id="update" parameterType="com.nis.domain.configuration.PxyObjSpoofingIpPool" >
@@ -261,6 +262,9 @@
<if test="port != null and port!=''" >
port=#{port, jdbcType=VARCHAR},
</if>
<if test="direction != null and direction!=''" >
direction=#{direction, jdbcType=INTEGER},
</if>
<if test="ipType != null" >
ip_type=#{ipType, jdbcType=INTEGER},
</if>

1
src/main/java/com/nis/web/service/configuration/PxyObjSpoofingIpPoolService.java
View File

@@ -89,7 +89,6 @@ public class PxyObjSpoofingIpPoolService extends BaseService{
setAreaEffectiveIds(entity);
//新增
if(StringUtil.isEmpty(entity.getCfgId())){
entity.initDefaultValue();
entity.setCreatorId(UserUtils.getUser().getId());
entity.setCreateTime(createTime);
//调用服务接口获取compileId

30
src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
View File

@@ -18,7 +18,10 @@ $(function(){
}); */
if("${_cfg.groupType}" == 4){
$("#asnNo").parents(".form-group").removeClass("hidden");
$(".asnNo").removeClass("hidden");
}
if("${_cfg.groupType}" == 6){
$(".groupType").removeClass("hidden");
}
/* $("#groupType").on("change",function(){
if($(this).val() != 4){
@@ -36,6 +39,12 @@ $(function(){
}
},
submitHandler: function(form){
if("${_cfg.groupType}" == 4){
$(".asnNo").removeClass("hidden");
}
if("${_cfg.groupType}" == 6){
$("#asnNo").val($(".groupType").find("#asnNo").val());
}
loading('onloading...');
form.submit();
},
@@ -115,13 +124,30 @@ $(function(){
</div>
</div>
<div class="col-md-6">
<div class="form-group hidden">
<div class="form-group asnNo hidden">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="asn_no"/></label>
<div class="col-md-6">
<input id="asnNo" class="form-control required asnNoUnique number" type="text" name="asnNo" value="${_cfg.asnNo}" autocomplete="off" maxlength="15" ctx="${ctx }">
</div>
<div for="asnNo"></div>
</div>
<div class="form-group groupType hidden">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group_type"/></label>
<div class="col-md-6">
<select name="asnNo" id="asnNo" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IR_TYPE')}" var="ipTypeC">
<option value="${ipTypeC.itemCode}"
<c:if test="${_cfg.asnNo==ipTypeC.itemCode}">
selected
</c:if>
>
<spring:message code="${ipTypeC.itemValue}"/>
</option>
</c:forEach>
</select>
</div>
<div for="asnNo"></div>
</div>
</div>
</div>
</div>

28
src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
View File

@@ -264,6 +264,9 @@
<c:if test="${cfg.groupType==4}">
<th><spring:message code="asn_no"/></th>
</c:if>
<%-- <c:if test="${cfg.groupType==6}">
<th><spring:message code="group_type"/></th>
</c:if> --%>
<th><spring:message code="desc"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
@@ -282,14 +285,31 @@
</a>
</td>
<td>
<c:forEach items="${fns:getDictList('GROUP_TYPE')}" var="groupTypeC">
<c:if test="${cfg.groupType==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
</c:forEach>
<c:choose>
<c:when test="${cfg.groupType==6 }">
<c:forEach items="${fns:getDictList('IR_TYPE')}" var="groupTypeC">
<c:if test="${cfg.asnNo==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
</c:forEach>
</c:when>
<c:otherwise>
<c:forEach items="${fns:getDictList('GROUP_TYPE')}" var="groupTypeC">
<c:if test="${cfg.groupType==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
</c:forEach>
</c:otherwise>
</c:choose>
</td>
<c:if test="${cfg.groupType==4}">
<td>${cfg.asnNo}</td>
</c:if>
<%-- <c:if test="${cfg.groupType==6}">
<td>
<c:forEach items="${fns:getDictList('IR_TYPE')}" var="ipTypeC">
<c:if test="${cfg.asnNo==ipTypeC.itemCode}">
${ipTypeC.itemValue }
</c:if>
</c:forEach>
</td>
</c:if> --%>
<td title="${cfg.description }">${fns:abbr(cfg.description,20)}</td>
<td>${cfg.creatorName }</td>
<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>

16
src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp
View File

@@ -14,6 +14,12 @@ $(function(){
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
},
submitHandler: function(form){
var groupType = $("#group").find("option:selected").attr("groupType");
if(groupType==0){//snat
$("#direction").val(2);
}else{//dnat
$("#direction").val(1);
}
loading('onloading...');
form.submit();
},
@@ -46,7 +52,7 @@ $(function(){
<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" name="direction" value="0">
<input type="hidden" name="direction" id="direction" value="0">
<input type="hidden" name="location" value="0">
<input type="hidden" name="protocol" value="0">
<input type="hidden" name="port" value="0">
@@ -83,10 +89,9 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group"/></label>
<div class="col-md-6">
<select name="groupId" class="selectpicker show-tick form-control required">
<option value="" ><spring:message code="select"/></option>
<select name="groupId" id="group" class="selectpicker show-tick form-control required">
<c:forEach items="${policyGroups }" var="policyGroup">
<option value="${policyGroup.groupId}" <c:if test="${_cfg.groupId==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
<option value="${policyGroup.groupId}" groupType="${policyGroup.asnNo }" <c:if test="${_cfg.groupId==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
</c:forEach>
</select>
</div>
@@ -130,8 +135,7 @@ $(function(){
<select name="ipType" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<option value="${ipTypeC.itemCode}"
<c:if test="${_cfg.ipType==ipTypeC.itemCode
|| (_cfg.ipType==null && ipTypeC.itemCode==4)}">
<c:if test="${_cfg.ipType==ipTypeC.itemCode }">
selected
</c:if>
>