From 47bbea86521ca4a5b9435c374f2731fe59e37866 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Sun, 4 Nov 2018 13:32:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E3=80=81Packet?=
 =?UTF-8?q?=E3=80=81Stream=E9=85=8D=E7=BD=AE=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=BA=90/=E7=9B=AE=E7=9A=84IP=E3=80=81=E5=85=B3?=
 =?UTF-8?q?=E9=94=AE=E5=AD=97=E6=A3=80=E7=B4=A2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/dao/configuration/AppCfgDao.xml     |  4 ++--
 .../java/com/nis/web/dao/configuration/IpCfgDao.xml | 12 ++++++++++++
 .../com/nis/web/dao/configuration/WebsiteCfgDao.xml | 13 +++++++++++--
 .../WEB-INF/views/cfg/app/appPolicyCfgList.jsp      |  6 ++++++
 .../webapp/WEB-INF/views/cfg/basicprotocol/list.jsp | 10 +++++++---
 .../WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp | 10 +++++++---
 .../WEB-INF/views/cfg/intercept/interceptList.jsp   | 10 +++++++++-
 src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp |  6 ++++++
 .../webapp/WEB-INF/views/cfg/whitelist/ipList.jsp   |  6 ++++++
 9 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
index 20ed830c1..038ecc035 100644
--- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
@@ -788,13 +788,13 @@
 	    		<where>
 	    			and t.protocol_id=21
 	    			<if test="ipPort.srcIpAddress != null and ipPort.srcIpAddress != ''">
-	    				and  t.src_ip_address =#{(ipPort.srcIpAddress,jdbcType=VARCHAR}
+	    				and  t.src_ip_address =#{ipPort.srcIpAddress,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.srcPort != null  and ipPort.srcPort != ''">
 		    			and  t.src_port =#{ipPort.srcPort,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.destIpAddress != null and ipPort.destIpAddress != ''">
-	    				and  t.dest_ip_address =#{(ipPort.destIpAddress,jdbcType=VARCHAR}
+	    				and  t.dest_ip_address =#{ipPort.destIpAddress,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.destPort != null  and ipPort.destPort != ''">
 		    			and  t.dest_port =#{ipPort.destPort,jdbcType=VARCHAR}
diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
index 4f150623e..6d2f62b2c 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
@@ -1046,6 +1046,18 @@
 	    	<if test="functionId != null">
 	    		AND a.function_id=#{functionId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="ipPort != null">
+				AND a.compile_id in (select i.compile_id from ip_port_cfg i
+				<where>
+					<if test="ipPort.srcIpAddress != null and ipPort.srcIpAddress != ''">
+						i.src_ip_address = #{ipPort.srcIpAddress,jdbcType=VARCHAR}
+					</if>
+					<if test="ipPort.destIpAddress != null and ipPort.destIpAddress != ''">
+						i.dest_ip_address = #{ipPort.destIpAddress,jdbcType=VARCHAR}
+					</if>
+				</where>
+				)
+			</if>
 	    	<!-- 数据范围过滤 -->
 			${sqlMap.dsf}
 	    </trim>
diff --git a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
index ee72eedfa..8eea1a49c 100644
--- a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
@@ -233,13 +233,13 @@
 			    		AND t.function_id=#{functionId,jdbcType=INTEGER}
 			    	</if>
 	    			<if test="ipPort.srcIpAddress != null and ipPort.srcIpAddress != ''">
-	    				and  t.src_ip_address =#{(ipPort.srcIpAddress,jdbcType=VARCHAR}
+	    				and  t.src_ip_address =#{ipPort.srcIpAddress,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.srcPort != null  and ipPort.srcPort != ''">
 		    			and  t.src_port =#{ipPort.srcPort,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.destIpAddress != null and ipPort.destIpAddress != ''">
-	    				and  t.dest_ip_address =#{(ipPort.destIpAddress,jdbcType=VARCHAR}
+	    				and  t.dest_ip_address =#{ipPort.destIpAddress,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="ipPort.destPort != null  and ipPort.destPort != ''">
 		    			and  t.dest_port =#{ipPort.destPort,jdbcType=VARCHAR}
@@ -247,6 +247,15 @@
 	    		</where>
 	    		 )
 	    	</if>
+	    	<if test="interceptPktBin != null">
+	    		AND a.compile_id in (select i.compile_id from intercept_pkt_bin i
+	    		<where>
+	    			<if test="interceptPktBin.cfgKeywords != null and interceptPktBin.cfgKeywords != ''">
+	    				REPLACE(i.cfg_keywords,'***and***','|') like concat(concat('%',#{interceptPktBin.cfgKeywords,jdbcType=VARCHAR}),'%')
+		    		</if>
+				</where>
+				)
+	    	</if>
 	    	<if test="httpUrl!=null">
 	    		AND a.compile_id in (select f.compile_id from http_url_cfg f
 	    		<where>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
index 12d8e7459..55ebc4f67 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -12,6 +12,10 @@
 			$("#intype").val("${cfg.cfgDesc}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
+		}else if("${cfg.ipPort.srcIpAddress}"){
+			$("#intype").val("${cfg.ipPort.srcIpAddress}");
+		}else if("${cfg.ipPort.destIpAddress}"){
+			$("#intype").val("${cfg.ipPort.destIpAddress}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -169,6 +173,8 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
+												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
index ee93f5e1b..f93f48ee7 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -10,10 +10,12 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.ntcSubscribeIdCfg.cfgKeywords}"){
-			$("#intype").val("${cfg.ntcSubscribeIdCfg.cfgKeywords}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
+		}else if("${cfg.ipPort.srcIpAddress}"){
+			$("#intype").val("${cfg.ipPort.srcIpAddress}");
+		}else if("${cfg.ipPort.destIpAddress}"){
+			$("#intype").val("${cfg.ipPort.destIpAddress}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -174,8 +176,10 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
+												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
-												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="APP_SUBSCRIBE_ID"></spring:message></form:option>
+												<%-- <form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="APP_SUBSCRIBE_ID"></spring:message></form:option> --%>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
index 2b1ec9a5b..d17bbb545 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -10,10 +10,12 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.ntcSubscribeIdCfg.cfgKeywords}"){
-			$("#intype").val("${cfg.ntcSubscribeIdCfg.cfgKeywords}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
+		}else if("${cfg.ipPort.srcIpAddress}"){
+			$("#intype").val("${cfg.ipPort.srcIpAddress}");
+		}else if("${cfg.ipPort.destIpAddress}"){
+			$("#intype").val("${cfg.ipPort.destIpAddress}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -171,7 +173,9 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
-												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="APP_SUBSCRIBE_ID"></spring:message></form:option>
+												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
+												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
+												<%-- <form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="APP_SUBSCRIBE_ID"></spring:message></form:option> --%>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
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 5fd497daf..bdbd46d63 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -11,6 +11,12 @@
 			$("#intype").val("${cfg.cfgDesc}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
+		}else if("${cfg.ipPort.srcIpAddress}"){
+			$("#intype").val("${cfg.ipPort.srcIpAddress}");
+		}else if("${cfg.ipPort.destIpAddress}"){
+			$("#intype").val("${cfg.ipPort.destIpAddress}");
+		}else if("${cfg.interceptPktBin.cfgKeywords}"){
+			$("#intype").val("${cfg.interceptPktBin.cfgKeywords}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -159,8 +165,10 @@
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<%-- <form:option value="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
-												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
+												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
+												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
+												<form:option value="interceptPktBin.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
index b883dc897..6a6e86625 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
@@ -11,6 +11,10 @@
 			$("#intype").val("${cfg.cfgDesc}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
+		}else if("${cfg.ipPort.srcIpAddress}"){
+			$("#intype").val("${cfg.ipPort.srcIpAddress}");
+		}else if("${cfg.ipPort.destIpAddress}"){
+			$("#intype").val("${cfg.ipPort.destIpAddress}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -149,6 +153,8 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
+												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
index 8d717bda9..f221b707a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
@@ -11,6 +11,10 @@
 			$("#intype").val("${cfg.cfgDesc}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
+		}else if("${cfg.ipPort.srcIpAddress}"){
+			$("#intype").val("${cfg.ipPort.srcIpAddress}");
+		}else if("${cfg.ipPort.destIpAddress}"){
+			$("#intype").val("${cfg.ipPort.destIpAddress}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -152,6 +156,8 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
+												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
+												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>