diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index fbcdf51f6..24c6b1c95 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -687,7 +687,7 @@ behavior_protocol=Behavior Protocol intercept_policy=Intercept Policy ip_intercept=IP Intercept domain_intercept=Domain Intercept -control_policy=Block Policy +control_policy=Control Policy domain_forward=Domain Forward http_redirect=HTTP(s) Redirect http_req_replace=Http Request Body Replace @@ -1296,4 +1296,5 @@ max_cache_obj_size=Max Cache Object Size cache_time_error=Cache time can not exceed 24 hours(1440 minutes,86400 seconds). cache_size_error=Cache size can not exceed 1024TB(1048576GB,1073741824MB). ignore_qs_error=Ignore query string has invisible character or comma -NTC_DDOS_PROTECT_TARGET_IP=DDOS IP Configuration \ No newline at end of file +NTC_DDOS_PROTECT_TARGET_IP=DDOS IP Configuration +bypass=Bypass \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index bdb80fa31..b0f2b421b 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -2009,4 +2009,5 @@ max_cache_obj_size=Max Cache Object Size cache_time_error=Cache time can not exceed 24 hours(1440 minutes,86400 seconds). cache_size_error=Cache size can not exceed 1024TB(1048576GB,1073741824MB). ignore_qs_error=Ignore query string has invisible character or comma -NTC_DDOS_PROTECT_TARGET_IP=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F IP-\u0410\u0434\u0440\u0435\u0441\u0430 DDOS \ No newline at end of file +NTC_DDOS_PROTECT_TARGET_IP=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F IP-\u0410\u0434\u0440\u0435\u0441\u0430 DDOS +bypass=Bypass \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 69603a986..a78b95cd0 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -2163,4 +2163,5 @@ max_cache_obj_size=\u6700\u5927\u7F13\u5B58\u5BF9\u8C61\u5927\u5C0F cache_time_error=\u7F13\u5B58\u65F6\u95F4\u4E0D\u80FD\u8D85\u8FC7 24 \u5C0F\u65F6(1440\u5206\u949F,86400\u79D2). cache_size_error=\u7F13\u5B58\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC71024TB(1048576GB,1073741824MB). ignore_qs_error=\u5FFD\u7565\u7684\u67E5\u8BE2\u53C2\u6570\u4E2D\u5305\u542B\u4E0D\u53EF\u89C1\u5B57\u7B26\u6216\u8005\u9017\u53F7 -NTC_DDOS_PROTECT_TARGET_IP=\u76EE\u6807\u9632\u62A4IP\u914D\u7F6E \ No newline at end of file +NTC_DDOS_PROTECT_TARGET_IP=\u76EE\u6807\u9632\u62A4IP\u914D\u7F6E +bypass=Bypass \ No newline at end of file diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index b63442288..825e7cef9 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -239,7 +239,6 @@ ntcIpLog=ntcIpLogs ntcBgpLog=ntcBgpLogs ntcP2pLog=ntcP2pLogs ntcHttpLog=ntcHttpLogs -ntcKeywordsUrlLog=ntcKeywordsUrlLogs ntcDnsLog=ntcDnsLogs ntcSslLog=ntcSslLogs ntcPptpLog=ntcPptpLogs @@ -269,7 +268,6 @@ pxyHttpLog=pxyHttpLogs mmSpeakerRecognizationLog=mmSpeakerRecognizationLogs mmLogoDetectionLog=mmLogoDetectionLogs mmFaceRecognizationLog=mmFaceRecognizationLogs -ntcCollectVoipLog=ntcCollectVoipLogs ######################################## #\u5927\u5c4f\u56fe\u8868\u5c55\u793a\u670d\u52a1\u63a5\u53e3 dashboardUrl=http://192.168.10.204:9999/galaxy-service/service/log/v1/ @@ -287,7 +285,6 @@ trafficTopicAndDomainChart=trafficTopicAndDomainChart ntcTotalReport=ntcTotalReport trafficIpActiveFiveMinute=trafficIpActiveFiveMinute trafficIpActiveOneHour=trafficIpActiveOneHour -ntcRadiusReport=ntcRadiusReport client_connect_timeout=300000 client_read_timeout=300000 @@ -549,4 +546,7 @@ domain_regexp=^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA- #IP复用maat json中的ip region单次send 最大个数 maat_json_send_size=2000 #导入验证的线程数量 -mulity_thread_size=5 \ No newline at end of file +mulity_thread_size=5 +ntcRadiusReport=ntcRadiusReport +ntcCollectVoipLog=ntcCollectVoipLogs +ntcKeywordsUrlLog=ntcKeywordsUrlLogs \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp index e3af30bb6..2059b600f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp @@ -190,7 +190,7 @@ -
+
hidden">
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp index 49db32aaa..bec64f3b0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp @@ -22,6 +22,7 @@ openSingleBoxsolid(); }); + setInterceptDefaultInfo($("input[name='cfgId']").val()); openSingleBoxsolid(); $("#serviceId").val($(".action:checked").attr("serviceId")); $("#protocolId").val($(".action:checked").attr("protocolId")); @@ -82,9 +83,11 @@ if(action==1){ //监测 $(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); $(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); + $(".whiteListAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); }else if(action==64){//限速 $(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); $(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); + $(".whiteListAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); var rateLimitType=$("input[name='userRegion1']checked").val(); if(rateLimitType == 0){//丢包率 $(".bandwith").find("input[name='userRegion3']").attr("disabled",true); @@ -95,6 +98,7 @@ }else if(action==80){//替换 $(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); $(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); + $(".whiteListAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); }else {//白名单 $(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); $(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); @@ -168,58 +172,85 @@ var keyringType=$(".monitAction").find("select[name='userRegion1']").find("option[value='"+cert+"']").attr("keyringType"); if(cert != '' && keyringType == 'end-entity'){ var cn=$(".monitAction").find("select[name='userRegion1']").find("option[value='"+cert+"']").attr("cn"); - var cnReg = new RegExp('^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\'+cn.replace("*","")+')+$'); - var san=$(".monitAction").find("select[name='userRegion1']").find("option[value='"+cert+"']").attr("san"); - if(cn.trim() =='' && san.trim() ==''){ - flag=false; - }else{ - $("input[name$='cfgRegionCode'").each(function(){ - var serviceType=$(this).attr("serviceType"); - var prefixName=$(this).attr("name").split("cfgRegionCode")[0]; - if(serviceType == "intercept_domain"){ - var domain=$("input[name='"+prefixName+"cfgKeywords']").val(); - var domain=domain.trim(); - if(!flag){ - for (var i=0;i-1){ + var sanReg= new RegExp('^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\'+sanStr.replace("*","")+')+$'); + if(sanReg.exec(domain) != null){ + flag=true; + } + }else{ + if(sanStr == domain){ //完全匹配 + flag=true; + } + } } - var sanStr=san.split(",")[i].trim(); - if(sanStr.indexOf("*") >-1){ - var sanReg= new RegExp('^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\'+sanStr.replace("*","")+')+$'); - if(sanReg.exec(domain) != null){ + } + + if(!flag){ + if(cn.indexOf("*") > -1){ + if(cnReg.exec(domain) != null){ flag=true; } }else{ - if(sanStr == domain){ //完全匹配 + if(cn == domain){ //完全匹配 flag=true; } } } + }else{ + flag=true; } - - if(!flag){ - if(cn.indexOf("*") > -1){ - if(cnReg.exec(domain) != null){ - flag=true; - } - }else{ - if(cn == domain){ //完全匹配 - flag=true; - } - } - } + } + if(!flag){ + $("div[for='"+prefixName+"cfgKeywords']").html(""); + $("div[for='"+prefixName+"cfgKeywords']").html(""); }else{ - flag=true; + $("div[for='"+prefixName+"cfgKeywords']").html(""); + } + }); + }else{ + flag=false; + $("input[name$='cfgRegionCode'").each(function(){ + var serviceType=$(this).attr("serviceType"); + var prefixName=$(this).attr("name").split("cfgRegionCode")[0]; + if(serviceType == "intercept_domain"){ + if(error ==null || error.trim() == ''){ + $("div[for='"+prefixName+"cfgKeywords']").html(""); + $("div[for='"+prefixName+"cfgKeywords']").html(""); + } + } + + }); + } + }else{ + flag=false; + $("input[name$='cfgRegionCode'").each(function(){ + var serviceType=$(this).attr("serviceType"); + var prefixName=$(this).attr("name").split("cfgRegionCode")[0]; + var error=$("div[for='"+prefixName+"cfgKeywords']").html(); + if(serviceType == "intercept_domain"){ + if(error ==null || error.trim() == ''){ + $("div[for='"+prefixName+"cfgKeywords']").html(""); + $("div[for='"+prefixName+"cfgKeywords']").html(""); } } - if(!flag){ - $("div[for='"+prefixName+"cfgKeywords']").html(""); - $("div[for='"+prefixName+"cfgKeywords']").html(""); - }else{ - $("div[for='"+prefixName+"cfgKeywords']").html(""); - } + }); } }else{ @@ -231,6 +262,105 @@ return flag; } + var setInterceptDefaultInfo=function(cfgId){ + var action=$("input[name='action']:checked").val(); + var interceptRatelimitIp=""; + var interceptReplacePktBin=""; + var protocolNamePrefix=""; + var serviceType=""; + //查找当前业务中的serviceRegionType，是否存在intercept_ratelimit_ip + $("input[name$='cfgRegionCode']").each(function(){ + //替换动作非tcp + var serviceRegionTypeValue=$(this).attr("serviceType"); + serviceType=serviceRegionTypeValue; + var serviceRegionTypeName=$(this).attr("name"); + if(serviceRegionTypeName.indexOf(".") >-1){ + serviceRegionTypeName=serviceRegionTypeName.substring(0,serviceRegionTypeName.indexOf(".")+1); + }else{ + serviceRegionTypeName=""; + } + if(serviceRegionTypeValue == 'intercept_ratelimit_ip'){ + interceptRatelimitIp=serviceRegionTypeValue; + protocolNamePrefix=serviceRegionTypeName; + } + if(serviceRegionTypeValue == 'intercept_replace_pkt_bin'){ + interceptReplacePktBin=serviceRegionTypeValue; + } + }); + if(action==1){ + //监测 + $(".monitAction").removeClass("hidden"); + $(".ratelimitAction").addClass("hidden"); + $(".replaceAction").addClass("hidden"); + $(".whiteListAction").addClass("hidden"); + if(interceptRatelimitIp == 'intercept_ratelimit_ip'){ + $("select[name='"+protocolNamePrefix+"protocol']").find("option").remove(); + $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); + //$("select[name='"+protocolNamePrefix+"protocol']").append(""); + $("select[name='"+protocolNamePrefix+"protocol']").append(""); + //$("select[name='"+protocolNamePrefix+"protocol']").append(""); + $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); + } + if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){ + $("."+interceptReplacePktBin).addClass("hidden"); + $("."+interceptReplacePktBin+"_div").addClass("hidden"); + } + }else if(action==64){ + //限速 + $(".monitAction").addClass("hidden"); + $(".ratelimitAction").removeClass("hidden"); + $(".replaceAction").addClass("hidden"); + $(".whiteListAction").addClass("hidden"); + if(interceptRatelimitIp == 'intercept_ratelimit_ip'){ + $("select[name='"+protocolNamePrefix+"protocol']").find("option").remove(); + $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); + $("select[name='"+protocolNamePrefix+"protocol']").append(""); + $("select[name='"+protocolNamePrefix+"protocol']").append(""); + $("select[name='"+protocolNamePrefix+"protocol']").append(""); + $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); + switchRateLimitType(); + } + if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){ + $("."+interceptReplacePktBin).addClass("hidden"); + $("."+interceptReplacePktBin+"_div").addClass("hidden"); + } + }else if(action==80){ + //替换 + $(".monitAction").addClass("hidden"); + $(".ratelimitAction").addClass("hidden"); + $(".replaceAction").removeClass("hidden"); + $(".whiteListAction").addClass("hidden"); + if(interceptRatelimitIp == 'intercept_ratelimit_ip'){ + $("select[name='"+protocolNamePrefix+"protocol']").find("option").remove(); + $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); + $("select[name='"+protocolNamePrefix+"protocol']").append("") + $("select[name='"+protocolNamePrefix+"protocol']").append("") + $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); + } + if(interceptReplacePktBin == 'intercept_replace_pkt_bin' && cfgId == ""){ + $("."+interceptReplacePktBin).removeClass("hidden"); + $("."+interceptReplacePktBin).find("span").removeClass("hidden"); + } + }else if(action==128){ + $(".monitAction").addClass("hidden"); + $(".ratelimitAction").addClass("hidden"); + $(".replaceAction").addClass("hidden"); + $(".whiteListAction").removeClass("hidden"); + if(interceptRatelimitIp == 'intercept_ratelimit_ip'){ + $("select[name='"+protocolNamePrefix+"protocol']").find("option").remove(); + $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); + //$("select[name='"+protocolNamePrefix+"protocol']").append("") + $("select[name='"+protocolNamePrefix+"protocol']").append("") + $("select[name='"+protocolNamePrefix+"protocol']").append("") + $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); + } + if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){ + $("."+interceptReplacePktBin).addClass("hidden"); + $("."+interceptReplacePktBin+"_div").addClass("hidden"); + } + } + + } @@ -279,7 +409,6 @@
-
@@ -309,7 +438,10 @@ - + + + + @@ -345,37 +477,36 @@
- - -
-
-
- -
- -
-
-
-
-
- + <%-- action 为1 监测时 可以选择证书--%> + diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp index 5b3727e8e..5ae59c755 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp @@ -373,7 +373,7 @@ <%-- --%> - + @@ -413,7 +413,10 @@ - + + + + @@ -442,7 +445,8 @@ - ${certificate.cfgDesc} + ${indexCfg.userRegion1} + ${certificate.cfgDesc} diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp index ef82a938e..461683af3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp @@ -278,50 +278,6 @@
- -
-
-
- - -
-
-
-
-
-
- - -
-
-
- - -
-
-
- - -
-
-
-
-
-
- - -
-
-
-
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 0043293b4..be2c94a50 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -150,7 +150,6 @@ $(function(){ }); switchAction($("input[name='action']:checked").val()); - setInterceptDefaultInfo($("input[name='cfgId']").val()); $(".glyphicon-plus").on("click",function(){ var obj=$(this).parents(".form-section").next(".container-fluid").clone(); @@ -693,100 +692,7 @@ window.onload=function(){ } } } -var setInterceptDefaultInfo=function(cfgId){ - var action=$("input[name='action']:checked").val(); - var interceptRatelimitIp=""; - var interceptReplacePktBin=""; - var protocolNamePrefix=""; - //查找当前业务中的serviceRegionType，是否存在intercept_ratelimit_ip - $("input[name$='cfgRegionCode']").each(function(){ - //替换动作非tcp - var serviceRegionTypeValue=$(this).attr("serviceType"); - var serviceRegionTypeName=$(this).attr("name"); - if(serviceRegionTypeName.indexOf(".") >-1){ - serviceRegionTypeName=serviceRegionTypeName.substring(0,serviceRegionTypeName.indexOf(".")+1); - }else{ - serviceRegionTypeName=""; - } - if(serviceRegionTypeValue == 'intercept_ratelimit_ip'){ - interceptRatelimitIp=serviceRegionTypeValue; - protocolNamePrefix=serviceRegionTypeName; - } - if(serviceRegionTypeValue == 'intercept_replace_pkt_bin'){ - interceptReplacePktBin=serviceRegionTypeValue; - } - }); - if(action==1){ - //监测 - $(".monitAction").removeClass("hidden"); - $(".ratelimitAction").addClass("hidden"); - $(".replaceAction").addClass("hidden"); - if(interceptRatelimitIp == 'intercept_ratelimit_ip'){ - $("select[name='"+protocolNamePrefix+"protocol']").find("option").remove(); - $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); - //$("select[name='"+protocolNamePrefix+"protocol']").append(""); - $("select[name='"+protocolNamePrefix+"protocol']").append(""); - //$("select[name='"+protocolNamePrefix+"protocol']").append(""); - $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); - } - if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){ - $("."+interceptReplacePktBin).addClass("hidden"); - $("."+interceptReplacePktBin+"_div").addClass("hidden"); - } - }else if(action==64){ - //限速 - $(".monitAction").addClass("hidden"); - $(".ratelimitAction").removeClass("hidden"); - $(".replaceAction").addClass("hidden"); - if(interceptRatelimitIp == 'intercept_ratelimit_ip'){ - $("select[name='"+protocolNamePrefix+"protocol']").find("option").remove(); - $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); - $("select[name='"+protocolNamePrefix+"protocol']").append(""); - $("select[name='"+protocolNamePrefix+"protocol']").append(""); - $("select[name='"+protocolNamePrefix+"protocol']").append(""); - $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); - switchRateLimitType(); - } - if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){ - $("."+interceptReplacePktBin).addClass("hidden"); - $("."+interceptReplacePktBin+"_div").addClass("hidden"); - } - }else if(action==80){ - //替换 - $(".monitAction").addClass("hidden"); - $(".ratelimitAction").addClass("hidden"); - $(".replaceAction").removeClass("hidden"); - if(interceptRatelimitIp == 'intercept_ratelimit_ip'){ - $("select[name='"+protocolNamePrefix+"protocol']").find("option").remove(); - $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); - $("select[name='"+protocolNamePrefix+"protocol']").append("") - $("select[name='"+protocolNamePrefix+"protocol']").append("") - $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); - } - if(interceptReplacePktBin == 'intercept_replace_pkt_bin' && cfgId == ""){ - $("."+interceptReplacePktBin).removeClass("hidden"); - $("."+interceptReplacePktBin).find("span").removeClass("hidden"); - } - }else if(action==128){ - //白名单 - $(".monitAction").addClass("hidden"); - $(".ratelimitAction").addClass("hidden"); - $(".replaceAction").addClass("hidden"); - if(interceptRatelimitIp == 'intercept_ratelimit_ip'){ - $("select[name='"+protocolNamePrefix+"protocol']").find("option").remove(); - $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); - //$("select[name='"+protocolNamePrefix+"protocol']").append("") - $("select[name='"+protocolNamePrefix+"protocol']").append("") - $("select[name='"+protocolNamePrefix+"protocol']").append("") - $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); - } - if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){ - $("."+interceptReplacePktBin).addClass("hidden"); - $("."+interceptReplacePktBin+"_div").addClass("hidden"); - } - } - -} + //0 非十六进制 大小不敏感 1 十六进制，大小写不敏感 2非十六进制 大小写敏感 var setIsHexBin=function(obj){ var profix="";