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

support log

Browse Source
This commit is contained in:
liuwentan
2022-12-10 00:37:51 +08:00
parent 0536083cbe
commit 83bdf09dc9
6 changed files with 110 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/inc_internal/maat_table_schema.h
View File

@@ -221,7 +221,8 @@ int plugin_table_schema_set_ex_data_schema(struct table_schema *table_schema,
maat_plugin_ex_new_func_t *new_func, maat_plugin_ex_new_func_t *new_func,
maat_plugin_ex_free_func_t *free_func, maat_plugin_ex_free_func_t *free_func,
maat_plugin_ex_dup_func_t *dup_func, maat_plugin_ex_dup_func_t *dup_func,
long argl, void *argp); long argl, void *argp,
struct log_handle *logger);
struct ex_data_schema *plugin_table_schema_get_ex_data_schema(struct table_schema *table_schema); struct ex_data_schema *plugin_table_schema_get_ex_data_schema(struct table_schema *table_schema);
/** /**
@@ -232,10 +233,10 @@ struct ex_data_schema *plugin_table_schema_get_ex_data_schema(struct table_schem
int plugin_table_schema_ex_data_schema_flag(struct table_schema *table_schema); int plugin_table_schema_ex_data_schema_flag(struct table_schema *table_schema);
int plugin_table_schema_add_callback(struct table_schema_manager *table_schema_mgr, int table_id, int plugin_table_schema_add_callback(struct table_schema_manager *table_schema_mgr, int table_id,
maat_start_callback_t *start,//MAAT_RULE_UPDATE_TYPE_*,u_para maat_start_callback_t *start,
maat_update_callback_t *update,//table line ,u_para maat_update_callback_t *update,
maat_finish_callback_t *finish,//u_para maat_finish_callback_t *finish,
void *u_para); void *u_para, struct log_handle *logger);
/** /**
* @brief the number of callback function stored in plugin table schema * @brief the number of callback function stored in plugin table schema
*/ */

6
src/maat_api.cpp
View File

@@ -312,7 +312,8 @@ int maat_table_callback_register(struct maat *maat_instance, int table_id,
int ret = -1; int ret = -1;
pthread_mutex_lock(&(maat_instance->background_update_mutex)); pthread_mutex_lock(&(maat_instance->background_update_mutex));
ret = plugin_table_schema_add_callback(maat_instance->table_schema_mgr, table_id, start, update, finish, u_para); ret = plugin_table_schema_add_callback(maat_instance->table_schema_mgr, table_id,
start, update, finish, u_para, maat_instance->logger);
if (ret < 0) { if (ret < 0) {
pthread_mutex_unlock(&(maat_instance->background_update_mutex)); pthread_mutex_unlock(&(maat_instance->background_update_mutex));
return -1; return -1;
@@ -357,7 +358,8 @@ int maat_plugin_table_ex_schema_register(struct maat *maat_instance, int table_i
{ {
struct table_schema *table_schema = table_schema_get(maat_instance->table_schema_mgr, table_id); struct table_schema *table_schema = table_schema_get(maat_instance->table_schema_mgr, table_id);
pthread_mutex_lock(&(maat_instance->background_update_mutex)); pthread_mutex_lock(&(maat_instance->background_update_mutex));
int ret = plugin_table_schema_set_ex_data_schema(table_schema, new_func, free_func, dup_func, argl, argp); int ret = plugin_table_schema_set_ex_data_schema(table_schema, new_func, free_func, dup_func,
argl, argp, maat_instance->logger);
if (ret < 0) { if (ret < 0) {
pthread_mutex_unlock(&(maat_instance->background_update_mutex)); pthread_mutex_unlock(&(maat_instance->background_update_mutex));
return -1; return -1;

8
src/maat_command.cpp
View File

@@ -61,8 +61,14 @@ redisContext *maat_cmd_connect_redis(const char *redis_ip, int redis_port, int r
redisContext *c = redisConnectWithTimeout(redis_ip, redis_port, connect_timeout); redisContext *c = redisConnectWithTimeout(redis_ip, redis_port, connect_timeout);
if (NULL == c || c->err) { if (NULL == c || c->err) {
log_error(logger, MODULE_MAAT_COMMAND, "Unable to connect redis server %s:%d db%d, error: %s", if (NULL == logger) {
printf("Unable to connect redis server %s:%d db%d, error: %s",
redis_ip, redis_port, redis_db, c == NULL ? "Unknown" : c->errstr); redis_ip, redis_port, redis_db, c == NULL ? "Unknown" : c->errstr);
} else {
log_error(logger, MODULE_MAAT_COMMAND,
"Unable to connect redis server %s:%d db%d, error: %s",
redis_ip, redis_port, redis_db, c == NULL ? "Unknown" : c->errstr);
}
if (c != NULL) { if (c != NULL) {
redisFree(c); redisFree(c);

126
src/maat_table_schema.cpp
View File

@@ -151,7 +151,8 @@ void table_schema_free(struct table_schema *ptable)
} }
int read_expr_table_schema(cJSON *root, struct table_schema *ptable, int read_expr_table_schema(cJSON *root, struct table_schema *ptable,
struct maat_kv_store* reserved_word_map) struct maat_kv_store* reserved_word_map,
struct log_handle *logger)
{ {
int read_cnt = 0; int read_cnt = 0;
cJSON *json = NULL; cJSON *json = NULL;
@@ -165,7 +166,8 @@ int read_expr_table_schema(cJSON *root, struct table_schema *ptable,
json = cJSON_GetObjectItem(root, "table_name"); json = cJSON_GetObjectItem(root, "table_name");
if (json != NULL && json->type == cJSON_String) { if (json != NULL && json->type == cJSON_String) {
if (strlen(json->valuestring) >= NAME_MAX) { if (strlen(json->valuestring) >= NAME_MAX) {
fprintf(stderr, "table name %s length too long\n", json->valuestring); log_error(logger, MODULE_TABLE_SCHEMA, "expr table name %s length too long",
json->valuestring);
return -1; return -1;
} }
memcpy(ptable->table_name[0], json->valuestring, strlen(json->valuestring)); memcpy(ptable->table_name[0], json->valuestring, strlen(json->valuestring));
@@ -176,7 +178,7 @@ int read_expr_table_schema(cJSON *root, struct table_schema *ptable,
if (json != NULL && json->type == cJSON_String) { if (json != NULL && json->type == cJSON_String) {
int ret = maat_kv_read(reserved_word_map, json->valuestring, (int*)&(ptable->expr.scan_mode)); int ret = maat_kv_read(reserved_word_map, json->valuestring, (int*)&(ptable->expr.scan_mode));
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "scan_mode %s illegal\n", json->valuestring); log_error(logger, MODULE_TABLE_SCHEMA, "scan_mode %s illegal", json->valuestring);
return -1; return -1;
} }
read_cnt++; read_cnt++;
@@ -196,7 +198,8 @@ int read_expr_table_schema(cJSON *root, struct table_schema *ptable,
json = cJSON_GetObjectItem(root, "custom"); json = cJSON_GetObjectItem(root, "custom");
if (json == NULL || json->type != cJSON_Object) { if (json == NULL || json->type != cJSON_Object) {
fprintf(stderr, "table %s has no custom column\n", ptable->table_name[0]); log_error(logger, MODULE_TABLE_SCHEMA, "table %s has no custom column",
ptable->table_name[0]);
return -1; return -1;
} }
@@ -244,8 +247,8 @@ int read_expr_table_schema(cJSON *root, struct table_schema *ptable,
return 0; return 0;
} }
#if 0
int read_ip_table_schema(cJSON *root, struct table_schema *ptable) int read_ip_table_schema(cJSON *root, struct table_schema *ptable, struct log_handle *logger)
{ {
size_t read_cnt = 0; size_t read_cnt = 0;
cJSON *json = NULL; cJSON *json = NULL;
@@ -259,7 +262,8 @@ int read_ip_table_schema(cJSON *root, struct table_schema *ptable)
json = cJSON_GetObjectItem(root, "table_name"); json = cJSON_GetObjectItem(root, "table_name");
if (json != NULL && json->type == cJSON_String) { if (json != NULL && json->type == cJSON_String) {
if (strlen(json->valuestring) >= NAME_MAX) { if (strlen(json->valuestring) >= NAME_MAX) {
fprintf(stderr, "table name %s length too long\n", json->valuestring); log_error(logger, MODULE_TABLE_SCHEMA, "ip table name %s length too long",
json->valuestring);
return -1; return -1;
} }
memcpy(ptable->table_name[0], json->valuestring, strlen(json->valuestring)); memcpy(ptable->table_name[0], json->valuestring, strlen(json->valuestring));
@@ -280,7 +284,8 @@ int read_ip_table_schema(cJSON *root, struct table_schema *ptable)
json = cJSON_GetObjectItem(root, "custom"); json = cJSON_GetObjectItem(root, "custom");
if (NULL == json || json->type != cJSON_Object) { if (NULL == json || json->type != cJSON_Object) {
fprintf(stderr, "table %s has no custom column\n", ptable->table_name[0]); log_error(logger, MODULE_TABLE_SCHEMA, "ip table %s has no custom column",
ptable->table_name[0]);
return -1; return -1;
} }
@@ -362,8 +367,9 @@ int read_ip_table_schema(cJSON *root, struct table_schema *ptable)
return 0; return 0;
} }
#endif
int read_ip_plus_table_schema(cJSON *root, struct table_schema *ptable) int read_ip_plus_table_schema(cJSON *root, struct table_schema *ptable,
struct log_handle *logger)
{ {
size_t read_cnt = 0; size_t read_cnt = 0;
cJSON *json = NULL; cJSON *json = NULL;
@@ -377,7 +383,8 @@ int read_ip_plus_table_schema(cJSON *root, struct table_schema *ptable)
json = cJSON_GetObjectItem(root, "table_name"); json = cJSON_GetObjectItem(root, "table_name");
if (json != NULL && json->type == cJSON_String) { if (json != NULL && json->type == cJSON_String) {
if (strlen(json->valuestring) >= NAME_MAX) { if (strlen(json->valuestring) >= NAME_MAX) {
fprintf(stderr, "table name %s length too long\n", json->valuestring); log_error(logger, MODULE_TABLE_SCHEMA, "ip_plus table name %s length too long",
json->valuestring);
return -1; return -1;
} }
memcpy(ptable->table_name[0], json->valuestring, strlen(json->valuestring)); memcpy(ptable->table_name[0], json->valuestring, strlen(json->valuestring));
@@ -398,7 +405,8 @@ int read_ip_plus_table_schema(cJSON *root, struct table_schema *ptable)
json = cJSON_GetObjectItem(root, "custom"); json = cJSON_GetObjectItem(root, "custom");
if (NULL == json || json->type != cJSON_Object) { if (NULL == json || json->type != cJSON_Object) {
fprintf(stderr, "table %s has no custom column\n", ptable->table_name[0]); log_error(logger, MODULE_TABLE_SCHEMA, "ip_plus table %s has no custom column",
ptable->table_name[0]);
return -1; return -1;
} }
@@ -505,8 +513,10 @@ int read_ip_plus_table_schema(cJSON *root, struct table_schema *ptable)
return 0; return 0;
} }
int read_virtual_table_schema(cJSON *root, struct table_schema **table_array, struct table_schema *ptable, int read_virtual_table_schema(cJSON *root, struct table_schema **table_array,
struct maat_kv_store *tablename2id_map) struct table_schema *ptable,
struct maat_kv_store *tablename2id_map,
struct log_handle *logger)
{ {
size_t read_cnt = 0; size_t read_cnt = 0;
cJSON *json = NULL; cJSON *json = NULL;
@@ -520,7 +530,8 @@ int read_virtual_table_schema(cJSON *root, struct table_schema **table_array, st
json = cJSON_GetObjectItem(root, "table_name"); json = cJSON_GetObjectItem(root, "table_name");
if (json != NULL && json->type == cJSON_String) { if (json != NULL && json->type == cJSON_String) {
if (strlen(json->valuestring) >= NAME_MAX) { if (strlen(json->valuestring) >= NAME_MAX) {
fprintf(stderr, "table name %s length too long\n", json->valuestring); log_error(logger, MODULE_TABLE_SCHEMA, "virtual table name %s length too long",
json->valuestring);
return -1; return -1;
} }
memcpy(ptable->table_name[0], json->valuestring, strlen(json->valuestring)); memcpy(ptable->table_name[0], json->valuestring, strlen(json->valuestring));
@@ -529,7 +540,8 @@ int read_virtual_table_schema(cJSON *root, struct table_schema **table_array, st
json = cJSON_GetObjectItem(root, "physical_table"); json = cJSON_GetObjectItem(root, "physical_table");
if (NULL == json || json->type != cJSON_Array) { if (NULL == json || json->type != cJSON_Array) {
fprintf(stderr, "table %s has no physical_table column\n", ptable->table_name[0]); log_error(logger, MODULE_TABLE_SCHEMA, "virtual table %s has no physical_table column",
ptable->table_name[0]);
return -1; return -1;
} }
read_cnt++; read_cnt++;
@@ -557,7 +569,9 @@ int read_virtual_table_schema(cJSON *root, struct table_schema **table_array, st
return 0; return 0;
} }
int read_composition_table_schema(cJSON *root, struct table_schema *ptable, struct maat_kv_store *tablename2id_map) int read_composition_table_schema(cJSON *root, struct table_schema *ptable,
struct maat_kv_store *tablename2id_map,
struct log_handle *logger)
{ {
size_t read_cnt = 0; size_t read_cnt = 0;
cJSON *json = NULL; cJSON *json = NULL;
@@ -571,7 +585,8 @@ int read_composition_table_schema(cJSON *root, struct table_schema *ptable, stru
json = cJSON_GetObjectItem(root, "table_name"); json = cJSON_GetObjectItem(root, "table_name");
if (json != NULL && json->type == cJSON_String) { if (json != NULL && json->type == cJSON_String) {
if (strlen(json->valuestring) >= NAME_MAX) { if (strlen(json->valuestring) >= NAME_MAX) {
fprintf(stderr, "table name %s length too long\n", json->valuestring); log_error(logger, MODULE_TABLE_SCHEMA, "composition table name %s length too long",
json->valuestring);
return -1; return -1;
} }
memcpy(ptable->table_name[0], json->valuestring, strlen(json->valuestring)); memcpy(ptable->table_name[0], json->valuestring, strlen(json->valuestring));
@@ -580,7 +595,8 @@ int read_composition_table_schema(cJSON *root, struct table_schema *ptable, stru
json = cJSON_GetObjectItem(root, "composition_table"); json = cJSON_GetObjectItem(root, "composition_table");
if (NULL == json || json->type != cJSON_Object) { if (NULL == json || json->type != cJSON_Object) {
fprintf(stderr, "table %s has no composition_table column\n", ptable->table_name[0]); log_error(logger, MODULE_TABLE_SCHEMA, "table %s has no composition_table column",
ptable->table_name[0]);
return -1; return -1;
} }
read_cnt++; read_cnt++;
@@ -592,7 +608,8 @@ int read_composition_table_schema(cJSON *root, struct table_schema *ptable, stru
/* physical table should already exist */ /* physical table should already exist */
ret = maat_kv_read(tablename2id_map, item->valuestring, &composition_schema->component_table_id[COMPOSITION_TYPE_SIP]); ret = maat_kv_read(tablename2id_map, item->valuestring, &composition_schema->component_table_id[COMPOSITION_TYPE_SIP]);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Child table %s of table %s (id=%d) are not defined", log_error(logger, MODULE_TABLE_SCHEMA,
"Child table %s of table %s (id=%d) are not defined",
item->valuestring, ptable->table_name[0], ptable->table_id); item->valuestring, ptable->table_name[0], ptable->table_id);
return -1; return -1;
} }
@@ -603,7 +620,8 @@ int read_composition_table_schema(cJSON *root, struct table_schema *ptable, stru
/* physical table should already exist */ /* physical table should already exist */
ret = maat_kv_read(tablename2id_map, item->valuestring, &composition_schema->component_table_id[COMPOSITION_TYPE_DIP]); ret = maat_kv_read(tablename2id_map, item->valuestring, &composition_schema->component_table_id[COMPOSITION_TYPE_DIP]);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Child table %s of table %s (id=%d) are not defined", log_error(logger, MODULE_TABLE_SCHEMA,
"Child table %s of table %s (id=%d) are not defined",
item->valuestring, ptable->table_name[0], ptable->table_id); item->valuestring, ptable->table_name[0], ptable->table_id);
return -1; return -1;
} }
@@ -614,7 +632,8 @@ int read_composition_table_schema(cJSON *root, struct table_schema *ptable, stru
/* physical table should already exist */ /* physical table should already exist */
ret = maat_kv_read(tablename2id_map, item->valuestring, &composition_schema->component_table_id[COMPOSITION_TYPE_SESSION]); ret = maat_kv_read(tablename2id_map, item->valuestring, &composition_schema->component_table_id[COMPOSITION_TYPE_SESSION]);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Child table %s of table %s (id=%d) are not defined", log_error(logger, MODULE_TABLE_SCHEMA,
"Child table %s of table %s (id=%d) are not defined",
item->valuestring, ptable->table_name[0], ptable->table_id); item->valuestring, ptable->table_name[0], ptable->table_id);
return -1; return -1;
} }
@@ -644,7 +663,7 @@ static int read_integer_array(char *string, int *array, int size)
return i; return i;
} }
int read_plugin_table_schema(cJSON *root, struct table_schema *ptable) int read_plugin_table_schema(cJSON *root, struct table_schema *ptable, struct log_handle *logger)
{ {
size_t read_cnt = 0; size_t read_cnt = 0;
cJSON *json = NULL; cJSON *json = NULL;
@@ -658,7 +677,8 @@ int read_plugin_table_schema(cJSON *root, struct table_schema *ptable)
json = cJSON_GetObjectItem(root, "table_name"); json = cJSON_GetObjectItem(root, "table_name");
if (json != NULL && json->type == cJSON_String) { if (json != NULL && json->type == cJSON_String) {
if (strlen(json->valuestring) >= NAME_MAX) { if (strlen(json->valuestring) >= NAME_MAX) {
fprintf(stderr, "table name %s length too long\n", json->valuestring); log_error(logger, MODULE_TABLE_SCHEMA, "plugin table name %s length too long",
json->valuestring);
return -1; return -1;
} }
memcpy(ptable->table_name[0], json->valuestring, strlen(json->valuestring)); memcpy(ptable->table_name[0], json->valuestring, strlen(json->valuestring));
@@ -673,7 +693,8 @@ int read_plugin_table_schema(cJSON *root, struct table_schema *ptable)
json = cJSON_GetObjectItem(root, "custom"); json = cJSON_GetObjectItem(root, "custom");
if (json == NULL || json->type != cJSON_Object) { if (json == NULL || json->type != cJSON_Object) {
fprintf(stderr, "table %s has no custom column\n", ptable->table_name[0]); log_error(logger, MODULE_TABLE_SCHEMA, "table %s has no custom column",
ptable->table_name[0]);
return -1; return -1;
} }
@@ -719,7 +740,7 @@ int read_plugin_table_schema(cJSON *root, struct table_schema *ptable)
return 0; return 0;
} }
int read_ip_plugin_table_schema(cJSON *root, struct table_schema *ptable) int read_ip_plugin_table_schema(cJSON *root, struct table_schema *ptable, struct log_handle *logger)
{ {
size_t read_cnt = 0; size_t read_cnt = 0;
cJSON *json = NULL; cJSON *json = NULL;
@@ -733,7 +754,8 @@ int read_ip_plugin_table_schema(cJSON *root, struct table_schema *ptable)
json = cJSON_GetObjectItem(root, "table_name"); json = cJSON_GetObjectItem(root, "table_name");
if (json != NULL && json->type == cJSON_String) { if (json != NULL && json->type == cJSON_String) {
if (strlen(json->valuestring) >= NAME_MAX) { if (strlen(json->valuestring) >= NAME_MAX) {
fprintf(stderr, "table name %s length too long\n", json->valuestring); log_error(logger, MODULE_TABLE_SCHEMA, "ip_plugin table name %s length too long",
json->valuestring);
return -1; return -1;
} }
memcpy(ptable->table_name[0], json->valuestring, strlen(json->valuestring)); memcpy(ptable->table_name[0], json->valuestring, strlen(json->valuestring));
@@ -748,7 +770,8 @@ int read_ip_plugin_table_schema(cJSON *root, struct table_schema *ptable)
json = cJSON_GetObjectItem(root, "custom"); json = cJSON_GetObjectItem(root, "custom");
if (NULL == json || json->type != cJSON_Object) { if (NULL == json || json->type != cJSON_Object) {
fprintf(stderr, "table %s has no custom column\n", ptable->table_name[0]); log_error(logger, MODULE_TABLE_SCHEMA, "table %s has no custom column",
ptable->table_name[0]);
return -1; return -1;
} }
@@ -783,8 +806,11 @@ int read_ip_plugin_table_schema(cJSON *root, struct table_schema *ptable)
return 0; return 0;
} }
int table_schema_populate(cJSON *json, struct table_schema **table_array, struct table_schema *ptable, int table_schema_populate(cJSON *json, struct table_schema **table_array,
struct maat_kv_store *reserved_word_map, struct maat_kv_store *tablename2id_map) struct table_schema *ptable,
struct maat_kv_store *reserved_word_map,
struct maat_kv_store *tablename2id_map,
struct log_handle *logger)
{ {
int ret = -1; int ret = -1;
cJSON *item = NULL; cJSON *item = NULL;
@@ -793,7 +819,8 @@ int table_schema_populate(cJSON *json, struct table_schema **table_array, struct
if (item != NULL && item->type == cJSON_String) { if (item != NULL && item->type == cJSON_String) {
ret = maat_kv_read(reserved_word_map, item->valuestring, (int*)&(ptable->table_type)); ret = maat_kv_read(reserved_word_map, item->valuestring, (int*)&(ptable->table_type));
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "table_type %s is illegal\n", item->valuestring); log_error(logger, MODULE_TABLE_SCHEMA, "table_type %s is illegal",
item->valuestring);
return -1; return -1;
} }
} }
@@ -801,7 +828,7 @@ int table_schema_populate(cJSON *json, struct table_schema **table_array, struct
switch (ptable->table_type) { switch (ptable->table_type) {
case TABLE_TYPE_EXPR: case TABLE_TYPE_EXPR:
case TABLE_TYPE_EXPR_PLUS: case TABLE_TYPE_EXPR_PLUS:
ret = read_expr_table_schema(json, ptable, reserved_word_map); ret = read_expr_table_schema(json, ptable, reserved_word_map, logger);
if (ret < 0) { if (ret < 0) {
return -1; return -1;
} }
@@ -814,31 +841,31 @@ int table_schema_populate(cJSON *json, struct table_schema **table_array, struct
} }
break; */ break; */
case TABLE_TYPE_IP_PLUS: case TABLE_TYPE_IP_PLUS:
ret = read_ip_plus_table_schema(json, ptable); ret = read_ip_plus_table_schema(json, ptable, logger);
if (ret < 0) { if (ret < 0) {
return -1; return -1;
} }
break; break;
case TABLE_TYPE_PLUGIN: case TABLE_TYPE_PLUGIN:
ret = read_plugin_table_schema(json, ptable); ret = read_plugin_table_schema(json, ptable, logger);
if (ret < 0) { if (ret < 0) {
return -1; return -1;
} }
break; break;
case TABLE_TYPE_IP_PLUGIN: case TABLE_TYPE_IP_PLUGIN:
ret = read_ip_plugin_table_schema(json, ptable); ret = read_ip_plugin_table_schema(json, ptable, logger);
if (ret < 0) { if (ret < 0) {
return -1; return -1;
} }
break; break;
case TABLE_TYPE_VIRTUAL: case TABLE_TYPE_VIRTUAL:
ret = read_virtual_table_schema(json, table_array, ptable, tablename2id_map); ret = read_virtual_table_schema(json, table_array, ptable, tablename2id_map, logger);
if (ret < 0) { if (ret < 0) {
return -1; return -1;
} }
break; break;
case TABLE_TYPE_COMPOSITION: case TABLE_TYPE_COMPOSITION:
ret = read_composition_table_schema(json, ptable, tablename2id_map); ret = read_composition_table_schema(json, ptable, tablename2id_map, logger);
if (ret < 0) { if (ret < 0) {
return -1; return -1;
} }
@@ -850,7 +877,8 @@ int table_schema_populate(cJSON *json, struct table_schema **table_array, struct
return 0; return 0;
} }
struct table_schema_manager *table_schema_manager_create(const char *table_info_path, struct log_handle *logger) struct table_schema_manager *
table_schema_manager_create(const char *table_info_path, struct log_handle *logger)
{ {
unsigned char *json_buff = NULL; unsigned char *json_buff = NULL;
size_t json_buff_sz = 0; size_t json_buff_sz = 0;
@@ -906,7 +934,7 @@ struct table_schema_manager *table_schema_manager_create(const char *table_info_
if (json != NULL && json->type == cJSON_Object) { if (json != NULL && json->type == cJSON_Object) {
struct table_schema *ptable = table_schema_new(); struct table_schema *ptable = table_schema_new();
int ret = table_schema_populate(json, table_array, ptable, reserved_word_map, int ret = table_schema_populate(json, table_array, ptable, reserved_word_map,
table_schema_mgr->tablename2id_map); table_schema_mgr->tablename2id_map, logger);
if (ret < 0) { if (ret < 0) {
log_error(logger, MODULE_TABLE_SCHEMA, log_error(logger, MODULE_TABLE_SCHEMA,
"Maat populate table info error, table_id:%d", ptable->table_id); "Maat populate table info error, table_id:%d", ptable->table_id);
@@ -1723,23 +1751,26 @@ int plugin_table_schema_set_ex_data_schema(struct table_schema *table_schema,
maat_plugin_ex_new_func_t *new_func, maat_plugin_ex_new_func_t *new_func,
maat_plugin_ex_free_func_t *free_func, maat_plugin_ex_free_func_t *free_func,
maat_plugin_ex_dup_func_t *dup_func, maat_plugin_ex_dup_func_t *dup_func,
long argl, void *argp) long argl, void *argp,
struct log_handle *logger)
{ {
if (NULL == table_schema || NULL == new_func || NULL == free_func || NULL == dup_func) { if (NULL == table_schema || NULL == new_func || NULL == free_func || NULL == dup_func) {
assert(0); assert(0);
fprintf(stderr, "%s failed: invalid parameter\n", __FUNCTION__); log_error(logger, MODULE_TABLE_SCHEMA, "%s failed: invalid parameter", __FUNCTION__);
return -1; return -1;
} }
struct ex_data_schema *ex_schema = plugin_table_schema_get_ex_data_schema(table_schema); struct ex_data_schema *ex_schema = plugin_table_schema_get_ex_data_schema(table_schema);
if (NULL == ex_schema) { if (NULL == ex_schema) {
fprintf(stderr, "Error: %s, target table is not a valid plugin table\n", __FUNCTION__); log_error(logger, MODULE_TABLE_SCHEMA,
"Error: %s, target table is not a valid plugin table", __FUNCTION__);
return -1; return -1;
} }
if (ex_schema->set_flag) { if (ex_schema->set_flag) {
assert(0); assert(0);
fprintf(stderr, "Error: %s, EX data schema already registed\n", __FUNCTION__); log_error(logger, MODULE_TABLE_SCHEMA, "Error: %s, EX data schema already registed",
__FUNCTION__);
return -1; return -1;
} }
@@ -1801,7 +1832,7 @@ int plugin_table_schema_add_callback(struct table_schema_manager* table_schema_m
maat_start_callback_t *start, maat_start_callback_t *start,
maat_update_callback_t *update, maat_update_callback_t *update,
maat_finish_callback_t *finish, maat_finish_callback_t *finish,
void *u_para) void *u_para, struct log_handle *logger)
{ {
if ((NULL == table_schema_mgr) || (table_id < 0)) { if ((NULL == table_schema_mgr) || (table_id < 0)) {
return -1; return -1;
@@ -1809,7 +1840,8 @@ int plugin_table_schema_add_callback(struct table_schema_manager* table_schema_m
struct table_schema *ptable = table_schema_get(table_schema_mgr, table_id); struct table_schema *ptable = table_schema_get(table_schema_mgr, table_id);
if (NULL == ptable) { if (NULL == ptable) {
fprintf(stderr, "table_id:%d unregistered, can't add callback func\n", table_id); log_error(logger, MODULE_TABLE_SCHEMA,
"table_id:%d unregistered, can't add callback func", table_id);
return -1; return -1;
} }
@@ -1817,7 +1849,7 @@ int plugin_table_schema_add_callback(struct table_schema_manager* table_schema_m
case TABLE_TYPE_EXPR: case TABLE_TYPE_EXPR:
case TABLE_TYPE_EXPR_PLUS: case TABLE_TYPE_EXPR_PLUS:
case TABLE_TYPE_IP_PLUS: case TABLE_TYPE_IP_PLUS:
fprintf(stderr, "table_id: %d is not plugin type\n", table_id); log_error(logger, MODULE_TABLE_SCHEMA, "table_id: %d is not plugin type", table_id);
return -1; return -1;
default: default:
break; break;
@@ -1826,7 +1858,7 @@ int plugin_table_schema_add_callback(struct table_schema_manager* table_schema_m
struct plugin_table_schema *plugin_schema = &(ptable->plugin); struct plugin_table_schema *plugin_schema = &(ptable->plugin);
size_t idx = plugin_schema->cb_plug_cnt; size_t idx = plugin_schema->cb_plug_cnt;
if (idx == MAX_PLUGIN_PER_TABLE) { if (idx == MAX_PLUGIN_PER_TABLE) {
fprintf(stderr, "the plugin number of table_id: %d exceed maxium:%d\n", log_error(logger, MODULE_TABLE_SCHEMA, "the plugin number of table_id: %d exceed maxium:%d",
ptable->table_id, MAX_PLUGIN_PER_TABLE); ptable->table_id, MAX_PLUGIN_PER_TABLE);
return -1; return -1;
} }

5
test/maat_api_gtest.cpp
View File

@@ -6,11 +6,6 @@ TEST(EQ_Test, Always_True) {
EXPECT_EQ(1, 1); EXPECT_EQ(1, 1);
} }
TEST(maat_api, maat_scan_string) {
int ret = maat_scan_string(nullptr, 0, 0, nullptr, 0, nullptr, nullptr, nullptr);
EXPECT_EQ(ret, 0);
}
int main(int argc, char ** argv) int main(int argc, char ** argv)
{ {
int ret=0; int ret=0;

13
test/maat_input_mode_gtest.cpp
View File

@@ -140,9 +140,11 @@ TEST(redis_mode, maat_scan_string) {
int redis_port = 6379; int redis_port = 6379;
int redis_db = 0; int redis_db = 0;
struct log_handle *logger = log_handle_create("./tmp.log", 0);
snprintf(json_iris_path, sizeof(json_iris_path), "./%s_iris_tmp", json_filename); 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, NULL); redisContext *c = maat_cmd_connect_redis(redis_ip, redis_port, redis_db, logger);
EXPECT_NE(c, nullptr); EXPECT_NE(c, nullptr);
redisReply *reply = maat_cmd_wrap_redis_command(c, "flushdb"); redisReply *reply = maat_cmd_wrap_redis_command(c, "flushdb");
@@ -157,25 +159,25 @@ TEST(redis_mode, maat_scan_string) {
EXPECT_NE(ret, -1); EXPECT_NE(ret, -1);
ret = json2iris(json_buff, json_filename, NULL, NULL, NULL, c, tmp_iris_path, ret = json2iris(json_buff, json_filename, NULL, NULL, NULL, c, tmp_iris_path,
sizeof(tmp_iris_path), NULL, NULL, NULL); sizeof(tmp_iris_path), NULL, NULL, logger);
EXPECT_NE(ret, -1); EXPECT_NE(ret, -1);
} }
size_t total_line_cnt = 0; size_t total_line_cnt = 0;
char tmp_iris_full_idx_path[128] = {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); 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, NULL); config_monitor_traverse(0, tmp_iris_full_idx_path, NULL, count_line_num_cb, NULL, &total_line_cnt, logger);
struct serial_rule *s_rule = ALLOC(struct serial_rule, total_line_cnt); struct serial_rule *s_rule = ALLOC(struct serial_rule, total_line_cnt);
long long server_time = maat_cmd_redis_server_time_s(c); long long server_time = maat_cmd_redis_server_time_s(c);
EXPECT_NE(server_time, -1); EXPECT_NE(server_time, -1);
absolute_expire_time = server_time + 300; absolute_expire_time = server_time + 300;
config_monitor_traverse(0, tmp_iris_full_idx_path, NULL, make_serial_rule, NULL, s_rule, NULL); config_monitor_traverse(0, tmp_iris_full_idx_path, NULL, make_serial_rule, NULL, s_rule, logger);
int success_cnt = 0; int success_cnt = 0;
do { do {
success_cnt = maat_cmd_write_rule(c, s_rule, total_line_cnt, server_time, NULL); success_cnt = maat_cmd_write_rule(c, s_rule, total_line_cnt, server_time, logger);
} while (success_cnt < 0); } while (success_cnt < 0);
EXPECT_EQ(success_cnt, (int)total_line_cnt); EXPECT_EQ(success_cnt, (int)total_line_cnt);
@@ -189,6 +191,7 @@ TEST(redis_mode, maat_scan_string) {
struct maat_options *opts = maat_options_new(); struct maat_options *opts = maat_options_new();
maat_options_set_redis_ip(opts, redis_ip); maat_options_set_redis_ip(opts, redis_ip);
maat_options_set_redis_port(opts, redis_port); maat_options_set_redis_port(opts, redis_port);
maat_options_set_logger(opts, logger);
struct maat *maat_instance = maat_new(opts, table_info_path); struct maat *maat_instance = maat_new(opts, table_info_path);
struct table_schema_manager *table_schema_mgr = maat_instance->table_schema_mgr; struct table_schema_manager *table_schema_mgr = maat_instance->table_schema_mgr;