summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
Diffstat (limited to 'plugin')
-rw-r--r--plugin/business/doh/src/logger.cpp3
-rw-r--r--plugin/business/traffic-mirror/src/entry.cpp1
-rw-r--r--plugin/business/tsg-http/src/tsg_http.cpp154
-rw-r--r--plugin/business/tsg-http/src/tsg_logger.cpp2
4 files changed, 81 insertions, 79 deletions
diff --git a/plugin/business/doh/src/logger.cpp b/plugin/business/doh/src/logger.cpp
index 8dad40c..f269969 100644
--- a/plugin/business/doh/src/logger.cpp
+++ b/plugin/business/doh/src/logger.cpp
@@ -398,8 +398,7 @@ int doh_send_log(struct doh_conf *handle, const struct tfe_http_session *http, c
tfe_stream_info_get(stream, INFO_FROM_DOWNSTREAM_RX_OFFSET, &c2s_byte_num, sizeof(c2s_byte_num));
tfe_stream_info_get(stream, INFO_FROM_UPSTREAM_RX_OFFSET, &s2c_byte_num, sizeof(s2c_byte_num));
- cJSON_AddStringToObject(common_obj, "decoded_as", "HTTP");
- cJSON_AddStringToObject(common_obj, "ip_protocol", "TCP");
+ cJSON_AddStringToObject(common_obj, "ip_protocol", "tcp");
cJSON_AddNumberToObject(common_obj, "out_link_id", 0);
cJSON_AddNumberToObject(common_obj, "in_link_id", 0);
cJSON_AddStringToObject(common_obj, "sled_ip", handle->kafka_logger->local_ip_str);
diff --git a/plugin/business/traffic-mirror/src/entry.cpp b/plugin/business/traffic-mirror/src/entry.cpp
index cf00a2b..e9376bd 100644
--- a/plugin/business/traffic-mirror/src/entry.cpp
+++ b/plugin/business/traffic-mirror/src/entry.cpp
@@ -367,7 +367,6 @@ static struct maat* maat_feather_create_with_override(const char * instance_name
{
maat_options_set_deferred_load_on(opts);
}
- maat_options_set_rule_effect_interval_ms(opts, effect_interval);
if (strlen(accept_tags) > 0)
{
maat_options_set_accept_tags(opts, accept_tags);
diff --git a/plugin/business/tsg-http/src/tsg_http.cpp b/plugin/business/tsg-http/src/tsg_http.cpp
index 42afd8c..5e6f96b 100644
--- a/plugin/business/tsg-http/src/tsg_http.cpp
+++ b/plugin/business/tsg-http/src/tsg_http.cpp
@@ -1189,6 +1189,77 @@ struct proxy_http_ctx
int thread_id;
};
+static inline int ctx_actually_replaced(struct proxy_http_ctx * ctx)
+{
+ if(ctx->action == PX_ACTION_MANIPULATE &&
+ ctx->param->action == MA_ACTION_REPLACE &&
+ ctx->rep_ctx->actually_replaced==1)
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+}
+
+static inline int ctx_actually_ran_script(struct proxy_http_ctx * ctx)
+{
+ if(ctx->action == PX_ACTION_MANIPULATE &&
+ ctx->param->action == MA_ACTION_LUA_SCRIPT &&
+ ctx->tsg_ctx->actually_executed==1)
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+}
+
+static inline int ctx_actually_inserted(struct proxy_http_ctx * ctx)
+{
+ if(ctx->action == PX_ACTION_MANIPULATE &&
+ ctx->param->action == MA_ACTION_INSERT &&
+ ctx->ins_ctx->actually_inserted==1)
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+}
+
+static inline int ctx_actually_edited(struct proxy_http_ctx * ctx)
+{
+ if(ctx->action == PX_ACTION_MANIPULATE &&
+ ctx->param->action == MA_ACTION_ELEMENT && ctx->edit_ctx != NULL &&
+ ctx->edit_ctx->actually_edited==1)
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+}
+
+static inline int ctx_actually_manipulate(struct proxy_http_ctx * ctx)
+{
+ if(ctx->action == PX_ACTION_MANIPULATE &&
+ (ctx->param->action == MA_ACTION_REDIRECT ||
+ ctx->param->action == MA_ACTION_HIJACK)&&
+ ctx->manipulate_replaced==1)
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+}
+
void http_repl_ctx_free(struct replace_ctx* rep_ctx)
{
if (rep_ctx->http_body)
@@ -2743,6 +2814,8 @@ enum proxy_action http_scan(const struct tfe_http_session * session, enum tfe_ht
if ((events & EV_HTTP_REQ_BODY_END) | (events & EV_HTTP_RESP_BODY_END))
{
+ table_id = events & EV_HTTP_REQ_BODY_END ? g_proxy_rt->scan_table_id[PXY_CTRL_HTTP_REQ_BODY] : g_proxy_rt
+ ->scan_table_id[PXY_CTRL_HTTP_RES_BODY];
scan_ret = maat_scan_not_logic(g_proxy_rt->feather, table_id, result + hit_cnt, MAX_SCAN_RESULT - hit_cnt,
&n_hit_result, ctx->scan_mid);
if (scan_ret == MAAT_SCAN_HIT)
@@ -2829,7 +2902,12 @@ void enforce_control_policy(const struct tfe_stream * stream, const struct tfe_h
if(ctx->log_resp_body == NULL) ctx->log_resp_body = evbuffer_new();
evbuffer_add(ctx->log_resp_body, body_frag, frag_size);
}
- proxy_send_metric_log(stream, ctx, thread_id, 1);
+
+ if((((ctx_actually_replaced(ctx)) || (ctx_actually_inserted(ctx)) || (ctx_actually_edited(ctx)) || (ctx_actually_manipulate(ctx))
+ || ctx_actually_ran_script(ctx)) || ctx->action == PX_ACTION_REJECT || (ctx->action == PX_ACTION_MONIT)))
+ {
+ proxy_send_metric_log(stream, ctx, thread_id, 1);
+ }
return;
}
@@ -2910,80 +2988,6 @@ void proxy_on_http_begin(const struct tfe_stream *stream, const struct tfe_http_
return;
}
-static inline int ctx_actually_replaced(struct proxy_http_ctx * ctx)
-{
-
- if(ctx->action == PX_ACTION_MANIPULATE &&
- ctx->param->action == MA_ACTION_REPLACE &&
- ctx->rep_ctx->actually_replaced==1)
- {
- return 1;
- }
- else
- {
- return 0;
- }
-}
-
-static inline int ctx_actually_ran_script(struct proxy_http_ctx * ctx)
-{
- if(ctx->action == PX_ACTION_MANIPULATE &&
- ctx->param->action == MA_ACTION_LUA_SCRIPT &&
- ctx->tsg_ctx->actually_executed==1)
- {
- return 1;
- }
- else
- {
- return 0;
- }
-}
-
-static inline int ctx_actually_inserted(struct proxy_http_ctx * ctx)
-{
-
- if(ctx->action == PX_ACTION_MANIPULATE &&
- ctx->param->action == MA_ACTION_INSERT &&
- ctx->ins_ctx->actually_inserted==1)
- {
- return 1;
- }
- else
- {
- return 0;
- }
-}
-
-static inline int ctx_actually_edited(struct proxy_http_ctx * ctx)
-{
-
- if(ctx->action == PX_ACTION_MANIPULATE &&
- ctx->param->action == MA_ACTION_ELEMENT && ctx->edit_ctx != NULL &&
- ctx->edit_ctx->actually_edited==1)
- {
- return 1;
- }
- else
- {
- return 0;
- }
-}
-
-static inline int ctx_actually_manipulate(struct proxy_http_ctx * ctx)
-{
- if(ctx->action == PX_ACTION_MANIPULATE &&
- (ctx->param->action == MA_ACTION_REDIRECT ||
- ctx->param->action == MA_ACTION_HIJACK)&&
- ctx->manipulate_replaced==1)
- {
- return 1;
- }
- else
- {
- return 0;
- }
-}
-
void proxy_on_http_end(const struct tfe_stream * stream,
const struct tfe_http_session * session, unsigned int thread_id, void ** pme)
{
diff --git a/plugin/business/tsg-http/src/tsg_logger.cpp b/plugin/business/tsg-http/src/tsg_logger.cpp
index 6673d83..4ae7203 100644
--- a/plugin/business/tsg-http/src/tsg_logger.cpp
+++ b/plugin/business/tsg-http/src/tsg_logger.cpp
@@ -253,7 +253,7 @@ int proxy_send_log(struct proxy_logger* handle, const struct proxy_log* log_msg)
cJSON_AddStringToObject(common_obj, "http_version", app_proto[http->major_version]);
cJSON_AddStringToObject(common_obj, "decoded_as", "HTTP");
- cJSON_AddStringToObject(common_obj, "ip_protocol", "TCP");
+ cJSON_AddStringToObject(common_obj, "ip_protocol", "tcp");
cJSON_AddNumberToObject(common_obj, "out_link_id", 0);
cJSON_AddNumberToObject(common_obj, "in_link_id", 0);
cJSON_AddStringToObject(common_obj, "sled_ip", handle->kafka_logger->local_ip_str);
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-31 00:29:15 +0000