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

修复笔误，造成fqdn_cat命中路径中存在异常路径

Browse Source
This commit is contained in:
fengweihao
2023-12-19 14:44:34 +08:00
parent 43eaafb034
commit 50bf60cc3f
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/include/verify_policy.h
View File

@@ -114,7 +114,6 @@ struct fqdn_category_id
{ {
int fqdn_cat_num; int fqdn_cat_num;
long long int group_id[8]; long long int group_id[8];
unsigned int fqdn_cat_id[8];
}; };
struct request_query_obj struct request_query_obj

10
platform/src/verify_matcher.cpp
View File

@@ -1543,12 +1543,11 @@ int get_fqdn_category_id(long long *result, const char *fqdn, int table_id, int
{ {
if(i < 8) if(i < 8)
{ {
if(http_hit_policy_match((int *)(query_obj->fqdn_user.fqdn_cat_id), j, (int)fqdn_cat_user[i]->fqdn_cat_id)) if(http_hit_policy_match((int *)(query_obj->fqdn_user.group_id), j, (int)fqdn_cat_user[i]->group_id))
{ {
continue; continue;
} }
query_obj->fqdn_user.fqdn_cat_id[i] = fqdn_cat_user[i]->fqdn_cat_id; query_obj->fqdn_user.group_id[j] = fqdn_cat_user[i]->group_id;
query_obj->fqdn_user.group_id[i] = fqdn_cat_user[i]->group_id;
j++; j++;
} }
fqdn_cat_table_free(fqdn_cat_user[i]); fqdn_cat_table_free(fqdn_cat_user[i]);
@@ -1560,12 +1559,11 @@ int get_fqdn_category_id(long long *result, const char *fqdn, int table_id, int
{ {
if(i < 8) if(i < 8)
{ {
if(http_hit_policy_match((int *)(query_obj->fqdn_builtin.fqdn_cat_id), k, (int)fqdn_cat_built[i]->fqdn_cat_id)) if(http_hit_policy_match((int *)(query_obj->fqdn_builtin.group_id), k, (int)fqdn_cat_built[i]->group_id))
{ {
continue; continue;
} }
query_obj->fqdn_builtin.fqdn_cat_id[i] = fqdn_cat_built[i]->fqdn_cat_id; query_obj->fqdn_builtin.group_id[k] = fqdn_cat_built[i]->group_id;
query_obj->fqdn_builtin.group_id[i] = fqdn_cat_built[i]->group_id;
k++; k++;
} }
fqdn_cat_table_free(fqdn_cat_built[i]); fqdn_cat_table_free(fqdn_cat_built[i]);