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

修复正则匹配由于笔误造成返回的正则数组命名错误

Browse Source
This commit is contained in:
fengweihao
2023-05-11 16:48:59 +08:00
parent d94c81d7e6
commit 412d6f8944
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/src/verify_policy.cpp
View File

@@ -340,9 +340,8 @@ enum verify_type get_verify_type(cJSON* data_json)
static int get_query_result_regex(cJSON *verifylist_array_item, cJSON *data_obj) static int get_query_result_regex(cJSON *verifylist_array_item, cJSON *data_obj)
{ {
int cur_id=0, i=0, is_valid[32]={0}; int cur_id=0, i=0, is_valid[32]={0};
cJSON *regexstr_obj[32]; cJSON *regexstr_obj[32],*attributes=NULL;
cJSON *item = NULL, *subchild = NULL; cJSON *item = NULL, *subchild = NULL;
cJSON *attributes=NULL;
attributes = cJSON_GetObjectItem(verifylist_array_item, "verifyRegex"); attributes = cJSON_GetObjectItem(verifylist_array_item, "verifyRegex");
if(attributes==NULL || attributes->type != cJSON_Array) if(attributes==NULL || attributes->type != cJSON_Array)
@@ -364,7 +363,7 @@ static int get_query_result_regex(cJSON *verifylist_array_item, cJSON *data_obj)
cJSON *verify_regex_obj=NULL; cJSON *verify_regex_obj=NULL;
cJSON *verifyRegex=cJSON_CreateArray(); cJSON *verifyRegex=cJSON_CreateArray();
cJSON_AddItemToObject(data_obj, "attributes", verifyRegex); cJSON_AddItemToObject(data_obj, "verifyRegex", verifyRegex);
for (i = 0; i < cur_id; i++) for (i = 0; i < cur_id; i++)
{ {
verify_regex_obj=cJSON_CreateObject(); verify_regex_obj=cJSON_CreateObject();
@@ -494,6 +493,7 @@ cJSON *get_query_from_request(const char *data, int thread_id)
cJSON_AddItemToObject(policy_obj, "data", data_obj); cJSON_AddItemToObject(policy_obj, "data", data_obj);
int verify_type=get_verify_type(data_json); int verify_type=get_verify_type(data_json);
mesa_runtime_log(RLOG_LV_DEBUG, " [I] verifyType= %d", verify_type);
cJSON *item = NULL, *subitem = NULL; cJSON *item = NULL, *subitem = NULL;
item = cJSON_GetObjectItem(data_json,"verifyList"); item = cJSON_GetObjectItem(data_json,"verifyList");
@@ -503,6 +503,7 @@ cJSON *get_query_from_request(const char *data, int thread_id)
{ {
if(verify_type == VERIFY_TYPE_REGEX) if(verify_type == VERIFY_TYPE_REGEX)
{ {
mesa_runtime_log(RLOG_LV_DEBUG, " [I] data= %s", data);
hit_cnt = get_query_result_regex(subitem, data_obj); hit_cnt = get_query_result_regex(subitem, data_obj);
} }