support scan ip
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
#include "maat_table_schema.h"
|
||||
#include "maat_table_runtime.h"
|
||||
#include "maat_command.h"
|
||||
#include "IPMatcher.h"
|
||||
|
||||
struct maat *g_maat_instance = NULL;
|
||||
const char *table_info_path = "./table_info.conf";
|
||||
@@ -206,6 +207,24 @@ TEST(maat_scan_string, hit_three_expr) {
|
||||
EXPECT_EQ(result_array[2], 18);
|
||||
}
|
||||
|
||||
TEST(maat_scan_ip, hit_ip) {
|
||||
struct table_schema_manager *table_schema_mgr = g_maat_instance->table_schema_mgr;
|
||||
int table_id = table_schema_manager_get_table_id(table_schema_mgr, "IP_PLUS_CONFIG");
|
||||
char ip_str[32] = "192.168.50.24";
|
||||
struct addr_4tuple addr;
|
||||
addr.type = IP_TYPE_V4;
|
||||
int ret = inet_pton(AF_INET, ip_str, &addr.ipv4.sip);
|
||||
EXPECT_EQ(ret, 1);
|
||||
addr.ipv4.sport = htons(1);
|
||||
|
||||
int results[3] = {-1};
|
||||
size_t n_result = 0;
|
||||
ret = maat_scan_ip(g_maat_instance, table_id, 0, &addr, results, &n_result, nullptr);
|
||||
EXPECT_EQ(ret, 0);
|
||||
EXPECT_EQ(n_result, 1);
|
||||
EXPECT_EQ(results[0], 4);
|
||||
}
|
||||
|
||||
int main(int argc, char ** argv)
|
||||
{
|
||||
int ret=0;
|
||||
|
||||
@@ -57,7 +57,8 @@ TEST(iris_mode, maat_scan_string) {
|
||||
int ret = load_file_to_memory(json_filename, (unsigned char**)&json_buff, &json_buff_sz);
|
||||
EXPECT_NE(ret, -1);
|
||||
|
||||
ret = json2iris(json_buff, json_filename, NULL, NULL, NULL, NULL, tmp_iris_path, sizeof(tmp_iris_path), NULL, NULL);
|
||||
ret = json2iris(json_buff, json_filename, NULL, NULL, NULL, NULL,
|
||||
tmp_iris_path, sizeof(tmp_iris_path), NULL, NULL, NULL);
|
||||
EXPECT_NE(ret, -1);
|
||||
}
|
||||
|
||||
@@ -141,7 +142,7 @@ TEST(redis_mode, maat_scan_string) {
|
||||
|
||||
snprintf(json_iris_path, sizeof(json_iris_path), "./%s_iris_tmp", json_filename);
|
||||
|
||||
redisContext *c = maat_cmd_connect_redis(redis_ip, redis_port, redis_db);
|
||||
redisContext *c = maat_cmd_connect_redis(redis_ip, redis_port, redis_db, NULL);
|
||||
EXPECT_NE(c, nullptr);
|
||||
|
||||
redisReply *reply = maat_cmd_wrap_redis_command(c, "flushdb");
|
||||
@@ -155,25 +156,26 @@ TEST(redis_mode, maat_scan_string) {
|
||||
int ret = load_file_to_memory(json_filename, (unsigned char **)&json_buff, &json_buff_sz);
|
||||
EXPECT_NE(ret, -1);
|
||||
|
||||
ret = json2iris(json_buff, json_filename, NULL, NULL, NULL, c, tmp_iris_path, sizeof(tmp_iris_path), NULL, NULL);
|
||||
ret = json2iris(json_buff, json_filename, NULL, NULL, NULL, c, tmp_iris_path,
|
||||
sizeof(tmp_iris_path), NULL, NULL, NULL);
|
||||
EXPECT_NE(ret, -1);
|
||||
}
|
||||
|
||||
size_t total_line_cnt = 0;
|
||||
char tmp_iris_full_idx_path[128] = {0};
|
||||
snprintf(tmp_iris_full_idx_path, sizeof(tmp_iris_full_idx_path), "%s/index", json_iris_path);
|
||||
config_monitor_traverse(0, tmp_iris_full_idx_path, NULL, count_line_num_cb, NULL, &total_line_cnt);
|
||||
config_monitor_traverse(0, tmp_iris_full_idx_path, NULL, count_line_num_cb, NULL, &total_line_cnt, NULL);
|
||||
|
||||
struct serial_rule *s_rule = ALLOC(struct serial_rule, total_line_cnt);
|
||||
long long server_time = maat_cmd_redis_server_time_s(c);
|
||||
EXPECT_NE(server_time, -1);
|
||||
|
||||
absolute_expire_time = server_time + 300;
|
||||
config_monitor_traverse(0, tmp_iris_full_idx_path, NULL, make_serial_rule, NULL, s_rule);
|
||||
config_monitor_traverse(0, tmp_iris_full_idx_path, NULL, make_serial_rule, NULL, s_rule, NULL);
|
||||
|
||||
int success_cnt = 0;
|
||||
do {
|
||||
success_cnt = maat_cmd_write_rule(c, s_rule, total_line_cnt, server_time);
|
||||
success_cnt = maat_cmd_write_rule(c, s_rule, total_line_cnt, server_time, NULL);
|
||||
} while (success_cnt < 0);
|
||||
|
||||
EXPECT_EQ(success_cnt, (int)total_line_cnt);
|
||||
|
||||
@@ -6,20 +6,20 @@
|
||||
"scan_mode":"block",
|
||||
"item_id":1,
|
||||
"group_id":2,
|
||||
"rule": {
|
||||
"custom": {
|
||||
"keywords":3,
|
||||
"expr_type":4,
|
||||
"match_method":5,
|
||||
"is_hexbin":6,
|
||||
"is_valid":7
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
"table_id":2,
|
||||
"table_name":"IP_PLUGIN_TABLE",
|
||||
"table_type":"ip_plugin",
|
||||
"item_id":1,
|
||||
"rule": {
|
||||
"custom": {
|
||||
"ip_type":2,
|
||||
"start_ip":3,
|
||||
"end_ip":4,
|
||||
@@ -31,11 +31,64 @@
|
||||
"table_name":"PLUGIN_TABLE",
|
||||
"table_type":"plugin",
|
||||
"item_id":1,
|
||||
"rule": {
|
||||
"custom": {
|
||||
"key":2,
|
||||
"tag":3,
|
||||
"is_valid":4,
|
||||
"foreign":[6,8,10]
|
||||
}
|
||||
},
|
||||
{
|
||||
"table_id":4,
|
||||
"table_name":"IP_PLUS_CONFIG",
|
||||
"table_type":"ip_plus",
|
||||
"item_id":1,
|
||||
"group_id":2,
|
||||
"custom": {
|
||||
"addr_type":3,
|
||||
"saddr_format":4,
|
||||
"sip1":5,
|
||||
"sip2":6,
|
||||
"sport_format":7,
|
||||
"sport1":8,
|
||||
"sport2":9,
|
||||
"daddr_format":10,
|
||||
"dip1":11,
|
||||
"dip2":12,
|
||||
"dport_format":13,
|
||||
"dport1":14,
|
||||
"dport2":15,
|
||||
"proto":16,
|
||||
"direction":17,
|
||||
"is_valid":18
|
||||
}
|
||||
},
|
||||
{
|
||||
"table_id":5,
|
||||
"table_name":"COMPOSITION_IP_SOURCE",
|
||||
"table_type":"virtual",
|
||||
"physical_table":["IP_PLUS_CONFIG"]
|
||||
},
|
||||
{
|
||||
"table_id":6,
|
||||
"table_name":"COMPOSITION_IP_DEST",
|
||||
"table_type":"virtual",
|
||||
"physical_table":["IP_PLUS_CONFIG"]
|
||||
},
|
||||
{
|
||||
"table_id":7,
|
||||
"table_name":"COMPOSITION_IP_SESSION",
|
||||
"table_type":"virtual",
|
||||
"physical_table":["IP_PLUS_CONFIG"]
|
||||
},
|
||||
{
|
||||
"table_id":8,
|
||||
"table_name":"COMPOSITION_IP",
|
||||
"table_type":"composition",
|
||||
"composition_table": {
|
||||
"source": "COMPOSITION_IP_SOURCE",
|
||||
"dest": "COMPOSITION_IP_DEST",
|
||||
"session": "COMPOSITION_IP_SESSION"
|
||||
}
|
||||
}
|
||||
]
|
||||
Reference in New Issue
Block a user