适配服务分类(fqdn_cat)

2 files changed, 75 insertions, 74 deletions

diff --git a/resource/table_info_proxy.conf b/resource/table_info_proxy.conf
index 1cda569..08089ef 100644
--- a/resource/table_info_proxy.conf
+++ b/resource/table_info_proxy.conf
@@ -15,35 +15,35 @@
 #
 #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       GROUP_COMPILE_RELATION  group2compile   --
-2       GROUP_GROUP_RELATION    group2group     --
-3       TSG_OBJ_IP_ADDR ip_plus ---
-4       TSG_OBJ_URL     expr    UTF8    GBK/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8      yes     0       quickoff
-5       TSG_FIELD_HTTP_URL      virtual TSG_OBJ_URL     --
-6       TSG_OBJ_FQDN    expr    UTF8    GBK/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8      yes     0       quickoff
-6       TSG_OBJ_FQDN_CAT        expr    UTF8    GBK/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8      yes     0       quickoff
-7       TSG_FIELD_HTTP_HOST     virtual TSG_OBJ_FQDN    --
-8       TSG_OBJ_HTTP_SIGNATURE  expr_plus       UTF8    UTF8    yes     0       quickoff
-9       TSG_FIELD_HTTP_REQ_HDR  virtual TSG_OBJ_HTTP_SIGNATURE  --
-10       TSG_FIELD_HTTP_RES_HDR  virtual TSG_OBJ_HTTP_SIGNATURE  --
-11      TSG_OBJ_KEYWORDS expr   UTF8    GBK/UNICODE/UTF8/windows-1251        yes     128     quickoff
-12      TSG_FIELD_HTTP_REQ_CONTENT      virtual TSG_OBJ_KEYWORDS --
-13      TSG_FIELD_HTTP_RES_CONTENT      virtual TSG_OBJ_KEYWORDS --
-14      TSG_OBJ_SUBSCRIBER_ID   expr    UTF8    UTF8    yes     0       quickon
-15	TSG_OBJ_APP_ID	intval	UTF8	UTF8	yes	0
-16	TSG_SECURITY_SOURCE_ADDR	virtual	TSG_OBJ_IP_ADDR	--
-17	TSG_SECURITY_DESTINATION_ADDR	virtual	TSG_OBJ_IP_ADDR	--
-18	TSG_SECURITY_ADDR	composition	{"source":"TSG_SECURITY_SOURCE_ADDR","destination":"TSG_SECURITY_DESTINATION_ADDR"}
-19 	TSG_IP_ASN_BUILT_IN     ip_plugin {"row_id":1,"ip_type":2,"start_ip":3,"end_ip":4,"valid":7,"estimate_size":4194304}
-20	TSG_IP_ASN_USER_DEFINED ip_plugin {"row_id":1,"ip_type":2,"start_ip":3,"end_ip":4,"valid":7,"estimate_size":4194304}
-21	TSG_IP_LOCATION_BUILT_IN    ip_plugin   {"row_id":1,"ip_type":3,"start_ip":4,"end_ip":5,"valid":18,"estimate_size":4194304}
-22	TSG_IP_LOCATION_USER_DEFINED    ip_plugin   {"row_id":1,"ip_type":3,"start_ip":4,"end_ip":5,"valid":18,"estimate_size":4194304}
-23	TSG_OBJ_AS_NUMBER   expr    UTF8    UTF8/GBK    yes 0
-24	TSG_SECURITY_SOURCE_ASN virtual TSG_OBJ_AS_NUMBER   --
-25	TSG_SECURITY_DESTINATION_ASN    virtual TSG_OBJ_AS_NUMBER   --
-26	TSG_OBJ_GEO_LOCATION    expr    UTF8    UTF8/GBK    yes 0
-27	TSG_SECURITY_SOURCE_LOCATION    virtual TSG_OBJ_GEO_LOCATION    --
-28	TSG_SECURITY_DESTINATION_LOCATION   virtual TSG_OBJ_GEO_LOCATION    --
-29	TSG_FIELD_DOH_QNAME virtual TSG_OBJ_FQDN    --
-30	TSG_FIELD_DOH_HOST  virtual TSG_OBJ_FQDN    --
+0	PXY_CTRL_COMPILE        compile escape  --
+1	GROUP_COMPILE_RELATION  group2compile   --
+2	GROUP_GROUP_RELATION    group2group     --
+3	TSG_OBJ_IP_ADDR ip_plus ---
+4	TSG_OBJ_URL     expr    UTF8    GBK/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8      yes     0       quickoff
+5	TSG_FIELD_HTTP_URL      virtual TSG_OBJ_URL     --
+6	TSG_OBJ_FQDN    expr    UTF8    GBK/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8      yes     0       quickoff
+7	TSG_OBJ_FQDN_CAT	intval	UTF8	UTF8	yes	0
+8	TSG_FIELD_HTTP_HOST     virtual ["TSG_OBJ_FQDN","TSG_OBJ_FQDN_CAT"]    --
+9	TSG_OBJ_HTTP_SIGNATURE  expr_plus       UTF8    UTF8    yes     0       quickoff
+10	TSG_FIELD_HTTP_REQ_HDR  virtual TSG_OBJ_HTTP_SIGNATURE  --
+11	TSG_FIELD_HTTP_RES_HDR  virtual TSG_OBJ_HTTP_SIGNATURE  --
+12	TSG_OBJ_KEYWORDS expr   UTF8    GBK/UNICODE/UTF8/windows-1251        yes     128     quickoff
+13	TSG_FIELD_HTTP_REQ_CONTENT      virtual TSG_OBJ_KEYWORDS --
+14	TSG_FIELD_HTTP_RES_CONTENT      virtual TSG_OBJ_KEYWORDS --
+15	TSG_OBJ_SUBSCRIBER_ID   expr    UTF8    UTF8    yes     0       quickon
+16	TSG_OBJ_APP_ID	intval	UTF8	UTF8	yes	0
+17	TSG_SECURITY_SOURCE_ADDR	virtual	TSG_OBJ_IP_ADDR	--
+18	TSG_SECURITY_DESTINATION_ADDR	virtual	TSG_OBJ_IP_ADDR	--
+19	TSG_SECURITY_ADDR	composition	{"source":"TSG_SECURITY_SOURCE_ADDR","destination":"TSG_SECURITY_DESTINATION_ADDR"}
+20 	TSG_IP_ASN_BUILT_IN     ip_plugin {"row_id":1,"ip_type":2,"start_ip":3,"end_ip":4,"valid":7,"estimate_size":4194304}
+21	TSG_IP_ASN_USER_DEFINED ip_plugin {"row_id":1,"ip_type":2,"start_ip":3,"end_ip":4,"valid":7,"estimate_size":4194304}
+22	TSG_IP_LOCATION_BUILT_IN    ip_plugin   {"row_id":1,"ip_type":3,"start_ip":4,"end_ip":5,"valid":18,"estimate_size":4194304}
+23	TSG_IP_LOCATION_USER_DEFINED    ip_plugin   {"row_id":1,"ip_type":3,"start_ip":4,"end_ip":5,"valid":18,"estimate_size":4194304}
+24	TSG_OBJ_AS_NUMBER   expr    UTF8    UTF8/GBK    yes 0
+25	TSG_SECURITY_SOURCE_ASN virtual TSG_OBJ_AS_NUMBER   --
+26	TSG_SECURITY_DESTINATION_ASN    virtual TSG_OBJ_AS_NUMBER   --
+27	TSG_OBJ_GEO_LOCATION    expr    UTF8    UTF8/GBK    yes 0
+28	TSG_SECURITY_SOURCE_LOCATION    virtual TSG_OBJ_GEO_LOCATION    --
+29	TSG_SECURITY_DESTINATION_LOCATION   virtual TSG_OBJ_GEO_LOCATION    --
+30	TSG_FIELD_DOH_QNAME virtual ["TSG_OBJ_FQDN","TSG_OBJ_FQDN_CAT"]    --
+31	TSG_FIELD_DOH_HOST  virtual ["TSG_OBJ_FQDN","TSG_OBJ_FQDN_CAT"]    --
diff --git a/resource/table_info_security.conf b/resource/table_info_security.conf
index 7d3ca97..c78adee 100644
--- a/resource/table_info_security.conf
+++ b/resource/table_info_security.conf
@@ -8,52 +8,53 @@
 #cross cache 0~max
 #quickswitch quickon or quick off
 #id	name			type	src_charset	dst_charset	do_merge cross_cache quickswitch
-0       TSG_SECURITY_COMPILE    compile escape  --
-1       GROUP_COMPILE_RELATION  group2compile   --
-2       GROUP_GROUP_RELATION    group2group     --
+0	TSG_SECURITY_COMPILE    compile escape  --
+1	GROUP_COMPILE_RELATION  group2compile   --
+2	GROUP_GROUP_RELATION    group2group     --
 3	TSG_OBJ_IP_ADDR	ip_plus	UTF8	UTF8	no	0
 4	TSG_OBJ_SUBSCRIBER_ID	expr	UTF8	UTF8	yes	0
 5	TSG_OBJ_ACCOUNT	expr	UTF8	UTF8	yes	0
 6	TSG_OBJ_URL	expr	UTF8	UTF8/GBK	yes	0
 7	TSG_OBJ_FQDN	expr	UTF8	UTF8	yes	0
-7	TSG_OBJ_FQDN_CAT	expr	UTF8	UTF8	yes	0
-8	TSG_OBJ_KEYWORDS	expr	UTF8	UTF8/GBK/windows-1251	yes	0
-9	TSG_OBJ_APP_ID	intval	UTF8	UTF8	yes	0
-10	TSG_OBJ_HTTP_SIGNATURE	expr_plus	UTF8	UTF8/GBK	yes	0
-11	TSG_FIELD_HTTP_HOST	virtual	TSG_OBJ_FQDN	--
-12	TSG_FIELD_HTTP_URL	virtual	TSG_OBJ_URL	--
-13	TSG_FIELD_HTTP_REQ_HDR	virtual	TSG_OBJ_HTTP_SIGNATURE	--
-14	TSG_FIELD_HTTP_RES_HDR	virtual	TSG_OBJ_HTTP_SIGNATURE	--
-15	TSG_FIELD_HTTP_REQ_CONTENT	virtual	TSG_OBJ_KEYWORDS	--
-16	TSG_FIELD_HTTP_RES_CONTENT	virtual	TSG_OBJ_KEYWORDS	--
-17	TSG_FIELD_SSL_SNI	virtual	TSG_OBJ_FQDN	--
-18	TSG_FIELD_SSL_CN	virtual	TSG_OBJ_FQDN	--
-19	TSG_FIELD_SSL_SAN	virtual	TSG_OBJ_FQDN	--
-20	TSG_FIELD_DNS_QNAME	virtual	TSG_OBJ_FQDN	--
-21	TSG_FIELD_QUIC_SNI	virtual	TSG_OBJ_FQDN	--
-22	TSG_FIELD_MAIL_ACCOUNT	virtual	TSG_OBJ_ACCOUNT	--
-23	TSG_FIELD_MAIL_FROM	virtual	TSG_OBJ_ACCOUNT	--
-24	TSG_FIELD_MAIL_TO	virtual	TSG_OBJ_ACCOUNT	--
-25	TSG_FIELD_MAIL_SUBJECT	virtual	TSG_OBJ_KEYWORDS	--
-26	TSG_FIELD_MAIL_CONTENT	virtual	TSG_OBJ_KEYWORDS	--
-27	TSG_FIELD_MAIL_ATT_NAME	virtual	TSG_OBJ_KEYWORDS	--
-28	TSG_FIELD_MAIL_ATT_CONTENT	virtual	TSG_OBJ_KEYWORDS	--
-29	TSG_FIELD_FTP_URI	virtual	TSG_OBJ_URL	--
-30	TSG_FIELD_FTP_CONTENT	virtual	TSG_OBJ_KEYWORDS	--
-31	TSG_FIELD_FTP_ACCOUNT	virtual	TSG_OBJ_ACCOUNT	--
-32	TSG_SECURITY_SOURCE_ADDR	virtual	TSG_OBJ_IP_ADDR	--
-33	TSG_SECURITY_DESTINATION_ADDR	virtual	TSG_OBJ_IP_ADDR	--
-34	TSG_SECURITY_ADDR	composition	{"source":"TSG_SECURITY_SOURCE_ADDR","destination":"TSG_SECURITY_DESTINATION_ADDR"}
-35      TSG_IP_ASN_BUILT_IN     ip_plugin {"row_id":1,"ip_type":2,"start_ip":3,"end_ip":4,"valid":7,"estimate_size":4194304}
-36      TSG_IP_ASN_USER_DEFINED ip_plugin {"row_id":1,"ip_type":2,"start_ip":3,"end_ip":4,"valid":7,"estimate_size":4194304}
-37      TSG_IP_LOCATION_BUILT_IN        ip_plugin {"row_id":1,"ip_type":3,"start_ip":4,"end_ip":5,"valid":18,"estimate_size":4194304}
-38      TSG_IP_LOCATION_USER_DEFINED    ip_plugin {"row_id":1,"ip_type":3,"start_ip":4,"end_ip":5,"valid":18,"estimate_size":4194304}
-39      TSG_OBJ_AS_NUMBER       expr    UTF8    UTF8/GBK        yes     0
-40      TSG_SECURITY_SOURCE_ASN virtual TSG_OBJ_AS_NUMBER       --
-41      TSG_SECURITY_DESTINATION_ASN    virtual TSG_OBJ_AS_NUMBER       --
-42      TSG_OBJ_GEO_LOCATION    expr    UTF8    UTF8/GBK        yes     0
-43      TSG_SECURITY_SOURCE_LOCATION    virtual TSG_OBJ_GEO_LOCATION    --
-44      TSG_SECURITY_DESTINATION_LOCATION       virtual TSG_OBJ_GEO_LOCATION    --
-
+8	TSG_OBJ_FQDN_CAT	intval	UTF8	UTF8	yes	0
+9	TSG_OBJ_KEYWORDS	expr	UTF8	UTF8/GBK/windows-1251	yes	0
+10	TSG_OBJ_APP_ID	intval	UTF8	UTF8	yes	0
+11	TSG_OBJ_HTTP_SIGNATURE	expr_plus	UTF8	UTF8/GBK	yes	0
+12	TSG_FIELD_HTTP_HOST	virtual	["TSG_OBJ_FQDN","TSG_OBJ_FQDN_CAT"]	--
+13	TSG_FIELD_HTTP_URL	virtual	TSG_OBJ_URL	--
+14	TSG_FIELD_HTTP_REQ_HDR	virtual	TSG_OBJ_HTTP_SIGNATURE	--
+15	TSG_FIELD_HTTP_RES_HDR	virtual	TSG_OBJ_HTTP_SIGNATURE	--
+16	TSG_FIELD_HTTP_REQ_CONTENT	virtual	TSG_OBJ_KEYWORDS	--
+17	TSG_FIELD_HTTP_RES_CONTENT	virtual	TSG_OBJ_KEYWORDS	--
+18	TSG_FIELD_SSL_SNI	virtual	["TSG_OBJ_FQDN","TSG_OBJ_FQDN_CAT"]	--
+19	TSG_FIELD_SSL_CN	virtual	["TSG_OBJ_FQDN","TSG_OBJ_FQDN_CAT"]	--
+20	TSG_FIELD_SSL_SAN	virtual	["TSG_OBJ_FQDN","TSG_OBJ_FQDN_CAT"]	--
+21	TSG_FIELD_DNS_QNAME	virtual	["TSG_OBJ_FQDN","TSG_OBJ_FQDN_CAT"]	--
+22	TSG_FIELD_QUIC_SNI	virtual	["TSG_OBJ_FQDN","TSG_OBJ_FQDN_CAT"]	--
+23	TSG_FIELD_MAIL_ACCOUNT	virtual	TSG_OBJ_ACCOUNT	--
+24	TSG_FIELD_MAIL_FROM	virtual	TSG_OBJ_ACCOUNT	--
+25	TSG_FIELD_MAIL_TO	virtual	TSG_OBJ_ACCOUNT	--
+26	TSG_FIELD_MAIL_SUBJECT	virtual	TSG_OBJ_KEYWORDS	--
+27	TSG_FIELD_MAIL_CONTENT	virtual	TSG_OBJ_KEYWORDS	--
+28	TSG_FIELD_MAIL_ATT_NAME	virtual	TSG_OBJ_KEYWORDS	--
+29	TSG_FIELD_MAIL_ATT_CONTENT	virtual	TSG_OBJ_KEYWORDS	--
+30	TSG_FIELD_FTP_URI	virtual	TSG_OBJ_URL	--
+31	TSG_FIELD_FTP_CONTENT	virtual	TSG_OBJ_KEYWORDS	--
+32	TSG_FIELD_FTP_ACCOUNT	virtual	TSG_OBJ_ACCOUNT	--
+33	TSG_SECURITY_SOURCE_ADDR	virtual	TSG_OBJ_IP_ADDR	--
+34	TSG_SECURITY_DESTINATION_ADDR	virtual	TSG_OBJ_IP_ADDR	--
+35	TSG_SECURITY_ADDR	composition	{"source":"TSG_SECURITY_SOURCE_ADDR","destination":"TSG_SECURITY_DESTINATION_ADDR"}
+36	TSG_IP_ASN_BUILT_IN     ip_plugin {"row_id":1,"ip_type":2,"start_ip":3,"end_ip":4,"valid":7,"estimate_size":4194304}
+37	TSG_IP_ASN_USER_DEFINED ip_plugin {"row_id":1,"ip_type":2,"start_ip":3,"end_ip":4,"valid":7,"estimate_size":4194304}
+38	TSG_IP_LOCATION_BUILT_IN        ip_plugin {"row_id":1,"ip_type":3,"start_ip":4,"end_ip":5,"valid":18,"estimate_size":4194304}
+39	TSG_IP_LOCATION_USER_DEFINED    ip_plugin {"row_id":1,"ip_type":3,"start_ip":4,"end_ip":5,"valid":18,"estimate_size":4194304}
+40	TSG_OBJ_AS_NUMBER       expr    UTF8    UTF8/GBK        yes     0
+41	TSG_SECURITY_SOURCE_ASN virtual TSG_OBJ_AS_NUMBER       --
+42	TSG_SECURITY_DESTINATION_ASN    virtual TSG_OBJ_AS_NUMBER       --
+43	TSG_OBJ_GEO_LOCATION    expr    UTF8    UTF8/GBK        yes     0
+44	TSG_SECURITY_SOURCE_LOCATION    virtual TSG_OBJ_GEO_LOCATION    --
+45	TSG_SECURITY_DESTINATION_LOCATION       virtual TSG_OBJ_GEO_LOCATION    --
+46	TSG_FQDN_CATEGORY_BUILT_IN	fqdn_plugin	{"row_id":1,"is_suffix_match":4,"fqdn":3,"valid":5}	--
+47	TSG_FQDN_CATEGORY_USER_DEFINED	fqdn_plugin	{"row_id":1,"is_suffix_match":4,"fqdn":3,"valid":5}	--