diff options
| -rw-r--r-- | plugin/business/ssl-policy/src/ssl_policy.cpp | 1 | ||||
| -rw-r--r-- | plugin/business/tsg-http/src/tsg_http.cpp | 4 | ||||
| -rw-r--r-- | resource/pangu/doh.json | 204 | ||||
| -rw-r--r-- | resource/pangu/pangu_http.json | 14 | ||||
| -rw-r--r-- | resource/pangu/table_info.conf | 28 |
5 files changed, 104 insertions, 147 deletions
diff --git a/plugin/business/ssl-policy/src/ssl_policy.cpp b/plugin/business/ssl-policy/src/ssl_policy.cpp index 6586941..856c0e7 100644 --- a/plugin/business/ssl-policy/src/ssl_policy.cpp +++ b/plugin/business/ssl-policy/src/ssl_policy.cpp @@ -213,6 +213,7 @@ static void profile_param_new_cb(const char *table_name, const char *key, const cJSON_Delete(json); free(json_str); + return; error_out: if (json) diff --git a/plugin/business/tsg-http/src/tsg_http.cpp b/plugin/business/tsg-http/src/tsg_http.cpp index 4e365b1..4a177b6 100644 --- a/plugin/business/tsg-http/src/tsg_http.cpp +++ b/plugin/business/tsg-http/src/tsg_http.cpp @@ -450,7 +450,7 @@ char* str_unescape(char* s) unsigned char action_type_str2idx(const char *action_str) { - const char * action_name[__PX_ACTION_MAX]; + const char * action_name[__PX_ACTION_MAX] ={0}; action_name[PX_ACTION_NONE] = "none"; action_name[PX_ACTION_MONIT] = "monitor"; action_name[PX_ACTION_INTERCEPT] = "intercept"; @@ -468,7 +468,7 @@ unsigned char action_type_str2idx(const char *action_str) int action = 0; for ( action = PX_ACTION_NONE; action < __PX_ACTION_MAX; action++) { - if (0 == strcasecmp(action_str, action_name[action])) + if (action_name[action] != NULL && 0 == strcasecmp(action_str, action_name[action])) break; } return action; diff --git a/resource/pangu/doh.json b/resource/pangu/doh.json index 31595ff..e40efd3 100644 --- a/resource/pangu/doh.json +++ b/resource/pangu/doh.json @@ -1,169 +1,131 @@ { - "compile_table": "PXY_CTRL_RULE", - "group_table": "GROUP_COMPILE_RELATION", + "rule_table": "PXY_CTRL_RULE", + "object2object_table": "OBJECT_GROUP", "rules": [ { - "compile_id": 1021, + "uuid": "40c9c6a7-70a9-48ae-9fba-ec7966edd3c6", "service": 1, - "action": 48, - "do_blacklist": 1, - "do_log": 1, - "effective_range": 0, - "user_region": "{\"protocol\":\"http\",\"method\":\"redirect\",\"code\":302,\"to\":\"https://www.jd.com\"}", - "is_valid": "yes", - "groups": [ + "action": "manipulate", + "blacklist_option": 1, + "log_option": "all", + "action_parameter":{"protocol":"DoH","method":"redirect","resolution":[{"qtype":"A","answer":[{"atype":"CNAME","value":"www.abc.com","ttl":{"min":60,"max":300}},{"atype":"A","value":"1.1.1.1","ttl":{"min":60,"max":300}}]},{"qtype":"AAAA","answer":[{"atype":"AAAA","value":"aaaa:ffff:00","ttl":{"min":60,"max":300}},{"atype":"CNAME","value":"abc.com.cn","ttl":{"min":60,"max":300}}]}]}, + "is_valid": "yes", + "conditions": [ { - "group_name":"http_url", - "not_flag":0, - "regions": [ + "attribute_name": "ATTR_DOH_QNAME", + "objects": [ { - "table_name": "TSG_OBJ_URL", - "table_type": "string", - "table_content": { - "keywords": "baidu.com", - "expr_type": "regex", - "match_method": "sub", - "format": "uncase plain" - } + "items": [ + { + "table_name": "TSG_OBJ_FQDN", + "table_type": "expr", + "table_content": { + "keywords": "www.126.com", + "expr_type": "and" + } + } + ] } ] } ] }, - { - "compile_id": 1022, + { + "uuid": "40c9c6a7-70a9-48ae-9fba-ec7966edd3c7", "service": 1, - "action": 48, - "do_blacklist": 1, - "do_log": 1, - "effective_range": 0, - "user_region": "{\"protocol\":\"http\",\"method\":\"redirect\",\"code\":302,\"to\":\"https://www.jd.com\"}", + "action": "manipulate", + "blacklist_option": 1, + "log_option": "all", + "action_parameter":{"protocol":"DoH","method":"redirect","resolution":[{"qtype":"A","answer":[{"atype":"CNAME","value":"www.a.shifen.com","ttl":{"min":10,"max":10}},{"atype":"A","value":"182.61.200.6","ttl":{"min":20,"max":30}},{"atype":"A","value":"182.61.200.7","ttl":{"min":60,"max":61}}]},{"qtype":"AAAA","answer":[{"atype":"CNAME","value":"www.taobao.com.danuoyi.tbcache.com","ttl":{"min":100,"max":100}},{"atype":"AAAA","value":"2408:871a:2800:4:3::3fa","ttl":{"min":200,"max":300}},{"atype":"AAAA","value":"2408:871a:2800:2:3::3fa","ttl":{"min":600,"max":310}}]}]}, "is_valid": "yes", - "groups": [ - { - "group_name":"http_url", - "virtual_table":"TSG_FIELD_HTTP_URL", - "not_flag":0 - } - ] - }, - { - "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": [ + "conditions": [ { - "group_name":"http_fqdn", - "not_flag":0, - "regions": [ + "attribute_name": "ATTR_DOH_QNAME", + "objects": [ { - "table_name": "TSG_OBJ_FQDN", - "table_type": "string", - "table_content": { - "keywords": "www.126.com", - "expr_type": "regex", - "match_method": "sub", - "format": "uncase plain" - } + "items": [ + { + "table_name": "TSG_OBJ_FQDN", + "table_type": "expr", + "table_content": { + "keywords": "www.126.com", + "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\":\"小小\"}]}", - "is_valid": "yes", - "groups": [ - { - "group_name":"http_fqdn", - "virtual_table":"TSG_FIELD_HTTP_HOST", - "not_flag":0 - } - ] - }, - { - "compile_id": 1025, - "service": 1, - "action": 48, - "do_blacklist": 1, - "do_log": 1, - "effective_range": 0, - "user_region": "{\"protocol\":\"DoH\",\"method\":\"redirect\",\"resolution\":[{\"qtype\":\"A\",\"answer\":[{\"atype\":\"CNAME\",\"value\":\"www.abc.com\",\"ttl\":{\"min\":60,\"max\":300}},{\"atype\":\"A\",\"value\":\"1.1.1.1\",\"ttl\":{\"min\":60,\"max\":300}}]},{\"qtype\":\"AAAA\",\"answer\":[{\"atype\":\"AAAA\",\"value\":\"aaaa:ffff:00\",\"ttl\":{\"min\":60,\"max\":300}},{\"atype\":\"CNAME\",\"value\":\"abc.com.cn\",\"ttl\":{\"min\":60,\"max\":300}}]}]}", - "is_valid": "yes", - "groups": [ - { - "group_name":"http_fqdn", - "virtual_table":"TSG_FIELD_DOH_QNAME", - "not_flag":0 - } - ] - }, - { - "compile_id": 1026, - "service": 1, - "action": 48, - "do_blacklist": 1, - "do_log": 1, - "effective_range": 0, - "user_region": "{\"protocol\":\"DoH\",\"method\":\"redirect\",\"resolution\":[{\"qtype\":\"A\",\"answer\":[{\"atype\":\"CNAME\",\"value\":\"www.a.shifen.com\",\"ttl\":{\"min\":10,\"max\":10}},{\"atype\":\"A\",\"value\":\"182.61.200.6\",\"ttl\":{\"min\":20,\"max\":30}},{\"atype\":\"A\",\"value\":\"182.61.200.7\",\"ttl\":{\"min\":60,\"max\":61}}]},{\"qtype\":\"AAAA\",\"answer\":[{\"atype\":\"CNAME\",\"value\":\"www.taobao.com.danuoyi.tbcache.com\",\"ttl\":{\"min\":100,\"max\":100}},{\"atype\":\"AAAA\",\"value\":\"2408:871a:2800:4:3::3fa\",\"ttl\":{\"min\":200,\"max\":300}},{\"atype\":\"AAAA\",\"value\":\"2408:871a:2800:2:3::3fa\",\"ttl\":{\"min\":600,\"max\":310}}]}]}", - "is_valid": "yes", - "groups": [ - { - "group_name":"http_fqdn", - "virtual_table":"TSG_FIELD_DOH_QNAME", - "not_flag":0 - } - ] } ], "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} + ] + }, + { "table_name": "TSG_PROFILE_RESPONSE_PAGES", "table_content": [ - "101\t404\thtml\t./resource/pangu/policy_file/404.html\t1", - "102\tHTTP403\ttemplate\t./resource/pangu/HTTP403.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", - "202\tWPS8648\tWPS8648-132M.exe\tapplication/x-msdos-program\t./resource/pangu/policy_file/WPS8648-132M.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", - "302\tu1\tcss\t./resource/pangu/policy_file/u1.css\tbefore_page_load\t1", - "303\tu1\tjs\t./resource/pangu/policy_file/alert.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":"intercept", "log_option":"none", "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":"intercept", "log_option":"none","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} + ] + }, + { + "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} + ] + }, + { + "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} + ] + }, + { + "table_name": "APP_ID_DICT", + "table_content": [ + {"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"} ] } ] -}
\ No newline at end of file +} diff --git a/resource/pangu/pangu_http.json b/resource/pangu/pangu_http.json index 84a4522..5798ee4 100644 --- a/resource/pangu/pangu_http.json +++ b/resource/pangu/pangu_http.json @@ -5,10 +5,10 @@ { "uuid": "40c9c6a7-70a9-48ae-9fba-ec7966edd3c6", "service": 1, - "action": 1, - "do_blacklist": 1, - "do_log": 1, - "user_region": "{\"protocol\":\"http\",\"method\":\"redirect\",\"code\":302,\"to\":\"https://www.jd.com\"}", + "action": "manipulate", + "blacklist_option": 1, + "log_option": "all", + "action_parameter": {"protocol":"http","method":"redirect","code":302,"to":"https://www.jd.com"}, "is_valid": "yes", "conditions": [ { @@ -67,15 +67,15 @@ { "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":"intercept", "log_option":"none", "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":"intercept", "log_option":"none","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-000000000011","effective_range":{},"action_parameter":{"vsys_id":1,"targeted_traffic":"decrypted","sff_profiles":["00000000-0000-0000-2222-000000000001"]},"is_valid":1} ] }, { diff --git a/resource/pangu/table_info.conf b/resource/pangu/table_info.conf index 4680eaf..0c58d95 100644 --- a/resource/pangu/table_info.conf +++ b/resource/pangu/table_info.conf @@ -157,12 +157,6 @@ }, { "table_id":22, - "table_name":"ATTR_DOH_QNAME", - "table_type":"virtual", - "physical_table": "TSG_OBJ_FQDN" - }, - { - "table_id":23, "table_name":"PXY_SSL_FINGERPRINT", "table_type":"plugin", "custom": { @@ -171,7 +165,7 @@ } }, { - "table_id":24, + "table_id":23, "table_name":"PXY_PROFILE_RUN_SCRIPTS", "table_type":"plugin", "custom": { @@ -180,7 +174,7 @@ } }, { - "table_id":25, + "table_id":24, "table_name":"PXY_PROFILE_TCP_OPTION", "table_type":"plugin", "custom": { @@ -189,7 +183,7 @@ } }, { - "table_id":26, + "table_id":25, "table_name":"SERVICE_CHAINING_RULE", "table_type":"plugin", "custom":{ @@ -198,7 +192,7 @@ } }, { - "table_id":27, + "table_id":26, "table_name": "APP_ID_DICT", "table_type": "plugin", "custom": { @@ -208,7 +202,7 @@ } }, { - "table_id":28, + "table_id":27, "table_name": "TSG_IP_PROTOCOL", "table_type": "plugin", "custom": { @@ -217,12 +211,12 @@ } }, { - "table_id":29, + "table_id":28, "table_name":"TSG_OBJ_PORT", "table_type":"interval" }, { - "table_id":30, + "table_id":29, "table_name": "LIBRARY_TAG", "table_type": "plugin", "custom": { @@ -231,22 +225,22 @@ } }, { - "table_id":31, + "table_id":30, "table_name":"TSG_OBJ_IMSI", "table_type":"expr" }, { - "table_id":32, + "table_id":31, "table_name":"TSG_OBJ_PHONE_NUMBER", "table_type":"expr" }, { - "table_id":33, + "table_id":32, "table_name":"TSG_OBJ_APN", "table_type":"expr" }, { - "table_id":34, + "table_id":33, "table_name":"TSG_OBJ_IMEI", "table_type":"expr" } |