diff --git a/common/include/verify_policy.h b/common/include/verify_policy.h index e264958..ab0d046 100644 --- a/common/include/verify_policy.h +++ b/common/include/verify_policy.h @@ -29,6 +29,7 @@ enum compile_table_typle TSG_SERVICE_CHAINGNG, PXY_TABLE_INTERCEPT, TSG_STATISTICS, + TSG_MONITOR, PXY_TABLE_DEFENCE, __SCAN_POLICY_MAX }; diff --git a/platform/src/verify_matcher.cpp b/platform/src/verify_matcher.cpp index 4d6d48a..deda8c2 100644 --- a/platform/src/verify_matcher.cpp +++ b/platform/src/verify_matcher.cpp @@ -1026,14 +1026,14 @@ void http_get_fqdn_cat_id(struct request_query_obj *query_obj, cJSON *attributeO { fqdnObj=cJSON_CreateObject(); cJSON_AddItemToArray(sniCategory, fqdnObj); - cJSON_AddNumberToObject(fqdnObj, "categoryId", query_obj->fqdn_user.fqdn_cat_id[i]); + cJSON_AddNumberToObject(fqdnObj, "objectId", query_obj->fqdn_user.group_id[i]); } for(i=0; ifqdn_builtin.fqdn_cat_num; i++) { fqdnObj=cJSON_CreateObject(); cJSON_AddItemToArray(sniCategory, fqdnObj); - cJSON_AddNumberToObject(fqdnObj, "categoryId", query_obj->fqdn_builtin.fqdn_cat_id[i]); + cJSON_AddNumberToObject(fqdnObj, "objectId", query_obj->fqdn_builtin.group_id[i]); } } @@ -2093,7 +2093,7 @@ int maat_complie_plugin_table_init(int vsys_id, int compile_type_id) const char *table_name=NULL; const char *conjunction_table_name_map[] = {"TSG_SECURITY_COMPILE_CONJUNCTION", "PXY_CTRL_COMPILE_CONJUNCTION", "TRAFFIC_SHAPING_COMPILE_CONJUNCTION", - "SERVICE_CHAINING_COMPILE_CONJUNCTION", "PXY_INTERCEPT_COMPILE_CONJUNCTION","STATISTICS_COMPILE_CONJUNCTION"}; + "SERVICE_CHAINING_COMPILE_CONJUNCTION", "PXY_INTERCEPT_COMPILE_CONJUNCTION","STATISTICS_COMPILE_CONJUNCTION", "MONITOR_COMPILE_CONJUNCTION"}; table_name = conjunction_table_name_map[compile_type_id]; table_id=g_policy_rt->compile_table_id[compile_type_id]=maat_get_table_id(g_policy_rt->feather[vsys_id], table_name); @@ -2102,8 +2102,8 @@ int maat_complie_plugin_table_init(int vsys_id, int compile_type_id) return table_id; } - const char *plugin_table_name_map[] = {"TSG_SECURITY_COMPILE_PLUGIN", "PXY_CTRL_COMPILE_PLUGIN", "TRAFFIC_SHAPING_COMPILE_PLUGIN", - "SERVICE_CHAINING_COMPILE_PLUGIN", "PXY_INTERCEPT_COMPILE_PLUGIN", "STATISTICS_COMPILE_PLUGIN"}; + const char *plugin_table_name_map[] = {"TSG_SECURITY_COMPILE_PLUGIN", "PXY_CTRL_COMPILE_PLUGIN", "TRAFFIC_SHAPING_COMPILE_PLUGIN", + "SERVICE_CHAINING_COMPILE_PLUGIN", "PXY_INTERCEPT_COMPILE_PLUGIN", "STATISTICS_COMPILE_PLUGIN", "MONITOR_COMPILE_PLUGIN"}; table_name = plugin_table_name_map[compile_type_id]; table_id = g_policy_rt->plugin_table_id[compile_type_id]=maat_get_table_id(g_policy_rt->feather[vsys_id], table_name); diff --git a/platform/src/verify_policy.cpp b/platform/src/verify_policy.cpp index 15c7002..0231215 100644 --- a/platform/src/verify_policy.cpp +++ b/platform/src/verify_policy.cpp @@ -75,6 +75,7 @@ int tsg_policy_type_str2idx(const char *action_str) policy_name[TSG_SERVICE_CHAINGNG] = "service_chaining"; policy_name[PXY_TABLE_INTERCEPT] = "pxy_intercept"; policy_name[TSG_STATISTICS] = "statistics"; + policy_name[TSG_MONITOR] = "monitor"; policy_name[PXY_TABLE_DEFENCE] = "active_defence"; size_t i = 0; diff --git a/resource/table_info.conf b/resource/table_info.conf index 93fa867..3c67d49 100644 --- a/resource/table_info.conf +++ b/resource/table_info.conf @@ -2,20 +2,6 @@ { "table_id":0, "table_name":"TSG_SECURITY_COMPILE", - "table_type":"compile", - "user_region_encoded":"escape", - "valid_column":8, - "custom": { - "compile_id":1, - "tags":6, - "clause_num":9 - } - }, - { - "table_id":1, - "table_name":"TSG_SECURITY_COMPILE_CONJUNCTION", - "db_tables":["TSG_SECURITY_COMPILE"], - "default_compile_table":1, "table_type":"compile", "user_region_encoded":"escape", "valid_column":8, @@ -25,10 +11,24 @@ "clause_num":9 } }, - { + { + "table_id":1, + "table_name":"TSG_SECURITY_COMPILE_CONJUNCTION", + "db_tables":["TSG_SECURITY_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { "table_id":2, "table_name":"TSG_SECURITY_COMPILE_PLUGIN", - "db_tables":["TSG_SECURITY_COMPILE"], + "db_tables":["TSG_SECURITY_COMPILE"], "table_type":"plugin", "valid_column":8, "custom": { @@ -37,7 +37,7 @@ "key_len":8 } }, - { + { "table_id":3, "table_name":"GROUP_SECURITY_COMPILE_RELATION", "table_type":"group2compile", @@ -51,25 +51,25 @@ "clause_index":6 } }, - { + { "table_id":4, "table_name":"PXY_CTRL_COMPILE", "table_type":"compile", - "user_region_encoded":"escape", + "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, "tags":6, "clause_num":9 - } + } }, { "table_id":5, "table_name":"PXY_CTRL_COMPILE_CONJUNCTION", - "db_tables":["PXY_CTRL_COMPILE"], - "default_compile_table":1, + "db_tables":["PXY_CTRL_COMPILE"], + "default_compile_table":1, "table_type":"compile", - "user_region_encoded":"escape", + "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, @@ -80,13 +80,13 @@ { "table_id":6, "table_name":"PXY_CTRL_COMPILE_PLUGIN", - "db_tables":["PXY_CTRL_COMPILE"], + "db_tables":["PXY_CTRL_COMPILE"], "table_type":"plugin", "valid_column":8, "custom": { "key":1, - "key_type":"integer", - "key_len": 8 + "key_type":"integer", + "key_len": 8 } }, { @@ -107,7 +107,7 @@ "table_id":8, "table_name":"TRAFFIC_SHAPING_COMPILE", "table_type":"compile", - "user_region_encoded":"escape", + "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, @@ -118,10 +118,10 @@ { "table_id":9, "table_name":"TRAFFIC_SHAPING_COMPILE_CONJUNCTION", - "db_tables":["TRAFFIC_SHAPING_COMPILE"], - "default_compile_table":1, + "db_tables":["TRAFFIC_SHAPING_COMPILE"], + "default_compile_table":1, "table_type":"compile", - "user_region_encoded":"escape", + "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, @@ -132,13 +132,13 @@ { "table_id":10, "table_name":"TRAFFIC_SHAPING_COMPILE_PLUGIN", - "db_tables":["TRAFFIC_SHAPING_COMPILE"], + "db_tables":["TRAFFIC_SHAPING_COMPILE"], "table_type":"plugin", "valid_column":8, "custom": { "key":1, - "key_type":"integer", - "key_len": 8 + "key_type":"integer", + "key_len": 8 } }, { @@ -159,7 +159,7 @@ "table_id":12, "table_name":"SERVICE_CHAINING_COMPILE", "table_type":"compile", - "user_region_encoded":"escape", + "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, @@ -170,10 +170,10 @@ { "table_id":13, "table_name":"SERVICE_CHAINING_COMPILE_CONJUNCTION", - "db_tables":["SERVICE_CHAINING_COMPILE"], - "default_compile_table":1, + "db_tables":["SERVICE_CHAINING_COMPILE"], + "default_compile_table":1, "table_type":"compile", - "user_region_encoded":"escape", + "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, @@ -184,13 +184,13 @@ { "table_id":14, "table_name":"SERVICE_CHAINING_COMPILE_PLUGIN", - "db_tables":["SERVICE_CHAINING_COMPILE"], + "db_tables":["SERVICE_CHAINING_COMPILE"], "table_type":"plugin", "valid_column":8, "custom": { "key":1, - "key_type":"integer", - "key_len": 8 + "key_type":"integer", + "key_len": 8 } }, { @@ -219,7 +219,7 @@ "clause_num":9 } }, - { + { "table_id":17, "table_name":"PXY_INTERCEPT_COMPILE_CONJUNCTION", "db_tables":["PXY_INTERCEPT_COMPILE"], @@ -231,17 +231,17 @@ "compile_id":1, "tags":6, "clause_num":9 - } + } }, - { + { "table_id":18, "table_name":"PXY_INTERCEPT_COMPILE_PLUGIN", - "db_tables":["PXY_INTERCEPT_COMPILE"], + "db_tables":["PXY_INTERCEPT_COMPILE"], "table_type":"plugin", "valid_column":8, "custom": { "key":1, - "key_type":"integer", + "key_type":"integer", "key_len":8 } }, @@ -259,7 +259,7 @@ "clause_index":6 } }, - { + { "table_id":20, "table_name":"STATISTICS_COMPILE", "table_type":"compile", @@ -271,7 +271,7 @@ "clause_num":9 } }, - { + { "table_id":21, "table_name":"STATISTICS_COMPILE_CONJUNCTION", "db_tables":["STATISTICS_COMPILE"], @@ -285,10 +285,10 @@ "clause_num":9 } }, - { + { "table_id":22, "table_name":"STATISTICS_COMPILE_PLUGIN", - "db_tables":["STATISTICS_COMPILE"], + "db_tables":["STATISTICS_COMPILE"], "table_type":"plugin", "valid_column":8, "custom": { @@ -313,18 +313,70 @@ }, { "table_id":24, + "table_name":"MONITOR_COMPILE", + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { + "table_id":25, + "table_name":"MONITOR_COMPILE_CONJUNCTION", + "db_tables":["MONITOR_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { + "table_id":26, + "table_name":"MONITOR_COMPILE_PLUGIN", + "db_tables":["MONITOR_COMPILE"], + "table_type":"plugin", + "valid_column":8, + "custom": { + "key":1, + "key_type":"integer", + "key_len": 8 + } + }, + { + "table_id":27, + "table_name":"GROUP_MONITOR_COMPILE_RELATION", + "table_type":"group2compile", + "associated_compile_table_id":25, + "valid_column":3, + "custom": { + "group_id":1, + "compile_id":2, + "not_flag":4, + "virtual_table_name":5, + "clause_index":6 + } + }, + { + "table_id":28, "table_name":"GROUP_GROUP_RELATION", "table_type":"group2group", "valid_column":4, "custom": { "group_id":1, "super_group_id":2, - "is_exclude":3 + "is_exclude":3 } }, { - "table_id":25, - "table_name":"TSG_OBJ_IP", + "table_id":29, + "table_name":"TSG_OBJ_IP", "db_tables":["TSG_OBJ_IP_ADDR","TSG_OBJ_IP_LEARNING_ADDR"], "table_type":"ip_plus", "valid_column":11, @@ -341,8 +393,8 @@ "protocol":10 } }, - { - "table_id":26, + { + "table_id":30, "table_name":"TSG_OBJ_SUBSCRIBER_ID", "table_type":"expr", "valid_column":7, @@ -355,8 +407,8 @@ "is_hexbin":6 } }, - { - "table_id":27, + { + "table_id":31, "table_name":"TSG_OBJ_ACCOUNT", "table_type":"expr", "valid_column":7, @@ -369,8 +421,8 @@ "is_hexbin":6 } }, - { - "table_id":28, + { + "table_id":32, "table_name":"TSG_OBJ_URL", "table_type":"expr", "valid_column":7, @@ -383,8 +435,8 @@ "is_hexbin":6 } }, - { - "table_id":29, + { + "table_id":33, "table_name":"TSG_OBJ_FQDN", "table_type":"expr", "valid_column":7, @@ -397,8 +449,8 @@ "is_hexbin":6 } }, - { - "table_id":30, + { + "table_id":34, "table_name":"TSG_OBJ_FQDN_CAT", "table_type":"interval", "valid_column":5, @@ -409,8 +461,8 @@ "up_bound":4 } }, - { - "table_id":31, + { + "table_id":35, "table_name":"TSG_OBJ_KEYWORDS", "table_type":"expr", "valid_column":7, @@ -423,8 +475,8 @@ "is_hexbin":6 } }, - { - "table_id":33, + { + "table_id":36, "table_name":"TSG_OBJ_HTTP_SIGNATURE", "table_type":"expr_plus", "valid_column":8, @@ -439,181 +491,181 @@ } }, { - "table_id": 34, + "table_id": 37, "table_name": "ATTR_HTTP_HOST_VIRTUAL", "db_tables": ["ATTR_HTTP_HOST", "ATTR_DESTINATION_SERVER_FQDN"], "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id": 35, + "table_id": 38, "table_name": "ATTR_HTTP_HOST_CAT_VIRTUAL", "db_tables": ["ATTR_HTTP_HOST_CAT", "ATTR_DESTINATION_SERVER_FQDN_CAT"], "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, - { - "table_id":36, + { + "table_id":39, "table_name":"ATTR_HTTP_URL", "table_type":"virtual", "physical_table": "TSG_OBJ_URL" }, - { - "table_id":37, + { + "table_id":40, "table_name":"ATTR_HTTP_REQ_HDR", "table_type":"virtual", "physical_table": "TSG_OBJ_HTTP_SIGNATURE" }, - { - "table_id":38, + { + "table_id":41, "table_name":"ATTR_HTTP_RES_HDR", "table_type":"virtual", "physical_table": "TSG_OBJ_HTTP_SIGNATURE" }, - { - "table_id":39, + { + "table_id":42, "table_name":"ATTR_HTTP_REQ_BODY", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, - { - "table_id":40, + { + "table_id":43, "table_name":"ATTR_HTTP_RES_BODY", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id": 41, + "table_id": 44, "table_name": "ATTR_SSL_SNI_VIRTUAL", "db_tables": ["ATTR_SSL_SNI", "ATTR_DESTINATION_SERVER_FQDN"], "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id": 42, + "table_id": 45, "table_name": "ATTR_SSL_SNI_CAT_VIRTUAL", "db_tables": ["ATTR_SSL_SNI_CAT", "ATTR_DESTINATION_SERVER_FQDN_CAT"], "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, - { - "table_id":43, + { + "table_id":46, "table_name":"ATTR_SSL_CN", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, - { - "table_id":44, + { + "table_id":47, "table_name":"ATTR_SSL_CN_CAT", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, - { - "table_id":45, + { + "table_id":48, "table_name":"ATTR_SSL_SAN", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, - { - "table_id":46, + { + "table_id":49, "table_name":"ATTR_SSL_SAN_CAT", "table_type":"virtual", "physical_table":"TSG_OBJ_FQDN_CAT" }, - { - "table_id":47, + { + "table_id":50, "table_name":"ATTR_DNS_QNAME", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id": 48, + "table_id":51, "table_name": "ATTR_QUIC_SNI_VIRTUAL", "db_tables": ["ATTR_QUIC_SNI", "ATTR_DESTINATION_SERVER_FQDN"], "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id": 49, + "table_id":52, "table_name": "ATTR_QUIC_SNI_CAT_VIRTUAL", "db_tables": ["ATTR_QUIC_SNI_CAT", "ATTR_DESTINATION_SERVER_FQDN_CAT"], "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, { - "table_id":50, + "table_id":53, "table_name":"ATTR_MAIL_ACCOUNT", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, - { - "table_id":51, + { + "table_id":54, "table_name":"ATTR_MAIL_FROM", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, - { - "table_id":52, + { + "table_id":55, "table_name":"ATTR_MAIL_TO", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, - { - "table_id":53, + { + "table_id":56, "table_name":"ATTR_MAIL_SUBJECT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, - { - "table_id":54, + { + "table_id":57, "table_name":"ATTR_MAIL_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, - { - "table_id":55, + { + "table_id":58, "table_name":"ATTR_MAIL_ATT_NAME", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, - { - "table_id":56, + { + "table_id":59, "table_name":"ATTR_MAIL_ATT_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, - { - "table_id":57, + { + "table_id":60, "table_name":"ATTR_FTP_URI", "table_type":"virtual", "physical_table": "TSG_OBJ_URL" }, - { - "table_id":58, + { + "table_id":61, "table_name":"ATTR_FTP_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, - { - "table_id":59, + { + "table_id":62, "table_name":"ATTR_FTP_ACCOUNT", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, - { - "table_id":60, + { + "table_id":63, "table_name":"ATTR_SOURCE_ADDR", "table_type":"virtual", "physical_table": "TSG_OBJ_IP" }, - { - "table_id":61, + { + "table_id":64, "table_name":"ATTR_DESTINATION_ADDR", "table_type":"virtual", "physical_table": "TSG_OBJ_IP" }, - { - "table_id":62, + { + "table_id":65, "table_name":"TSG_IP_ASN_BUILT_IN", "table_type":"ip_plugin", "valid_column":19, @@ -626,7 +678,7 @@ } }, { - "table_id":63, + "table_id":66, "table_name":"TSG_IP_ASN_USER_DEFINED", "table_type":"ip_plugin", "valid_column":19, @@ -639,7 +691,7 @@ } }, { - "table_id":64, + "table_id":67, "table_name":"TSG_IP_LOCATION_BUILT_IN", "table_type":"ip_plugin", "valid_column":19, @@ -652,7 +704,7 @@ } }, { - "table_id":65, + "table_id":68, "table_name":"TSG_IP_LOCATION_USER_DEFINED", "table_type":"ip_plugin", "valid_column":19, @@ -665,7 +717,7 @@ } }, { - "table_id":66, + "table_id":69, "table_name":"TSG_OBJ_AS_NUMBER", "table_type":"expr", "valid_column":7, @@ -678,20 +730,20 @@ "is_hexbin":6 } }, - { - "table_id":67, + { + "table_id":70, "table_name":"ATTR_SOURCE_ASN", "table_type":"virtual", "physical_table": "TSG_OBJ_AS_NUMBER" }, - { - "table_id":68, + { + "table_id":71, "table_name":"ATTR_DESTINATION_ASN", "table_type":"virtual", "physical_table": "TSG_OBJ_AS_NUMBER" }, - { - "table_id":69, + { + "table_id":72, "table_name":"TSG_OBJ_GEO_LOCATION", "table_type":"expr", "valid_column":7, @@ -704,20 +756,20 @@ "is_hexbin":6 } }, - { - "table_id":70, + { + "table_id":73, "table_name":"ATTR_SOURCE_LOCATION", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, - { - "table_id":71, + { + "table_id":74, "table_name":"ATTR_DESTINATION_LOCATION", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, - { - "table_id":72, + { + "table_id":75, "table_name":"TSG_FQDN_CATEGORY_BUILT_IN", "table_type":"fqdn_plugin", "valid_column":5, @@ -728,7 +780,7 @@ } }, { - "table_id":73, + "table_id":76, "table_name":"TSG_FQDN_CATEGORY_USER_DEFINED", "table_type":"fqdn_plugin", "valid_column":5, @@ -739,19 +791,19 @@ } }, { - "table_id":74, + "table_id":77, "table_name":"ATTR_SIP_ORIGINATOR_DESCRIPTION", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, - { - "table_id":75, + { + "table_id":78, "table_name":"ATTR_SIP_RESPONDER_DESCRIPTION", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, - { - "table_id":76, + { + "table_id":79, "table_name":"TSG_OBJ_IMSI", "table_type":"expr", "valid_column":7, @@ -764,8 +816,8 @@ "is_hexbin":6 } }, - { - "table_id":77, + { + "table_id":80, "table_name":"TSG_OBJ_PHONE_NUMBER", "table_type":"expr", "valid_column":7, @@ -778,8 +830,8 @@ "is_hexbin":6 } }, - { - "table_id":78, + { + "table_id":81, "table_name":"TSG_OBJ_APN", "table_type":"expr", "valid_column":7, @@ -792,32 +844,32 @@ "is_hexbin":6 } }, - { - "table_id":79, + { + "table_id":82, "table_name":"ATTR_GTP_IMSI", "table_type":"virtual", "physical_table": "TSG_OBJ_IMSI" }, - { - "table_id":80, + { + "table_id":83, "table_name":"ATTR_GTP_PHONE_NUMBER", "table_type":"virtual", "physical_table": "TSG_OBJ_PHONE_NUMBER" }, - { - "table_id":81, + { + "table_id":84, "table_name":"ATTR_GTP_APN", "table_type":"virtual", "physical_table": "TSG_OBJ_APN" }, - { - "table_id":82, + { + "table_id":85, "table_name":"TSG_DECYPTION_EXCLUSION_SSL_SNI", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, - { - "table_id":83, + { + "table_id":86, "table_name":"TSG_OBJ_TUNNEL_ID", "table_type":"interval", "valid_column":5, @@ -828,8 +880,8 @@ "up_bound":4 } }, - { - "table_id":84, + { + "table_id":87, "table_name":"TSG_TUNNEL_CATALOG", "table_type":"bool_plugin", "valid_column":5, @@ -838,8 +890,8 @@ "bool_expr":4 } }, - { - "table_id":85, + { + "table_id":88, "table_name":"TSG_TUNNEL_ENDPOINT", "table_type":"ip_plugin", "valid_column":6, @@ -851,8 +903,8 @@ "addr_format":7 } }, - { - "table_id":86, + { + "table_id":89, "table_name":"TSG_TUNNEL_LABEL", "table_type":"plugin", "valid_column":4, @@ -862,14 +914,14 @@ "tag":3 } }, - { - "table_id":87, + { + "table_id":90, "table_name":"ATTR_TUNNEL", "table_type":"virtual", "physical_table": "TSG_OBJ_TUNNEL_ID" }, - { - "table_id":88, + { + "table_id":91, "table_name":"TSG_OBJ_FLAG", "table_type":"flag", "valid_column":5, @@ -880,32 +932,32 @@ "flag_mask":4 } }, - { - "table_id":89, + { + "table_id":92, "table_name":"ATTR_FLAG", "table_type":"virtual", "physical_table": "TSG_OBJ_FLAG" }, { - "table_id":90, + "table_id":93, "table_name":"ATTR_DOH_QNAME", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, - { - "table_id":91, + { + "table_id":94, "table_name":"ATTR_DOH_HOST", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, - { - "table_id":92, + { + "table_id":95, "table_name":"ATTR_DOH_HOST_CAT", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, - { - "table_id":93, + { + "table_id":96, "table_name":"TSG_OBJ_IMEI", "table_type":"expr", "valid_column":7, @@ -918,14 +970,14 @@ "is_hexbin":6 } }, - { - "table_id":94, + { + "table_id":97, "table_name":"ATTR_GTP_IMEI", "table_type":"virtual", "physical_table": "TSG_OBJ_IMEI" }, { - "table_id": 95, + "table_id":98, "table_name": "APP_ID_DICT", "table_type": "plugin", "valid_column": 18, @@ -936,13 +988,13 @@ } }, { - "table_id":96, + "table_id":99, "table_name":"ATTR_SUBSCRIBER_ID", "table_type":"virtual", "physical_table": "TSG_OBJ_SUBSCRIBER_ID" }, { - "table_id":97, + "table_id":100, "table_name":"ATTR_APP_ID", "table_type":"virtual", "physical_table": "APP_ID_DICT" diff --git a/resource/table_info_simple.conf b/resource/table_info_simple.conf index 3535699..83d543f 100644 --- a/resource/table_info_simple.conf +++ b/resource/table_info_simple.conf @@ -2,20 +2,6 @@ { "table_id":0, "table_name":"TSG_SECURITY_COMPILE", - "table_type":"compile", - "user_region_encoded":"escape", - "valid_column":8, - "custom": { - "compile_id":1, - "tags":6, - "clause_num":9 - } - }, - { - "table_id":1, - "table_name":"TSG_SECURITY_COMPILE_CONJUNCTION", - "db_tables":["TSG_SECURITY_COMPILE"], - "default_compile_table":1, "table_type":"compile", "user_region_encoded":"escape", "valid_column":8, @@ -25,19 +11,33 @@ "clause_num":9 } }, - { + { + "table_id":1, + "table_name":"TSG_SECURITY_COMPILE_CONJUNCTION", + "db_tables":["TSG_SECURITY_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { "table_id":2, "table_name":"TSG_SECURITY_COMPILE_PLUGIN", - "db_tables":["TSG_SECURITY_COMPILE"], + "db_tables":["TSG_SECURITY_COMPILE"], "table_type":"plugin", "valid_column":8, "custom": { "key":1, - "key_type":"integer", + "key_type":"integer", "key_len":8 } }, - { + { "table_id":3, "table_name":"GROUP_SECURITY_COMPILE_RELATION", "table_type":"group2compile", @@ -51,25 +51,25 @@ "clause_index":6 } }, - { + { "table_id":4, "table_name":"PXY_CTRL_COMPILE", "table_type":"compile", - "user_region_encoded":"escape", + "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, "tags":6, "clause_num":9 - } + } }, { "table_id":5, "table_name":"PXY_CTRL_COMPILE_CONJUNCTION", - "db_tables":["PXY_CTRL_COMPILE"], - "default_compile_table":1, + "db_tables":["PXY_CTRL_COMPILE"], + "default_compile_table":1, "table_type":"compile", - "user_region_encoded":"escape", + "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, @@ -80,13 +80,13 @@ { "table_id":6, "table_name":"PXY_CTRL_COMPILE_PLUGIN", - "db_tables":["PXY_CTRL_COMPILE"], + "db_tables":["PXY_CTRL_COMPILE"], "table_type":"plugin", "valid_column":8, "custom": { "key":1, - "key_type":"integer", - "key_len": 8 + "key_type":"integer", + "key_len": 8 } }, { @@ -107,7 +107,7 @@ "table_id":8, "table_name":"TRAFFIC_SHAPING_COMPILE", "table_type":"compile", - "user_region_encoded":"escape", + "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, @@ -118,10 +118,10 @@ { "table_id":9, "table_name":"TRAFFIC_SHAPING_COMPILE_CONJUNCTION", - "db_tables":["TRAFFIC_SHAPING_COMPILE"], - "default_compile_table":1, + "db_tables":["TRAFFIC_SHAPING_COMPILE"], + "default_compile_table":1, "table_type":"compile", - "user_region_encoded":"escape", + "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, @@ -132,13 +132,13 @@ { "table_id":10, "table_name":"TRAFFIC_SHAPING_COMPILE_PLUGIN", - "db_tables":["TRAFFIC_SHAPING_COMPILE"], + "db_tables":["TRAFFIC_SHAPING_COMPILE"], "table_type":"plugin", "valid_column":8, "custom": { "key":1, - "key_type":"integer", - "key_len": 8 + "key_type":"integer", + "key_len": 8 } }, { @@ -159,7 +159,7 @@ "table_id":12, "table_name":"SERVICE_CHAINING_COMPILE", "table_type":"compile", - "user_region_encoded":"escape", + "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, @@ -170,10 +170,10 @@ { "table_id":13, "table_name":"SERVICE_CHAINING_COMPILE_CONJUNCTION", - "db_tables":["SERVICE_CHAINING_COMPILE"], - "default_compile_table":1, + "db_tables":["SERVICE_CHAINING_COMPILE"], + "default_compile_table":1, "table_type":"compile", - "user_region_encoded":"escape", + "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, @@ -184,7 +184,7 @@ { "table_id":14, "table_name":"SERVICE_CHAINING_COMPILE_PLUGIN", - "db_tables":["SERVICE_CHAINING_COMPILE"], + "db_tables":["SERVICE_CHAINING_COMPILE"], "table_type":"plugin", "valid_column":8, "custom": { @@ -219,7 +219,7 @@ "clause_num":9 } }, - { + { "table_id":17, "table_name":"PXY_INTERCEPT_COMPILE_CONJUNCTION", "db_tables":["PXY_INTERCEPT_COMPILE"], @@ -231,12 +231,12 @@ "compile_id":1, "tags":6, "clause_num":9 - } + } }, - { + { "table_id":18, "table_name":"PXY_INTERCEPT_COMPILE_PLUGIN", - "db_tables":["PXY_INTERCEPT_COMPILE"], + "db_tables":["PXY_INTERCEPT_COMPILE"], "table_type":"plugin", "valid_column":8, "custom": { @@ -259,7 +259,7 @@ "clause_index":6 } }, - { + { "table_id":20, "table_name":"STATISTICS_COMPILE", "table_type":"compile", @@ -271,7 +271,7 @@ "clause_num":9 } }, - { + { "table_id":21, "table_name":"STATISTICS_COMPILE_CONJUNCTION", "db_tables":["STATISTICS_COMPILE"], @@ -285,16 +285,16 @@ "clause_num":9 } }, - { + { "table_id":22, "table_name":"STATISTICS_COMPILE_PLUGIN", - "db_tables":["STATISTICS_COMPILE"], + "db_tables":["STATISTICS_COMPILE"], "table_type":"plugin", "valid_column":8, "custom": { "key":1, - "key_type":"integer", - "key_len": 8 + "key_type":"integer", + "key_len": 8 } }, { @@ -313,18 +313,70 @@ }, { "table_id":24, + "table_name":"MONITOR_COMPILE", + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { + "table_id":25, + "table_name":"MONITOR_COMPILE_CONJUNCTION", + "db_tables":["MONITOR_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { + "table_id":26, + "table_name":"MONITOR_COMPILE_PLUGIN", + "db_tables":["MONITOR_COMPILE"], + "table_type":"plugin", + "valid_column":8, + "custom": { + "key":1, + "key_type":"integer", + "key_len": 8 + } + }, + { + "table_id":27, + "table_name":"GROUP_MONITOR_COMPILE_RELATION", + "table_type":"group2compile", + "associated_compile_table_id":25, + "valid_column":3, + "custom": { + "group_id":1, + "compile_id":2, + "not_flag":4, + "virtual_table_name":5, + "clause_index":6 + } + }, + { + "table_id":28, "table_name":"GROUP_GROUP_RELATION", "table_type":"group2group", "valid_column":4, "custom": { "group_id":1, "super_group_id":2, - "is_exclude":3 + "is_exclude":3 } }, { - "table_id":25, - "table_name":"TSG_OBJ_IP", + "table_id":29, + "table_name":"TSG_OBJ_IP", "db_tables":["TSG_OBJ_IP_ADDR","TSG_OBJ_IP_LEARNING_ADDR"], "table_type":"ip_plus", "valid_column":11, @@ -341,8 +393,8 @@ "protocol":10 } }, - { - "table_id":26, + { + "table_id":30, "table_name":"TSG_OBJ_SUBSCRIBER_ID", "table_type":"expr", "valid_column":7, @@ -355,8 +407,8 @@ "is_hexbin":6 } }, - { - "table_id":27, + { + "table_id":31, "table_name":"TSG_OBJ_ACCOUNT", "table_type":"expr", "valid_column":7, @@ -369,8 +421,8 @@ "is_hexbin":6 } }, - { - "table_id":28, + { + "table_id":32, "table_name":"TSG_OBJ_URL", "table_type":"expr", "valid_column":7, @@ -383,8 +435,8 @@ "is_hexbin":6 } }, - { - "table_id":29, + { + "table_id":33, "table_name":"TSG_OBJ_FQDN", "table_type":"expr", "valid_column":7, @@ -397,8 +449,8 @@ "is_hexbin":6 } }, - { - "table_id":30, + { + "table_id":34, "table_name":"TSG_OBJ_FQDN_CAT", "table_type":"interval", "valid_column":5, @@ -409,8 +461,8 @@ "up_bound":4 } }, - { - "table_id":31, + { + "table_id":35, "table_name":"TSG_OBJ_KEYWORDS", "table_type":"expr", "valid_column":7, @@ -423,8 +475,8 @@ "is_hexbin":6 } }, - { - "table_id":33, + { + "table_id":36, "table_name":"TSG_OBJ_HTTP_SIGNATURE", "table_type":"expr_plus", "valid_column":8, @@ -439,175 +491,175 @@ } }, { - "table_id": 34, + "table_id": 37, "table_name": "ATTR_HTTP_HOST_VIRTUAL", "db_tables": ["ATTR_HTTP_HOST", "ATTR_DESTINATION_SERVER_FQDN"], "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id": 35, + "table_id": 38, "table_name": "ATTR_HTTP_HOST_CAT_VIRTUAL", "db_tables": ["ATTR_HTTP_HOST_CAT", "ATTR_DESTINATION_SERVER_FQDN_CAT"], "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, - { - "table_id":36, + { + "table_id":39, "table_name":"ATTR_HTTP_URL", "table_type":"virtual", "physical_table": "TSG_OBJ_URL" }, - { - "table_id":37, + { + "table_id":40, "table_name":"ATTR_HTTP_REQ_HDR", "table_type":"virtual", "physical_table": "TSG_OBJ_HTTP_SIGNATURE" }, - { - "table_id":38, + { + "table_id":41, "table_name":"ATTR_HTTP_RES_HDR", "table_type":"virtual", "physical_table": "TSG_OBJ_HTTP_SIGNATURE" }, - { - "table_id":39, + { + "table_id":42, "table_name":"ATTR_HTTP_REQ_BODY", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, - { - "table_id":40, + { + "table_id":43, "table_name":"ATTR_HTTP_RES_BODY", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id": 41, + "table_id": 44, "table_name": "ATTR_SSL_SNI_VIRTUAL", "db_tables": ["ATTR_SSL_SNI", "ATTR_DESTINATION_SERVER_FQDN"], "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id": 42, + "table_id": 45, "table_name": "ATTR_SSL_SNI_CAT_VIRTUAL", "db_tables": ["ATTR_SSL_SNI_CAT", "ATTR_DESTINATION_SERVER_FQDN_CAT"], "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, - { - "table_id":43, + { + "table_id":46, "table_name":"ATTR_SSL_CN", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, - { - "table_id":44, + { + "table_id":47, "table_name":"ATTR_SSL_CN_CAT", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, - { - "table_id":45, + { + "table_id":48, "table_name":"ATTR_SSL_SAN", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, - { - "table_id":46, + { + "table_id":49, "table_name":"ATTR_SSL_SAN_CAT", "table_type":"virtual", "physical_table":"TSG_OBJ_FQDN_CAT" }, - { - "table_id":47, + { + "table_id":50, "table_name":"ATTR_DNS_QNAME", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id": 48, + "table_id":51, "table_name": "ATTR_QUIC_SNI_VIRTUAL", "db_tables": ["ATTR_QUIC_SNI", "ATTR_DESTINATION_SERVER_FQDN"], "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id": 49, + "table_id":52, "table_name": "ATTR_QUIC_SNI_CAT_VIRTUAL", "db_tables": ["ATTR_QUIC_SNI_CAT", "ATTR_DESTINATION_SERVER_FQDN_CAT"], "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, { - "table_id":50, + "table_id":53, "table_name":"ATTR_MAIL_ACCOUNT", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, - { - "table_id":51, + { + "table_id":54, "table_name":"ATTR_MAIL_FROM", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, - { - "table_id":52, + { + "table_id":55, "table_name":"ATTR_MAIL_TO", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, - { - "table_id":53, + { + "table_id":56, "table_name":"ATTR_MAIL_SUBJECT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, - { - "table_id":54, + { + "table_id":57, "table_name":"ATTR_MAIL_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, - { - "table_id":55, + { + "table_id":58, "table_name":"ATTR_MAIL_ATT_NAME", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, - { - "table_id":56, + { + "table_id":59, "table_name":"ATTR_MAIL_ATT_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, - { - "table_id":57, + { + "table_id":60, "table_name":"ATTR_FTP_URI", "table_type":"virtual", "physical_table": "TSG_OBJ_URL" }, - { - "table_id":58, + { + "table_id":61, "table_name":"ATTR_FTP_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, - { - "table_id":59, + { + "table_id":62, "table_name":"ATTR_FTP_ACCOUNT", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, - { - "table_id":60, + { + "table_id":63, "table_name":"ATTR_SOURCE_ADDR", "table_type":"virtual", "physical_table": "TSG_OBJ_IP" }, - { - "table_id":61, + { + "table_id":64, "table_name":"ATTR_DESTINATION_ADDR", "table_type":"virtual", "physical_table": "TSG_OBJ_IP" @@ -626,20 +678,20 @@ "is_hexbin":6 } }, - { - "table_id":63, + { + "table_id":70, "table_name":"ATTR_SOURCE_ASN", "table_type":"virtual", "physical_table": "TSG_OBJ_AS_NUMBER" }, - { - "table_id":64, + { + "table_id":71, "table_name":"ATTR_DESTINATION_ASN", "table_type":"virtual", "physical_table": "TSG_OBJ_AS_NUMBER" }, - { - "table_id":65, + { + "table_id":72, "table_name":"TSG_OBJ_GEO_LOCATION", "table_type":"expr", "valid_column":7, @@ -652,32 +704,32 @@ "is_hexbin":6 } }, - { - "table_id":66, + { + "table_id":73, "table_name":"ATTR_SOURCE_LOCATION", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, - { - "table_id":67, + { + "table_id":74, "table_name":"ATTR_DESTINATION_LOCATION", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, - { - "table_id":68, + { + "table_id":75, "table_name":"ATTR_SIP_ORIGINATOR_DESCRIPTION", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, - { - "table_id":69, + { + "table_id":78, "table_name":"ATTR_SIP_RESPONDER_DESCRIPTION", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, - { - "table_id":70, + { + "table_id":79, "table_name":"TSG_OBJ_IMSI", "table_type":"expr", "valid_column":7, @@ -690,8 +742,8 @@ "is_hexbin":6 } }, - { - "table_id":71, + { + "table_id":80, "table_name":"TSG_OBJ_PHONE_NUMBER", "table_type":"expr", "valid_column":7, @@ -704,8 +756,8 @@ "is_hexbin":6 } }, - { - "table_id":72, + { + "table_id":81, "table_name":"TSG_OBJ_APN", "table_type":"expr", "valid_column":7, @@ -718,32 +770,32 @@ "is_hexbin":6 } }, - { - "table_id":73, + { + "table_id":82, "table_name":"ATTR_GTP_IMSI", "table_type":"virtual", "physical_table": "TSG_OBJ_IMSI" }, - { - "table_id":74, + { + "table_id":83, "table_name":"ATTR_GTP_PHONE_NUMBER", "table_type":"virtual", "physical_table": "TSG_OBJ_PHONE_NUMBER" }, - { - "table_id":75, + { + "table_id":84, "table_name":"ATTR_GTP_APN", "table_type":"virtual", "physical_table": "TSG_OBJ_APN" }, - { - "table_id":76, + { + "table_id":85, "table_name":"TSG_DECYPTION_EXCLUSION_SSL_SNI", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, - { - "table_id":77, + { + "table_id":86, "table_name":"TSG_OBJ_TUNNEL_ID", "table_type":"interval", "valid_column":5, @@ -754,8 +806,8 @@ "up_bound":4 } }, - { - "table_id":78, + { + "table_id":87, "table_name":"TSG_TUNNEL_CATALOG", "table_type":"bool_plugin", "valid_column":5, @@ -764,8 +816,8 @@ "bool_expr":4 } }, - { - "table_id":79, + { + "table_id":88, "table_name":"TSG_TUNNEL_ENDPOINT", "table_type":"ip_plugin", "valid_column":6, @@ -777,8 +829,8 @@ "addr_format":7 } }, - { - "table_id":80, + { + "table_id":89, "table_name":"TSG_TUNNEL_LABEL", "table_type":"plugin", "valid_column":4, @@ -788,14 +840,14 @@ "tag":3 } }, - { - "table_id":81, + { + "table_id":90, "table_name":"ATTR_TUNNEL", "table_type":"virtual", "physical_table": "TSG_OBJ_TUNNEL_ID" }, - { - "table_id":82, + { + "table_id":91, "table_name":"TSG_OBJ_FLAG", "table_type":"flag", "valid_column":5, @@ -806,32 +858,32 @@ "flag_mask":4 } }, - { - "table_id":83, + { + "table_id":92, "table_name":"ATTR_FLAG", "table_type":"virtual", "physical_table": "TSG_OBJ_FLAG" }, { - "table_id":84, + "table_id":93, "table_name":"ATTR_DOH_QNAME", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, - { - "table_id":85, + { + "table_id":94, "table_name":"ATTR_DOH_HOST", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, - { - "table_id":86, + { + "table_id":95, "table_name":"ATTR_DOH_HOST_CAT", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, - { - "table_id":87, + { + "table_id":96, "table_name":"TSG_OBJ_IMEI", "table_type":"expr", "valid_column":7, @@ -844,14 +896,14 @@ "is_hexbin":6 } }, - { - "table_id":88, + { + "table_id":97, "table_name":"ATTR_GTP_IMEI", "table_type":"virtual", "physical_table": "TSG_OBJ_IMEI" }, - { - "table_id": 89, + { + "table_id":98, "table_name": "APP_ID_DICT", "table_type": "plugin", "valid_column": 18, @@ -861,14 +913,14 @@ "key_len": 8 } }, - { - "table_id":90, + { + "table_id":99, "table_name":"ATTR_SUBSCRIBER_ID", "table_type":"virtual", "physical_table": "TSG_OBJ_SUBSCRIBER_ID" }, { - "table_id":91, + "table_id":100, "table_name":"ATTR_APP_ID", "table_type":"virtual", "physical_table": "APP_ID_DICT"