support same pattern different offset(x-x:pat1 & y-y:pat1)

This commit is contained in:
liuwentan
2023-03-22 11:10:00 +08:00
parent 37447eef7f
commit 23ef2c3797
15 changed files with 970 additions and 906 deletions

View File

@@ -29,16 +29,10 @@
"table_id":2,
"table_name":"COMPILE_ALIAS",
"table_type":"compile",
"user_region_encoded":"escape",
"valid_column":4,
"custom": {
"compile_id":1,
"service_id":2,
"action":3,
"do_blacklist":4,
"do_log":5,
"tags":6,
"user_region":7,
"clause_num":9,
"evaluation_order":10
}
@@ -69,11 +63,10 @@
},
{
"table_id":5,
"table_name":["HTTP_URL_LITERAL", "HTTP_HOST_LITERAL"],
"table_name":["HTTP_URL", "HTTP_HOST"],
"table_type":"expr",
"valid_column":7,
"custom": {
"pattern_type":"literal",
"item_id":1,
"group_id":2,
"keywords":3,
@@ -84,21 +77,6 @@
},
{
"table_id":6,
"table_name":"HTTP_URL_REGEX",
"table_type":"expr",
"valid_column":7,
"custom": {
"pattern_type":"regex",
"item_id":1,
"group_id":2,
"keywords":3,
"expr_type":4,
"match_method":5,
"is_hexbin":6
}
},
{
"table_id":7,
"table_name":"KEYWORDS_TABLE",
"table_type":"expr",
"valid_column":7,
@@ -113,7 +91,7 @@
}
},
{
"table_id":8,
"table_id":7,
"table_name":"IP_CONFIG",
"table_type":"ip_plus",
"valid_column":18,
@@ -127,7 +105,7 @@
}
},
{
"table_id":9,
"table_id":8,
"table_name":"CONTENT_SIZE",
"table_type":"intval",
"valid_column":5,
@@ -139,23 +117,17 @@
}
},
{
"table_id":10,
"table_id":9,
"table_name":"QD_ENTRY_INFO",
"table_type":"plugin",
"valid_column":4,
"custom": {
"key_type":"pointer",
"key":1,
"tag":3
}
"valid_column":4
},
{
"table_id":11,
"table_id":10,
"table_name":"HTTP_SIGNATURE",
"table_type":"expr_plus",
"valid_column":8,
"custom": {
"pattern_type":"literal",
"item_id":1,
"group_id":2,
"district":3,
@@ -166,12 +138,11 @@
}
},
{
"table_id":12,
"table_id":11,
"table_name":"IMAGE_FP",
"table_type":"expr",
"valid_column":7,
"custom": {
"pattern_type":"literal",
"item_id":1,
"group_id":2,
"keywords":3,
@@ -181,7 +152,7 @@
}
},
{
"table_id":13,
"table_id":12,
"table_name":"TEST_EFFECTIVE_RANGE_TABLE",
"table_type":"plugin",
"valid_column":4,
@@ -192,7 +163,7 @@
}
},
{
"table_id":14,
"table_id":13,
"table_name":"TEST_FOREIGN_KEY",
"table_type":"plugin",
"valid_column":4,
@@ -204,7 +175,7 @@
}
},
{
"table_id":15,
"table_id":14,
"table_name":"TEST_PLUGIN_EXDATA_TABLE",
"table_type":"plugin",
"valid_column":4,
@@ -215,7 +186,7 @@
}
},
{
"table_id":16,
"table_id":15,
"table_name":"IR_INTERCEPT_IP",
"table_type":"plugin",
"valid_column":14,
@@ -226,12 +197,11 @@
}
},
{
"table_id":17,
"table_id":16,
"table_name":"APP_PAYLOAD",
"table_type":"expr_plus",
"valid_column":8,
"custom": {
"pattern_type":"literal",
"item_id":1,
"group_id":2,
"district":3,
@@ -242,12 +212,11 @@
}
},
{
"table_id":18,
"table_id":17,
"table_name":"TROJAN_PAYLOAD",
"table_type":"expr",
"valid_column":7,
"custom": {
"pattern_type":"literal",
"item_id":1,
"group_id":2,
"keywords":3,
@@ -258,12 +227,11 @@
}
},
{
"table_id":19,
"table_id":18,
"table_name":"MAIL_ADDR",
"table_type":"expr",
"valid_column":7,
"custom": {
"pattern_type":"literal",
"item_id":1,
"group_id":2,
"keywords":3,
@@ -273,7 +241,7 @@
}
},
{
"table_id":20,
"table_id":19,
"table_name":"IP_PLUS_CONFIG",
"table_type":"ip_plus",
"valid_column":18,
@@ -287,43 +255,43 @@
}
},
{
"table_id":21,
"table_id":20,
"table_name":"HTTP_RESPONSE_KEYWORDS",
"table_type":"virtual",
"physical_table": ["KEYWORDS_TABLE"]
"physical_table": "KEYWORDS_TABLE"
},
{
"table_id":21,
"table_name":"HTTP_REQUEST_HEADER",
"table_type":"virtual",
"physical_table": "HTTP_SIGNATURE"
},
{
"table_id":22,
"table_name":"HTTP_REQUEST_HEADER",
"table_name":"HTTP_RESPONSE_HEADER",
"table_type":"virtual",
"physical_table": ["HTTP_SIGNATURE"]
"physical_table": "HTTP_SIGNATURE"
},
{
"table_id":23,
"table_name":"HTTP_RESPONSE_HEADER",
"table_name":"VIRTUAL_IP_PLUS_TABLE",
"table_type":"virtual",
"physical_table": ["HTTP_SIGNATURE"]
"physical_table": "IP_PLUS_CONFIG"
},
{
"table_id":24,
"table_name":"VIRTUAL_IP_PLUS_TABLE",
"table_name":"VIRTUAL_IP_PLUS_SOURCE",
"table_type":"virtual",
"physical_table": ["IP_PLUS_CONFIG"]
"physical_table": "IP_PLUS_CONFIG"
},
{
"table_id":25,
"table_name":"VIRTUAL_IP_PLUS_SOURCE",
"table_name":"VIRTUAL_IP_PLUS_DESTINATION",
"table_type":"virtual",
"physical_table": ["IP_PLUS_CONFIG"]
"physical_table": "IP_PLUS_CONFIG"
},
{
"table_id":26,
"table_name":"VIRTUAL_IP_PLUS_DESTINATION",
"table_type":"virtual",
"physical_table": ["IP_PLUS_CONFIG"]
},
{
"table_id":27,
"table_name":"TEST_IP_PLUGIN_WITH_EXDATA",
"table_type":"ip_plugin",
"valid_column":6,
@@ -336,12 +304,11 @@
}
},
{
"table_id":28,
"table_id":27,
"table_name":"AS_NUMBER",
"table_type":"expr",
"valid_column":7,
"custom": {
"pattern_type":"literal",
"item_id":1,
"group_id":2,
"keywords":3,
@@ -351,24 +318,23 @@
}
},
{
"table_id":29,
"table_id":28,
"table_name":"SOURCE_IP_ASN",
"table_type":"virtual",
"physical_table":["AS_NUMBER"]
"physical_table":"AS_NUMBER"
},
{
"table_id":29,
"table_name":"DESTINATION_IP_ASN",
"table_type":"virtual",
"physical_table":"AS_NUMBER"
},
{
"table_id":30,
"table_name":"DESTINATION_IP_ASN",
"table_type":"virtual",
"physical_table":["AS_NUMBER"]
},
{
"table_id":31,
"table_name":"GeoLocation",
"table_type":"expr",
"valid_column":7,
"custom": {
"pattern_type":"literal",
"item_id":1,
"group_id":2,
"keywords":3,
@@ -378,13 +344,13 @@
}
},
{
"table_id":32,
"table_id":31,
"table_name":"SOURCE_IP_GEO",
"table_type":"virtual",
"physical_table":["GeoLocation"]
"physical_table":"GeoLocation"
},
{
"table_id":33,
"table_id":32,
"table_name":"INTERGER_PLUS",
"table_type":"intval_plus",
"valid_column":6,
@@ -397,7 +363,7 @@
}
},
{
"table_id":34,
"table_id":33,
"table_name":"TEST_FQDN_PLUGIN_WITH_EXDATA",
"table_type":"fqdn_plugin",
"valid_column":5,
@@ -408,7 +374,7 @@
}
},
{
"table_id":35,
"table_id":34,
"table_name":"APP_ID",
"table_type":"intval",
"valid_column":5,
@@ -420,12 +386,11 @@
}
},
{
"table_id":36,
"table_id":35,
"table_name":"EMPTY_KEYWORD",
"table_type":"expr",
"valid_column":7,
"custom": {
"pattern_type":"literal",
"item_id":1,
"group_id":2,
"keywords":3,
@@ -435,7 +400,7 @@
}
},
{
"table_id":37,
"table_id":36,
"table_name":"EMPTY_INTERGER",
"table_type":"intval",
"valid_column":5,
@@ -447,7 +412,7 @@
}
},
{
"table_id":38,
"table_id":37,
"table_name":"TEST_BOOL_PLUGIN_WITH_EXDATA",
"table_type":"bool_plugin",
"valid_column":4,
@@ -457,7 +422,7 @@
}
},
{
"table_id":39,
"table_id":38,
"table_name":"FLAG_CONFIG",
"table_type":"flag",
"valid_column":5,
@@ -469,7 +434,7 @@
}
},
{
"table_id":40,
"table_id":39,
"table_name":"FLAG_PLUS_CONFIG",
"table_type":"flag_plus",
"valid_column":6,
@@ -482,7 +447,7 @@
}
},
{
"table_id":41,
"table_id":40,
"table_name":"PORT_CONFIG",
"table_type":"port",
"valid_column":7,
@@ -496,19 +461,19 @@
}
},
{
"table_id":42,
"table_id":41,
"table_name":"VIRTUAL_PORT_SOURCE",
"table_type":"virtual",
"physical_table": ["PORT_CONFIG"]
"physical_table": "PORT_CONFIG"
},
{
"table_id":42,
"table_name":"VIRTUAL_PORT_DESTINATION",
"table_type":"virtual",
"physical_table": "PORT_CONFIG"
},
{
"table_id":43,
"table_name":"VIRTUAL_PORT_DESTINATION",
"table_type":"virtual",
"physical_table": ["PORT_CONFIG"]
},
{
"table_id":44,
"table_name":"COMPOSITION_CONFIG",
"table_type":"composition",
"custom": {
@@ -519,7 +484,7 @@
}
},
{
"table_id":45,
"table_id":44,
"table_name":"TEST_PLUGIN_KEY_TYPE_TABLE",
"table_type":"plugin",
"valid_column":4,