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

Add session_uuid and log_uuid to the log field

Browse Source
This commit is contained in:
fengweihao
2024-11-28 16:27:21 +08:00
parent 59e7f7a6a3
commit 15714b4ba3
7 changed files with 68 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/business/tsg-http/src/tsg_http.cpp
View File

@@ -2824,13 +2824,13 @@ enum proxy_action http_scan(const struct tfe_http_session * session, enum tfe_ht
int str_host_length = get_fqdn_len(str_host);
if (str_host != NULL && str_host_length != 0)
{
scan_ret = maat_scan_string(g_proxy_rt->feather, "TSG_OBJ_FQDN", "SERVER_FQDN", str_host, str_host_length,
scan_ret = maat_scan_string(g_proxy_rt->feather, "TSG_OBJ_FQDN", "DESTINATION_FQDN", str_host, str_host_length,
result + hit_cnt, MAX_SCAN_RESULT - hit_cnt, &n_hit_result, ctx->scan_mid);
if (scan_ret == MAAT_SCAN_HIT)
{
hit_cnt += n_hit_result;
}
scan_ret = maat_scan_not_logic(g_proxy_rt->feather, "TSG_OBJ_FQDN", "SERVER_FQDN",
scan_ret = maat_scan_not_logic(g_proxy_rt->feather, "TSG_OBJ_FQDN", "DESTINATION_FQDN",
result + hit_cnt, MAX_SCAN_RESULT - hit_cnt, &n_hit_result, ctx->scan_mid);
if (scan_ret == MAAT_SCAN_HIT)
{

29
plugin/business/tsg-http/src/tsg_logger.cpp
View File

@@ -48,10 +48,10 @@ enum _log_action
#else
#include "uuid_v4_arm.h"
#endif
UUIDv4::UUIDGenerator<std::mt19937_64> uuidGenerator;
void get_http_body_uuid(char *uuid)
void uuidv4_generate(char *uuid)
{
UUIDv4::UUIDGenerator<std::mt19937_64> uuidGenerator;
UUIDv4::UUID uid = uuidGenerator.getUUID();
uid.str(uuid);
return;
@@ -119,7 +119,7 @@ int tfe_get_format_host(cJSON *common_obj, const char *req_spec_host)
char *format_host=ALLOC(char, strlen(req_spec_host)+1);
sscanf(req_spec_host, "%[^:]:%u", format_host, &port);
cJSON_AddStringToObject(common_obj, "http_host", format_host);
cJSON_AddStringToObject(common_obj, "server_fqdn", format_host);
cJSON_AddStringToObject(common_obj, "destination_fqdn", format_host);
FREE(&format_host);
return 0;
}
@@ -155,6 +155,21 @@ int tfe_get_string_by_cmsg(cJSON *common_obj, struct tfe_cmsg * cmsg, enum tfe_
return 0;
}
int tfe_get_uuid_by_cmsg(cJSON *common_obj, struct tfe_cmsg * cmsg, enum tfe_cmsg_tlv_type type, const char *keyword)
{
uuid_t opt_val;
char session_uuid[UUID_STRING_SIZE]={0};
uint16_t opt_out_size = 0;
int ret=tfe_cmsg_get_value(cmsg, type, (unsigned char *)opt_val, sizeof(opt_val), &opt_out_size);
if (ret == 0 && opt_out_size > 0)
{
uuid_unparse(opt_val,session_uuid);
cJSON_AddStringToObject(common_obj, keyword, session_uuid);
}
return 0;
}
size_t tfe_get_c2s_byte_num(const struct tfe_stream *stream, size_t c2s_byte_num)
{
size_t rewrite_c2s_byte_num = 0;
@@ -187,7 +202,7 @@ int tfe_upload_http_body(struct proxy_logger* handle, cJSON *common_obj, struct
}
else
{
get_http_body_uuid(uuid);
uuidv4_generate(uuid);
datalen=file_bucket_upload_once(handle, uuid, http_body);
if(datalen>0)
{
@@ -234,15 +249,19 @@ int proxy_send_log(struct proxy_logger* handle, const struct proxy_log* log_msg)
return 0;
}
char log_uuid[40] = {0};
uuidv4_generate(log_uuid);
common_obj=cJSON_CreateObject();
gettimeofday(&cur_time, NULL);
cJSON_AddNumberToObject(common_obj, "start_timestamp_ms", get_time_ms(http->start_time));
cJSON_AddNumberToObject(common_obj, "end_timestamp_ms", get_time_ms(cur_time));
cJSON_AddStringToObject(common_obj, "log_uuid", log_uuid);
struct tfe_cmsg *cmsg = tfe_stream_get0_cmsg(log_msg->stream);
if (cmsg != NULL)
{
tfe_get_string_by_cmsg(common_obj, cmsg, TFE_CMSG_STREAM_TRACE_ID, "session_id");
tfe_get_uuid_by_cmsg(common_obj, cmsg, TFE_CMSG_STREAM_TRACE_ID, "session_uuid");
tfe_get_string_by_cmsg(common_obj, cmsg, TFE_CMSG_SRC_SUB_ID, "subscriber_id");
tfe_get_string_by_cmsg(common_obj, cmsg, TFE_CMSG_SRC_IMSI_STR, "imsi");