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

modify fqdn_plugin table

Browse Source
This commit is contained in:
root
2024-08-13 07:29:41 +00:00
parent 71871622dd
commit 7dd54ad0ec
5 changed files with 25 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/maat_framework_gtest.cpp
View File

@@ -5764,7 +5764,7 @@ void fqdn_plugin_ex_new_cb(const char *table_name, int table_id, const char *key
EXPECT_EQ(ret, 0);
ud->rule_id = atoi(table_line + column_offset);
ret = get_column_pos(table_line, 4, &column_offset, &column_len);
ret = get_column_pos(table_line, 3, &column_offset, &column_len);
EXPECT_EQ(ret, 0);
sscanf(table_line + column_offset, "catid=%d", &ud->catid);
@@ -8660,17 +8660,17 @@ TEST_F(MaatCmd, UpdateFQDNPlugin) {
struct maat *maat_inst = MaatCmd::_shared_maat_inst;
int *ex_data_counter = MaatCmd::_ex_data_counter;
const char *table_line_add[TEST_CMD_LINE_NUM]={
"201\t0\twww.example1.com\tcatid=1\t1",
"202\t1\t.example1.com\tcatid=1\t1",
"203\t0\tnews.example1.com\tcatid=2\t1",
"204\t0\tr3---sn-i3belne6.example2.com\tcatid=3\t1",
"205\t0\tr3---sn-i3belne6.example2.com\tcatid=3\t1"};
"201\twww.example1.com\tcatid=1\t1",
"202\t*.example1.com\tcatid=1\t1",
"203\tnews.example1.com\tcatid=2\t1",
"204\tr3---sn-i3belne6.example2.com\tcatid=3\t1",
"205\tr3---sn-i3belne6.example2.com\tcatid=3\t1"};
const char *table_line_del[TEST_CMD_LINE_NUM]={
"201\t0\twww.example1.com\tcatid=1\t0",
"202\t1\t.example1.com\tcatid=1\t0",
"203\t0\tnews.example1.com\tcatid=2\t0",
"204\t0\tr3---sn-i3belne6.example2.com\tcatid=3\t0",
"205\t0\tr3---sn-i3belne6.example2.com\tcatid=3\t0"};
"201\twww.example1.com\tcatid=1\t0",
"202\t*.example1.com\tcatid=1\t0",
"203\tnews.example1.com\tcatid=2\t0",
"204\tr3---sn-i3belne6.example2.com\tcatid=3\t0",
"205\tr3---sn-i3belne6.example2.com\tcatid=3\t0"};
int table_id = maat_get_table_id(maat_inst, table_name);
ASSERT_GT(table_id, 0);

2
test/maat_framework_perf_gtest.cpp
View File

@@ -1107,7 +1107,7 @@ void perf_fqdn_plugin_EX_new_cb(const char *table_name, int table_id,
EXPECT_EQ(ret, 0);
ud->rule_id = atoll(table_line+column_offset);
ret = maat_helper_read_column(table_line, 4, &column_offset, &column_len);
ret = maat_helper_read_column(table_line, 3, &column_offset, &column_len);
EXPECT_EQ(ret, 0);
sscanf(table_line+column_offset, "catid=%d",&ud->catid);

10
test/maat_json.json
View File

@@ -4089,11 +4089,11 @@
{
"table_name": "TEST_FQDN_PLUGIN_WITH_EXDATA",
"table_content": [
"201\t0\twww.example1.com\tcatid=1\t1",
"202\t1\t.example1.com\tcatid=1\t1",
"203\t0\tnews.example1.com\tcatid=2\t1",
"204\t0\tr3---sn-i3belne6.example2.com\tcatid=3\t1",
"205\t0\tr3---sn-i3belne6.example2.com\tcatid=3\t1"
"201\twww.example1.com\tcatid=1\t1",
"202\t*.example1.com\tcatid=1\t1",
"203\tnews.example1.com\tcatid=2\t1",
"204\tr3---sn-i3belne6.example2.com\tcatid=3\t1",
"205\tr3---sn-i3belne6.example2.com\tcatid=3\t1"
]
},
{

5
test/table_info.conf
View File

@@ -428,12 +428,11 @@
"table_id":36,
"table_name":"TEST_FQDN_PLUGIN_WITH_EXDATA",
"table_type":"fqdn_plugin",
"valid_column":5,
"valid_column":4,
"custom": {
"gc_timeout_s": 3,
"item_id":1,
"suffix_match_method":2,
"fqdn":3
"fqdn":2
}
},
{