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

basic和behavior也加上dkc的自定义域，界面暂时隐藏，调整app的dns spoofing的复选框位置；

Browse Source 
APP Identify IP修改为APP IP；
DK GL修改为Correlation；
调整导入的stream模块自定义域设置；
https 的contol doLog默认为1，可选择；
https 的cache和intercep默认为2，不变；
This commit is contained in:
duandongmei
2019-01-11 11:36:04 +06:00
parent bfb931747b
commit 11e35d04ed
11 changed files with 115 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
View File

@@ -329,11 +329,11 @@ var delContent = function(contentClassName, addBtnClassName) {
<div class="col-md-6 dnsIpSpoofing hidden">
<div class="form-group">
<label class="control-label col-md-3">
<input type="checkbox" name="userRegion4" class="child-checks" <c:if test='${_cfg.userRegion4 eq "8" }'> checked</c:if> value="8">
<spring:message code="block_by_app_server_ip"/>
</label>
<div class="col-md-6">
<label class="control-label">
<spring:message code="block_by_app_server_ip"/>
<input type="checkbox" name="userRegion4" class="child-checks" <c:if test='${_cfg.userRegion4 eq "8" }'> checked</c:if> value="8">
</label>
</div>
<div for="userRegion4"></div>

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

@@ -17,6 +17,11 @@ $(function(){
$(".ratelimitAction").find("input[name='userRegion1']").on("change",function(){
switchRateLimitType();
});
if($(".action:checked").val()==16){
$(".dnsIpSpoofing").removeClass("hidden");
}else{
$(".dnsIpSpoofing").addClass("hidden");
}
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));
@@ -26,6 +31,11 @@ $(function(){
}else{
$(".ratelimitAction").addClass("hidden");
}
if($(".action:checked").val()==16){
$(".dnsIpSpoofing").removeClass("hidden");
}else{
$(".dnsIpSpoofing").addClass("hidden");
}
switchAction(action);
if($(this).val()==1){
$(".ipPortAdd").click();
@@ -268,10 +278,10 @@ var switchRateLimitType=function(){
</c:forEach>
</div>
</div>
<div class="col-md-6 hidden">
<%-- <div class="col-md-6 dnsIpSpoofing hidden">
<div class="form-group">
<label class="control-label col-md-3">
<input type="checkbox" name="userRegion4" class="child-checks" <%-- <c:if test="${_cfg.userRegion4 eq '1' }"> --%>checked<%-- </c:if> --%> value="1">
<input type="checkbox" name="userRegion4" class="child-checks" <c:if test='${_cfg.userRegion4 eq "8" }'> checked</c:if> value="8">
</label>
<div class="col-md-6">
<label class="control-label">
@@ -280,7 +290,7 @@ var switchRateLimitType=function(){
</div>
<div for="userRegion4"></div>
</div>
</div>
</div> --%>
</div>
<div class="row ratelimitAction hidden">
<h4 class="form-section">

8
src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
View File

@@ -387,7 +387,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th column="cfg_id" class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th column="config_describe" class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<%-- <th column="behaviour_type" ><spring:message code="behaviour_type"/></th> --%>
<%-- <th column="user_region4" ><spring:message code="block_by_app_server_ip"/></th> --%>
<th column="block_type" class="sort-column r.action"><spring:message code="block_type"/></th>
<th column="ratelimit" ><spring:message code="ratelimit"/></th>
<th column="basic_protocol" ><spring:message code="basic_protocol"/></th>
@@ -417,6 +417,11 @@
</td>
<td>${cfg.compileId }</td>
<td>${cfg.cfgDesc }</td>
<%-- <td>
<c:if test="${cfg.userRegion4 eq '8'}">
<spring:message code="block_by_app_server_ip"/>
</c:if>
</td> --%>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq cfg.action }">
@@ -434,7 +439,6 @@
</c:if>
</td>
<td class="appCode" id="${cfg.appCode }">${cfg.appCode }</td>
<%--<td class="behavCode" id="${cfg.behavCode }">${cfg.behavCode }</td>--%>
<td>
<c:choose>
<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>

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

@@ -12,6 +12,11 @@ $(function(){
$(".ratelimitAction").find("input[name='userRegion1']").on("change",function(){
switchRateLimitType();
});
if($(".action:checked").val()==16){
$(".dnsIpSpoofing").removeClass("hidden");
}else{
$(".dnsIpSpoofing").addClass("hidden");
}
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));
@@ -21,6 +26,11 @@ $(function(){
}else{
$(".ratelimitAction").addClass("hidden");
}
if($(".action:checked").val()==16){
$(".dnsIpSpoofing").removeClass("hidden");
}else{
$(".dnsIpSpoofing").addClass("hidden");
}
switchAction(action);
});
$("#serviceId").val($(".action:checked").attr("serviceId"));
@@ -263,10 +273,10 @@ var switchRateLimitType=function(){
</c:forEach>
</div>
</div>
<div class="col-md-6 hidden">
<%-- <div class="col-md-6 dnsIpSpoofing hidden">
<div class="form-group">
<label class="control-label col-md-3">
<input type="checkbox" name="userRegion4" class="child-checks" <%-- <c:if test="${_cfg.userRegion4 eq '1' }"> --%>checked<%-- </c:if> --%> value="1">
<input type="checkbox" name="userRegion4" class="child-checks" <c:if test='${_cfg.userRegion4 eq "8" }'> checked</c:if> value="8">
</label>
<div class="col-md-6">
<label class="control-label">
@@ -275,7 +285,7 @@ var switchRateLimitType=function(){
</div>
<div for="userRegion4"></div>
</div>
</div>
</div> --%>
</div>
<div class="row">

6
src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
View File

@@ -384,6 +384,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th column="cfg_id" class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th column="config_describe" class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<%-- <th column="user_region4" ><spring:message code="block_by_app_server_ip"/></th> --%>
<th column="block_type" class="sort-column r.action"><spring:message code="block_type"/></th>
<th column="ratelimit" ><spring:message code="ratelimit"/></th>
<th column="encrypted_tunnel_behavior" ><spring:message code="encrypted_tunnel_behavior"/></th>
@@ -414,6 +415,11 @@
</td>
<td>${cfg.compileId }</td>
<td>${cfg.cfgDesc }</td>
<%-- <td>
<c:if test="${cfg.userRegion4 eq '8'}">
<spring:message code="block_by_app_server_ip"/>
</c:if>
</td> --%>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq cfg.action }">

14
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
View File

@@ -148,7 +148,6 @@
<input type="hidden" name="compileId" value="${_cfg.compileId}">
<input type="hidden" name="functionId" value="${_cfg.functionId}">
<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
<input type="hidden" id="doLog" name="doLog" value="2">
<div class="form-body">
<div class="row">
@@ -192,14 +191,20 @@
</div>
</div>
<c:if test="${action != 128 }">
<c:if test="${empty _cfg.cfgId }">
<c:set var="doLog" value="1"/>
</c:if>
<c:if test="${!empty _cfg.cfgId }">
<c:set var="doLog" value="${_cfg.doLog }"/>
</c:if>
<!-- 记录日志begin -->
<%-- <div class="row">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doLog}">
<c:when test="${dict.itemCode eq doLog}">
<label class="radio-inline">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
@@ -210,10 +215,11 @@
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
</div> --%>
</div>
<!-- 记录日志end -->
</c:if>
<c:if test="${action eq 128}"><!-- 白名单不记录日志，默认为：0 -->