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

修改MESA头文件引用修改

Browse Source 
扫描函数名优化
This commit is contained in:
fengweihao
2020-06-22 15:15:52 +08:00
parent d5bc9581ae
commit fc437a76ec
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/include/verify_policy.h
View File

@@ -132,9 +132,9 @@ void * pangu_http_ctx_new(unsigned int thread_id);
void pangu_http_ctx_free(void * pme); void pangu_http_ctx_free(void * pme);
size_t http_scan(enum verify_policy_type policy_type, struct verify_policy_query_obj *query_obj, cJSON *data_obj, void *pme); size_t http_policy_scan(enum verify_policy_type policy_type, struct verify_policy_query_obj *query_obj, cJSON *data_obj, void *pme);
void get_scan_status(struct verify_policy_query_obj *query_obj, cJSON *attributes, cJSON *data_obj, void *pme); void http_get_scan_status(struct verify_policy_query_obj *query_obj, cJSON *attributes, cJSON *data_obj, void *pme);
int security_policy_init(struct verify_policy * verify, const char* profile_path); int security_policy_init(struct verify_policy * verify, const char* profile_path);

5
common/src/verify_policy_logging.cpp
View File

@@ -16,8 +16,9 @@
#include <ctype.h> #include <ctype.h>
#include "verify_policy_logging.h" #include "verify_policy_logging.h"
#include "MESA_prof_load.h" #include <MESA/MESA_prof_load.h>
#include "MESA_handle_logger.h" #include <MESA/MESA_handle_logger.h>
RTLogInit2Data logging_sc_lid; RTLogInit2Data logging_sc_lid;

8
platform/src/verify_policy.cpp
View File

@@ -23,8 +23,8 @@
#include <MESA/stream.h> #include <MESA/stream.h>
#include "verify_policy.h" #include "verify_policy.h"
#include "MESA_prof_load.h" #include <MESA/MESA_prof_load.h>
#include "MESA_handle_logger.h" #include <MESA/MESA_handle_logger.h>
#include "verify_policy_utils.h" #include "verify_policy_utils.h"
#include "verify_policy_logging.h" #include "verify_policy_logging.h"
@@ -310,7 +310,7 @@ cJSON *get_query_from_request(const char *data, int thread_id)
{ {
goto free; goto free;
} }
hit_cnt = http_scan(verify_policy->type, &verify_policy->verify_object[i], data_obj, ctx); hit_cnt = http_policy_scan(verify_policy->type, &verify_policy->verify_object[i], data_obj, ctx);
if(0 == strcasecmp(verify_policy->verify_object[i].attri_name, "ip")) if(0 == strcasecmp(verify_policy->verify_object[i].attri_name, "ip"))
{ {
ipaddr_free(verify_policy->verify_object[i].ip_addr); ipaddr_free(verify_policy->verify_object[i].ip_addr);
@@ -324,7 +324,7 @@ cJSON *get_query_from_request(const char *data, int thread_id)
cJSON_AddItemToObject(verfifySession, "attributes", attributes); cJSON_AddItemToObject(verfifySession, "attributes", attributes);
for (item = 0; item < i; item++) for (item = 0; item < i; item++)
{ {
get_scan_status(&verify_policy->verify_object[item], attributes,data_obj, ctx); http_get_scan_status(&verify_policy->verify_object[item], attributes,data_obj, ctx);
} }
pangu_http_ctx_free(ctx); pangu_http_ctx_free(ctx);
} }

4
scan/src/pangu_http.cpp
View File

@@ -171,7 +171,7 @@ static enum pangu_action decide_ctrl_action(const struct Maat_rule_t * hit_rules
return prior_action; return prior_action;
} }
void get_scan_status(struct verify_policy_query_obj *query_obj, cJSON *attributes, cJSON *data_obj, void *pme) void http_get_scan_status(struct verify_policy_query_obj *query_obj, cJSON *attributes, cJSON *data_obj, void *pme)
{ {
int i=0; int i=0;
cJSON *attributeObj=NULL,*hitPaths=NULL; cJSON *attributeObj=NULL,*hitPaths=NULL;
@@ -255,7 +255,7 @@ static int http_hit_policy_list(Maat_feather_t maat, size_t hit_cnt, cJSON *data
return 0; return 0;
} }
size_t http_scan(enum verify_policy_type policy_type, struct verify_policy_query_obj *query_obj, cJSON *data_obj, void *pme) size_t http_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; int scan_ret=0, n_read;
size_t hit_cnt=0; size_t hit_cnt=0;