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

TSG-7549: 安全事件日志中SMTPS、POPS、IMAPS出现重复日志

Browse Source
This commit is contained in:
liuxueli
2021-08-24 20:29:18 +08:00
parent e41a8c3c58
commit ac265ec46b
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/tsg_entry.cpp
View File

@@ -1262,7 +1262,7 @@ static unsigned char master_deal_scan_result(const struct streaminfo *a_stream,
} }
break; break;
case TSG_ACTION_MONITOR: case TSG_ACTION_MONITOR:
if(context->proto==PROTO_RTP) if(context->proto==PROTO_RTP || context->is_parent_ssl==1)
{ {
break; break;
} }
@@ -1296,10 +1296,10 @@ static unsigned char master_deal_scan_result(const struct streaminfo *a_stream,
static int app_identify_result_cb(const struct streaminfo *a_stream, int bridge_id, void *data) static int app_identify_result_cb(const struct streaminfo *a_stream, int bridge_id, void *data)
{ {
int hit_num=0; int hit_num=0,app_id=-1;
struct master_context *context=NULL; struct master_context *context=NULL;
struct Maat_rule_t scan_result[MAX_RESULT_NUM];
struct gather_app_result *gather_result=NULL; struct gather_app_result *gather_result=NULL;
struct Maat_rule_t scan_result[MAX_RESULT_NUM]={0};
struct app_identify_result *identify_result=(struct app_identify_result *)data; struct app_identify_result *identify_result=(struct app_identify_result *)data;
if(data==NULL) if(data==NULL)
@@ -1341,6 +1341,17 @@ static int app_identify_result_cb(const struct streaminfo *a_stream, int bridge_
{ {
set_l7_protocol_to_pme(context, identify_result->app_id[identify_result->app_id_num-1]); set_l7_protocol_to_pme(context, identify_result->app_id[identify_result->app_id_num-1]);
} }
app_id=identify_result->app_id[identify_result->app_id_num-1];
if(app_id==(int)tsg_l7_protocol_name2id("SMTPS") ||
app_id==(int)tsg_l7_protocol_name2id("IMAPS") ||
app_id==(int)tsg_l7_protocol_name2id("POP3S") ||
app_id==(int)tsg_l7_protocol_name2id("FTPS") ||
app_id==(int)tsg_l7_protocol_name2id("HTTPS")
)
{
context->is_parent_ssl=1;
}
break; break;
default: default:
MESA_handle_runtime_log(g_tsg_para.logger, RLOG_LV_FATAL, "APP_BRIDGE_CB", "Unknown type: %d addr: %s", identify_result->origin, PRINTADDR(a_stream, g_tsg_para.level)); MESA_handle_runtime_log(g_tsg_para.logger, RLOG_LV_FATAL, "APP_BRIDGE_CB", "Unknown type: %d addr: %s", identify_result->origin, PRINTADDR(a_stream, g_tsg_para.level));

1
src/tsg_entry.h
View File

@@ -177,6 +177,7 @@ struct master_context
int is_esni; int is_esni;
int is_log; int is_log;
int is_ratelimit; int is_ratelimit;
int is_parent_ssl;
char *domain; char *domain;
scan_status_t mid; scan_status_t mid;
struct Maat_rule_t *result; struct Maat_rule_t *result;