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

TSG-8138 修复上报服务分类id重复问题

Browse Source
This commit is contained in:
fengweihao
2021-10-26 11:35:45 +08:00
parent d6b943b335
commit 024d2c2ef5
2 changed files with 32 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scan/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_library(policy_scan src/policy_scan.cpp)
target_include_directories(policy_scan PUBLIC ${CMAKE_CURRENT_LIST_DIR}/incluce)
target_link_libraries(policy_scan PUBLIC common libevent-static pthread cjson maatframe)
target_link_libraries(policy_scan PUBLIC common pthread cjson maatframe)

124
scan/src/policy_scan.cpp
View File

@@ -18,10 +18,6 @@
#include <cjson/cJSON.h>
#include <event2/listener.h>
#include <event2/http.h>
#include <event2/buffer.h>
#include "verify_policy.h"
#include "verify_policy_utils.h"
#include "verify_policy_logging.h"
@@ -710,7 +706,7 @@ void http_get_scan_status(struct verify_policy_query_obj *query_obj, int type, c
{
if (query_obj->nth_scan[j] == ctx->hit_path[i].Nth_scan)
{
if(http_hit_policy_match(result_hit_nth, k, ctx->hit_path[i].compile_id) && query_obj->district == NULL)
if(http_hit_policy_match(result_hit_nth, k, ctx->hit_path[i].compile_id))
{
continue;
}
@@ -953,6 +949,7 @@ int http_ip_asn_scan(struct Maat_rule_t *result, struct ip_address* sip, struct
int verify_get_fqdn_category_id(struct Maat_rule_t *result, const char *fqdn, int protocol_field, int hit_cnt, unsigned int thread_id, enum verify_policy_type policy_type,
struct pangu_http_ctx * ctx, struct verify_policy_query_obj *query_obj)
{
int j=0, k=0;;
int n_read=0, hit_path_cnt=0;
int i=0,ret=0, hit_cnt_fqdn=0;
struct fqdn_category_t *fqdn_cat_user[8]={0},*fqdn_cat_built[8]={0};
@@ -962,22 +959,32 @@ int verify_get_fqdn_category_id(struct Maat_rule_t *result, const char *fqdn, in
{
if(i < 8)
{
query_obj->category_id_user[i] = fqdn_cat_user[i]->category_id;
if(http_hit_policy_match((int *)query_obj->category_id_user, j, (int)fqdn_cat_user[i]->category_id))
{
continue;
}
query_obj->category_id_user[j] = fqdn_cat_user[i]->category_id;
j++;
}
fqdn_cat_table_free(fqdn_cat_user[i]);
}
query_obj->category_user_num = i< 8 ? i : 8;
query_obj->category_user_num = j< 8 ? j : 8;
ret=Maat_fqdn_plugin_get_EX_data(g_pangu_rt->maat[PXY_TABLE_SECURITY], g_pangu_rt->plolicy_table_id[POLICY_FQDN_CAT_BUILT_IN], fqdn, (void **)fqdn_cat_built, 8);
for(i=0; i <ret; i++)
{
if(i < 8)
{
query_obj->category_id_built[i] = fqdn_cat_built[i]->category_id;
if(http_hit_policy_match((int *)query_obj->category_id_user, k, (int)fqdn_cat_user[i]->category_id))
{
continue;
}
query_obj->category_id_built[k] = fqdn_cat_built[i]->category_id;
k++;
}
fqdn_cat_table_free(fqdn_cat_built[i]);
}
query_obj->category_built_num = i< 8 ? i : 8;
query_obj->category_built_num = k < 8 ? k : 8;
if(query_obj->category_user_num > 0)
{
@@ -1044,82 +1051,6 @@ static int verify_intercept_exclusion(const char *value, unsigned int thread_id,
return 0;
}
static void evutil_rtrim_lws_(char *str)
{
char *cp;
if (str == NULL)
return;
if ((cp = strchr(str, '\0')) == NULL || (cp == str))
return;
--cp;
while (*cp == ' ' || *cp == '\t') {
*cp = '\0';
if (cp == str)
break;
--cp;
}
}
int verify_policy_parse_headers(struct Maat_rule_t *result, const char *district, int protocol_field, int hit_cnt, unsigned int thread_id, enum verify_policy_type policy_type,
struct pangu_http_ctx * ctx, struct verify_policy_query_obj *query_obj)
{
char *line;
int scan_ret=0,n_read=0;
struct evbuffer* evbuf_body=NULL;
int hit_cnt_header=0,hit_path_cnt=0;
evbuf_body = evbuffer_new();
evbuffer_add(evbuf_body, district, strlen(district));
size_t line_length;
while ((line = evbuffer_readln(evbuf_body, &line_length, EVBUFFER_EOL_CRLF))
!= NULL) {
char *str_field_name, *str_field_value;
if (*line == '\0')
{
break;
}
if (*line == ' ' || *line == '\t')
{
continue;
}
str_field_value = line;
str_field_name = strsep(&str_field_value, ":");
if (str_field_value == NULL)
{
goto finish;
}
str_field_value += strspn(str_field_value, " ");
evutil_rtrim_lws_(str_field_value);
scan_ret = Maat_set_scan_status(g_pangu_rt->maat[policy_type], &(ctx->scan_mid), MAAT_SET_SCAN_DISTRICT, str_field_name, strlen(str_field_name));
assert(scan_ret == 0);
scan_ret = Maat_full_scan_string(g_pangu_rt->maat[policy_type], g_pangu_rt->scan_table_id[policy_type][protocol_field],
CHARSET_UTF8, str_field_value, strlen(str_field_value), ctx->result + hit_cnt + hit_cnt_header, NULL, MAX_SCAN_RESULT - hit_cnt - hit_cnt_header, &(ctx->scan_mid), ctx->thread_id);
if(scan_ret > 0)
{
hit_cnt_header+=scan_ret;
}
n_read=Maat_get_scan_status(g_pangu_rt->maat[policy_type], &(ctx->scan_mid), MAAT_GET_SCAN_HIT_PATH, ctx->hit_path, sizeof(ctx->hit_path));
if(scan_ret == -2 || scan_ret >0)
{
query_obj->nth_scan[hit_path_cnt] = ctx->hit_path[ctx->n_read].Nth_scan;
ctx->n_read=n_read;
hit_path_cnt++;
}
}
finish:
query_obj->nth_scan_num = hit_path_cnt;
return hit_cnt_header;
}
size_t verify_policy_scan(enum verify_policy_type policy_type, struct verify_policy_query_obj *query_obj, cJSON *data_obj, void *pme)
{
int scan_ret=0, n_read;
@@ -1173,16 +1104,23 @@ size_t verify_policy_scan(enum verify_policy_type policy_type, struct verify_pol
if ((protocol_field == PXY_CTRL_HTTP_REQ_HDR) || protocol_field == PXY_CTRL_HTTP_RES_HDR)
{
if(query_obj->district == NULL)
if(query_obj->district != NULL)
{
goto decide;
const char * str_field_name = query_obj->district;
scan_ret = Maat_set_scan_status(g_pangu_rt->maat[policy_type], &(ctx->scan_mid), MAAT_SET_SCAN_DISTRICT,
str_field_name, strlen(str_field_name));
assert(scan_ret == 0);
scan_ret = Maat_full_scan_string(g_pangu_rt->maat[policy_type], g_pangu_rt->scan_table_id[policy_type][protocol_field],
CHARSET_UTF8, value, strlen(value),
ctx->result + hit_cnt, NULL, MAX_SCAN_RESULT - hit_cnt, &(ctx->scan_mid), ctx->thread_id);
if (scan_ret > 0)
{
hit_cnt += scan_ret;
}
n_read=Maat_get_scan_status(g_pangu_rt->maat[policy_type], &(ctx->scan_mid), MAAT_GET_SCAN_HIT_PATH, ctx->hit_path, sizeof(ctx->hit_path));
query_obj->nth_scan[0] = ctx->hit_path[ctx->n_read].Nth_scan;
ctx->n_read=n_read;
}
scan_ret = verify_policy_parse_headers(ctx->result, query_obj->district, protocol_field, hit_cnt, ctx->thread_id, policy_type, ctx, query_obj);
if(scan_ret>0)
{
hit_cnt+=scan_ret;
}
goto decide;
}
if(policy_type == PXY_TABLE_SECURITY &&(protocol_field == PXY_SECURITY_HTTPS_SNI || protocol_field == PXY_SECURITY_HTTP_FQDN))