From fc437a76ec425306836afaf6d2aaa63a023930e7 Mon Sep 17 00:00:00 2001 From: fengweihao Date: Mon, 22 Jun 2020 15:15:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9MESA=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=BC=95=E7=94=A8=E4=BF=AE=E6=94=B9=20=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=87=BD=E6=95=B0=E5=90=8D=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/include/verify_policy.h | 4 ++-- common/src/verify_policy_logging.cpp | 5 +++-- platform/src/verify_policy.cpp | 8 ++++---- scan/src/pangu_http.cpp | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/common/include/verify_policy.h b/common/include/verify_policy.h index 9eb5f93..5b08be7 100644 --- a/common/include/verify_policy.h +++ b/common/include/verify_policy.h @@ -132,9 +132,9 @@ void * pangu_http_ctx_new(unsigned int thread_id); 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); diff --git a/common/src/verify_policy_logging.cpp b/common/src/verify_policy_logging.cpp index 44d1495..8d41225 100644 --- a/common/src/verify_policy_logging.cpp +++ b/common/src/verify_policy_logging.cpp @@ -16,8 +16,9 @@ #include #include "verify_policy_logging.h" -#include "MESA_prof_load.h" -#include "MESA_handle_logger.h" +#include +#include + RTLogInit2Data logging_sc_lid; diff --git a/platform/src/verify_policy.cpp b/platform/src/verify_policy.cpp index 5a33ef7..2942569 100644 --- a/platform/src/verify_policy.cpp +++ b/platform/src/verify_policy.cpp @@ -23,8 +23,8 @@ #include #include "verify_policy.h" -#include "MESA_prof_load.h" -#include "MESA_handle_logger.h" +#include +#include #include "verify_policy_utils.h" #include "verify_policy_logging.h" @@ -310,7 +310,7 @@ cJSON *get_query_from_request(const char *data, int thread_id) { 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")) { 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); 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); } diff --git a/scan/src/pangu_http.cpp b/scan/src/pangu_http.cpp index e664f0f..05aa4a5 100644 --- a/scan/src/pangu_http.cpp +++ b/scan/src/pangu_http.cpp @@ -171,7 +171,7 @@ static enum pangu_action decide_ctrl_action(const struct Maat_rule_t * hit_rules 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; 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; } -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; size_t hit_cnt=0;