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

fix clause update bug and stream scan bug

Browse Source
This commit is contained in:
liuwentan
2023-03-29 14:29:34 +08:00
parent cca03b6faf
commit 658625fde3
6 changed files with 141 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test/adapter_hs_gtest.cpp
View File

@@ -241,7 +241,6 @@ TEST(adapter_hs_scan, literal_sub_has_normal_offset)
int ret = parse_config_file("./literal_expr.conf", expr_array, &n_expr_array);
EXPECT_EQ(ret, 0);
EXPECT_EQ(n_expr_array, 12);
struct adapter_hs *hs_instance = adapter_hs_new(1, expr_array, n_expr_array, g_logger);
EXPECT_TRUE(hs_instance != NULL);
@@ -653,6 +652,32 @@ TEST(adapter_hs_scan, same_pattern_different_offset)
hs_instance = NULL;
}
TEST(adapter_hs_scan, long_scan_data)
{
struct hs_expr expr_array[64] = {0};
size_t n_expr_array = 0;
int ret = parse_config_file("./literal_expr.conf", expr_array, &n_expr_array);
EXPECT_EQ(ret, 0);
struct adapter_hs *hs_instance = adapter_hs_new(1, expr_array, n_expr_array, g_logger);
EXPECT_TRUE(hs_instance != NULL);
expr_array_free(expr_array, n_expr_array);
const char* scan_data = "A directed path in a directed graph is a finite or infinite\
sequence of edges which joins a sequence of distinct vertices, but with the added restriction\
that the edges be all directed in the same direction.";
struct hs_scan_result result[64] = {0};
size_t n_result = 0;
ret = adapter_hs_scan(hs_instance, 0, scan_data, strlen(scan_data), result, 64, &n_result);
EXPECT_EQ(ret, 0);
EXPECT_EQ(n_result, 1);
EXPECT_EQ(result[0].item_id, 113);
adapter_hs_free(hs_instance);
hs_instance = NULL;
}
int main(int argc, char **argv)
{
int ret = 0;

12
test/literal_expr.conf
View File

@@ -161,6 +161,18 @@
"offset": "16~20"
}
]
},
{
"expr_id": 113,
"pattern_num": 1,
"patterns": [
{
"match_method": "sub",
"case_sensitive": "yes",
"is_hexbin": "no",
"pattern": "a finite or infinite"
}
]
}
]
}

36
test/maat_framework_gtest.cpp
View File

@@ -1286,7 +1286,7 @@ TEST_F(MaatIPScan, IPv4_IPPort) {
uint32_t sip;
int ret = inet_pton(AF_INET, ip_str, &sip);
EXPECT_EQ(ret, 1);
uint16_t port = htons(65529);
uint16_t port = htons(65530);
int proto = 6;
long long results[ARRAY_SIZE] = {0};
@@ -1313,7 +1313,7 @@ TEST_F(MaatIPScan, IPv4_Port) {
uint32_t sip;
int ret = inet_pton(AF_INET, ip_str, &sip);
EXPECT_EQ(ret, 1);
uint16_t port = htons(65528);
uint16_t port = htons(20303);
int proto = 6;
long long results[ARRAY_SIZE] = {0};
@@ -1324,12 +1324,12 @@ TEST_F(MaatIPScan, IPv4_Port) {
EXPECT_EQ(ret, MAAT_SCAN_OK);
maat_state_reset(state);
port = htons(65529);
port = htons(64999);
ret = maat_scan_ipv4(maat_instance, table_id, sip, port, proto,
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
EXPECT_EQ(results[0], 154);
EXPECT_EQ(results[0], 169);
maat_state_free(state);
state = NULL;
@@ -2929,7 +2929,6 @@ protected:
maat_cmd_flushDB(_shared_maat_instance);
maat_free(_shared_maat_instance);
maat_options_set_deferred_load_on(opts);
_shared_maat_instance = maat_new(opts, table_info_path);
maat_options_free(opts);
}
@@ -4270,7 +4269,7 @@ TEST_F(MaatCmdTest, GroupInMassCompiles) {
maat_state_free(state);
state = NULL;
}
#if 0
TEST_F(MaatCmdTest, HitPath) {
const char *g2g_table_name = "GROUP2GROUP";
const char *g2c_table_name = "GROUP2COMPILE";
@@ -4343,7 +4342,7 @@ TEST_F(MaatCmdTest, HitPath) {
NULL, 0, 0, 0, 0); /*EXPR_TYPE_STRING MATCH_METHOD_SUB*/
EXPECT_EQ(ret, 1);
sleep(WAIT_FOR_EFFECTIVE_S);
sleep(WAIT_FOR_EFFECTIVE_S * 2);
const char* http_url = "en.wikipedia.org/wiki/Path_(graph_theory)";
const char* http_resp_hdr_cookie = "laptop=thinkpad X1 extrem;time=2020-02-11T15:34:00;main[XWJOKE]=hoho; Hm_lvt_bbac0322e6ee13093f98d5c4b5a10912=1578874808;";
@@ -4419,7 +4418,7 @@ that the edges be all directed in the same direction.";
struct maat_stream *stream = maat_stream_new(maat_instance, table_id, state);
Nth_scan++;
ret = maat_stream_scan(stream, keywords1, strlen(keywords1), results, ARRAY_SIZE,
&n_hit_result, state);
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HALF_HIT);
n_read = maat_state_get_hit_paths(state, hit_path, sizeof(hit_path));
EXPECT_EQ(n_read, 3);
@@ -4456,7 +4455,7 @@ that the edges be all directed in the same direction.";
EXPECT_EQ(hit_path[path_idx].vtable_id, 0);
EXPECT_EQ(hit_path[path_idx].compile_id, -1);
Nth_scan++;
Nth_scan++;
ret = maat_stream_scan(stream, keywords2, strlen(keywords2), results, ARRAY_SIZE,
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HALF_HIT);
@@ -4502,19 +4501,19 @@ TEST_F(MaatCmdTest, SameScanStatusWhenClauseUpdate_TSG6419) {
long long item11_id = maat_cmd_incrby(maat_instance, "SEQUENCE_REGION", 1);
ret = ip_table_set_line(maat_instance, ip_table_name, MAAT_OP_ADD, item11_id, group11_id,
IPv4, "192.168.2.1", "192.168.2.4", 0, 0, 0);
IPv4, "192.168.2.1", "192.168.2.4", 0, 65535, 0);
EXPECT_EQ(ret, 1);
long long group21_id = maat_cmd_incrby(maat_instance, "SEQUENCE_GROUP", 1);
ret = group2compile_table_set_line(maat_instance, g2c_table_name, MAAT_OP_ADD, group21_id,
compile1_id, 0, "null", 1, 0);
compile1_id, 0, "null", 2, 0);
EXPECT_EQ(ret, 1);
long long item21_id = maat_cmd_incrby(maat_instance, "SEQUENCE_REGION", 1);
ret = intval_table_set_line(maat_instance, app_id_table_name, MAAT_OP_ADD, item21_id,
group21_id, 31, 31, NULL, 0);
EXPECT_EQ(ret, 1);
sleep(WAIT_FOR_EFFECTIVE_S);
sleep(WAIT_FOR_EFFECTIVE_S * 2);
long long results[ARRAY_SIZE] = {0};
size_t n_hit_result = 0;
@@ -4555,7 +4554,7 @@ TEST_F(MaatCmdTest, SameScanStatusWhenClauseUpdate_TSG6419) {
group22_id, 32, 32, NULL, 0);
EXPECT_EQ(ret, 1);
sleep(WAIT_FOR_EFFECTIVE_S);
sleep(WAIT_FOR_EFFECTIVE_S * 2);
table_id = maat_get_table_id(maat_instance, app_id_table_name);
ret = maat_scan_integer(maat_instance, table_id, 31, results, ARRAY_SIZE,
@@ -4595,7 +4594,7 @@ TEST_F(MaatCmdTest, GroupEdit) {
long long item11_id = maat_cmd_incrby(maat_instance, "SEQUENCE_REGION", 1);
ret = ip_table_set_line(maat_instance, ip_table_name, MAAT_OP_ADD, item11_id, group11_id,
IPv4, "192.168.3.1", "192.168.3.4", 0, 0, 0);
IPv4, "192.168.3.1", "192.168.3.4", 0, 65535, 0);
EXPECT_EQ(ret, 1);
long long group21_id = maat_cmd_incrby(maat_instance, "SEQUENCE_GROUP", 1);
@@ -4747,11 +4746,11 @@ TEST_F(MaatCmdTest, CompileDelete_TSG6548) {
while (now - update_time < 3) {
ret = maat_scan_ipv4(maat_instance, table_id, ip_addr, port, 6, results, ARRAY_SIZE,
&n_hit_result, state);
if (ret > 0) {
if (ret == MAAT_SCAN_HIT) {
hit_cnt++;
EXPECT_EQ(results[0], compile1_id);
} else {
EXPECT_EQ(ret, MAAT_SCAN_HALF_HIT);
}
if (ret == MAAT_SCAN_HALF_HIT) {
miss_cnt++;
}
now = time(NULL);
@@ -4761,6 +4760,7 @@ TEST_F(MaatCmdTest, CompileDelete_TSG6548) {
maat_state_free(state);
}
#if 0
TEST_F(MaatCmdTest, UpdateDeadLockDetection) {
const char* g2c_table_name = "GROUP2COMPILE";
const char* compile_table_name = "COMPILE";
@@ -4878,7 +4878,7 @@ TEST_F(MaatCmdTest, StreamScanSegfaultWhenVersionRollBack_TSG6324) {
EXPECT_EQ(results[0], compile1_id);
//DON'T DO THIS!!!
//Roll back version, trigger full udpate.
//Roll back version, trigger full update.
//This operation generates FATAL logs in test_maat_redis.log.yyyy-mm-dd.
//For example: Add group 22 vt_id 0 to clause 2 of compile 979 failed, group is already exisited
maat_cmd_incrby(maat_instance, "MAAT_VERSION", -100);

33
test/maat_json.json
View File

@@ -1064,7 +1064,7 @@
"ip1": "10.0.7.100",
"ip2": "10.0.7.106",
"port_format": "range",
"port1": "65529",
"port1": "65530",
"port2": "65535",
"protocol": 6
}
@@ -1506,6 +1506,37 @@
}
]
},
{
"compile_id": 169,
"service": 0,
"action": 0,
"do_blacklist": 0,
"do_log": 0,
"effective_rage": 0,
"user_region": "IPScan.IPv4_Any",
"is_valid": "yes",
"groups": [
{
"regions": [
{
"table_type": "ip_plus",
"table_name": "IP_PLUS_CONFIG",
"table_content": {
"addr_type": "ipv4",
"addr_format": "CIDR",
"ip1": "0.0.0.0",
"ip2": "0",
"port_format": "range",
"port1": "64000",
"port2": "64999",
"protocol": 6
}
}
],
"not_flag" : 0
}
]
},
{
"compile_id": 170,
"service": 0,