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

//HTTP block： response code is not null ;response content

Browse Source 
null(userRegion is not null)
//HTTP redirect： response code is not null ;response content is not
null(userRegion is not null)
//HTTP replace： replace type is not null ;find is not null;replace with
is not null(userRegion is not null)
修复proxy 排序 查询列表bug
This commit is contained in:
duandongmei
2018-08-09 15:07:49 +08:00
parent 5964eeca80
commit 9b1f4d30cc
5 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
View File

@@ -404,43 +404,35 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
//判断http配置是否需要设置自定义域参数 //判断http配置是否需要设置自定义域参数
String userRegion = ""; String userRegion = "";
//HTTP block //HTTP block： response code is not null ;response content null(userRegion is not null)
if(entity.getAction().equals(16)){ if(entity.getAction().equals(16)){
String userRegion1=StringUtil.isEmpty(entity.getUserRegion1()) ? "":entity.getUserRegion1(); String userRegion1=StringUtil.isEmpty(entity.getUserRegion1()) ? "":entity.getUserRegion1();
userRegion=Constants.REDIRECT_RESPONSE_CODE_KEY+"="+userRegion1; userRegion=Constants.REDIRECT_RESPONSE_CODE_KEY+"="+userRegion1;
String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2(); String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2();
userRegion=userRegion+";"+Constants.REDIRECT_CONTENT_KEY+"="+userRegion2; userRegion=userRegion+";"+Constants.REDIRECT_CONTENT_KEY+"="+userRegion2;
} }
//HTTP redirect //HTTP redirect： response code is not null ;response content is not null(userRegion is not null)
if(entity.getAction().equals(48)){ if(entity.getAction().equals(48)){
String userRegion1=StringUtil.isEmpty(entity.getUserRegion1()) ? "":entity.getUserRegion1(); String userRegion1=StringUtil.isEmpty(entity.getUserRegion1()) ? "":entity.getUserRegion1();
userRegion=Constants.REDIRECT_RESPONSE_CODE_KEY+"="+userRegion1; userRegion=Constants.REDIRECT_RESPONSE_CODE_KEY+"="+userRegion1;
String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2(); String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2();
userRegion=userRegion+";"+Constants.REDIRECT_URL_KEY+"="+userRegion2; userRegion=userRegion+";"+Constants.REDIRECT_URL_KEY+"="+userRegion2;
} }
//HTTP replace //HTTP replace： replace type is not null ;find is not null;replace with is not null(userRegion is not null)
if(entity.getAction().equals(80)){ if(entity.getAction().equals(80)){
if(!StringUtil.isEmpty(entity.getUserRegion1())){
userRegion=Constants.REPLACE_ZONE_KEY+"="+entity.getUserRegion1(); userRegion=Constants.REPLACE_ZONE_KEY+"="+entity.getUserRegion1();
}
String substitute=""; String substitute="";
if(!StringUtil.isEmpty(entity.getUserRegion2())){ String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2();
String userRegion2=entity.getUserRegion2();
substitute="/"; substitute="/";
userRegion2 = BaseService.replaceContentEscape(userRegion2); userRegion2 = BaseService.replaceContentEscape(userRegion2);
substitute=substitute+userRegion2; substitute=substitute+userRegion2;
}
if(!StringUtil.isEmpty(entity.getUserRegion3())){ String userRegion3=StringUtil.isEmpty(entity.getUserRegion3()) ? "":entity.getUserRegion3();
String userRegion3=entity.getUserRegion3();
userRegion3 = BaseService.replaceContentEscape(userRegion3); userRegion3 = BaseService.replaceContentEscape(userRegion3);
substitute=substitute+"/"+userRegion3; substitute=substitute+"/"+userRegion3;
}
if(StringUtil.isEmpty(substitute)){
userRegion="";
}else{
userRegion=userRegion+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute; userRegion=userRegion+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute;
} }
}
if(StringUtil.isEmpty(userRegion)){ if(StringUtil.isEmpty(userRegion)){
userRegion=Constants.USER_REGION_PLACEHOLDER; userRegion=Constants.USER_REGION_PLACEHOLDER;
} }

20
src/main/resources/messages/message_en.properties
View File

@@ -557,7 +557,7 @@ http_req_body_control=HTTP Request Body Control
http_res_control=HTTP Response Control http_res_control=HTTP Response Control
http_res_hdr_control=HTTP Response Header Control http_res_hdr_control=HTTP Response Header Control
http_res_body_control=HTTP Response Header Control http_res_body_control=HTTP Response Header Control
av_control=Online Media av_control=Media Addr
av_content_ip_control=Audio/Video IP av_content_ip_control=Audio/Video IP
av_picture_ip_control=Picture IP av_picture_ip_control=Picture IP
av_content_url_control=Audio/Video URL av_content_url_control=Audio/Video URL
@@ -569,8 +569,8 @@ av_sample_audio_control=Audio Sample
av_sample_video_control=Video Sample av_sample_video_control=Video Sample
av_sample_picture_control=Picture Sample av_sample_picture_control=Picture Sample
av_sample_voip_control=VoIP Sample av_sample_voip_control=VoIP Sample
av_sample_audio_porn_control=Audio Sign Sample av_sample_audio_porn_control=Audio Scene Detection
av_sample_video_porn_control=Video Sign Sample av_sample_video_porn_control=Video Scene Detection
av_sample_control=Sample av_sample_control=Sample
configure_statistics_info=Configure statistics info configure_statistics_info=Configure statistics info
harm_level=Degree of harm harm_level=Degree of harm
@@ -836,8 +836,8 @@ av_sample_audio=Audio Sample
av_sample_video=Video Sample av_sample_video=Video Sample
av_sample_picture=Picture Sample av_sample_picture=Picture Sample
av_sample_voip=VoIP Sample av_sample_voip=VoIP Sample
av_sample_audio_porn=Audio Sign Sample av_sample_audio_porn=Audio Scene Detection
av_sample_video_porn=Video Sgin Sample av_sample_video_porn=Video Scene Detection
WHITE_LIST_IP=IP White List WHITE_LIST_IP=IP White List
av_voip_ip=VoIP IP Configuration av_voip_ip=VoIP IP Configuration
NTC_HTTP_URL=URL Configuration NTC_HTTP_URL=URL Configuration
@@ -933,10 +933,10 @@ pic_sample_reject=Picture Sample Control
pic_sample_monit=Picture Sample Monitoring pic_sample_monit=Picture Sample Monitoring
voip_sample_reject=VoIP Sample Control voip_sample_reject=VoIP Sample Control
voip_sample_monit=VoIP Sample Monitoring voip_sample_monit=VoIP Sample Monitoring
audio_pornography_sample_reject=Audio Sign Control audio_pornography_sample_reject=Audio Scene Detection Control
audio_pornography_sample_monit=Audio Sign Monitoring audio_pornography_sample_monit=Audio Scene Detection Monitoring
video_pornography_sample_reject=Video Sign Control video_pornography_sample_reject=Video Scene Detection Control
video_pornography_sample_monit=Video Sign Monitoring video_pornography_sample_monit=Video Scene Detection Monitoring
ip_white_monit=IP Address White List Monitoring ip_white_monit=IP Address White List Monitoring
ip_white_reject=IP Address White List Control ip_white_reject=IP Address White List Control
ip_white_whitelist=IP Address White List ip_white_whitelist=IP Address White List
@@ -1052,7 +1052,7 @@ traffic_website_type_chart=Website Type
website=Website website=Website
#===============dashboard end=================================== #===============dashboard end===================================
ratelimit_limit=Limit Rate must between 0 and 100 ratelimit_limit=Limit Rate must between 0 and 100
Maintenance=Policy Objects Maintenance=Advanced
Proxy=Proxy Proxy=Proxy
selective=Selective selective=Selective
ip_protocol=IP Protocol ip_protocol=IP Protocol

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

@@ -22,9 +22,8 @@
<div class="col-md-6"> <div class="col-md-6">
<select name="userRegion1" <select name="userRegion1"
class="selectpicker show-tick form-control"> class="selectpicker show-tick form-control">
<option value="" <c:if test="${empty _cfg.userRegion1}">selected</c:if>>Silent</option>
<c:forEach items="${fns:getDictList('RESPONSE_CODE')}" var="responseCodeC"> <c:forEach items="${fns:getDictList('RESPONSE_CODE')}" var="responseCodeC">
<option value="${responseCodeC.itemCode}" <c:if test="${_cfg.userRegion1 eq responseCodeC.itemCode}">selected</c:if>>${responseCodeC.itemCode} <spring:message code="${responseCodeC.itemValue}"/></option> <option value="${responseCodeC.itemCode}" <c:if test="${_cfg.userRegion1 eq responseCodeC.itemCode || (empty _cfg.userRegion1 && responseCodeC.itemCode eq 404)}">selected</c:if>>${responseCodeC.itemCode} <spring:message code="${responseCodeC.itemValue}"/></option>
</c:forEach> </c:forEach>
</select> </select>
</div> </div>
@@ -34,10 +33,9 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group "> <div class="form-group ">
<label class="control-label col-md-3"> <label class="control-label col-md-3">
<font color="red" class="userRegion2">*</font>
<spring:message code="response_content" /></label> <spring:message code="response_content" /></label>
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control required" type="text" <input class="form-control" type="text"
name="userRegion2" name="userRegion2"
value="${_cfg.userRegion2 }"> value="${_cfg.userRegion2 }">
</div> </div>

8
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
View File

@@ -237,22 +237,27 @@
<c:if test="${action eq 16 }"> <c:if test="${action eq 16 }">
<c:set var="configPermissionName" value="control:httpBlock:config"/> <c:set var="configPermissionName" value="control:httpBlock:config"/>
<c:set var="confirmPermissionName" value="control:httpBlock:confirm"/> <c:set var="confirmPermissionName" value="control:httpBlock:confirm"/>
<c:set var="actionPath" value="${ctx}/proxy/control/httpRedirect/httpBlockList?functionId=${cfg.functionId}"></c:set>
</c:if> </c:if>
<c:if test="${action eq 48 }"> <c:if test="${action eq 48 }">
<c:set var="configPermissionName" value="control:httpRedirect:config"/> <c:set var="configPermissionName" value="control:httpRedirect:config"/>
<c:set var="confirmPermissionName" value="control:httpRedirect:confirm"/> <c:set var="confirmPermissionName" value="control:httpRedirect:confirm"/>
<c:set var="actionPath" value="${ctx}/proxy/control/httpRedirect/httpRedirectList?functionId=${cfg.functionId}"></c:set>
</c:if> </c:if>
<c:if test="${action eq 80 }"> <c:if test="${action eq 80 }">
<c:set var="configPermissionName" value="control:httpReplace:config"/> <c:set var="configPermissionName" value="control:httpReplace:config"/>
<c:set var="confirmPermissionName" value="control:httpReplace:confirm"/> <c:set var="confirmPermissionName" value="control:httpReplace:confirm"/>
<c:set var="actionPath" value="${ctx}/proxy/control/httpRedirect/httpReplaceList?functionId=${cfg.functionId}"></c:set>
</c:if> </c:if>
<c:if test="${action eq 1 }"> <c:if test="${action eq 1 }">
<c:set var="configPermissionName" value="control:httpMonit:config"/> <c:set var="configPermissionName" value="control:httpMonit:config"/>
<c:set var="confirmPermissionName" value="control:httpMonit:confirm"/> <c:set var="confirmPermissionName" value="control:httpMonit:confirm"/>
<c:set var="actionPath" value="${ctx}/proxy/control/httpRedirect/httpMonitList?functionId=${cfg.functionId}"></c:set>
</c:if> </c:if>
<c:if test="${action eq 128 }"> <c:if test="${action eq 128 }">
<c:set var="configPermissionName" value="control:httpWhitelist:config"/> <c:set var="configPermissionName" value="control:httpWhitelist:config"/>
<c:set var="confirmPermissionName" value="control:httpWhitelist:confirm"/> <c:set var="confirmPermissionName" value="control:httpWhitelist:confirm"/>
<c:set var="actionPath" value="${ctx}/proxy/control/httpRedirect/httpWhitelistList?functionId=${cfg.functionId}"></c:set>
</c:if> </c:if>
<shiro:hasPermission name="${configPermissionName }"> <shiro:hasPermission name="${configPermissionName }">
<button type="button" class="btn btn-primary" <button type="button" class="btn btn-primary"
@@ -286,7 +291,8 @@
<div class="portlet-body"> <div class="portlet-body">
<div class="row" > <div class="row" >
<sys:message content="${message}"/> <sys:message content="${message}"/>
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/proxy/control/httpRedirect/list?functionId=${cfg.functionId}" method="post" class="form-search">
<form:form id="searchForm" modelAttribute="cfg" action="${actionPath }" method="post" class="form-search">
<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/> <input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
<input id="audit" name="audit" type="hidden" value="${audit}"/> <input id="audit" name="audit" type="hidden" value="${audit}"/>
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/> <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>

2
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
View File

@@ -30,7 +30,7 @@
ipMaskRange:"IP mask must between 0 and 32", ipMaskRange:"IP mask must between 0 and 32",
srcIpNotEqDestIp:"Sourse IP ", srcIpNotEqDestIp:"Sourse IP ",
destIpNotEqDestIp:" and destination IP ", destIpNotEqDestIp:" and destination IP ",
IpNotEqDestIp:" can't the same", IpNotEqDestIp:" can't be the same",
srcIpIsNotValue:"Sourse IP can't be ", srcIpIsNotValue:"Sourse IP can't be ",
destIpIsNotValue:"Destination IP can't be ", destIpIsNotValue:"Destination IP can't be ",
ipRange:"Wrong IP format or start IP and end IP in two subnet", ipRange:"Wrong IP format or start IP and end IP in two subnet",