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

TSG-8663: 安全日志中Application Label不包含策略中的Application

Browse Source
This commit is contained in:
liuxueli
2022-01-06 23:33:37 +03:00
parent 12d86d17bb
commit c278c7fe77
4 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/tsg_send_log.cpp
View File

@@ -693,8 +693,11 @@ static int set_app_id(struct tsg_log_instance_t *_instance, struct TLD_handle_t
if(app_id_flag==1)
{
TLD_append(_handle, _instance->id2field[LOG_COMMON_APP_LABEL].name, (void *)app_name, TLD_TYPE_STRING);
if(!(TLD_search(_handle, _instance->id2field[LOG_COMMON_APP_LABEL].name)))
{
TLD_append(_handle, _instance->id2field[LOG_COMMON_APP_LABEL].name, (void *)app_name, TLD_TYPE_STRING);
}
Value app_id_object(kObjectType);
get_app_id_list(&app_id_object, _handle, "USER_DEFINE", &(label->result[ORIGIN_USER_DEFINE]));
get_app_id_list(&app_id_object, _handle, "BUILT_IN", &(label->result[ORIGIN_BUILT_IN]));
@@ -888,6 +891,20 @@ int TLD_cancel(struct TLD_handle_t *handle)
return 0;
}
int TLD_search(struct TLD_handle_t *handle, char *key)
{
if (handle != NULL && handle->document != NULL && key != NULL)
{
Value::ConstMemberIterator itr = handle->document->FindMember(key);
if (itr!=handle->document->MemberEnd())
{
return 1;
}
}
return 0;
}
static void TLD_delete(struct TLD_handle_t *handle, char *key)
{
if (handle != NULL && handle->document != NULL && key != NULL)