gfwleak/tango-verify-policy
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TSG-17801 PolicyVerify适配新增的Server FQDN和Category虚拟表

Browse Source
This commit is contained in:
fengweihao
2023-11-24 16:38:58 +08:00
parent 779f6dffd6
commit edb39d917a
3 changed files with 79 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/src/verify_matcher.cpp
View File

@@ -2029,14 +2029,14 @@ error_out:
static void http_table_name_init(const char *table_name[__TSG_OBJ_MAX])
{
table_name[TSG_OBJ_HTTP_URL] = "ATTR_HTTP_URL";
table_name[TSG_OBJ_HTTP_HOST] = "ATTR_HTTP_HOST";
table_name[TSG_OBJ_HTTP_HOST_CAT] = "ATTR_HTTP_HOST_CAT";
table_name[TSG_OBJ_HTTP_HOST] = "ATTR_HTTP_HOST_VIRTUAL";
table_name[TSG_OBJ_HTTP_HOST_CAT] = "ATTR_HTTP_HOST_CAT_VIRTUAL";
table_name[TSG_OBJ_HTTP_REQ_HDR] = "ATTR_HTTP_REQ_HDR";
table_name[TSG_OBJ_HTTP_REQ_BODY] = "ATTR_HTTP_REQ_BODY";
table_name[TSG_OBJ_HTTP_RES_HDR] = "ATTR_HTTP_RES_HDR";
table_name[TSG_OBJ_HTTP_RES_BODY] = "ATTR_HTTP_RES_BODY";
table_name[TSG_OBJ_SSL_SNI] = "ATTR_SSL_SNI";
table_name[TSG_OBJ_SSL_SNI_CAT] = "ATTR_SSL_SNI_CAT";
table_name[TSG_OBJ_SSL_SNI] = "ATTR_SSL_SNI_VIRTUAL";
table_name[TSG_OBJ_SSL_SNI_CAT] = "ATTR_SSL_SNI_CAT_VIRTUAL";
table_name[TSG_OBJ_SSL_CN] = "ATTR_SSL_CN";
table_name[TSG_OBJ_SSL_CN_CAT] = "ATTR_SSL_CN_CAT";
table_name[TSG_OBJ_SSL_SAN] = "ATTR_SSL_SAN";
@@ -2050,8 +2050,8 @@ static void doq_table_name_init(const char *table_name[__TSG_OBJ_MAX])
table_name[TSG_OBJ_DOH_HOST]="ATTR_DOH_HOST";
table_name[TSG_OBJ_DOH_HOST_CAT]="ATTR_DOH_HOST_CAT";
table_name[TSG_OBJ_DNS_QNAME] = "ATTR_DOH_QNAME";
table_name[TSG_OBJ_QUIC_SNI] = "ATTR_QUIC_SNI";
table_name[TSG_OBJ_QUIC_SNI_CAT] = "ATTR_QUIC_SNI_CAT";
table_name[TSG_OBJ_QUIC_SNI] = "ATTR_QUIC_SNI_VIRTUAL";
table_name[TSG_OBJ_QUIC_SNI_CAT] = "ATTR_QUIC_SNI_CAT_VIRTUAL";
return;
}

64
resource/table_info.conf
View File

@@ -55,7 +55,7 @@
"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,
@@ -63,7 +63,7 @@
"clause_num":9
}
},
{
{
"table_id":5,
"table_name":"PXY_CTRL_COMPILE_CONJUNCTION",
"db_tables":["PXY_CTRL_COMPILE"],
@@ -103,11 +103,11 @@
"clause_index":6
}
},
{
{
"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,
@@ -438,18 +438,20 @@
"is_hexbin":7
}
},
{
"table_id":34,
"table_name":"ATTR_HTTP_HOST",
"table_type":"virtual",
{
"table_id": 34,
"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_name":"ATTR_HTTP_HOST_CAT",
"table_type":"virtual",
{
"table_id": 35,
"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_name":"ATTR_HTTP_URL",
@@ -480,16 +482,18 @@
"table_type":"virtual",
"physical_table": "TSG_OBJ_KEYWORDS"
},
{
"table_id":41,
"table_name":"ATTR_SSL_SNI",
"table_type":"virtual",
{
"table_id": 41,
"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_name":"ATTR_SSL_SNI_CAT",
"table_type":"virtual",
{
"table_id": 42,
"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"
},
{
@@ -522,16 +526,18 @@
"table_type":"virtual",
"physical_table": "TSG_OBJ_FQDN"
},
{
"table_id":48,
"table_name":"ATTR_QUIC_SNI",
"table_type":"virtual",
{
"table_id": 48,
"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_name":"ATTR_QUIC_SNI_CAT",
"table_type":"virtual",
{
"table_id": 49,
"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"
},
{

70
resource/table_info_simple.conf
View File

@@ -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,
@@ -167,13 +167,13 @@
"clause_num":9
}
},
{
{
"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,
@@ -189,8 +189,8 @@
"valid_column":8,
"custom": {
"key":1,
"key_type":"integer",
"key_len": 8
"key_type":"integer",
"key_len": 8
}
},
{
@@ -438,18 +438,20 @@
"is_hexbin":7
}
},
{
"table_id":34,
"table_name":"ATTR_HTTP_HOST",
"table_type":"virtual",
{
"table_id": 34,
"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_name":"ATTR_HTTP_HOST_CAT",
"table_type":"virtual",
{
"table_id": 35,
"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_name":"ATTR_HTTP_URL",
@@ -480,16 +482,18 @@
"table_type":"virtual",
"physical_table": "TSG_OBJ_KEYWORDS"
},
{
"table_id":41,
"table_name":"ATTR_SSL_SNI",
"table_type":"virtual",
{
"table_id": 41,
"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_name":"ATTR_SSL_SNI_CAT",
"table_type":"virtual",
{
"table_id": 42,
"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"
},
{
@@ -522,16 +526,18 @@
"table_type":"virtual",
"physical_table": "TSG_OBJ_FQDN"
},
{
"table_id":48,
"table_name":"ATTR_QUIC_SNI",
"table_type":"virtual",
{
"table_id": 48,
"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_name":"ATTR_QUIC_SNI_CAT",
"table_type":"virtual",
{
"table_id": 49,
"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"
},
{