基础扫描功能的测试用例通过。

This commit is contained in:
zhengchao
2020-06-14 20:52:14 +08:00
parent d67aa1b8b2
commit 81a827d162
7 changed files with 123 additions and 105 deletions

View File

@@ -1,6 +1,7 @@
{
"compile_table": "COMPILE",
"group_table": "GROUP",
"group2compile_table": "GROUP2COMPILE",
"group2group_table": "GROUP2GROUP",
"groups": [
{
"group_name": "ASN1234",
@@ -1749,9 +1750,11 @@
"is_valid": "yes",
"groups": [
{
"group_name":"ipv4_composition.session",
"virtual_table":"COMPOSITION_IP_SESSION",
"not_flag":0
"group_name":"ipv4_composition.session",
"virtual_table":"COMPOSITION_IP_SESSION",
"not_flag":0,
"nth_clause":1
}
]
},

View File

@@ -18,37 +18,38 @@
#For expr/expr_plus Table
#id name type src_charset dst_charset do_merge cross_cache
0 COMPILE compile escape --
1 GROUP group --
2 HTTP_URL expr UTF8 GBK/BIG5/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8 yes 128
2 HTTP_HOST expr UTF8 GBK/BIG5/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8 yes 128
3 KEYWORDS_TABLE expr UTF8 GBK/BIG5/UNICODE/UTF8/unicode_ascii_esc/unicode_ascii_aligned/unicode_ncr_dec/unicode_ncr_hex/windows-1251 yes 0
4 IP_CONFIG ip --
5 CONTENT_SIZE intval --
6 QD_ENTRY_INFO plugin 4 --
7 FILE_DIGEST digest --
8 HTTP_SIGNATURE expr_plus GBK GBK yes 0
9 SIM_URL similar --
10 IMAGE_FP expr UTF8 UTF8 yes 128
11 TEST_EFFECTIVE_RANGE_TABLE plugin {"valid":4,"tag":5} --
12 TEST_FOREIGN_KEY plugin {"valid":4,"foreign":[6,8],"tag":3} --
13 COMPILE_ALIAS compile escape --
14 TEST_PLUGIN_EXDATA_TABLE plugin {"key":2,"valid":4,"tag":5,"estimate_size":1024} --
15 IR_INTERCEPT_IP plugin {"valid":14,"tag":18}
16 APP_PAYLOAD expr_plus UTF8 UTF8 yes 0
17 TROJAN_PAYLOAD expr UTF8 UTF8 yes 0
18 MAIL_ADDR expr UTF8 UTF8 yes 0
19 IP_PLUS_CONFIG ip_plus --
20 HTTP_RESPONSE_KEYWORDS virtual KEYWORDS_TABLE --
21 HTTP_REQUEST_HEADER virtual HTTP_SIGNATURE --
22 HTTP_RESPONSE_HEADER virtual HTTP_SIGNATURE --
23 VIRTUAL_IP_PLUS_TABLE virtual IP_PLUS_CONFIG --
23 VIRTUAL_IP_PLUS_SOURCE virtual IP_PLUS_CONFIG --
23 VIRTUAL_IP_PLUS_DESTINATION virtual IP_PLUS_CONFIG --
24 COMPOSITION_IP_SOURCE virtual IP_PLUS_CONFIG --
25 COMPOSITION_IP_DESTINATION virtual IP_PLUS_CONFIG --
26 COMPOSITION_IP_SESSION virtual IP_PLUS_CONFIG --
27 COMPOSITION_IP composition {"source":"COMPOSITION_IP_SOURCE","destination":"COMPOSITION_IP_DESTINATION","session":"COMPOSITION_IP_SESSION"}
28 TEST_IP_PLUGIN_WITH_EXDATA ip_plugin {"row_id":1,"ip_type":2,"start_ip":3,"end_ip":4,"valid":6} --
29 AS_NUMBER expr UTF8 UTF8 yes 0
30 SOURCE_IP_ASN virtual AS_NUMBER --
31 DESTINATION_IP_ASN virtual AS_NUMBER --
1 GROUP2COMPILE group2compile --
2 GROUP2GROUP group2group --
3 HTTP_URL expr UTF8 GBK/BIG5/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8 yes 128
3 HTTP_HOST expr UTF8 GBK/BIG5/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8 yes 128
4 KEYWORDS_TABLE expr UTF8 GBK/BIG5/UNICODE/UTF8/unicode_ascii_esc/unicode_ascii_aligned/unicode_ncr_dec/unicode_ncr_hex/windows-1251 yes 0
5 IP_CONFIG ip --
6 CONTENT_SIZE intval --
7 QD_ENTRY_INFO plugin 4 --
8 FILE_DIGEST digest --
9 HTTP_SIGNATURE expr_plus GBK GBK yes 0
10 SIM_URL similar --
11 IMAGE_FP expr UTF8 UTF8 yes 128
12 TEST_EFFECTIVE_RANGE_TABLE plugin {"valid":4,"tag":5} --
13 TEST_FOREIGN_KEY plugin {"valid":4,"foreign":[6,8],"tag":3} --
14 COMPILE_ALIAS compile escape --
15 TEST_PLUGIN_EXDATA_TABLE plugin {"key":2,"valid":4,"tag":5,"estimate_size":1024} --
16 IR_INTERCEPT_IP plugin {"valid":14,"tag":18}
17 APP_PAYLOAD expr_plus UTF8 UTF8 yes 0
18 TROJAN_PAYLOAD expr UTF8 UTF8 yes 0
19 MAIL_ADDR expr UTF8 UTF8 yes 0
20 IP_PLUS_CONFIG ip_plus --
21 HTTP_RESPONSE_KEYWORDS virtual KEYWORDS_TABLE --
22 HTTP_REQUEST_HEADER virtual HTTP_SIGNATURE --
23 HTTP_RESPONSE_HEADER virtual HTTP_SIGNATURE --
24 VIRTUAL_IP_PLUS_TABLE virtual IP_PLUS_CONFIG --
24 VIRTUAL_IP_PLUS_SOURCE virtual IP_PLUS_CONFIG --
24 VIRTUAL_IP_PLUS_DESTINATION virtual IP_PLUS_CONFIG --
25 COMPOSITION_IP_SOURCE virtual IP_PLUS_CONFIG --
26 COMPOSITION_IP_DESTINATION virtual IP_PLUS_CONFIG --
27 COMPOSITION_IP_SESSION virtual IP_PLUS_CONFIG --
28 COMPOSITION_IP composition {"source":"COMPOSITION_IP_SOURCE","destination":"COMPOSITION_IP_DESTINATION","session":"COMPOSITION_IP_SESSION"}
29 TEST_IP_PLUGIN_WITH_EXDATA ip_plugin {"row_id":1,"ip_type":2,"start_ip":3,"end_ip":4,"valid":6} --
30 AS_NUMBER expr UTF8 UTF8 yes 0
31 SOURCE_IP_ASN virtual AS_NUMBER --
32 DESTINATION_IP_ASN virtual AS_NUMBER --

View File

@@ -318,7 +318,7 @@ TEST(StringScan, Full)
int found_pos[4];
const char* table_name="HTTP_URL";
scan_status_t mid=NULL;
const char* scan_data="http://www.cyberessays.com/search_results.php?action=search&query=yulingjing,abckkk,1234567";
const char* scan_data="http://www.cyberessays.com/search_results.php?action=search&query=username,abckkk,1234567";
table_id=Maat_table_register(g_feather,table_name);
ASSERT_GT(table_id, 0);
@@ -326,6 +326,7 @@ TEST(StringScan, Full)
result,found_pos, 4, &mid, 0);
EXPECT_GE(ret, 1);
EXPECT_EQ(result[0].config_id, 125);
Maat_clean_status(&mid);
}