gfwleak/tango-kni
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除一些多余配置, 修复一些小bug

Browse Source
This commit is contained in:
崔一鸣
2019-11-20 16:05:40 +08:00
parent 3b81b3f083
commit 72e38dcdab
7 changed files with 40 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
conf/maat/dynamic_maat_tableinfo.conf
View File

@@ -1 +0,0 @@
1 TSG_DYN_SUBSCRIBER_IP plugin {"key":3,"valid":5}

94
conf/maat/maat_test.json
View File

@@ -1,94 +0,0 @@
{
"compile_table": "PXY_INTERCEPT_COMPILE",
"group_table": "PXY_INTERCEPT_GROUP",
"rules": [
{
"compile_id": 0,
"service": 1,
"action": 2,
"do_blacklist": 1,
"do_log": 1,
"effective_rage": 0,
"user_region": "zone=pkt_payload;substitute=/AAAA/BBBB",
"is_valid": "yes",
"groups": [
{
"group_name": "Untitled",
"regions": [
{
"table_name": "HTTP_URL",
"table_type": "string",
"table_content": {
"keywords": "i.ytimg.com",
"expr_type": "none",
"match_method": "sub",
"format": "uncase plain"
}
}
]
}
]
},
{
"compile_id": 1,
"service": 1,
"action": 2,
"do_blacklist": 1,
"do_log": 1,
"effective_rage": 0,
"user_region": "zone=pkt_payload;substitute=/AAAA/BBBB",
"is_valid": "yes",
"groups": [
{
"group_name": "Untitled",
"regions": [
{
"table_name": "PXY_INTERCEPT_IP",
"table_type": "ip",
"table_content": {
"addr_type": "ipv4",
"src_ip": "192.168.50.156",
"mask_src_ip": "255.255.255.255",
"src_port": "0",
"mask_src_port": "65535",
"dst_ip": "0.0.0.0",
"mask_dst_ip": "255.255.255.255",
"dst_port": "0",
"mask_dst_port": "65535",
"protocol": 0,
"direction": "double"
}
}
]
}
]
},
{
"compile_id": 2,
"service": 1,
"action":2,
"do_blacklist": 1,
"do_log": 1,
"effective_rage": 0,
"user_region": "zone=pkt_payload;substitute=/AAAA/BBBB",
"is_valid": "yes",
"groups": [
{
"group_name": "Untitled",
"regions": [
{
"table_name": "PXY_INTERCEPT_DOMAIN",
"table_type": "string",
"table_content": {
"keywords": "www.google.com",
"expr_type": "none",
"match_method": "sub",
"format": "uncase plain"
}
}
]
}
]
}
]
}

10
conf/maat/static_maat_tableinfo.conf
View File

@@ -1,10 +0,0 @@
1 PXY_INTERCEPT_COMPILE compile escape --
2 PXY_INTERCEPT_GROUP group --
2 GROUP_COMPILE_RELATION group --
3 PXY_INTERCEPT_IP ip_plus --
3 TSG_OBJ_IP_ADDR ip_plus --
4 PXY_INTERCEPT_DOMAIN expr utf8 utf8 yes 0
4 TSG_OBJ_FQDN expr utf8 utf8 yes 0
4 TSG_OBJ_FQDN_CAT expr utf8 utf8 yes 0
5 COMPILE_ALIAS compile escape --
6 TSG_OBJ_SUBSCRIBER_ID expr UTF8 UTF8 yes 0 quickon

17
conf/sapp/kni/kni.conf
View File

@@ -36,23 +36,6 @@ keepalive_idle = 2
keepalive_intvl = 1
keepalive_cnt = 3
[static_maat]
#readconf_mode: 0 = iris, 1 = json, 2 = redis
readconf_mode = 2
tableinfo_path = ./etc/kni/static_maat_tableinfo.conf
maatjson_path = ./etc/kni/maat_test.json
redis_ip = 192.168.10.31
redis_port = 6379
redis_index = 0
[dynamic_maat]
#readconf_mode: 0 = iris, 1 = json, 2 = redis
readconf_mode = 2
tableinfo_path = ./etc/kni/dynamic_maat_tableinfo.conf
redis_ip = 192.168.10.31
redis_port = 6379
redis_index = 0
[send_logger]
switch = 0
kafka_topic = SESSION-RECORD-LOG