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

rename terminology "clause" to "condition"

Browse Source
This commit is contained in:
root
2024-08-22 07:35:53 +00:00
parent f660e6b2ac
commit e538f5bb52
20 changed files with 682 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

204
test/maat_json.json
View File

@@ -846,7 +846,7 @@
"action": 1,
"do_blacklist": 1,
"do_log": 1,
"user_region": "NOTLogic.NotExprClauseAndNotIPClause",
"user_region": "NOTLogic.NotExprConditionAndNotIPCondition",
"is_valid": "yes",
"groups": [
{
@@ -854,7 +854,7 @@
"group_name": "146_url_group",
"group_id": 126,
"not_flag": 0,
"clause_index": 0,
"condition_index": 0,
"regions": [
{
"table_name": "HTTP_URL",
@@ -871,7 +871,7 @@
"group_name": "146_keywords_group",
"group_id": 127,
"not_flag": 1,
"clause_index": 1,
"condition_index": 1,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -887,7 +887,7 @@
"attribute": "ATTRIBUTE_IP_CONFIG",
"group_name": "123_IP_group",
"not_flag": 1,
"clause_index": 2
"condition_index": 2
}
]
},
@@ -897,7 +897,7 @@
"action": 1,
"do_blacklist": 1,
"do_log": 1,
"user_region": "NOTLogic.8NotClause",
"user_region": "NOTLogic.8NotCondition",
"is_valid": "yes",
"groups": [
{
@@ -905,13 +905,13 @@
"group_name": "147_keywords_group1",
"group_id": 128,
"not_flag": 1,
"clause_index": 0,
"condition_index": 0,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
"table_type": "expr",
"table_content": {
"keywords": "clause0-in-rule-147",
"keywords": "condition0-in-rule-147",
"expr_type": "and"
}
}
@@ -922,13 +922,13 @@
"group_name": "147_keywords_group2",
"group_id": 129,
"not_flag": 1,
"clause_index": 1,
"condition_index": 1,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
"table_type": "expr",
"table_content": {
"keywords": "clause1-in-rule-147",
"keywords": "condition1-in-rule-147",
"expr_type": "and"
}
}
@@ -939,13 +939,13 @@
"group_name": "147_keywords_group3",
"group_id": 130,
"not_flag": 1,
"clause_index": 2,
"condition_index": 2,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
"table_type": "expr",
"table_content": {
"keywords": "clause2-in-rule-147",
"keywords": "condition2-in-rule-147",
"expr_type": "and"
}
}
@@ -956,13 +956,13 @@
"group_name": "147_keywords_group4",
"group_id": 131,
"not_flag": 1,
"clause_index": 3,
"condition_index": 3,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
"table_type": "expr",
"table_content": {
"keywords": "clause3-in-rule-147",
"keywords": "condition3-in-rule-147",
"expr_type": "and"
}
}
@@ -973,13 +973,13 @@
"group_name": "147_keywords_group5",
"group_id": 132,
"not_flag": 1,
"clause_index": 4,
"condition_index": 4,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
"table_type": "expr",
"table_content": {
"keywords": "clause4-in-rule-147",
"keywords": "condition4-in-rule-147",
"expr_type": "and"
}
}
@@ -990,13 +990,13 @@
"group_name": "147_keywords_group6",
"group_id": 133,
"not_flag": 1,
"clause_index": 5,
"condition_index": 5,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
"table_type": "expr",
"table_content": {
"keywords": "clause5-in-rule-147",
"keywords": "condition5-in-rule-147",
"expr_type": "and"
}
}
@@ -1007,13 +1007,13 @@
"group_name": "147_keywords_group7",
"group_id": 134,
"not_flag": 1,
"clause_index": 6,
"condition_index": 6,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
"table_type": "expr",
"table_content": {
"keywords": "clause6-in-rule-147",
"keywords": "condition6-in-rule-147",
"expr_type": "and"
}
}
@@ -1024,13 +1024,13 @@
"group_name": "147_keywords_group8",
"group_id": 135,
"not_flag": 1,
"clause_index": 7,
"condition_index": 7,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
"table_type": "expr",
"table_content": {
"keywords": "clause7-in-rule-147",
"keywords": "condition7-in-rule-147",
"expr_type": "and"
}
}
@@ -1637,7 +1637,7 @@
"attribute": "HTTP_URL",
"group_name": "167_url_group",
"group_id": 158,
"clause_index": 1,
"condition_index": 1,
"regions": [
{
"table_name": "HTTP_URL",
@@ -1653,7 +1653,7 @@
"attribute": "HTTP_URL",
"group_name": "167_url_group",
"group_id": 158,
"clause_index": 3
"condition_index": 3
}
]
},
@@ -1671,13 +1671,13 @@
"attribute": "HTTP_URL",
"group_name": "167_url_group",
"group_id": 158,
"clause_index": 2
"condition_index": 2
},
{
"attribute": "HTTP_URL",
"group_name": "167_url_group",
"group_id": 158,
"clause_index": 6
"condition_index": 6
}
]
},
@@ -1694,7 +1694,7 @@
"attribute": "IP_PLUS_CONFIG",
"group_name": "169_IP_group",
"group_id": 160,
"clause_index": 0,
"condition_index": 0,
"not_flag" : 0,
"regions": [
{
@@ -1766,20 +1766,20 @@
"action": 1,
"do_blacklist": 1,
"do_log": 1,
"user_region": "NOTLogic.MultiGroupsInOneNotClause",
"user_region": "NOTLogic.MultiGroupsInOneNotCondition",
"is_valid": "yes",
"groups": [
{
"attribute": "ASN_NOT_LOGIC",
"group_name": ["ASN1234", "ASN6789", "ASN9001"],
"not_flag": 1,
"clause_index": 0
"condition_index": 0
},
{
"attribute": "DESTINATION_IP_ASN",
"group_name": "ASN2345",
"not_flag": 0,
"clause_index": 1
"condition_index": 1
}
]
},
@@ -1789,20 +1789,20 @@
"action": 1,
"do_blacklist": 1,
"do_log": 1,
"user_region": "Hierarchy.MultiGroupInOneClause",
"user_region": "Hierarchy.MultiGroupInOneCondition",
"is_valid": "yes",
"groups": [
{
"attribute": "SOURCE_IP_ASN",
"group_name": ["ASN1234", "ASN6789", "ASN9001"],
"not_flag": 0,
"clause_index": 0
"condition_index": 0
},
{
"attribute": "DESTINATION_IP_ASN",
"group_name": "ASN2345",
"not_flag": 0,
"clause_index": 1
"condition_index": 1
}
]
},
@@ -1838,26 +1838,26 @@
"action": 1,
"do_blacklist": 1,
"do_log": 1,
"user_region": "Hierarchy.MultiGroupInOneClause",
"user_region": "Hierarchy.MultiGroupInOneCondition",
"is_valid": "yes",
"groups": [
{
"attribute": "SOURCE_IP_ASN",
"group_name": ["ASN1234", "ASN6789", "ASN9001"],
"not_flag": 0,
"clause_index": 0
"condition_index": 0
},
{
"attribute": "SOURCE_IP_GEO",
"group_name": "Country-Sparta-IP",
"not_flag": 0,
"clause_index": 0
"condition_index": 0
},
{
"attribute": "IP_CONFIG",
"group_name": "financial-department-ip",
"not_flag": 0,
"clause_index": 1
"condition_index": 1
}
]
},
@@ -1867,26 +1867,26 @@
"action": 1,
"do_blacklist": 1,
"do_log": 1,
"user_region": "NOTLogic.MultiLiteralsInOneNotClause",
"user_region": "NOTLogic.MultiLiteralsInOneNotCondition",
"is_valid": "yes",
"groups": [
{
"attribute": "SOURCE_IP_ASN",
"group_name": ["ASN1234", "ASN6789", "ASN9001"],
"not_flag": 1,
"clause_index": 0
"condition_index": 0
},
{
"attribute": "IP_PLUS_CONFIG",
"group_name": "develop-department-ip",
"not_flag": 1,
"clause_index": 0
"condition_index": 0
},
{
"attribute": "SOURCE_IP_GEO",
"group_name": "Country-Sparta-IP",
"not_flag": 0,
"clause_index": 1
"condition_index": 1
}
]
},
@@ -1948,38 +1948,38 @@
"action": 1,
"do_blacklist": 1,
"do_log": 1,
"user_region": "NOTLogic.SameAttributeInMultiClause",
"user_region": "NOTLogic.SameAttributeInMultiCondition",
"is_valid": "yes",
"groups": [
{
"attribute": "DESTINATION_IP_ASN",
"group_name": ["ASN1234", "ASN6789", "ASN9001"],
"not_flag": 1,
"clause_index": 0
"condition_index": 0
},
{
"attribute": "SOURCE_IP_GEO",
"group_name": "Country-Sparta-IP",
"not_flag": 1,
"clause_index": 0
"condition_index": 0
},
{
"attribute": "DESTINATION_IP_ASN",
"group_name": "ASN9002",
"not_flag": 1,
"clause_index": 1
"condition_index": 1
},
{
"attribute": "DESTINATION_IP_ASN",
"group_name": "ASN9003",
"not_flag": 0,
"clause_index": 2
"condition_index": 2
},
{
"attribute": "IP_PLUS_CONFIG",
"group_name": "security-department-ip",
"not_flag": 0,
"clause_index": 3
"condition_index": 3
}
]
},
@@ -2423,7 +2423,7 @@
"group_name": "ExcludeLogicGroup199_1",
"group_id": 189,
"is_exclude": 0,
"clause_index": 0,
"condition_index": 0,
"regions": [
{
"table_name": "HTTP_URL",
@@ -2439,7 +2439,7 @@
"group_name": "ExcludeLogicGroup199_2",
"group_id": 190,
"is_exclude": 1,
"clause_index": 0,
"condition_index": 0,
"regions": [
{
"table_name": "HTTP_URL",
@@ -2474,7 +2474,7 @@
"group_name": "ExcludeLogicGroup200_1",
"group_id": 192,
"is_exclude": 0,
"clause_index": 0,
"condition_index": 0,
"regions": [
{
"table_name": "HTTP_URL",
@@ -2491,7 +2491,7 @@
"group_name": "ExcludeLogicGroup200_2",
"group_id": 193,
"is_exclude": 1,
"clause_index": 0,
"condition_index": 0,
"regions": [
{
"table_name": "HTTP_URL",
@@ -2520,7 +2520,7 @@
"attribute": "ATTRIBUTE_IP_PLUS_TABLE",
"group_name": "ExcludeLogicGroup202",
"group_id": 194,
"clause_index": 0,
"condition_index": 0,
"sub_groups":[
{
"group_name": "ExcludeLogicGroup202_1",
@@ -2581,7 +2581,7 @@
"attribute": "ATTRIBUTE_IP_PLUS_SOURCE",
"group_name": "ExcludeLogicGroup203_1",
"group_id": 198,
"clause_index": 0,
"condition_index": 0,
"regions": [
{
"table_name": "IP_PLUS_CONFIG",
@@ -2597,7 +2597,7 @@
"attribute": "ATTRIBUTE_IP_PLUS_DESTINATION",
"group_name": "ExcludeLogicGroup203_2",
"group_id": 199,
"clause_index": 1,
"condition_index": 1,
"regions": [
{
"table_name": "IP_PLUS_CONFIG",
@@ -2612,7 +2612,7 @@
"attribute": "HTTP_RESPONSE_KEYWORDS",
"group_name": "ExcludeLogicGroup203_3",
"group_id": 200,
"clause_index": 2,
"condition_index": 2,
"sub_groups": [
{
"group_name": "ExcludeLogicGroup203_3_1",
@@ -2661,7 +2661,7 @@
"attribute": "ATTRIBUTE_IP_PLUS_SOURCE",
"group_name": "ExcludeLogicGroup204_1",
"group_id": 203,
"clause_index": 0,
"condition_index": 0,
"regions": [
{
"table_name": "IP_PLUS_CONFIG",
@@ -2677,7 +2677,7 @@
"attribute": "ATTRIBUTE_IP_PLUS_DESTINATION",
"group_name": "ExcludeLogicGroup204_2",
"group_id":204,
"clause_index": 1,
"condition_index": 1,
"regions": [
{
"table_name": "IP_PLUS_CONFIG",
@@ -2692,7 +2692,7 @@
"attribute": "HTTP_RESPONSE_KEYWORDS",
"group_name": "ExcludeLogicGroup204_3",
"group_id": 205,
"clause_index": 2,
"condition_index": 2,
"sub_groups": [
{
"group_name": "ExcludeLogicGroup204_3_1",
@@ -3040,21 +3040,21 @@
"action": 0,
"do_blacklist": 0,
"do_log": 0,
"user_region": "NOTClause&ExcludeGroup",
"user_region": "NOTCondition&ExcludeGroup",
"is_valid": "yes",
"groups": [
{
"attribute": "HTTP_URL_FILTER",
"group_name": "ExcludeLogicGroup200",
"not_flag": 0,
"clause_index": 0
"condition_index": 0
},
{
"attribute": "HTTP_RESPONSE_KEYWORDS",
"group_name": "NOTClauseAndExcludeGroup216",
"group_name": "NOTConditionAndExcludeGroup216",
"group_id": 221,
"not_flag": 1,
"clause_index": 1,
"condition_index": 1,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3074,15 +3074,15 @@
"action": 0,
"do_blacklist": 0,
"do_log": 0,
"user_region": "NOTClause&ExcludeGroup",
"user_region": "NOTCondition&ExcludeGroup",
"is_valid": "yes",
"groups": [
{
"attribute": "HTTP_URL_FILTER",
"group_name": "NOTClauseAndExcludeGroup217_1",
"group_name": "NOTConditionAndExcludeGroup217_1",
"group_id": 222,
"not_flag": 1,
"clause_index": 0,
"condition_index": 0,
"sub_groups": [
{
"group_name": "ExcludeLogicGroup217_1_1",
@@ -3118,10 +3118,10 @@
},
{
"attribute": "HTTP_RESPONSE_KEYWORDS",
"group_name": "NOTClauseAndExcludeGroup217_2",
"group_name": "NOTConditionAndExcludeGroup217_2",
"group_id": 225,
"not_flag": 0,
"clause_index": 1,
"condition_index": 1,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3171,10 +3171,10 @@
"groups": [
{
"attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup219_1",
"group_name": "NOTConditionAndExcludeGroup219_1",
"group_id": 227,
"not_flag": 0,
"clause_index": 0,
"condition_index": 0,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3188,10 +3188,10 @@
},
{
"attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup219_2",
"group_name": "NOTConditionAndExcludeGroup219_2",
"group_id": 228,
"not_flag": 1,
"clause_index": 1,
"condition_index": 1,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3205,10 +3205,10 @@
},
{
"attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup219_3",
"group_name": "NOTConditionAndExcludeGroup219_3",
"group_id": 229,
"not_flag": 1,
"clause_index": 2,
"condition_index": 2,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3222,10 +3222,10 @@
},
{
"attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup219_4",
"group_name": "NOTConditionAndExcludeGroup219_4",
"group_id": 230,
"not_flag": 1,
"clause_index": 3,
"condition_index": 3,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3239,10 +3239,10 @@
},
{
"attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup219_5",
"group_name": "NOTConditionAndExcludeGroup219_5",
"group_id": 231,
"not_flag": 1,
"clause_index": 4,
"condition_index": 4,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3256,10 +3256,10 @@
},
{
"attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup219_6",
"group_name": "NOTConditionAndExcludeGroup219_6",
"group_id": 232,
"not_flag": 1,
"clause_index": 5,
"condition_index": 5,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3273,10 +3273,10 @@
},
{
"attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup219_7",
"group_name": "NOTConditionAndExcludeGroup219_7",
"group_id": 233,
"not_flag": 1,
"clause_index": 6,
"condition_index": 6,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3290,10 +3290,10 @@
},
{
"attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup219_8",
"group_name": "NOTConditionAndExcludeGroup219_8",
"group_id": 234,
"not_flag": 1,
"clause_index": 7,
"condition_index": 7,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3318,10 +3318,10 @@
"groups": [
{
"attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup220_1",
"group_name": "NOTConditionAndExcludeGroup220_1",
"group_id": 235,
"not_flag": 0,
"clause_index": 0,
"condition_index": 0,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3335,10 +3335,10 @@
},
{
"attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup220_2",
"group_name": "NOTConditionAndExcludeGroup220_2",
"group_id": 236,
"not_flag": 1,
"clause_index": 1,
"condition_index": 1,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3352,10 +3352,10 @@
},
{
"attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup220_3",
"group_name": "NOTConditionAndExcludeGroup220_3",
"group_id": 237,
"not_flag": 1,
"clause_index": 2,
"condition_index": 2,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3419,7 +3419,7 @@
"action": 0,
"do_blacklist": 0,
"do_log": 0,
"user_region": "NOTLogic.SingleNotClause",
"user_region": "NOTLogic.SingleNotCondition",
"is_valid": "yes",
"groups": [
{
@@ -3427,7 +3427,7 @@
"group_name": "NOTLogicGroup_222",
"group_id": 240,
"not_flag": 1,
"clause_index": 0,
"condition_index": 0,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3447,7 +3447,7 @@
"action": 0,
"do_blacklist": 0,
"do_log": 0,
"user_region": "NOTLogic.MultiNotClause",
"user_region": "NOTLogic.MultiNotCondition",
"is_valid": "yes",
"groups": [
{
@@ -3455,7 +3455,7 @@
"group_name": "NOTLogicGroup_223_1",
"group_id": 241,
"not_flag": 1,
"clause_index": 0,
"condition_index": 0,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3472,7 +3472,7 @@
"group_name": "NOTLogicGroup_223_2",
"group_id": 242,
"not_flag": 1,
"clause_index": 1,
"condition_index": 1,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3489,7 +3489,7 @@
"group_name": "NOTLogicGroup_223_1",
"group_id": 243,
"not_flag": 1,
"clause_index": 2,
"condition_index": 2,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3517,7 +3517,7 @@
"group_name": "NOTLogicGroup_224_1",
"group_id": 244,
"not_flag": 1,
"clause_index": 0,
"condition_index": 0,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3534,7 +3534,7 @@
"group_name": "NOTLogicGroup_224_2",
"group_id": 245,
"not_flag": 0,
"clause_index": 1,
"condition_index": 1,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3562,7 +3562,7 @@
"group_name": "EscapeGroup_225_1",
"group_id": 246,
"not_flag": 0,
"clause_index": 0,
"condition_index": 0,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3616,7 +3616,7 @@
"action": 1,
"do_blacklist": 1,
"do_log": 1,
"user_region": "NotClauseHitPath",
"user_region": "NotConditionHitPath",
"is_valid": "yes",
"groups": [
{
@@ -3624,7 +3624,7 @@
"group_name": "228_url_group",
"group_id": 249,
"not_flag": 0,
"clause_index": 1,
"condition_index": 1,
"regions": [
{
"table_name": "HTTP_URL",
@@ -3641,7 +3641,7 @@
"group_name": "228_IP_group",
"group_id": 250,
"not_flag": 1,
"clause_index": 2,
"condition_index": 2,
"regions": [
{
"table_name": "IP_CONFIG",
@@ -3788,7 +3788,7 @@
"group_name": "EscapeGroup_234_1",
"group_id": 260,
"not_flag": 0,
"clause_index": 0,
"condition_index": 0,
"regions": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3816,7 +3816,7 @@
"group_name": "EscapeGroup_235_1",
"group_id": 261,
"not_flag": 0,
"clause_index": 0,
"condition_index": 0,
"regions": [
{
"table_name": "KEYWORDS_TABLE",