× 修改管控策略注册表名为虚表

× 修改table_info.conf配置

3 files changed, 30 insertions, 34 deletions

diff --git a/plugin/business/pangu-http/src/pangu_http.cpp b/plugin/business/pangu-http/src/pangu_http.cpp
index c98f3a2..0a69f04 100644
--- a/plugin/business/pangu-http/src/pangu_http.cpp
+++ b/plugin/business/pangu-http/src/pangu_http.cpp
@@ -845,14 +845,14 @@ int pangu_policy_init(const char* profile_path, const char* static_section, cons
 	}
 
 	const char * table_name[__SCAN_TABLE_MAX];
-	table_name[PXY_CTRL_IP] = "PXY_CTRL_IP";
-	table_name[PXY_CTRL_HTTP_URL] = "PXY_CTRL_HTTP_URL";
-	table_name[PXY_CTRL_HTTP_FQDN] = "TSG_OBJ_FQDN";
-	table_name[PXY_CTRL_HTTP_REQ_HDR] = "TSG_OBJ_HTTP_SIGNATURE";
-	table_name[PXY_CTRL_HTTP_REQ_BODY] = "TSG_OBJ_CONTENT";
-	table_name[PXY_CTRL_HTTP_RES_HDR] = "TSG_OBJ_HTTP_SIGNATURE";
-	table_name[PXY_CTRL_HTTP_RES_BODY] = "TSG_OBJ_CONTENT";
-	table_name[PXY_CTRL_SUBSCRIBE_ID] = "PXY_CTRL_SUBSCRIBE_ID";
+	table_name[PXY_CTRL_IP] = "TSG_OBJ_IP_ADDR";
+	table_name[PXY_CTRL_HTTP_URL] = "TSG_FIELD_HTTP_URL";
+	table_name[PXY_CTRL_HTTP_FQDN] = "TSG_FIELD_HTTP_HOST";
+	table_name[PXY_CTRL_HTTP_REQ_HDR] = "TSG_FIELD_HTTP_REQ_HDR";
+	table_name[PXY_CTRL_HTTP_REQ_BODY] = "TSG_FIELD_HTTP_REQ_CONTENT";
+	table_name[PXY_CTRL_HTTP_RES_HDR] = "TSG_FIELD_HTTP_RES_HDR";
+	table_name[PXY_CTRL_HTTP_RES_BODY] = "TSG_FIELD_HTTP_RES_CONTENT";
+	table_name[PXY_CTRL_SUBSCRIBE_ID] = "TSG_OBJ_SUBSCRIBER_ID";
 	for (int i = 0; i < __SCAN_TABLE_MAX; i++)
 	{
 		g_pangu_rt->scan_table_id[i] = Maat_table_register(g_pangu_rt->maat, table_name[i]);
diff --git a/plugin/business/traffic-mirror/src/entry.cpp b/plugin/business/traffic-mirror/src/entry.cpp
index ceaf979..b3aa60d 100644
--- a/plugin/business/traffic-mirror/src/entry.cpp
+++ b/plugin/business/traffic-mirror/src/entry.cpp
@@ -137,7 +137,7 @@ success:
     goto out;
 
 ignore:
-    TFE_LOG_ERROR(instance->logger, "table line in PXY_INTERCEPT_COMPILE ignored %s: %s", key, table_line);
+    TFE_LOG_ERROR(instance->logger, "table line in TSG_SECURITY_COMPILE ignored %s: %s", key, table_line);
     goto out;
 
 out:
diff --git a/resource/pangu/table_info.conf b/resource/pangu/table_info.conf
index 3fac254..0dc105e 100644
--- a/resource/pangu/table_info.conf
+++ b/resource/pangu/table_info.conf
@@ -16,32 +16,28 @@
 #For expr/expr_plus Table
 #id	name	type	src_charset	dst_charset	do_merge cross_cache quick_mode
 0	PXY_CTRL_COMPILE	compile	escape	--
-1	PXY_CTRL_GROUP	group	--
 1	GROUP_COMPILE_RELATION	group	--
-2	PXY_CTRL_IP	ip_plus	---
 2	TSG_OBJ_IP_ADDR	ip_plus	---
-3	PXY_CTRL_HTTP_URL	expr	UTF8	GBK/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8	yes	0	quickoff
 3	TSG_OBJ_URL	expr	UTF8	GBK/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8	yes	0	quickoff
-4	TSG_OBJ_FQDN	expr	UTF8	GBK/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8	yes	0	quickoff
-4	TSG_OBJ_FQDN_CAT	expr	UTF8	GBK/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8	yes	0	quickoff
-5	PXY_CTRL_HTTP_REQ_HDR	expr_plus	UTF8	UTF8	yes	0	quickoff
-5	TSG_OBJ_REQ_HDR	expr_plus	UTF8	UTF8	yes	0	quickoff
-6	PXY_CTRL_HTTP_REQ_BODY	expr	UTF8	GBK/UNICODE/UTF8	yes	128	quickoff
-7	PXY_CTRL_HTTP_RES_HDR	expr_plus	UTF8	UTF8	yes	0	quickoff
-7	TSG_OBJ_RES_HDR	expr_plus	UTF8	UTF8	yes	0	quickoff
+4	TSG_FIELD_HTTP_URL	virtual	TSG_OBJ_URL	--
+5	TSG_OBJ_FQDN	expr	UTF8	GBK/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8	yes	0	quickoff
+5	TSG_OBJ_FQDN_CAT	expr	UTF8	GBK/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8	yes	0	quickoff
+6	TSG_FIELD_HTTP_HOST	virtual	TSG_OBJ_FQDN	--
 7	TSG_OBJ_HTTP_SIGNATURE	expr_plus	UTF8	UTF8	yes	0	quickoff
-8	PXY_CTRL_HTTP_RES_BODY	expr	UTF8	GBK/UNICODE/UTF8	yes	128	quickoff
-8	TSG_OBJ_CONTENT	expr	UTF8	GBK/UNICODE/UTF8	yes	128	quickoff
-9	PXY_CTRL_SUBSCRIBE_ID	expr	UTF8	UTF8	yes	0	quickon
-9	TSG_OBJ_SUBSCRIBER_ID	expr	UTF8	UTF8	yes	0	quickon
-10	PXY_CACHE_COMPILE	compile	escape	--
-11	PXY_CACHE_GROUP	group	--
-12	PXY_CACHE_HTTP_URL	expr	UTF8	UTF8	yes	0	quickoff
-13	PXY_CACHE_HTTP_COOKIE	expr	UTF8	UTF8	yes	0	quickoff
-14	PXY_PROFILE_TRUSTED_CA_CERT	plugin	{"key":1,"valid":4,"foreign":"3"}
-15	PXY_OBJ_TRUSTED_CA_CRL	plugin	{"valid":4,"foreign":"3"}
-16	PXY_PROFILE_RESPONSE_PAGES plugin	{"key":1,"foreign":"4","valid":5}
-17	PXY_PROFILE_HIJACK_FILES   plugin	{"key":1,"foreign":"5","valid":6}
-18	PXY_PROFILE_INSERT_SCRIPTS plugin	{"key":1,"foreign":"4","valid":6}
-19	TSG_SECURITY_COMPILE	plugin	{"key":1,"valid":8}
-20	PXY_PROFILE_TRAFFIC_MIRROR	plugin	{"key":1,"valid":4}
+8	TSG_FIELD_HTTP_REQ_HDR	virtual	TSG_OBJ_HTTP_SIGNATURE	--
+9	TSG_FIELD_HTTP_RES_HDR	virtual	TSG_OBJ_HTTP_SIGNATURE	--
+10	TSG_OBJ_CONTENT	expr	UTF8	GBK/UNICODE/UTF8	yes	128	quickoff
+11	TSG_FIELD_HTTP_REQ_CONTENT	virtual	TSG_OBJ_CONTENT	--
+12	TSG_FIELD_HTTP_RES_CONTENT	virtual	TSG_OBJ_CONTENT	--
+13	TSG_OBJ_SUBSCRIBER_ID	expr	UTF8	UTF8	yes	0	quickon
+14	PXY_CACHE_COMPILE	compile	escape	--
+14	PXY_CACHE_GROUP	group	--
+15	PXY_CACHE_HTTP_URL	expr	UTF8	UTF8	yes	0	quickoff
+16	PXY_CACHE_HTTP_COOKIE	expr	UTF8	UTF8	yes	0	quickoff
+17	PXY_PROFILE_TRUSTED_CA_CERT	plugin	{"key":1,"valid":4,"foreign":"3"}
+18	PXY_OBJ_TRUSTED_CA_CRL	plugin	{"valid":4,"foreign":"3"}
+19	PXY_PROFILE_RESPONSE_PAGES plugin	{"key":1,"foreign":"4","valid":5}
+20	PXY_PROFILE_HIJACK_FILES   plugin	{"key":1,"foreign":"5","valid":6}
+21	PXY_PROFILE_INSERT_SCRIPTS plugin	{"key":1,"foreign":"4","valid":6}
+22	TSG_SECURITY_COMPILE	plugin	{"key":1,"valid":8}
+23	PXY_PROFILE_TRAFFIC_MIRROR	plugin	{"key":1,"valid":4}