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

日志：

Browse Source 
1、PXY_HTTP_LOG 属性web_site补全属性;
2、修改NTC_DDOS_LOG 笔误改为IS_BLOCK；
配置：
1、新增VOIP动态阻断(0x112)配置文件；
This commit is contained in:
zhangdongxu
2018-10-15 16:39:40 +08:00
parent 306995c6e3
commit 09341ab920
6 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/nis/domain/restful/NtcDdosLog.java
View File

@@ -30,9 +30,9 @@ public class NtcDdosLog extends LogEntity<NtcDdosLog> {
@ApiModelProperty(value = "攻击累积字节数", required = true) @ApiModelProperty(value = "攻击累积字节数", required = true)
protected String attackTotalByte; protected String attackTotalByte;
@ApiModelProperty(value = "攻击流量是否被丢弃", required = true) @ApiModelProperty(value = "攻击流量是否被丢弃", required = true)
protected Integer isBlcok; protected Integer isBlock;
protected String searchIsBlcok; //攻击流量是否被丢弃 protected String searchIsBlock; //攻击流量是否被丢弃
public Integer getAttackType() { public Integer getAttackType() {
return attackType; return attackType;
} }
@@ -75,18 +75,18 @@ public class NtcDdosLog extends LogEntity<NtcDdosLog> {
public void setAttackTotalByte(String attackTotalByte) { public void setAttackTotalByte(String attackTotalByte) {
this.attackTotalByte = attackTotalByte; this.attackTotalByte = attackTotalByte;
} }
public Integer getIsBlcok() { public Integer getIsBlock() {
return isBlcok; return isBlock;
} }
public void setIsBlcok(Integer isBlcok) { public void setIsBlock(Integer isBlock) {
this.isBlcok = isBlcok; this.isBlock = isBlock;
} }
public String getSearchIsBlcok() { public String getSearchIsBlock() {
return searchIsBlcok; return searchIsBlock;
} }
public void setSearchIsBlcok(String searchIsBlcok) { public void setSearchIsBlock(String searchIsBlock) {
this.searchIsBlcok = searchIsBlcok; this.searchIsBlock = searchIsBlock;
} }
} }

10
src/main/java/com/nis/domain/restful/PxyHttpLog.java
View File

@@ -39,6 +39,9 @@ public class PxyHttpLog extends LogEntity<PxyHttpLog> {
protected String reqBody; protected String reqBody;
@ApiModelProperty(value="原始应答体", required=true) @ApiModelProperty(value="原始应答体", required=true)
protected String respBody; protected String respBody;
@ApiModelProperty(value="域名", required=true)
protected String webSite;
public String getUrl() { public String getUrl() {
return url; return url;
} }
@@ -117,4 +120,11 @@ public class PxyHttpLog extends LogEntity<PxyHttpLog> {
public void setRespBody(String respBody) { public void setRespBody(String respBody) {
this.respBody = respBody; this.respBody = respBody;
} }
public String getWebSite() {
return webSite;
}
public void setWebSite(String webSite) {
this.webSite = webSite;
}
} }

3
src/main/java/com/nis/web/dao/DfLogSearchDao.xml
View File

@@ -456,7 +456,7 @@
<result column="attack_max_bps" jdbcType="VARCHAR" property="attackMaxBps" /> <result column="attack_max_bps" jdbcType="VARCHAR" property="attackMaxBps" />
<result column="attack_total_pkt" jdbcType="VARCHAR" property="attackTotalPkt" /> <result column="attack_total_pkt" jdbcType="VARCHAR" property="attackTotalPkt" />
<result column="attack_total_byte" jdbcType="VARCHAR" property="attackTotalByte" /> <result column="attack_total_byte" jdbcType="VARCHAR" property="attackTotalByte" />
<result column="is_blcok" jdbcType="INTEGER" property="isBlcok" /> <result column="is_block" jdbcType="INTEGER" property="isBlock" />
</resultMap> </resultMap>
<resultMap id="DkBehaviorLogMap" type="com.nis.domain.restful.DkBehaviorLog"> <resultMap id="DkBehaviorLogMap" type="com.nis.domain.restful.DkBehaviorLog">
<result column="cfg_id" jdbcType="BIGINT" property="cfgId" /> <result column="cfg_id" jdbcType="BIGINT" property="cfgId" />
@@ -966,6 +966,7 @@
<result column="resp_header" jdbcType="VARCHAR" property="respHeader" /> <result column="resp_header" jdbcType="VARCHAR" property="respHeader" />
<result column="req_body" jdbcType="VARCHAR" property="reqBody" /> <result column="req_body" jdbcType="VARCHAR" property="reqBody" />
<result column="resp_body" jdbcType="VARCHAR" property="respBody" /> <result column="resp_body" jdbcType="VARCHAR" property="respBody" />
<result column="web_site" jdbcType="VARCHAR" property="webSite" />
</resultMap> </resultMap>
<resultMap id="NtcP2pLogMap" type="com.nis.domain.restful.NtcP2pLog"> <resultMap id="NtcP2pLogMap" type="com.nis.domain.restful.NtcP2pLog">
<result column="cfg_id" jdbcType="BIGINT" property="cfgId" /> <result column="cfg_id" jdbcType="BIGINT" property="cfgId" />

5
src/main/resources/applicationConfig-rule.properties
View File

@@ -262,6 +262,8 @@ unMaatService=3:32;4:96;5:32;25:32;28:32;64;65;261:16;262:16;263:16;264:16;265:1
269=0:MM_LOGO_DETECTION 269=0:MM_LOGO_DETECTION
#0x10E 人脸识别阻断 #0x10E 人脸识别阻断
270=0:MM_FACE_RECOGNIZATION 270=0:MM_FACE_RECOGNIZATION
#0X112 VOIP动态阻断 丢弃 李佳说只G设备使用，所以只入阀门
274=0:MM_DYN_VOIP_DROP
#0x185 音频样例监测 #0x185 音频样例监测
389=0:MM_SAMPLE_AUDIO 389=0:MM_SAMPLE_AUDIO
@@ -290,7 +292,6 @@ unMaatService=3:32;4:96;5:32;25:32;28:32;64;65;261:16;262:16;263:16;264:16;265:1
#0x340 IP复用地址池配置（回调） #0x340 IP复用地址池配置（回调）
832=0:IR_STATIC_IP_POOL_CB 832=0:IR_STATIC_IP_POOL_CB
##各业务类型对应的redisdb,业务类型:redisdb,多个业务以“;”分隔,多个db以“,”数量不能超过6个 ##各业务类型对应的redisdb,业务类型:redisdb,多个业务以“;”分隔,多个db以“,”数量不能超过6个
#系统简称对应的redisDBIndex: NTC+MM:2 MM样例:3 PXY(512-767):4 阀门:5 #系统简称对应的redisDBIndex: NTC+MM:2 MM样例:3 PXY(512-767):4 阀门:5
#APP 0x400-0x420 目前配置入到NTC系统对应的库中 #APP 0x400-0x420 目前配置入到NTC系统对应的库中
@@ -306,7 +307,7 @@ unMaatService=3:32;4:96;5:32;25:32;28:32;64;65;261:16;262:16;263:16;264:16;265:1
##回调类配置 ##回调类配置
#0x340 IP复用地址池配置（回调）832:2,4,5 #0x340 IP复用地址池配置（回调）832:2,4,5
########## ##########
serviceDBIndex=1:2,4,5;2:2,4,5;16:2;17:2;18:2;19:2;20:2;21:2;22:2;23:2;24:2;26:2;27:2;30:2;31:2;32:2;33:2,5;34:2;35:2;36:2;37:2;38:2;39:2;128:2;129:2;130:2;131:2;132:2;133:2;134:2;135:2;136:2;137:2;138:2;139:2;140:2;142:2;143:2;144:2;145:2;146:2;147:2;148:2;149:2;150:2;151:2;256:2;257:2;258:2;259:2;260:2;267:2;271:2;272:2;273:2;384:2;385:2;386:2;387:2;388:2;395:2;399:2;512:4,5;513:4,2,5;514:4;515:4;517:4;520:4;521:4;528:4;544:4;560:4;576:4;592:4;608:4;750:4;768:4;1024:2;1025:2;1026:2,5;1027:2;1028:2,5;1029:2;1030:2;1040:2;1041:2;1042:2;1152:2;3:5;4:5;5:2;25:5;28:5;64:2;65:2;261:3;262:3;263:3;264:3;265:3;266:3;268:3;269:3;270:3;389:3;390:3;391:3;392:3;393:2;394:2;396:3;397:3;398:3;832:2,4,5; serviceDBIndex=1:2,4,5;2:2,4,5;16:2;17:2;18:2;19:2;20:2;21:2;22:2;23:2;24:2;26:2;27:2;30:2;31:2;32:2;33:2,5;34:2;35:2;36:2;37:2;38:2;39:2;128:2;129:2;130:2;131:2;132:2;133:2;134:2;135:2;136:2;137:2;138:2;139:2;140:2;142:2;143:2;144:2;145:2;146:2;147:2;148:2;149:2;150:2;151:2;256:2;257:2;258:2;259:2;260:2;267:2;271:2;272:2;273:2;274:5;384:2;385:2;386:2;387:2;388:2;395:2;399:2;512:4,5;513:4,2,5;514:4;515:4;517:4;520:4;521:4;528:4;544:4;560:4;576:4;592:4;608:4;750:4;768:4;1024:2;1025:2;1026:2,5;1027:2;1028:2,5;1029:2;1030:2;1040:2;1041:2;1042:2;1152:2;3:5;4:5;5:2;25:5;28:5;64:2;65:2;261:3;262:3;263:3;264:3;265:3;266:3;268:3;269:3;270:3;389:3;390:3;391:3;392:3;393:2;394:2;396:3;397:3;398:3;832:2,4,5;
##阀门配置在redisdb的序号 ##阀门配置在redisdb的序号
tapRedisDb=5 tapRedisDb=5

3
src/main/resources/commonSources/applicationConfig-parser.xml
View File

@@ -9,8 +9,9 @@
#0x04 IP地址丢弃 4=0:INLINE_IP_CB #0x04 IP地址丢弃 4=0:INLINE_IP_CB
#0x19 IPSec丢弃 25=0:INLINE_IP_CB #0x19 IPSec丢弃 25=0:INLINE_IP_CB
#0x1C GRE 丢弃 28=0:INLINE_IP_CB #0x1C GRE 丢弃 28=0:INLINE_IP_CB
#0X112 VOIP动态阻断 丢弃 274=0:MM_DYN_VOIP_DROP
--> -->
<t:commonSource serviceIds="3,4,25,28"> <t:commonSource serviceIds="3,4,25,28,274">
<t:field fieldType="String" srcName="service" dstName="service" isRequired="true"/> <t:field fieldType="String" srcName="service" dstName="service" isRequired="true"/>
<t:field fieldType="Number" srcName="action" dstName="action" isRequired="true"/> <t:field fieldType="Number" srcName="action" dstName="action" isRequired="true"/>
<t:field fieldType="Number" srcName="cfgId" dstName="cfg_id" isRequired="true" isCfgId="true"/> <t:field fieldType="Number" srcName="cfgId" dstName="cfg_id" isRequired="true" isCfgId="true"/>

4
src/main/resources/maatXml/applicationConfig-maatRedis.xml
View File

@@ -52,8 +52,8 @@
</p:expressions> </p:expressions>
</p:maatType> </p:maatType>
<!-- #0x03 IP地址丢弃 3=0:INLINE_IP_CB #0x04 IP地址丢弃 4=0:INLINE_IP_CB #0x19 IPSec丢弃 <!-- #0x03 IP地址丢弃 3=0:INLINE_IP_CB #0x04 IP地址丢弃 4=0:INLINE_IP_CB #0x19 IPSec丢弃
25=0:INLINE_IP_CB #0x1C GRE 丢弃 28=0:INLINE_IP_CB --> 25=0:INLINE_IP_CB #0x1C GRE 丢弃 28=0:INLINE_IP_CB #0X112 VOIP动态阻断 丢弃 274=0:MM_DYN_VOIP_DROP-->
<p:maatType service="3;4;25;28"> <p:maatType service="3;4;25;28;274">
<p:expressions> <p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression> <p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
<p:valueExpression>[cfg_id];\t;0;\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[action];\t;[service];\t;[op_time];&amp;nbsp;0;\n</p:valueExpression> <p:valueExpression>[cfg_id];\t;0;\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[action];\t;[service];\t;[op_time];&amp;nbsp;0;\n</p:valueExpression>