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

TSG-511 proxy事件日志action统一赋值处理

Browse Source
This commit is contained in:
fengweihao
2019-12-20 10:08:30 +08:00
parent 5cdd28235d
commit fe7fc6fa9c
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/business/pangu-http/src/pangu_http.cpp
View File

@@ -2464,7 +2464,7 @@ void pangu_on_http_end(const struct tfe_stream * stream,
} }
} }
struct pangu_log log_msg = {.stream=stream, .http=session, .result=ctx->enforce_rules, .result_num=ctx->n_enforce, struct pangu_log log_msg = {.stream=stream, .http=session, .result=ctx->enforce_rules, .result_num=ctx->n_enforce,
.req_body= ctx->log_req_body, .resp_body=ctx->log_resp_body, .action=5}; .req_body= ctx->log_req_body, .resp_body=ctx->log_resp_body, .action=0};
if(ctx->action == PG_ACTION_MANIPULATE) if(ctx->action == PG_ACTION_MANIPULATE)
{ {

32
plugin/business/pangu-http/src/pangu_logger.cpp
View File

@@ -49,6 +49,20 @@ struct pangu_logger
struct cache_evbase_instance * log_file_upload_instance; struct cache_evbase_instance * log_file_upload_instance;
}; };
enum _log_action //Bigger action number is prior.
{
LG_ACTION_NONE = 0x00,
LG_ACTION_MONIT = 0x01,
LG_ACTION_FORWARD = 0x02, /* N/A */
LG_ACTION_REJECT = 0x10,
LG_ACTION_DROP = 0x20, /* N/A */
LG_ACTION_MANIPULATE = 0x30,
LG_ACTION_RATELIMIT = 0x40, /* N/A */
LG_ACTION_LOOP = 0x60, /* N/A */
LG_ACTION_WHITELIST = 0x80,
__LG_ACTION_MAX
};
static unsigned int get_ip_by_eth_name(const char *ifname) static unsigned int get_ip_by_eth_name(const char *ifname)
{ {
int sockfd; int sockfd;
@@ -191,7 +205,12 @@ int pangu_send_log(struct pangu_logger* handle, const struct pangu_log* log_msg)
const char *app_proto[]= {"unkonw","http1", "http2"}; const char *app_proto[]= {"unkonw","http1", "http2"};
const char *clue_action_map[]= {"redirect","block","replace","hijack","insert"}; const char *manipulate_action_map[]= {"redirect","block","replace","hijack","insert"};
const char *panggu_action_map[__LG_ACTION_MAX];
panggu_action_map[LG_ACTION_MONIT]="monitor";
panggu_action_map[LG_ACTION_REJECT]="deny";
panggu_action_map[LG_ACTION_WHITELIST]="allow";
struct json_spec req_fields[]={ {"http_cookie", TFE_HTTP_COOKIE}, struct json_spec req_fields[]={ {"http_cookie", TFE_HTTP_COOKIE},
{"http_referer", TFE_HTTP_REFERER}, {"http_referer", TFE_HTTP_REFERER},
@@ -365,11 +384,16 @@ int pangu_send_log(struct pangu_logger* handle, const struct pangu_log* log_msg)
per_hit_obj=cJSON_Duplicate(common_obj, 1); per_hit_obj=cJSON_Duplicate(common_obj, 1);
cJSON_AddNumberToObject(per_hit_obj, "common_policy_id", log_msg->result[i].config_id); cJSON_AddNumberToObject(per_hit_obj, "common_policy_id", log_msg->result[i].config_id);
cJSON_AddNumberToObject(per_hit_obj, "common_service", log_msg->result[i].service_id); cJSON_AddNumberToObject(per_hit_obj, "common_service", log_msg->result[i].service_id);
cJSON_AddNumberToObject(per_hit_obj, "common_action", (unsigned char)log_msg->result[i].action); cJSON_AddNumberToObject(per_hit_obj, "common_action", LG_ACTION_MANIPULATE);
if(log_msg->action<5) if(log_msg->result[i].action == LG_ACTION_MANIPULATE)
{ {
cJSON_AddStringToObject(per_hit_obj, "common_sub_action", clue_action_map[log_msg->action]); cJSON_AddStringToObject(per_hit_obj, "common_sub_action", manipulate_action_map[log_msg->action]);
} }
else
{
cJSON_AddStringToObject(per_hit_obj, "common_sub_action", panggu_action_map[(unsigned char)(log_msg->result[i].action)]);
}
log_payload = cJSON_PrintUnformatted(per_hit_obj); log_payload = cJSON_PrintUnformatted(per_hit_obj);
TFE_LOG_DEBUG(handle->local_logger, "%s", log_payload); TFE_LOG_DEBUG(handle->local_logger, "%s", log_payload);