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

从redis读取到无对应table的rule时，写日志。

Browse Source
This commit is contained in:
zhengchao
2022-06-30 14:39:22 +08:00
parent 432337da6d
commit 258ece3fa1
3 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/entry/Maat_command.cpp
View File

@@ -628,7 +628,7 @@ int get_rm_key_list(redisContext *c, long long instance_version, long long desir
} }
if(redis_version<instance_version) if(redis_version<instance_version)
{ {
MESA_handle_runtime_log(logger, RLOG_LV_INFO, maat_redis_monitor, MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_redis_monitor,
"VERSION roll back MAAT: %lld -> Redis: %lld.",instance_version,redis_version); "VERSION roll back MAAT: %lld -> Redis: %lld.",instance_version,redis_version);
goto FULL_UPDATE; goto FULL_UPDATE;
} }
@@ -671,7 +671,7 @@ int get_rm_key_list(redisContext *c, long long instance_version, long long desir
return rule_num; return rule_num;
FULL_UPDATE: FULL_UPDATE:
MESA_handle_runtime_log(logger, RLOG_LV_INFO, maat_redis_monitor, MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_redis_monitor,
"Initiate full udpate from instance_version %d to %lld.",instance_version,desired_version==0?redis_version:desired_version); "Initiate full udpate from instance_version %d to %lld.",instance_version,desired_version==0?redis_version:desired_version);
append_cmd_cnt=0; append_cmd_cnt=0;
ret=redisAppendCommand(c, "MULTI"); ret=redisAppendCommand(c, "MULTI");
@@ -800,7 +800,7 @@ int _get_maat_redis_value(redisContext *c, struct serial_rule_t* rule_list, int
ret=_wrap_redisGetReply(c,&reply); ret=_wrap_redisGetReply(c,&reply);
if(ret==REDIS_ERR) if(ret==REDIS_ERR)
{ {
MESA_handle_runtime_log(logger,RLOG_LV_INFO,maat_redis_monitor, MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_redis_monitor,
"Redis GET %s:%s,%d failed, redis server error.", mr_key_prefix[rule_list[i].op], "Redis GET %s:%s,%d failed, redis server error.", mr_key_prefix[rule_list[i].op],
rule_list[i].table_name, rule_list[i].table_name,
rule_list[i].rule_id); rule_list[i].rule_id);
@@ -820,10 +820,10 @@ int _get_maat_redis_value(redisContext *c, struct serial_rule_t* rule_list, int
} }
else else
{ {
MESA_handle_runtime_log(logger,RLOG_LV_INFO,maat_redis_monitor MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_redis_monitor,
,"Redis GET %s:%s,%d failed",mr_key_prefix[rule_list[i].op] "Redis GET %s:%s,%d failed",mr_key_prefix[rule_list[i].op],
,rule_list[i].table_name rule_list[i].table_name,
,rule_list[i].rule_id); rule_list[i].rule_id);
error_happened=1; error_happened=1;
} }
} }
@@ -850,8 +850,8 @@ int _get_maat_redis_value(redisContext *c, struct serial_rule_t* rule_list, int
ret=_wrap_redisGetReply(c,&reply); ret=_wrap_redisGetReply(c,&reply);
if(ret==REDIS_ERR) if(ret==REDIS_ERR)
{ {
MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_redis_monitor MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_redis_monitor,
,"redis command %s failed, redis server error.", redis_cmd); "redis command %s failed, redis server error.", redis_cmd);
free(retry_ids); free(retry_ids);
return -1; return -1;
} }
@@ -861,12 +861,12 @@ int _get_maat_redis_value(redisContext *c, struct serial_rule_t* rule_list, int
} }
else if(reply->type==REDIS_REPLY_ERROR)//Deal with Redis response: "Loading Redis is loading the database in memory" else if(reply->type==REDIS_REPLY_ERROR)//Deal with Redis response: "Loading Redis is loading the database in memory"
{ {
MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_redis_monitor, MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_redis_monitor,
"redis command %s error, reply type=%d, error str=%s", redis_cmd, reply->type, reply->str); "redis command %s error, reply type=%d, error str=%s", redis_cmd, reply->type, reply->str);
} }
else //Handle type "nil" else //Handle type "nil"
{ {
MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_redis_monitor, MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_redis_monitor,
"redis command %s failed, reply type=%d", redis_cmd, reply->type); "redis command %s failed, reply type=%d", redis_cmd, reply->type);
} }
@@ -1716,7 +1716,7 @@ void redis_monitor_traverse(long long version, struct source_redis_ctx* m
const char* dec_key, const char* dec_key,
_Maat_feather_t* feather) _Maat_feather_t* feather)
{ {
int table_id=0, i=0, rule_num=0, empty_value_num=0, valid_column=-1; int table_id=0, i=0, rule_num=0, empty_value_num=0, no_table_num=0, call_update_num=0, valid_column=-1;
int ret=0; int ret=0;
struct serial_rule_t* rule_list=NULL; struct serial_rule_t* rule_list=NULL;
int update_type=CM_UPDATE_TYPE_INC; int update_type=CM_UPDATE_TYPE_INC;
@@ -1774,7 +1774,7 @@ void redis_monitor_traverse(long long version, struct source_redis_ctx* m
ret=get_maat_redis_value(mr_ctx->read_ctx, rule_list, rule_num, logger, 0); ret=get_maat_redis_value(mr_ctx->read_ctx, rule_list, rule_num, logger, 0);
if(ret<0) if(ret<0)
{ {
MESA_handle_runtime_log(logger,RLOG_LV_INFO,maat_redis_monitor,"Get Redis value failed, abandon update."); MESA_handle_runtime_log(logger, RLOG_LV_INFO,maat_redis_monitor, "Get Redis value failed, abandon update.");
goto clean_up; goto clean_up;
} }
for(i=0;i<rule_num;i++) for(i=0;i<rule_num;i++)
@@ -1786,32 +1786,28 @@ void redis_monitor_traverse(long long version, struct source_redis_ctx* m
} }
if(empty_value_num==rule_num) if(empty_value_num==rule_num)
{ {
MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_redis_monitor,"All %d rules are empty, abandon update.",empty_value_num); MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_redis_monitor, "All %d rules are empty, abandon update.", empty_value_num);
goto clean_up; goto clean_up;
} }
if(empty_value_num>0)
{
MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_redis_monitor,"%d of %d rules are empty.",empty_value_num,rule_num);
}
ret=get_foreign_keys_define(mr_ctx->read_ctx, rule_list, rule_num, feather, feather->foreign_cont_dir, logger); ret=get_foreign_keys_define(mr_ctx->read_ctx, rule_list, rule_num, feather, feather->foreign_cont_dir, logger);
if(ret>0) if(ret>0)
{ {
get_foreign_conts(mr_ctx->read_ctx, rule_list, rule_num, 0, logger); get_foreign_conts(mr_ctx->read_ctx, rule_list, rule_num, 0, logger);
} }
} }
start(new_version,update_type,u_para); start(new_version, update_type, u_para);
MESA_handle_runtime_log(logger,RLOG_LV_INFO,maat_redis_monitor,"Start %s update: %lld -> %lld (%d entries).", MESA_handle_runtime_log(logger, RLOG_LV_INFO, maat_redis_monitor, "Start %s update: %lld -> %lld (%d entries).",
update_type==CM_UPDATE_TYPE_INC?"INC":"FULL",version,new_version,rule_num); update_type==CM_UPDATE_TYPE_INC?"INC":"FULL", version, new_version, rule_num);
for(i=0;i<rule_num;i++) for(i=0;i<rule_num;i++)
{ {
if(rule_list[i].table_line==NULL||rule_list[i].with_error==1) if(rule_list[i].table_line==NULL)
{ {
continue; continue;
} }
table_id=Maat_table_get_id_by_name(feather->table_mgr, rule_list[i].table_name); table_id=Maat_table_get_id_by_name(feather->table_mgr, rule_list[i].table_name);
if(table_id<0)//Unrecognized table. if(table_id<0)//Unrecognized table.
{ {
no_table_num++;
continue; continue;
} }
table_type=Maat_table_get_type_by_id(feather->table_mgr, table_id); table_type=Maat_table_get_type_by_id(feather->table_mgr, table_id);
@@ -1824,8 +1820,8 @@ void redis_monitor_traverse(long long version, struct source_redis_ctx* m
ret=invalidate_line(rule_list[i].table_line, table_type, valid_column); ret=invalidate_line(rule_list[i].table_line, table_type, valid_column);
if(ret<0) if(ret<0)
{ {
MESA_handle_runtime_log(logger,RLOG_LV_INFO,maat_redis_monitor,"Invalidate line failed, invaid format %s ." MESA_handle_runtime_log(logger, RLOG_LV_INFO, maat_redis_monitor, "Invalidate line failed, invaid format %s .",
,rule_list[i].table_line); rule_list[i].table_line);
continue; continue;
} }
} }
@@ -1834,9 +1830,14 @@ void redis_monitor_traverse(long long version, struct source_redis_ctx* m
rewrite_table_line_with_foreign(rule_list+i); rewrite_table_line_with_foreign(rule_list+i);
} }
update(rule_list[i].table_name,rule_list[i].table_line,u_para); update(rule_list[i].table_name,rule_list[i].table_line,u_para);
call_update_num++;
} }
finish(u_para); finish(u_para);
if(call_update_num<rule_num)
{
MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_redis_monitor, "Load %d entries to match engine, no tablle: %d, empty value: %d.",
call_update_num, no_table_num, empty_value_num);
}
clean_up: clean_up:
for(i=0;i<rule_num;i++) for(i=0;i<rule_num;i++)
{ {

2
src/entry/Maat_rule.cpp
View File

@@ -57,7 +57,7 @@ extern "C"
} }
#endif #endif
int MAAT_FRAME_VERSION_3_6_9_20220429=1; int MAAT_FRAME_VERSION_3_6_10_20220630=1;
int is_valid_table_name(const char* str) int is_valid_table_name(const char* str)
{ {

2
src/inc_internal/Maat_rule_internal.h
View File

@@ -10,7 +10,6 @@
#include <MESA/MESA_list_queue.h> #include <MESA/MESA_list_queue.h>
#include <MESA/field_stat2.h> #include <MESA/field_stat2.h>
#include <MESA/rulescan.h> #include <MESA/rulescan.h>
#include "dynamic_array.h"
#include "hiredis.h" #include "hiredis.h"
#include "IPMatcher.h" #include "IPMatcher.h"
#include "stream_fuzzy_hash.h" #include "stream_fuzzy_hash.h"
@@ -365,7 +364,6 @@ struct serial_rule_t //rm= Redis Maat
enum MAAT_OPERATION op;//0: delete, 1: add. enum MAAT_OPERATION op;//0: delete, 1: add.
unsigned long rule_id; unsigned long rule_id;
int label_id; int label_id;
char with_error;
long long timeout; // absolute unix time. long long timeout; // absolute unix time.
char table_name[256]; char table_name[256];
char* table_line; char* table_line;