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

修复 TSG-7994 ，避免处理未知district时出现误命中。

Browse Source
This commit is contained in:
zhengchao
2021-10-11 12:00:26 +03:00
parent a2f2adc82a
commit 593bcfb907
5 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/maat_json.json
View File

@@ -116,7 +116,7 @@
"regions": [
{
"table_name": "INTERGER_PLUS",
"table_type": "intval_plus",
"table_type": "interval_plus",
"table_content": {
"district": "fqdn_cat_id",
"low_boundary": 1724,
@@ -261,7 +261,7 @@
"regions": [
{
"table_name": "CONTENT_SIZE",
"table_type": "intval",
"table_type": "interval",
"table_content": {
"low_boundary": 100,
"up_boundary": 500
@@ -325,7 +325,7 @@
"regions": [
{
"table_name": "CONTENT_SIZE",
"table_type": "intval",
"table_type": "interval",
"table_content": {
"low_boundary": 2014,
"up_boundary": 2016
@@ -1947,9 +1947,9 @@
"regions": [
{
"table_name": "INTERGER_PLUS",
"table_type": "intval_plus",
"table_type": "interval_plus",
"table_content": {
"district": "intval.plus",
"district": "interval.plus",
"low_boundary": 2020,
"up_boundary": 2020
}

8
test/test_maatframe.cpp
View File

@@ -540,8 +540,8 @@ TEST(StringScan, PrefixAndSuffix)
}
#define IntvalPlusTest 1
TEST(IntvalScan, IntvalPlusPlus)
#define IntervalPlusTest 1
TEST(IntervalScan, IntervalPlus)
{
int table_id=0,ret=0;
int scan_val=2020;
@@ -551,7 +551,7 @@ TEST(IntvalScan, IntvalPlusPlus)
table_id=Maat_table_register(g_feather, "INTERGER_PLUS");
ASSERT_GT(table_id, 0);
ret=Maat_set_scan_status(g_feather, &mid, MAAT_SET_SCAN_DISTRICT, "intval.plus", strlen("intval.plus"));
ret=Maat_set_scan_status(g_feather, &mid, MAAT_SET_SCAN_DISTRICT, "interval.plus", strlen("interval.plus"));
ASSERT_EQ(ret, 0);
ret=Maat_scan_intval(g_feather, table_id, scan_val, result,4, &mid, 0);
@@ -675,7 +675,7 @@ TEST(StringScan, ShouldNotHitExprPlus)
ret=Maat_full_scan_string(g_feather, table_id,CHARSET_GBK, (char*)udp_payload_not_hit, sizeof(udp_payload_not_hit),
result, NULL, 4,
&mid, 0);
EXPECT_EQ(ret, 0);
EXPECT_EQ(ret, -2);
Maat_clean_status(&mid);
return;