TSG-22707 tfe adapts to maat interface changes

3 files changed, 137 insertions, 657 deletions

diff --git a/resource/pangu/doh.json b/resource/pangu/doh.json
index 4b31050..31595ff 100644
--- a/resource/pangu/doh.json
+++ b/resource/pangu/doh.json
@@ -1,5 +1,5 @@
 {
-    "compile_table": "PXY_CTRL_COMPILE",
+    "compile_table": "PXY_CTRL_RULE",
     "group_table": "GROUP_COMPILE_RELATION",
     "rules": [
         {
diff --git a/resource/pangu/pangu_http.json b/resource/pangu/pangu_http.json
index 1bb389e..84a4522 100644
--- a/resource/pangu/pangu_http.json
+++ b/resource/pangu/pangu_http.json
@@ -1,290 +1,102 @@
 {
-    "compile_table": "PXY_CTRL_COMPILE",
-    "group2compile_table": "GROUP_PXY_CTRL_COMPILE_RELATION",
-    "group2group_table": "GROUP_GROUP_RELATION",
+    "rule_table": "PXY_CTRL_RULE",
+    "object2object_table": "OBJECT_GROUP",
     "rules": [
-       {
-            "compile_id": 1021,
-            "service": 1,
-            "action": 48,
-            "do_blacklist": 1,
-			"do_log": 1,
-            "effective_range": 0,
-			"tags":"{\"tag_sets\":[[{\"tag\":\"device_id\",\"value\":[\"device_3\",\"device_4\"]}]]}",
-            "user_region": "{\"protocol\":\"http\",\"method\":\"redirect\",\"code\":302,\"to\":\"https://www.jd.com\"}",
-			"is_valid": "yes",
-            "groups": [
-                {
-					"virtual_table":"ATTR_HTTP_URL",
-                    "group_name":"http_url",
-					"group_id":101,
-					"not_flag":0,
-                    "regions": [
-                        {
-                            "table_name": "TSG_OBJ_URL",
-                            "table_type": "expr",
-                            "table_content": {
-                                "keywords": "baidu.com",
-                                "expr_type": "regex",
-                                "match_method": "sub",
-                                "format": "uncase plain"
-                            }
-                        }
-                    ]
-                },
-				{
-					"virtual_table":"ATTR_APP_ID",
-                    "group_name":"app_id",
-					"group_id":201,
-					"not_flag":0
-                }
-            ]
-        },
-		{
-            "compile_id": 1022,
+        {
+            "uuid": "40c9c6a7-70a9-48ae-9fba-ec7966edd3c6",
             "service": 1,
-            "action": 48,
+            "action": 1,
             "do_blacklist": 1,
-			"do_log": 1,
-            "effective_range": 0,
-            "tags":"{\"tag_sets\":[[{\"tag\":\"device_id\",\"value\":[\"device_3\",\"device_4\"]}]]}",
+            "do_log": 1,
             "user_region": "{\"protocol\":\"http\",\"method\":\"redirect\",\"code\":302,\"to\":\"https://www.jd.com\"}",
             "is_valid": "yes",
-            "groups": [
+            "conditions": [
                 {
-					"group_name":"http_url",
-					"virtual_table":"ATTR_HTTP_URL"
-                }
-            ]
-        },
-		{
-            "compile_id": 1023,
-            "service": 1,
-            "action": 48,
-            "do_blacklist": 1,
-			"do_log": 1,
-            "effective_range": 0,
-            "user_region": "{\"protocol\":\"http\",\"method\":\"replace\",\"rules\":[{\"search_in\":\"http_resp_body\",\"find\":\"邮箱\",\"replace_with\":\"test\"}]}",
-			"is_valid": "yes",
-            "groups": [
-                {
-					"virtual_table":"ATTR_SERVER_FQDN",
-					"group_name":"http_fqdn",
-					"group_id":102,
-					"not_flag":0,
-                    "regions": [
+                    "attribute_name": "ATTR_HTTP_URL",
+                    "objects": [
                         {
-                            "table_name": "TSG_OBJ_FQDN",
-                            "table_type": "expr",
-                            "table_content": {
-                                "keywords": "www.126.com",
-                                "expr_type": "regex",
-                                "match_method": "sub",
-                                "format": "uncase plain"
-                            }
+                            "items": [
+                                {
+                                    "table_name": "TSG_OBJ_URL",
+                                    "table_type": "expr",
+                                    "table_content": {
+                                        "keywords": "test123456",
+                                        "expr_type": "and"
+                                    }
+                                }
+                            ]
                         }
                     ]
                 }
             ]
-        },
-		{
-            "compile_id": 1024,
-            "service": 1,
-            "action": 48,
-            "do_blacklist": 1,
-			"do_log": 1,
-            "effective_range": 0,
-            "user_region":"{\"protocol\":\"http\",\"method\":\"replace\",\"rules\":[{\"search_in\":\"http_resp_body\",\"find\":\"账号登录\",\"replace_with\":\"Login\"}]}",
-            "is_valid": "yes",
-            "groups": [
-                {
-					"group_name":"http_fqdn",
-					"virtual_table":"ATTR_HTTP_HOST",
-					"not_flag":0 
-                }
-            ]
-        },
-		{
-            "compile_id": 1025,
-            "service": 1,
-            "action": 48,
-            "do_blacklist": 1,
-			"do_log": 1,
-            "effective_range": 0,
-            "user_region": "{\"protocol\":\"http\",\"method\":\"replace\",\"rules\":[{\"search_in\":\"http_resp_body\",\"find\":\"会员\",\"replace_with\":\"用户\"}]}",
-            "is_valid": "yes",
-            "groups": [
-                {
-					"group_name":"http_fqdn",
-					"virtual_table":"ATTR_DOH_QNAME",
-					"not_flag":0 
-                }
-            ]
-        },
-		{
-            "compile_id": 1026,
-            "service": 1,
-            "action": 48,
-            "do_blacklist": 1,
-			"do_log": 1,
-            "effective_range": 0,
-            "user_region": "{\"protocol\":\"http\",\"method\":\"block\",\"code\":403,\"message\":\"error\"}",
-			"is_valid": "yes",
-            "groups": [
-                {
-				    "virtual_table":"ATTR_HTTP_REQ_HDR",
-				    "group_name":"http_signature_ua",
-				    "group_id":103,
-					"not_flag":0,
-                    "regions": [
-                        {
-                            "table_name": "TSG_OBJ_HTTP_SIGNATURE",
-                            "table_type": "expr_plus",
-                            "table_content": {
-								"district": "User-Agent",
-                                "keywords": "Chrome",
-                                "expr_type": "none",
-                                "match_method": "sub",
-                                "format": "uncase plain"
-                            }
-                        }
-                    ]
-                },
-				{
-					
-		            "virtual_table":"ATTR_HTTP_REQ_HDR",
-					"group_name":"http_signature_cookie",
-					"group_id":104,
-		            "not_flag":0,
-		            "regions": [
-						{
-							"table_name": "TSG_OBJ_HTTP_SIGNATURE",
-							"table_type": "expr_plus",
-		                    "table_content": {
-								"district": "Cookie",
-                                "keywords": "uid=12345678",
-                                "expr_type": "none",
-                                "match_method": "sub",
-                                "format": "uncase plain"
-                            }
-		                }	                    
-		            ]
-		        }      
-            ]
-        },
-		{
-            "compile_id": 1027,
-            "service": 1,
-            "action": 48,
-            "do_blacklist": 1,
-			"do_log": 1,
-            "effective_range": 0,
-            "user_region": "test",
-			"is_valid": "yes",
-            "groups": [
-                {
-					"virtual_table":"ATTR_HTTP_URL",
-					"group_name":"http_url_bing",
-					"group_id": 105,
-					"not_flag":0,
-                    "regions": [
-                        {
-                            "table_name": "TSG_OBJ_URL",
-                            "table_type": "expr",
-                            "table_content": {
-                                "keywords": "bing.com",
-                                "expr_type": "regex",
-                                "match_method": "sub",
-                                "format": "uncase plain"
-                            }
-                        }
-                    ]
-                }	
-            ]
-        },
-		{
-            "compile_id": 1028,
-            "service": 1,
-            "action": 48,
-            "do_blacklist": 1,
-			"do_log": 1,
-            "effective_range": 0,
-            "user_region": "{\"protocol\":\"http\",\"method\":\"block\",\"code\":403,\"message\":\"error\"}",
-            "is_valid": "yes",
-            "groups": [
-				{
-					"group_name":"http_url_bing",
-					"virtual_table":"ATTR_HTTP_URL"
-                }
-            ]
         }
-   ],
+    ],
     "plugin_table": [
         {
             "table_name": "TSG_PROFILE_TRAFFIC_MIRROR",
             "table_content": [
-                "{\"uuid\":\"TRAFFIC0-MIRR-0000-0000-000000000001\",\"vlan_ids\":[1,2,3,4,5,6,7,8,9],\"is_valid\":1}"
+                {"uuid":"TRAFFIC0-MIRR-0000-0000-000000000001","vlan_ids":[1,2,3,4,5,6,7,8,9],"is_valid":1}
             ]
         },
         {
             "table_name": "TSG_PROFILE_RESPONSE_PAGES",
             "table_content": [
-                "101\t404\thtml\t./resource/pangu/policy_file/404.html\t1"
+                {"uuid":"RESPONSE-PAGES-0000-0000-000000000001","profile_name":"404","format":"html","path":"./resource/pangu/policy_file/404.html","is_valid":1,"modified_time":"1716531859000000"}
             ]
         },
         {
             "table_name": "PXY_PROFILE_HIJACK_FILES",
             "table_content": [
-                "201\tchakanqi\tchakanqi-947KB.exe\tapplication/x-msdos-program\t./resource/pangu/policy_file/chakanqi-947KB.exe\t1"
+                {"uuid":"HIJACK-FILES-0000-0000-000000000001","profile_name":"chakanqi","content_name":"chakanqi-947KB.exe","content_type":"application/x-msdos-program","path":"./resource/pangu/policy_file/chakanqi-947KB.exe","is_valid":1,"modified_time":"1716531859000000"}
             ]
         },
-				{
+		{
             "table_name": "PXY_PROFILE_INSERT_SCRIPTS",
             "table_content": [
-                "301\ttime\tjs\t./resource/pangu/policy_file/time.js\tbefore_page_load\t1"
+                {"uuid":"INSERT-SCRIPTS-0000-0000-000000000001","profile_name":"time","format":"js","insert_on":"before_page_load","path":"./resource/pangu/policy_file/time.js","is_valid":1,"modified_time":"1716531859000000"}
             ]
         },
 		{		
             "table_name": "PXY_PROFILE_DECRYPTION",
             "table_content": [
-                "{\"uuid\":\"DECRYPT0-0000-0000-0000-000000000001\",\"decryption\":{\"dynamic_bypass\":{\"ev_cert\":0,\"cert_transparency\":0,\"mutual_authentication\":1,\"cert_pinning\":1,\"protocol_errors\":1,\"trusted_root_cert_is_not_installed_on_client\":1},\"protocol_version\":{\"min\":\"ssl3\",\"max\":\"ssl3\",\"mirror_client\":1,\"allow_http2\":1},\"certificate_checks\":{\"approach\":{\"cn\":1,\"issuer\":1,\"self-signed\":1,\"expiration\":0},\"fail_action\":\"pass-through\"}},\"is_valid\":1}",
-                "{\"uuid\":\"DECRYPT0-0000-0000-0000-000000000003\",\"decryption\":{\"dynamic_bypass\":{\"ev_cert\":1,\"cert_transparency\":1,\"mutual_authentication\":1,\"cert_pinning\":1,\"protocol_errors\":1,\"trusted_root_cert_is_not_installed_on_client\":0},\"protocol_version\":{\"min\":\"ssl3\",\"max\":\"tls13\",\"mirror_client\":1,\"allow_http2\":1},\"certificate_checks\":{\"approach\":{\"cn\":1,\"issuer\":1,\"self-signed\":1,\"expiration\":1},\"fail_action\":\"fail-close\"}},\"is_valid\":1}",
-                "{\"uuid\":\"DECRYPT0-0000-0000-0000-000000000004\",\"decryption\":{\"dynamic_bypass\":{\"ev_cert\":0,\"cert_transparency\":0,\"mutual_authentication\":0,\"cert_pinning\":0,\"protocol_errors\":0,\"trusted_root_cert_is_not_installed_on_client\":0},\"protocol_version\":{\"min\":\"ssl3\",\"max\":\"ssl3\",\"mirror_client\":0,\"allow_http2\":0},\"certificate_checks\":{\"approach\":{\"cn\":0,\"issuer\":0,\"self-signed\":0,\"expiration\":0},\"fail_action\":\"pass-through\"}},\"is_valid\":1}"
+                {"uuid":"DECRYPT0-0000-0000-0000-000000000001","decryption":{"dynamic_bypass":{"ev_cert":0,"cert_transparency":0,"mutual_authentication":1,"cert_pinning":1,"protocol_errors":1,"trusted_root_cert_is_not_installed_on_client":1},"protocol_version":{"min":"ssl3","max":"ssl3","mirror_client":1,"allow_http2":1},"certificate_checks":{"approach":{"cn":1,"issuer":1,"self-signed":1,"expiration":0},"fail_action":"pass-through"}},"is_valid":1},
+                {"uuid":"DECRYPT0-0000-0000-0000-000000000003","decryption":{"dynamic_bypass":{"ev_cert":1,"cert_transparency":1,"mutual_authentication":1,"cert_pinning":1,"protocol_errors":1,"trusted_root_cert_is_not_installed_on_client":0},"protocol_version":{"min":"ssl3","max":"tls13","mirror_client":1,"allow_http2":1},"certificate_checks":{"approach":{"cn":1,"issuer":1,"self-signed":1,"expiration":1},"fail_action":"fail-close"}},"is_valid":1},
+                {"uuid":"DECRYPT0-0000-0000-0000-000000000004","decryption":{"dynamic_bypass":{"ev_cert":0,"cert_transparency":0,"mutual_authentication":0,"cert_pinning":0,"protocol_errors":0,"trusted_root_cert_is_not_installed_on_client":0},"protocol_version":{"min":"ssl3","max":"ssl3","mirror_client":0,"allow_http2":0},"certificate_checks":{"approach":{"cn":0,"issuer":0,"self-signed":0,"expiration":0},"fail_action":"pass-through"}},"is_valid":1}
             ]
         },
 		{
             "table_name": "PXY_INTERCEPT_RULE",
             "table_content": [
-                "{\"uuid\":\"INTERCEP-0000-0000-0000-000000000001\",\"action_parameter\":{\"vsys_id\":1,\"keyring_for_trusted\":\"KERING00-TRUS-0000-0000-000000000001\",\"keyring_for_untrusted\":\"KERING00-UNTR-0000-0000-000000000001\",\"decryption_profile\":\"DECRYPT0-0000-0000-0000-000000000001\",\"tcp_option_profile\":\"TCPOPT00-0000-0000-0000-000000000001\",\"traffic_mirror\":{\"enable\":0}},\"is_valid\":1}",
-                "{\"uuid\":\"INTERCEP-0000-0000-0000-000000000002\",\"action_parameter\":{\"vsys_id\":1,\"keyring_for_trusted\":\"KERING00-TRUS-0000-0000-000000000001\",\"keyring_for_untrusted\":\"KERING00-UNTR-0000-0000-000000000001\",\"decryption_profile\":\"DECRYPT0-0000-0000-0000-000000000001\",\"tcp_option_profile\":\"TCPOPT00-0000-0000-0000-000000000001\",\"traffic_mirror\":{\"enable\":1,\"mirror_profile\":\"TRAFFIC0-MIRR-0000-0000-000000000001\"}},\"is_valid\":1}"
+                {"uuid":"INTERCEP-0000-0000-0000-000000000001","action_parameter":{"vsys_id":1,"keyring_for_trusted":"KERING00-TRUS-0000-0000-000000000001","keyring_for_untrusted":"KERING00-UNTR-0000-0000-000000000001","decryption_profile":"DECRYPT0-0000-0000-0000-000000000001","tcp_option_profile":"TCPOPT00-0000-0000-0000-000000000001","traffic_mirror":{"enable":0}},"is_valid":1},
+                {"uuid":"INTERCEP-0000-0000-0000-000000000002","action_parameter":{"vsys_id":1,"keyring_for_trusted":"KERING00-TRUS-0000-0000-000000000001","keyring_for_untrusted":"KERING00-UNTR-0000-0000-000000000001","decryption_profile":"DECRYPT0-0000-0000-0000-000000000001","tcp_option_profile":"TCPOPT00-0000-0000-0000-000000000001","traffic_mirror":{"enable":1,"mirror_profile":"TRAFFIC0-MIRR-0000-0000-000000000001"}},"is_valid":1}
             ]
         },
         {
             "table_name": "SERVICE_CHAINING_RULE",
             "table_content": [
-                "{\"uuid\":\"SC000000-0000-0000-1111-000000000001\",\"effective_range\":{},\"action_parameter\":{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[\"00000000-0000-0000-2222-000000000001\"]},\"is_valid\":1}",
-                "{\"uuid\":\"SC000000-0000-0000-1111-000000000011\",\"effective_range\":{},\"action_parameter\":{\"vsys_id\":1,\"targeted_traffic\":\"decrypted\",\"sff_profiles\":[\"00000000-0000-0000-2222-000000000001\",]},\"is_valid\":1}"
+                {"uuid":"SC000000-0000-0000-1111-000000000001","effective_range":{},"action_parameter":{"vsys_id":1,"targeted_traffic":"raw","sff_profiles":["00000000-0000-0000-2222-000000000001"]},"is_valid":1},
+                {"uuid":"SC000000-0000-0000-1111-000000000011","effective_range":{},"action_parameter":{"vsys_id":1,"targeted_traffic":"decrypted","sff_profiles":["00000000-0000-0000-2222-000000000001",]},"is_valid":1}
             ]
         },
         {
             "table_name": "PXY_PROFILE_TCP_OPTION",
             "table_content": [
-                "{\"uuid\":\"TCPOPT00-0000-0000-0000-000000000001\",\"tcp_passthrough\":0,\"bypass_duplicated_packet\":0,\"client_side_conn_param\":{\"tcp_maxseg\":{\"enable\":0,\"maxseg\":1500},\"nodelay\":1,\"keep_alive\":{\"enable\":1,\"tcp_keepcnt\":8,\"tcp_keepidle\":30,\"tcp_keepintvl\":15},\"ttl\":70,\"user_timeout\":{\"enable\":1,\"timeout_ms\":600}},\"server_side_conn_param\":{\"tcp_maxseg\":{\"enable\":0,\"maxseg\":1500},\"nodelay\":1,\"keep_alive\":{\"enable\":1,\"tcp_keepcnt\":8,\"tcp_keepidle\":30,\"tcp_keepintvl\":15},\"ttl\":70,\"user_timeout\":{\"enable\":1,\"timeout_ms\":600}},\"is_valid\":1}"
+                {"uuid":"TCPOPT00-0000-0000-0000-000000000001","tcp_passthrough":0,"bypass_duplicated_packet":0,"client_side_conn_param":{"tcp_maxseg":{"enable":0,"maxseg":1500},"nodelay":1,"keep_alive":{"enable":1,"tcp_keepcnt":8,"tcp_keepidle":30,"tcp_keepintvl":15},"ttl":70,"user_timeout":{"enable":1,"timeout_ms":600}},"server_side_conn_param":{"tcp_maxseg":{"enable":0,"maxseg":1500},"nodelay":1,"keep_alive":{"enable":1,"tcp_keepcnt":8,"tcp_keepidle":30,"tcp_keepintvl":15},"ttl":70,"user_timeout":{"enable":1,"timeout_ms":600}},"is_valid":1}
             ]
         },
         {
             "table_name": "PXY_SSL_FINGERPRINT",
             "table_content": [
-                "{\"uuid\":\"JA300000-0000-0000-0000-000000000001\",\"ja3_hash\":\"599f223c2c9ee5702f5762913889dc21\",\"pinning_state\":1,\"is_valid\":1}",
-                "{\"uuid\":\"JA300000-0000-0000-0000-000000000002\",\"ja3_hash\":\"eb149984fc9c44d85ed7f12c90d818be\",\"pinning_state\":1,\"is_valid\":1}",
-                "{\"uuid\":\"JA300000-0000-0000-0000-000000000003\",\"ja3_hash\":\"e6573e91e6eb777c0933c5b8f97f10cd\",\"pinning_state\":1,\"is_valid\":1}"
+                {"uuid":"JA300000-0000-0000-0000-000000000001","ja3_hash":"599f223c2c9ee5702f5762913889dc21","pinning_state":1,"is_valid":1},
+                {"uuid":"JA300000-0000-0000-0000-000000000002","ja3_hash":"eb149984fc9c44d85ed7f12c90d818be","pinning_state":1,"is_valid":1},
+                {"uuid":"JA300000-0000-0000-0000-000000000003","ja3_hash":"e6573e91e6eb777c0933c5b8f97f10cd","pinning_state":1,"is_valid":1}
             ]
         },
 		{
             "table_name": "APP_ID_DICT",
             "table_content": [
-	            "67\thttp\t0\tnull\tnetworking\tinfrastructure\tnetwork-protocol\t3\tused-by-malware,vulnerability,widely-used\tnull\tnull\t{\"method\":\"drop\",\"after_n_packets\":0,\"send_icmp_unreachable\":1,\"send_tcp_reset\":1}\t0\t60\t120\t30\t30\t201\t1",
-                "68\thttps\t0\tnull\tnetworking\tinfrastructure\tnetwork-protocol\t3\tused-by-malware,vulnerability,widely-used\tnull\tnull\t{\"method\":\"rate_limit\",\"bps\":1000}\t0\t0\t0\t0\t0\t68000\t1"
+	            {"app_id":67,"object_id":201,"app_name":"http","parent_app_id":0,"parent_app_name":null,"category":"general-internet","subcategory":"internet-utility","content":"unknown","risk":"1","characteristics":null,"deny_action":null,"depends_on_app_ids":"null","implicitly_uses_app_ids":"null","continue_scanning":0,"tcp_timeout":120,"udp_timeout":120,"tcp_half_close":0,"tcp_time_wait":0,"is_valid":1,"modified_time":"1716531859000000"},
+                {"app_id":68,"object_id":68000,"app_name":"https","parent_app_id":0,"parent_app_name":null,"category":"general-internet","subcategory":"internet-utility","content":"unknown","risk":"1","characteristics":null,"deny_action":null,"depends_on_app_ids":"null","implicitly_uses_app_ids":"null","continue_scanning":0,"tcp_timeout":120,"udp_timeout":120,"tcp_half_close":0,"tcp_time_wait":0,"is_valid":1,"modified_time":"1716531859000000"}
             ]
         }
     ]
diff --git a/resource/pangu/table_info.conf b/resource/pangu/table_info.conf
index 0dd3077..4680eaf 100644
--- a/resource/pangu/table_info.conf
+++ b/resource/pangu/table_info.conf
@@ -1,339 +1,135 @@
 [
-	{
+      {
         "table_id":0,
-        "table_name":"PXY_CTRL_COMPILE",
-        "table_type":"compile",
-		"user_region_encoded":"escape",
-        "valid_column":9,
-        "custom": {
-            "compile_id":1,
-            "tags":6,
-            "clause_num":8
-        }
+        "table_name":"PXY_CTRL_RULE",
+        "table_type":"rule"
     },
-	{
+    {
         "table_id":1,
-        "table_name":"PXY_CTRL_COMPILE_CONJUNCTION",
-		"db_tables":["PXY_CTRL_COMPILE"],
-		"default_compile_table":1,
-        "table_type":"compile",
-		"user_region_encoded":"escape",
-        "valid_column":9,
-        "custom": {
-            "compile_id":1,
-            "tags":6,
-            "clause_num":8
-        }
+        "table_name":"PXY_CTRL_RULE_CONJUNCTION",
+		"db_tables":["PXY_CTRL_RULE"],
+		"default_rule_table":1,
+        "table_type":"rule"
     },
-	{
+    {
         "table_id":2,
-        "table_name":"PXY_CTRL_COMPILE_PLUGIN",
-		"db_tables":["PXY_CTRL_COMPILE"],
+        "table_name":"PXY_CTRL_RULE_PLUGIN",
+		"db_tables":["PXY_CTRL_RULE"],
         "table_type":"plugin",
-        "valid_column":9,
         "custom": {
-            "key":1,
-			"key_type":"integer",
-			"key_len": 8
+            "key_name":"uuid",
+	        "key_type":"pointer"
         }
     },	
-    {
+{
         "table_id":3,
-        "table_name":"GROUP_PXY_CTRL_COMPILE_RELATION",
-        "table_type":"group2compile",
-        "associated_compile_table_id":1,
-        "valid_column":6,
-        "custom": {
-            "group_id":1,
-            "compile_id":2,
-            "not_flag":3,
-            "virtual_table_name":4,
-            "clause_index":5
-        }
-    },
-    {
-        "table_id":4,
         "table_name":"OBJECT_GROUP",
-        "table_type":"group2group",
-        "valid_column":4,
-        "custom": {
-            "group_id":1,
-            "included_sub_group_ids":2,
-	        "excluded_sub_group_ids":3
-        }
+        "table_type":"object2object"
     },
     {
-        "table_id":5,
+        "table_id":4,
 		"table_name":"TSG_OBJ_IP",
-        "db_tables":["TSG_OBJ_IP_ADDR","TSG_OBJ_IP_LEARNING_ADDR"],
-        "table_type":"ip",
-        "valid_column":8,
-        "custom": {
-            "item_id":1,
-            "group_id":2,
-            "addr_type":3,
-            "addr_format":4,
-            "ip1":5,
-            "ip2":6,
-            "port":7
-        }
-    },	
+        "table_type":"ip"
+    },
 	{
-        "table_id":6,
+        "table_id":5,
         "table_name":"TSG_OBJ_URL",
-        "table_type":"expr",
-        "valid_column":7,
-        "custom": {
-            "item_id":1,
-            "group_id":2,
-            "keywords":3,
-            "expr_type":4,
-            "match_method":5,
-            "is_hexbin":6
-        }
-    },	
-	{
-        "table_id":7,
-        "table_name":"ATTR_HTTP_URL",
-        "table_type":"virtual",
-        "physical_table": "TSG_OBJ_URL"
-    },	
+        "table_type":"expr"
+    }, 	
 	{
-        "table_id":8,
+        "table_id":6,
         "table_name":"TSG_OBJ_FQDN",
-        "table_type":"expr",
-        "valid_column":7,
-        "custom": {
-            "item_id":1,
-            "group_id":2,
-            "keywords":3,
-            "expr_type":4,
-            "match_method":5,
-            "is_hexbin":6
-        }
-    },
-    {
-        "table_id":9,
-        "table_name": "ATTR_SERVER_FQDN",
-        "table_type": "virtual",
-        "physical_table": "TSG_OBJ_FQDN"
-    },
-	{
-        "table_id":10,
-        "table_name":"TSG_OBJ_HTTP_SIGNATURE",
-        "table_type":"expr_plus",
-        "valid_column":8,
-        "custom": {
-            "item_id":1,
-            "group_id":2,
-            "district":3,
-            "keywords":4,
-            "expr_type":5,
-            "match_method":6,
-            "is_hexbin":7
-        }
-    },	
-	{
-        "table_id":11,
-        "table_name":"ATTR_HTTP_REQ_HDR",
-        "table_type":"virtual",
-        "physical_table": "TSG_OBJ_HTTP_SIGNATURE"
-    },
+        "table_type":"expr"
+    }, 
 	{
-        "table_id":12,
-        "table_name":"ATTR_HTTP_RES_HDR",
-        "table_type":"virtual",
-        "physical_table": "TSG_OBJ_HTTP_SIGNATURE"
-    },
-	{
-        "table_id":13,
+        "table_id":7,
         "table_name":"TSG_OBJ_KEYWORDS",
-        "table_type":"expr",
-        "valid_column":7,
-        "custom": {
-            "item_id":1,
-            "group_id":2,
-            "keywords":3,
-            "expr_type":4,
-            "match_method":5,
-            "is_hexbin":6
-        }
-    },	
-	{
-        "table_id":14,
-        "table_name":"ATTR_HTTP_REQ_BODY",
-        "table_type":"virtual",
-        "physical_table": "TSG_OBJ_KEYWORDS"
+        "table_type":"expr"
     },
 	{
-        "table_id":15,
-        "table_name":"ATTR_HTTP_RES_BODY",
-        "table_type":"virtual",
-        "physical_table": "TSG_OBJ_KEYWORDS"
-    },
-	{
-        "table_id":16,
+        "table_id":8,
         "table_name":"TSG_OBJ_SUBSCRIBER_ID",
-        "table_type":"expr",
-        "valid_column":7,
-        "custom": {
-            "item_id":1,
-            "group_id":2,
-            "keywords":3,
-            "expr_type":4,
-            "match_method":5,
-            "is_hexbin":6
-        }
-    },
-	{
-        "table_id":17,
-        "table_name":"ATTR_SOURCE_IP",
-        "table_type":"virtual",
-        "physical_table": "TSG_OBJ_IP"
+        "table_type":"expr"
     },
-	{
-        "table_id":18,
-        "table_name":"ATTR_DESTINATION_IP",
-        "table_type":"virtual",
-        "physical_table": "TSG_OBJ_IP"
-    },
-	{
-        "table_id":19,
+    {
+        "table_id":9,
         "table_name":"PXY_CACHE_COMPILE",
-        "table_type":"compile",
-		"user_region_encoded":"escape",
-        "valid_column":9,
-        "custom": {
-            "compile_id":1,
-            "tags":6,
-            "clause_num":8
-        }
-    },
-	{
-        "table_id":20,
+        "table_type":"rule"
+    }, 
+    {
+        "table_id":10,
         "table_name":"PXY_CACHE_COMPILE_CONJUNCTION",
 		"db_tables":["PXY_CACHE_COMPILE"],
-		"default_compile_table":1,
-        "table_type":"compile",
-		"user_region_encoded":"escape",
-        "valid_column":9,
-        "custom": {
-            "compile_id":1,
-            "tags":6,
-            "clause_num":8
-        }
+		"default_rule_table":1,
+        "table_type":"rule"
     },
-	{
-        "table_id":21,
+    {
+        "table_id":11,
         "table_name":"PXY_CACHE_COMPILE_PLUGIN",
 		"db_tables":["PXY_CACHE_COMPILE"],
         "table_type":"plugin",
-        "valid_column":8,
-        "custom": {
-            "key":1,
-			"key_type":"integer",
-			"key_len": 8
-        }
-    },	
-	{
-        "table_id":22,
-        "table_name":"PXY_CACHE_GROUP",
-        "table_type":"group2compile",
-        "associated_compile_table_id":0,
-        "valid_column":6,
         "custom": {
-            "group_id":1,
-            "compile_id":2,
-            "not_flag":3,
-            "virtual_table_name":4,
-            "clause_index":5
+            "key_name":"uuid",
+	        "key_type":"pointer"
         }
     },
-	{
-        "table_id":23,
+    {
+        "table_id":12,
         "table_name":"PXY_CACHE_HTTP_URL",
-        "table_type":"expr",
-        "valid_column":7,
-        "custom": {
-            "item_id":1,
-            "group_id":2,
-            "keywords":3,
-            "expr_type":4,
-            "match_method":5,
-            "is_hexbin":6
-        }
+        "table_type":"expr"
     },
-	{
-        "table_id":24,
+    {
+        "table_id":13,
         "table_name":"PXY_CACHE_HTTP_COOKIE",
-        "table_type":"expr",
-        "valid_column":7,
-        "custom": {
-            "item_id":1,
-            "group_id":2,
-            "keywords":3,
-            "expr_type":4,
-            "match_method":5,
-            "is_hexbin":6
-        }
-    },		
-	{
-        "table_id":25,
-        "table_name":"PXY_PROFILE_TRUSTED_CA_CERT",
-        "table_type":"plugin",
-        "valid_column":4,
+        "table_type":"expr"
+    },
+    {
+        "table_id":14,
+        "table_name": "PXY_PROFILE_TRUSTED_CA_CERT",
+        "table_type": "plugin",
         "custom": {
-            "key":1,
-			"key_type":"pointer",
-            "foreign": [3]
+            "key_name":"uuid",
+            "key_type":"pointer"
         }
     },
-	{
-        "table_id":26,
-        "table_name":"PXY_OBJ_TRUSTED_CA_CRL",
-        "table_type":"plugin",
-        "valid_column":4,
+    {
+        "table_id":15,
+        "table_name": "PXY_OBJ_TRUSTED_CA_CRL",
+        "table_type": "plugin",
         "custom": {
-            "key":1,
-			"key_type":"pointer",
-            "foreign": [3]
+            "key_name":"uuid",
+            "key_type":"pointer"
         }
     },
 	{
-        "table_id":27,
+        "table_id":16,
         "table_name":"TSG_PROFILE_RESPONSE_PAGES",
         "table_type":"plugin",
-        "valid_column":5,
         "custom": {
-            "key":1,
-			"key_type":"pointer",
-            "foreign": [4]
+            "key_name":"uuid",
+            "key_type":"pointer"
         }
     },
 	{
-        "table_id":28,
+        "table_id":17,
         "table_name":"PXY_PROFILE_HIJACK_FILES",
         "table_type":"plugin",
-        "valid_column":6,
         "custom": {
-            "key":1,
-			"key_type":"pointer",
-            "foreign": [5]
+            "key_name":"uuid",
+            "key_type":"pointer"
         }
     },
 	{
-        "table_id":29,
+        "table_id":18,
         "table_name":"PXY_PROFILE_INSERT_SCRIPTS",
         "table_type":"plugin",
-        "valid_column":6,
         "custom": {
-            "key":1,
-		"key_type":"pointer",
-            "foreign": [4]
+            "key_name":"uuid",
+            "key_type":"pointer"
         }
     },
 	{
-        "table_id":30,
+        "table_id":19,
         "table_name":"PXY_INTERCEPT_RULE",
         "table_type":"plugin",
         "custom": {
@@ -342,7 +138,7 @@
         }
     },
 	{
-        "table_id":31,
+        "table_id":20,
         "table_name":"TSG_PROFILE_TRAFFIC_MIRROR",
         "table_type":"plugin",
         "custom": {
@@ -351,7 +147,7 @@
         }
     },
 	{
-        "table_id":32,
+        "table_id":21,
         "table_name":"PXY_PROFILE_DECRYPTION",
         "table_type":"plugin",
         "custom": {
@@ -360,13 +156,13 @@
         }
     },
 	{
-        "table_id":33,
+        "table_id":22,
         "table_name":"ATTR_DOH_QNAME",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
-        "table_id":34,
+        "table_id":23,
         "table_name":"PXY_SSL_FINGERPRINT",
         "table_type":"plugin",
         "custom": {
@@ -375,18 +171,16 @@
         }
     },
 	{
-        "table_id":35,
+        "table_id":24,
         "table_name":"PXY_PROFILE_RUN_SCRIPTS",
         "table_type":"plugin",
-        "valid_column":4,
         "custom": {
-            "key":1,
-		    "key_type":"pointer",
-            "foreign": [2]
+            "key_type":"pointer",
+            "key_name":"uuid"
         }
     },
 	{
-        "table_id":36,
+        "table_id":25,
         "table_name":"PXY_PROFILE_TCP_OPTION",
         "table_type":"plugin",
         "custom": {
@@ -395,7 +189,7 @@
         }
     },
     {
-        "table_id":37,
+        "table_id":26,
         "table_name":"SERVICE_CHAINING_RULE",
         "table_type":"plugin",
         "custom":{
@@ -404,182 +198,56 @@
         }
     },
     {
-        "table_id":38,
+        "table_id":27,
         "table_name": "APP_ID_DICT",
         "table_type": "plugin",
-        "valid_column": 19,
         "custom": {
-            "key": 1,
-            "key_type": "integer",
-            "key_len": 8
+            "key_name":"app_id",
+            "key_type":"integer",
+            "key_len":8
         }
     },
     {
-        "table_id":39,
-        "table_name":"ATTR_APP_ID",
-        "table_type":"virtual",
-        "physical_table": "APP_ID_DICT"
-    },
-    {
-        "table_id":40,
-        "table_name":"ATTR_SUBSCRIBER_ID",
-        "table_type":"virtual",
-        "physical_table": "TSG_OBJ_SUBSCRIBER_ID"
-    },
-    {
-        "table_id":41,
-        "table_name":"ATTR_INTERNAL_IP",
-        "table_type":"virtual",
-        "physical_table": "TSG_OBJ_IP"
-    },
-	{
-        "table_id":42,
-        "table_name":"ATTR_EXTERNAL_IP",
-        "table_type":"virtual",
-        "physical_table": "TSG_OBJ_IP"
-    },
-    {
-        "table_id":43,
+        "table_id":28,
         "table_name": "TSG_IP_PROTOCOL",
         "table_type": "plugin",
-        "valid_column": 4,
         "custom": {
-            "key": 1,
-            "key_type": "integer",
-            "key_len": 8
+            "key_name":"uuid",
+            "key_type":"pointer"
         }
     },
     {
-        "table_id":44,
+        "table_id":29,
         "table_name":"TSG_OBJ_PORT",
-        "table_type":"interval",
-        "valid_column":5,
-        "custom": {
-            "item_id":1,
-            "group_id":2,
-            "low_boundary":3,
-            "up_boundary":4
-        }
-    },
-    {
-        "table_id":45,
-        "table_name": "ATTR_SOURCE_PORT",
-        "table_type": "virtual",
-        "physical_table": "TSG_OBJ_PORT"
-    },
-    {
-        "table_id":46,
-        "table_name": "ATTR_DESTINATION_PORT",
-        "table_type": "virtual",
-        "physical_table": "TSG_OBJ_PORT"
-    },
-    {
-        "table_id":47,
-        "table_name": "ATTR_INTERNAL_PORT",
-        "table_type": "virtual",
-        "physical_table": "TSG_OBJ_PORT"
-    },
-    {
-        "table_id":48,
-        "table_name": "ATTR_EXTERNAL_PORT",
-        "table_type": "virtual",
-        "physical_table": "TSG_OBJ_PORT"
+        "table_type":"interval"
     },
     {
-        "table_id":49,
-        "table_name": "ATTR_IP_PROTOCOL",
-        "table_type": "virtual",
-        "physical_table": "TSG_IP_PROTOCOL"
-    },
-    {
-        "table_id": 50,
+        "table_id":30,
         "table_name": "LIBRARY_TAG",
         "table_type": "plugin",
-        "valid_column": 6,
         "custom": {
-            "key": 1,
-            "key_type": "integer",
-            "key_len": 8
+            "key_name":"uuid",
+            "key_type":"pointer"
         }
     },
     {
-        "table_id":51,
+        "table_id":31,
         "table_name":"TSG_OBJ_IMSI",
-        "table_type":"expr",
-        "valid_column":7,
-        "custom": {
-            "item_id":1,
-            "group_id":2,
-            "keywords":3,
-            "expr_type":4,
-            "match_method":5,
-            "is_hexbin":6
-        }
+        "table_type":"expr"
     },
     {
-        "table_id":52,
+        "table_id":32,
         "table_name":"TSG_OBJ_PHONE_NUMBER",
-        "table_type":"expr",
-        "valid_column":7,
-        "custom": {
-            "item_id":1,
-            "group_id":2,
-            "keywords":3,
-            "expr_type":4,
-            "match_method":5,
-            "is_hexbin":6
-        }
+        "table_type":"expr"
     },
     {
-        "table_id":53,
+        "table_id":33,
         "table_name":"TSG_OBJ_APN",
-        "table_type":"expr",
-        "valid_column":7,
-        "custom": {
-            "item_id":1,
-            "group_id":2,
-            "keywords":3,
-            "expr_type":4,
-            "match_method":5,
-            "is_hexbin":6
-        }
+        "table_type":"expr"
     },
     {
-        "table_id":54,
+        "table_id":34,
         "table_name":"TSG_OBJ_IMEI",
-        "table_type":"expr",
-        "valid_column":7,
-        "custom": {
-            "item_id":1,
-            "group_id":2,
-            "keywords":3,
-            "expr_type":4,
-            "match_method":5,
-            "is_hexbin":6
-        }
-    },
-    {
-        "table_id":55,
-        "table_name":"ATTR_GTP_IMSI",
-        "table_type":"virtual",
-        "physical_table": "TSG_OBJ_IMSI"
-    },
-    {
-        "table_id":56,
-        "table_name":"ATTR_GTP_PHONE_NUMBER",
-        "table_type":"virtual",
-        "physical_table": "TSG_OBJ_PHONE_NUMBER"
-    },
-    {
-        "table_id":57,
-        "table_name":"ATTR_GTP_APN",
-        "table_type":"virtual",
-        "physical_table": "TSG_OBJ_APN"
-    },
-    {
-        "table_id":58,
-        "table_name":"ATTR_GTP_IMEI",
-        "table_type":"virtual",
-        "physical_table": "TSG_OBJ_IMEI"
+        "table_type":"expr"
     }
 ]
\ No newline at end of file