summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorroot <[email protected]>2024-08-22 06:42:37 +0000
committerroot <[email protected]>2024-08-22 06:42:37 +0000
commitf660e6b2ac772ff6dcc8525e3d40ebbdff73a670 (patch)
tree9d4287110ff59e979501753dff4dea90b3858929 /test
parent678ddd718a3e1b3561ced76b3a3f65a075e25b5e (diff)
rename terminology "virtual table(vtable)" to "attribute"
Diffstat (limited to 'test')
-rw-r--r--test/benchmark/benchmark_gtest.cpp4
-rw-r--r--test/benchmark/benchmark_table_info.conf2
-rw-r--r--test/file_test_tableinfo.conf2
-rw-r--r--test/json_update/new.json2
-rw-r--r--test/json_update/old.json2
-rw-r--r--test/maat_framework_gtest.cpp246
-rw-r--r--test/maat_json.json354
-rw-r--r--test/table_info.conf56
-rw-r--r--test/test_utils.cpp4
-rw-r--r--test/test_utils.h2
10 files changed, 337 insertions, 337 deletions
diff --git a/test/benchmark/benchmark_gtest.cpp b/test/benchmark/benchmark_gtest.cpp
index 672913d..1ddfe71 100644
--- a/test/benchmark/benchmark_gtest.cpp
+++ b/test/benchmark/benchmark_gtest.cpp
@@ -137,7 +137,7 @@ void generate_rule_sample(const char *table_name, int sample_count)
fclose(fp);
}
-void generate_group2rule_sample(const char *table_name, const char *vtable_name,
+void generate_group2rule_sample(const char *table_name, const char *attribute_name,
int sample_count)
{
FILE *fp = fopen(table_name, "w+");
@@ -149,7 +149,7 @@ void generate_group2rule_sample(const char *table_name, const char *vtable_name,
fprintf(fp, "%d\n", sample_count);
for (int i = 0; i < sample_count; i++) {
- fprintf(fp, "%d\t%d\t0\t%s\t1\t1\n", i+1, 100+i, vtable_name);
+ fprintf(fp, "%d\t%d\t0\t%s\t1\t1\n", i+1, 100+i, attribute_name);
}
fclose(fp);
diff --git a/test/benchmark/benchmark_table_info.conf b/test/benchmark/benchmark_table_info.conf
index 755eb2e..5af3bb2 100644
--- a/test/benchmark/benchmark_table_info.conf
+++ b/test/benchmark/benchmark_table_info.conf
@@ -573,7 +573,7 @@
"group_id":1,
"rule_id":2,
"not_flag":3,
- "virtual_table_name":4,
+ "attribute_name":4,
"clause_index":5
}
},
diff --git a/test/file_test_tableinfo.conf b/test/file_test_tableinfo.conf
index 1385d2c..6263135 100644
--- a/test/file_test_tableinfo.conf
+++ b/test/file_test_tableinfo.conf
@@ -55,7 +55,7 @@
"group_id":1,
"rule_id":2,
"not_flag":4,
- "virtual_table_name":5,
+ "attribute_name":5,
"clause_index":6
}
},
diff --git a/test/json_update/new.json b/test/json_update/new.json
index b99272e..4fda461 100644
--- a/test/json_update/new.json
+++ b/test/json_update/new.json
@@ -13,7 +13,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"regions": [
{
"table_name": "HTTP_URL",
diff --git a/test/json_update/old.json b/test/json_update/old.json
index bddc415..c248157 100644
--- a/test/json_update/old.json
+++ b/test/json_update/old.json
@@ -14,7 +14,7 @@
"groups": [
{
"group_name": "Untitled",
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"regions": [
{
"table_name": "HTTP_URL",
diff --git a/test/maat_framework_gtest.cpp b/test/maat_framework_gtest.cpp
index 18936da..ddd5bd5 100644
--- a/test/maat_framework_gtest.cpp
+++ b/test/maat_framework_gtest.cpp
@@ -3249,8 +3249,8 @@ TEST_F(IPScan, RuleUpdates) {
TEST_F(IPScan, RuleChangeClauseId) {
//This test is a reproduce of bug OMPUB-1343.
- const char *src_table_name = "VIRTUAL_IP_PLUS_SOURCE";
- const char *dst_table_name = "VIRTUAL_IP_PLUS_DESTINATION";
+ const char *src_table_name = "ATTRIBUTE_IP_PLUS_SOURCE";
+ const char *dst_table_name = "ATTRIBUTE_IP_PLUS_DESTINATION";
const char *phy_ip_table_name = "IP_PLUS_CONFIG";
struct maat *maat_inst = IPScan::_shared_maat_inst;
int thread_id = 0;
@@ -3356,7 +3356,7 @@ TEST_F(IPScan, RuleChangeClauseId) {
struct maat_hit_group group;
group.item_id = 0;
- group.vtable_id = 0;
+ group.attribute_id = 0;
group.group_id = group_id3;
ret = maat_scan_group(maat_inst, app_id_table_id, &group, 1, results, ARRAY_SIZE, &n_hit_result, state);
@@ -3566,7 +3566,7 @@ TEST_F(GroupScan, PhysicalTable) {
struct maat_hit_group hit_group;
hit_group.group_id = 247;
- hit_group.vtable_id = table_id;
+ hit_group.attribute_id = table_id;
int ret = maat_scan_group(maat_inst, table_id, &hit_group, 1, results,
ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
@@ -3578,7 +3578,7 @@ TEST_F(GroupScan, PhysicalTable) {
sleep(2);
}
-TEST_F(GroupScan, VirtualTable) {
+TEST_F(GroupScan, Attribute) {
long long results[ARRAY_SIZE] = {0};
size_t n_hit_result = 0;
int thread_id = 0;
@@ -3591,7 +3591,7 @@ TEST_F(GroupScan, VirtualTable) {
struct maat_hit_group hit_group;
hit_group.group_id = 259;
- hit_group.vtable_id = table_id;
+ hit_group.attribute_id = table_id;
int ret = maat_scan_group(maat_inst, table_id, &hit_group, 1, results,
ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
@@ -3622,7 +3622,7 @@ TEST_F(GroupScan, SetScanRuleTable) {
struct maat_hit_group hit_group;
hit_group.group_id = 248;
- hit_group.vtable_id = table_id;
+ hit_group.attribute_id = table_id;
ret = maat_scan_group(maat_inst, table_id, &hit_group, 1, results,
ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
@@ -3940,14 +3940,14 @@ TEST_F(NOTLogic, ScanNotIP) {
size_t n_hit_result = 0;
int thread_id = 0;
const char *hit_table_name = "HTTP_URL";
- const char *not_hit_table_name = "VIRTUAL_IP_CONFIG";
+ const char *not_hit_table_name = "ATTRIBUTE_IP_CONFIG";
struct maat *maat_inst = NOTLogic::_shared_maat_inst;
struct maat_state *state = maat_state_new(maat_inst, thread_id);
int hit_table_id = maat_get_table_id(maat_inst, hit_table_name);
ASSERT_GT(hit_table_id, 0);
- // scan string_should_hit(HTTP_URL) & hit ip(VIRTUAL_IP_CONFIG) => not hit rule
+ // scan string_should_hit(HTTP_URL) & hit ip(ATTRIBUTE_IP_CONFIG) => not hit rule
int ret = maat_scan_string(maat_inst, hit_table_id, string_should_hit,
strlen(string_should_hit), results, ARRAY_SIZE,
&n_hit_result, state);
@@ -3975,7 +3975,7 @@ TEST_F(NOTLogic, ScanNotIP) {
maat_state_reset(state);
- // scan string_should_hit(HTTP_URL) & not hit ip(VIRTUAL_IP_CONFIG) => hit rule145
+ // scan string_should_hit(HTTP_URL) & not hit ip(ATTRIBUTE_IP_CONFIG) => hit rule145
ret = maat_scan_string(maat_inst, hit_table_id, string_should_hit,
strlen(string_should_hit), results, ARRAY_SIZE,
&n_hit_result, state);
@@ -4002,7 +4002,7 @@ TEST_F(NOTLogic, ScanNotWithDistrict) {
size_t n_hit_result = 0;
int thread_id = 0;
const char *url_table_name = "HTTP_URL";
- const char *virtual_table_name = "HTTP_REQUEST_HEADER";
+ const char *attribute_name = "HTTP_REQUEST_HEADER";
const char *district_str1 = "User-Agent";
struct maat *maat_inst = NOTLogic::_shared_maat_inst;
struct maat_state *state = maat_state_new(maat_inst, thread_id);
@@ -4016,18 +4016,18 @@ TEST_F(NOTLogic, ScanNotWithDistrict) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HALF_HIT);
- int virtual_table_id = maat_get_table_id(maat_inst, virtual_table_name);
- ASSERT_GT(virtual_table_id, 0);
+ int attribute_id = maat_get_table_id(maat_inst, attribute_name);
+ ASSERT_GT(attribute_id, 0);
- ret = maat_state_set_scan_district(state, virtual_table_id, district_str1,
+ ret = maat_state_set_scan_district(state, attribute_id, district_str1,
strlen(district_str1));
ASSERT_EQ(ret, 0);
- ret = maat_scan_string(maat_inst, virtual_table_id, string2, strlen(string2),
+ ret = maat_scan_string(maat_inst, attribute_id, string2, strlen(string2),
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HALF_HIT);
- ret = maat_scan_not_logic(maat_inst, virtual_table_id, results, ARRAY_SIZE,
+ ret = maat_scan_not_logic(maat_inst, attribute_id, results, ARRAY_SIZE,
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_OK);
@@ -4039,15 +4039,15 @@ TEST_F(NOTLogic, ScanNotWithDistrict) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HALF_HIT);
- ret = maat_state_set_scan_district(state, virtual_table_id, district_str1,
+ ret = maat_state_set_scan_district(state, attribute_id, district_str1,
strlen(district_str1));
ASSERT_EQ(ret, 0);
- ret = maat_scan_string(maat_inst, virtual_table_id, string3, strlen(string3),
+ ret = maat_scan_string(maat_inst, attribute_id, string3, strlen(string3),
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_OK);
- ret = maat_scan_not_logic(maat_inst, virtual_table_id, results, ARRAY_SIZE,
+ ret = maat_scan_not_logic(maat_inst, attribute_id, results, ARRAY_SIZE,
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
@@ -4066,7 +4066,7 @@ TEST_F(NOTLogic, NotUrlAndNotIp) {
size_t n_hit_result = 0;
int thread_id = 0;
const char *url_table_name = "HTTP_URL_FILTER";
- const char *ip_table_name = "VIRTUAL_IP_CONFIG";
+ const char *ip_table_name = "ATTRIBUTE_IP_CONFIG";
const char *http_table_name = "HTTP_RESPONSE_KEYWORDS";
struct maat *maat_inst = NOTLogic::_shared_maat_inst;
struct maat_state *state = maat_state_new(maat_inst, thread_id);
@@ -4074,7 +4074,7 @@ TEST_F(NOTLogic, NotUrlAndNotIp) {
int url_table_id = maat_get_table_id(maat_inst, url_table_name);
ASSERT_GT(url_table_id, 0);
- //scan string_should_half_hit(HTTP_URL_FILTER) & hit ip(VIRTUAL_IP_CONFIG) => not hit rule
+ //scan string_should_half_hit(HTTP_URL_FILTER) & hit ip(ATTRIBUTE_IP_CONFIG) => not hit rule
int ret = maat_scan_string(maat_inst, url_table_id, string_should_half_hit,
strlen(string_should_half_hit), results, ARRAY_SIZE,
&n_hit_result, state);
@@ -4100,7 +4100,7 @@ TEST_F(NOTLogic, NotUrlAndNotIp) {
maat_state_reset(state);
- // scan string_should_half_hit(HTTP_RESPONSE_KEYWORDS) & not hit ip(VIRTUAL_IP_CONFIG) => not hit rule
+ // scan string_should_half_hit(HTTP_RESPONSE_KEYWORDS) & not hit ip(ATTRIBUTE_IP_CONFIG) => not hit rule
int http_table_id = maat_get_table_id(maat_inst, http_table_name);
ASSERT_GT(http_table_id, 0);
@@ -4124,7 +4124,7 @@ TEST_F(NOTLogic, NotUrlAndNotIp) {
maat_state_reset(state);
- // scan scan string_should_half_hit(HTTP_URL_FILTER) & not hit ip(VIRTUAL_IP_CONFIG) => hit rule146
+ // scan scan string_should_half_hit(HTTP_URL_FILTER) & not hit ip(ATTRIBUTE_IP_CONFIG) => hit rule146
ret = maat_scan_string(maat_inst, url_table_id, string_should_half_hit,
strlen(string_should_half_hit), results, ARRAY_SIZE,
&n_hit_result, state);
@@ -4162,15 +4162,15 @@ TEST_F(NOTLogic, NotPhysicalTable) {
size_t n_hit_result = 0;
int thread_id = 0;
const char *phy_table_name = "KEYWORDS_TABLE";
- const char *vtable_name = "HTTP_RESPONSE_KEYWORDS";
+ const char *attribute_name = "HTTP_RESPONSE_KEYWORDS";
struct maat *maat_inst = NOTLogic::_shared_maat_inst;
struct maat_state *state = maat_state_new(maat_inst, thread_id);
int phy_table_id = maat_get_table_id(maat_inst, phy_table_name);
ASSERT_GT(phy_table_id, 0);
- int vtable_id = maat_get_table_id(maat_inst, vtable_name);
- ASSERT_GT(vtable_id, 0);
+ int attribute_id = maat_get_table_id(maat_inst, attribute_name);
+ ASSERT_GT(attribute_id, 0);
// scan hit string1(KEYWORDS_TABLE) & hit string2(HTTP_RESPONSE_KEYWORDS) => not hit rule
int ret = maat_scan_string(maat_inst, phy_table_id, string1,
@@ -4182,7 +4182,7 @@ TEST_F(NOTLogic, NotPhysicalTable) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_OK);
- ret = maat_scan_string(maat_inst, vtable_id, string2, strlen(string2),
+ ret = maat_scan_string(maat_inst, attribute_id, string2, strlen(string2),
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HALF_HIT);
@@ -4197,7 +4197,7 @@ TEST_F(NOTLogic, NotPhysicalTable) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_OK);
- ret = maat_scan_string(maat_inst, vtable_id, string2, strlen(string2),
+ ret = maat_scan_string(maat_inst, attribute_id, string2, strlen(string2),
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
@@ -4762,7 +4762,7 @@ TEST_F(NOTLogic, MultiLiteralsInOneNotClause) {
state = NULL;
}
-TEST_F(NOTLogic, SameVtableInMultiClause) {
+TEST_F(NOTLogic, SameAttributeInMultiClause) {
const char *src_asn1 = "AS1234";
const char *src_asn2 = "AS9002";
const char *src_asn3 = "AS9003";
@@ -5062,13 +5062,13 @@ TEST_F(ExcludeLogic, ScanIrrelavantAtLast) {
state = NULL;
}
-TEST_F(ExcludeLogic, ScanVirtualTable) {
+TEST_F(ExcludeLogic, ScanAttribute) {
long long results[ARRAY_SIZE] = {0};
size_t n_hit_result = 0;
int thread_id = 0;
struct maat *maat_inst = ExcludeLogic::_shared_maat_inst;
struct maat_state *state = maat_state_new(maat_inst, thread_id);
- const char *table_name = "VIRTUAL_IP_PLUS_TABLE";
+ const char *table_name = "ATTRIBUTE_IP_PLUS_TABLE";
int table_id = maat_get_table_id(maat_inst, table_name);
ASSERT_GT(table_id, 0);
@@ -5130,7 +5130,7 @@ TEST_F(ExcludeLogic, ScanWithMultiClause) {
int thread_id = 0;
struct maat *maat_inst = ExcludeLogic::_shared_maat_inst;
struct maat_state *state = maat_state_new(maat_inst, thread_id);
- const char *ip_table_name = "VIRTUAL_IP_PLUS_TABLE";
+ const char *ip_table_name = "ATTRIBUTE_IP_PLUS_TABLE";
int ip_table_id = maat_get_table_id(maat_inst, ip_table_name);
ASSERT_GT(ip_table_id, 0);
@@ -5191,7 +5191,7 @@ TEST_F(ExcludeLogic, ExcludeInDifferentLevel) {
int thread_id = 0;
struct maat *maat_inst = ExcludeLogic::_shared_maat_inst;
struct maat_state *state = maat_state_new(maat_inst, thread_id);
- const char *ip_table_name = "VIRTUAL_IP_PLUS_TABLE";
+ const char *ip_table_name = "ATTRIBUTE_IP_PLUS_TABLE";
int ip_table_id = maat_get_table_id(maat_inst, ip_table_name);
ASSERT_GT(ip_table_id, 0);
@@ -6082,7 +6082,7 @@ TEST_F(BoolPluginTable, EX_DATA) {
EXPECT_EQ(result[0]->id, 305);
}
-class VirtualTable : public testing::Test
+class Attribute : public testing::Test
{
protected:
static void SetUpTestCase() {
@@ -6111,7 +6111,7 @@ protected:
maat_options_free(opts);
if (NULL == _shared_maat_inst) {
log_fatal(logger, MODULE_FRAMEWORK_GTEST,
- "[%s:%d] create maat instance in VirtualTable failed.",
+ "[%s:%d] create maat instance in Attribute failed.",
__FUNCTION__, __LINE__);
}
}
@@ -6125,15 +6125,15 @@ protected:
static struct maat *_shared_maat_inst;
};
-struct maat *VirtualTable::_shared_maat_inst;
-struct log_handle *VirtualTable::logger;
+struct maat *Attribute::_shared_maat_inst;
+struct log_handle *Attribute::logger;
-TEST_F(VirtualTable, basic) {
+TEST_F(Attribute, basic) {
long long results[ARRAY_SIZE] = {0};
size_t n_hit_result = 0;
int thread_id = 0;
const char *table_name = "HTTP_RESPONSE_KEYWORDS";
- struct maat *maat_inst = VirtualTable::_shared_maat_inst;
+ struct maat *maat_inst = Attribute::_shared_maat_inst;
struct maat_state *state = maat_state_new(maat_inst, thread_id);
int table_id = maat_get_table_id(maat_inst, table_name);
@@ -6271,33 +6271,33 @@ TEST_F(TableSchemaTag, RuleTable) {
EXPECT_EQ(ret, 0);
//HTTP_RESPONSE_KEYWORDS
- const char *vtable_name = "HTTP_RESPONSE_KEYWORDS";
- int vtable_id = maat_get_table_id(maat_inst, vtable_name);
- EXPECT_EQ(vtable_id, 25);
+ const char *attribute_name = "HTTP_RESPONSE_KEYWORDS";
+ int attribute_id = maat_get_table_id(maat_inst, attribute_name);
+ EXPECT_EQ(attribute_id, 25);
- const char *tag7 = maat_get_table_schema_tag(maat_inst, vtable_id);
+ const char *tag7 = maat_get_table_schema_tag(maat_inst, attribute_id);
EXPECT_TRUE(tag7 != NULL);
- ret = strcmp(tag7, "{\"http_response_keywords\": \"virtual\"}");
+ ret = strcmp(tag7, "{\"http_response_keywords\": \"attribute\"}");
EXPECT_EQ(ret, 0);
- //VIRTUAL_IP_PLUS_TABLE
- const char *vtable1_name = "VIRTUAL_IP_PLUS_TABLE";
- int vtable1_id = maat_get_table_id(maat_inst, vtable1_name);
- EXPECT_EQ(vtable1_id, 28);
+ //ATTRIBUTE_IP_PLUS_TABLE
+ const char *attribute1_name = "ATTRIBUTE_IP_PLUS_TABLE";
+ int attribute1_id = maat_get_table_id(maat_inst, attribute1_name);
+ EXPECT_EQ(attribute1_id, 28);
- const char *vtable2_name = "VIRTUAL_IP_PLUS_SOURCE";
- int vtable2_id = maat_get_table_id(maat_inst, vtable2_name);
- EXPECT_EQ(vtable2_id, 28);
+ const char *attribute2_name = "ATTRIBUTE_IP_PLUS_SOURCE";
+ int attribute2_id = maat_get_table_id(maat_inst, attribute2_name);
+ EXPECT_EQ(attribute2_id, 28);
- const char *vtable3_name = "VIRTUAL_IP_PLUS_DESTINATION";
- int vtable3_id = maat_get_table_id(maat_inst, vtable3_name);
- EXPECT_EQ(vtable3_id, 28);
+ const char *attribute3_name = "ATTRIBUTE_IP_PLUS_DESTINATION";
+ int attribute3_id = maat_get_table_id(maat_inst, attribute3_name);
+ EXPECT_EQ(attribute3_id, 28);
- const char *tag8 = maat_get_table_schema_tag(maat_inst, vtable1_id);
+ const char *tag8 = maat_get_table_schema_tag(maat_inst, attribute1_id);
EXPECT_TRUE(tag8 != NULL);
- ret = strcmp(tag8, "{\"virtual_ip_plus_table\": \"virtual\"}");
+ ret = strcmp(tag8, "{\"attribute_ip_plus_table\": \"attribute\"}");
EXPECT_EQ(ret, 0);
}
@@ -6745,37 +6745,37 @@ TEST_F(Policy, EvaluationOrder) {
size_t n_hit_path = maat_state_get_hit_paths(state, hit_path, 128);
EXPECT_EQ(n_hit_path, 6);
- EXPECT_EQ(hit_path[0].vtable_id, table_id);
+ EXPECT_EQ(hit_path[0].attribute_id, table_id);
EXPECT_EQ(hit_path[0].sub_group_id, 158);
EXPECT_EQ(hit_path[0].top_group_id, 158);
EXPECT_EQ(hit_path[0].clause_index, 2);
EXPECT_EQ(hit_path[0].rule_id, 168);
- EXPECT_EQ(hit_path[1].vtable_id, table_id);
+ EXPECT_EQ(hit_path[1].attribute_id, table_id);
EXPECT_EQ(hit_path[1].sub_group_id, 157);
EXPECT_EQ(hit_path[1].top_group_id, 157);
EXPECT_EQ(hit_path[1].clause_index, 0);
EXPECT_EQ(hit_path[1].rule_id, 166);
- EXPECT_EQ(hit_path[2].vtable_id, table_id);
+ EXPECT_EQ(hit_path[2].attribute_id, table_id);
EXPECT_EQ(hit_path[2].sub_group_id, 155);
EXPECT_EQ(hit_path[2].top_group_id, -1);
EXPECT_EQ(hit_path[2].clause_index, -1);
EXPECT_EQ(hit_path[2].rule_id, -1);
- EXPECT_EQ(hit_path[3].vtable_id, table_id);
+ EXPECT_EQ(hit_path[3].attribute_id, table_id);
EXPECT_EQ(hit_path[3].sub_group_id, 158);
EXPECT_EQ(hit_path[3].top_group_id, 158);
EXPECT_EQ(hit_path[3].clause_index, 6);
EXPECT_EQ(hit_path[3].rule_id, 168);
- EXPECT_EQ(hit_path[4].vtable_id, table_id);
+ EXPECT_EQ(hit_path[4].attribute_id, table_id);
EXPECT_EQ(hit_path[4].sub_group_id, 158);
EXPECT_EQ(hit_path[4].top_group_id, 158);
EXPECT_EQ(hit_path[4].clause_index, 1);
EXPECT_EQ(hit_path[4].rule_id, 167);
- EXPECT_EQ(hit_path[5].vtable_id, table_id);
+ EXPECT_EQ(hit_path[5].attribute_id, table_id);
EXPECT_EQ(hit_path[5].sub_group_id, 158);
EXPECT_EQ(hit_path[5].top_group_id, 158);
EXPECT_EQ(hit_path[5].clause_index, 3);
@@ -6807,7 +6807,7 @@ TEST_F(Policy, EvaluationOrder) {
TEST_F(Policy, NotClauseHitPath) {
const char *url_table_name = "HTTP_URL";
- const char *ip_table_name = "VIRTUAL_IP_CONFIG";
+ const char *ip_table_name = "ATTRIBUTE_IP_CONFIG";
const char *url = "www.youtube.com";
long long results[ARRAY_SIZE] = {0};
size_t n_hit_result = 0;
@@ -6844,7 +6844,7 @@ TEST_F(Policy, NotClauseHitPath) {
EXPECT_EQ(n_hit_path, 4);
EXPECT_EQ(hit_path[0].Nth_scan, 1);
- EXPECT_EQ(hit_path[0].vtable_id, url_table_id);
+ EXPECT_EQ(hit_path[0].attribute_id, url_table_id);
EXPECT_EQ(hit_path[0].NOT_flag, 0);
EXPECT_EQ(hit_path[0].clause_index, 1);
EXPECT_EQ(hit_path[0].sub_group_id, 249);
@@ -6852,7 +6852,7 @@ TEST_F(Policy, NotClauseHitPath) {
EXPECT_EQ(hit_path[0].rule_id, 228);
EXPECT_EQ(hit_path[1].Nth_scan, 2);
- EXPECT_EQ(hit_path[1].vtable_id, ip_table_id);
+ EXPECT_EQ(hit_path[1].attribute_id, ip_table_id);
EXPECT_EQ(hit_path[1].NOT_flag, 1);
EXPECT_EQ(hit_path[1].clause_index, -1);
EXPECT_EQ(hit_path[1].sub_group_id, 100);
@@ -6860,7 +6860,7 @@ TEST_F(Policy, NotClauseHitPath) {
EXPECT_EQ(hit_path[1].rule_id, -1);
EXPECT_EQ(hit_path[2].Nth_scan, 2);
- EXPECT_EQ(hit_path[2].vtable_id, ip_table_id);
+ EXPECT_EQ(hit_path[2].attribute_id, ip_table_id);
EXPECT_EQ(hit_path[2].NOT_flag, 1);
EXPECT_EQ(hit_path[2].clause_index, -1);
EXPECT_EQ(hit_path[2].sub_group_id, 100);
@@ -6868,7 +6868,7 @@ TEST_F(Policy, NotClauseHitPath) {
EXPECT_EQ(hit_path[2].rule_id, -1);
EXPECT_EQ(hit_path[3].Nth_scan, 2);
- EXPECT_EQ(hit_path[3].vtable_id, ip_table_id);
+ EXPECT_EQ(hit_path[3].attribute_id, ip_table_id);
EXPECT_EQ(hit_path[3].NOT_flag, 1);
EXPECT_EQ(hit_path[3].clause_index, 2);
EXPECT_EQ(hit_path[3].sub_group_id, 250);
@@ -7114,7 +7114,7 @@ protected:
struct maat *GroupHierarchy::_shared_maat_inst;
struct log_handle *GroupHierarchy::logger;
-TEST_F(GroupHierarchy, VirtualOfOnePhysical)
+TEST_F(GroupHierarchy, AttributeOfOnePhysical)
{
const char *http_content = "Batman\\:Take me Home.Superman/:Fine,stay with me.";
const char *http_url = "https://blog.csdn.net/littlefang/article/details/8213058";
@@ -7167,7 +7167,7 @@ TEST_F(GroupHierarchy, VirtualOfOnePhysical)
state = NULL;
}
-TEST_F(GroupHierarchy, VirtualWithVirtual) {
+TEST_F(GroupHierarchy, AttributeWithAttribute) {
const char *http_req_hdr_ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
"AppleWebKit/537.36 (KHTML, like Gecko) "
"Chrome/78.0.3904.108 Safari/537.36";
@@ -7220,7 +7220,7 @@ TEST_F(GroupHierarchy, VirtualWithVirtual) {
state = NULL;
}
-TEST_F(GroupHierarchy, OneGroupInTwoVirtual) {
+TEST_F(GroupHierarchy, OneGroupInTwoAttribute) {
const char *http_resp_hdr_cookie = "sessionid=888888;BDORZ=B490B5EBF6F3CD402E515D22BCDA1598; sugstore=1;";
const char *req_table_name = "HTTP_REQUEST_HEADER";
const char *res_table_name = "HTTP_RESPONSE_HEADER";
@@ -7708,7 +7708,7 @@ TEST_F(MaatCmd, GroupScan) {
struct maat_hit_group hit_group;
hit_group.group_id = group_id;
- hit_group.vtable_id = table_id;
+ hit_group.attribute_id = table_id;
ret = maat_scan_group(maat_inst, table_id, &hit_group, 1, results, ARRAY_SIZE,
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
@@ -7720,11 +7720,11 @@ TEST_F(MaatCmd, GroupScan) {
}
/**
- * Filter such as URL: http://filtermenot.com => {vtable_id, group_id}
+ * Filter such as URL: http://filtermenot.com => {attribute_id, group_id}
One rule reference this filter twice, the rule should be hit.
*/
TEST_F(MaatCmd, SameFilterRefByOneRule) {
- const char *vtable_name = "HTTP_URL_FILTER";
+ const char *attribute_name = "HTTP_URL_FILTER";
const char *scan_data = "http://filtermenot.com";
const char *keywords = "menot.com";
const char *rule_table_name = "RULE_DEFAULT";
@@ -7735,7 +7735,7 @@ TEST_F(MaatCmd, SameFilterRefByOneRule) {
struct maat *maat_inst = MaatCmd::_shared_maat_inst;
struct maat_state *state = maat_state_new(maat_inst, thread_id);
- int table_id = maat_get_table_id(maat_inst, vtable_name);
+ int table_id = maat_get_table_id(maat_inst, attribute_name);
ASSERT_GT(table_id, 0);
long long rule_id = maat_cmd_incrby(maat_inst, "TEST_SEQ", 1);
@@ -7743,14 +7743,14 @@ TEST_F(MaatCmd, SameFilterRefByOneRule) {
rule_id, "null", 2, 0); // rule has two clause
EXPECT_EQ(ret, 1);
- //clause1 & clause2 has same filter => {vtable_id, group_id}
+ //clause1 & clause2 has same filter => {attribute_id, group_id}
long long group_id = maat_cmd_incrby(maat_inst, "SEQUENCE_GROUP", 1);
ret = group2rule_table_set_line(maat_inst, g2c_table_name, MAAT_OP_ADD,
- group_id, rule_id, 0, vtable_name, 1, 0);
+ group_id, rule_id, 0, attribute_name, 1, 0);
EXPECT_EQ(ret, 1);
ret = group2rule_table_set_line(maat_inst, g2c_table_name, MAAT_OP_ADD,
- group_id, rule_id, 0, vtable_name, 2, 0);
+ group_id, rule_id, 0, attribute_name, 2, 0);
EXPECT_EQ(ret, 1);
long long item_id = maat_cmd_incrby(maat_inst, "SEQUENCE_REGION", 1);
@@ -8138,7 +8138,7 @@ TEST_F(MaatCmd, RefGroup) {
state = NULL;
}
-TEST_F(MaatCmd, VirtualTable) {
+TEST_F(MaatCmd, Attribute) {
const char* rule_table_name = "RULE_DEFAULT";
const char* g2c_table_name = "GROUP2RULE_DEFAULT";
const char* table_name="HTTP_SIGNATURE";
@@ -9187,7 +9187,7 @@ TEST_F(MaatCmd, HitGroup) {
EXPECT_EQ(n_hit_group, 1);
EXPECT_EQ(hit_groups[0].item_id, item1_id);
EXPECT_EQ(hit_groups[0].group_id, group1_id);
- EXPECT_EQ(hit_groups[0].vtable_id, http_req_table_id);
+ EXPECT_EQ(hit_groups[0].attribute_id, http_req_table_id);
memset(hit_groups, 0, sizeof(hit_groups));
n_hit_group = maat_state_get_indirect_hit_group_cnt(state);
@@ -9195,7 +9195,7 @@ TEST_F(MaatCmd, HitGroup) {
EXPECT_EQ(n_hit_group, 1);
EXPECT_EQ(hit_groups[0].item_id, 0);
EXPECT_EQ(hit_groups[0].group_id, group11_id);
- EXPECT_EQ(hit_groups[0].vtable_id, http_req_table_id);
+ EXPECT_EQ(hit_groups[0].attribute_id, http_req_table_id);
size_t n_last_hit_group = maat_state_get_last_hit_group_cnt(state);
struct maat_hit_group last_hit_groups[128] = {0};
@@ -9204,11 +9204,11 @@ TEST_F(MaatCmd, HitGroup) {
EXPECT_EQ(last_hit_groups[0].item_id, item1_id);
EXPECT_EQ(last_hit_groups[0].group_id, group1_id);
- EXPECT_EQ(last_hit_groups[0].vtable_id, http_req_table_id);
+ EXPECT_EQ(last_hit_groups[0].attribute_id, http_req_table_id);
EXPECT_EQ(last_hit_groups[1].item_id, 0);
EXPECT_EQ(last_hit_groups[1].group_id, group11_id);
- EXPECT_EQ(last_hit_groups[1].vtable_id, http_req_table_id);
+ EXPECT_EQ(last_hit_groups[1].attribute_id, http_req_table_id);
int http_res_table_id = maat_get_table_id(maat_inst, "HTTP_RESPONSE_HEADER");
ASSERT_GT(http_res_table_id, 0);
@@ -9235,7 +9235,7 @@ TEST_F(MaatCmd, HitGroup) {
EXPECT_EQ(hit_groups[0].item_id, item2_id);
EXPECT_EQ(hit_groups[0].group_id, group2_id);
- EXPECT_EQ(hit_groups[0].vtable_id, http_res_table_id);
+ EXPECT_EQ(hit_groups[0].attribute_id, http_res_table_id);
memset(hit_groups, 0, sizeof(hit_groups));
n_hit_group = maat_state_get_indirect_hit_group_cnt(state);
@@ -9243,7 +9243,7 @@ TEST_F(MaatCmd, HitGroup) {
EXPECT_EQ(n_hit_group, 1);
EXPECT_EQ(hit_groups[0].item_id, 0);
EXPECT_EQ(hit_groups[0].group_id, group21_id);
- EXPECT_EQ(hit_groups[0].vtable_id, http_res_table_id);
+ EXPECT_EQ(hit_groups[0].attribute_id, http_res_table_id);
n_last_hit_group = maat_state_get_last_hit_group_cnt(state);
maat_state_get_last_hit_groups(state, last_hit_groups, 128);
@@ -9251,11 +9251,11 @@ TEST_F(MaatCmd, HitGroup) {
EXPECT_EQ(last_hit_groups[0].item_id, item2_id);
EXPECT_EQ(last_hit_groups[0].group_id, group2_id);
- EXPECT_EQ(last_hit_groups[0].vtable_id, http_res_table_id);
+ EXPECT_EQ(last_hit_groups[0].attribute_id, http_res_table_id);
EXPECT_EQ(last_hit_groups[1].item_id, 0);
EXPECT_EQ(last_hit_groups[1].group_id, group21_id);
- EXPECT_EQ(last_hit_groups[1].vtable_id, http_res_table_id);
+ EXPECT_EQ(last_hit_groups[1].attribute_id, http_res_table_id);
const char* keywords1="In graph theory, hit group item forth";
const char *keywords2="To test one group hit group item fifth";
@@ -9289,11 +9289,11 @@ TEST_F(MaatCmd, HitGroup) {
EXPECT_EQ(hit_groups[0].item_id, item4_id);
EXPECT_EQ(hit_groups[0].group_id, group4_id);
- EXPECT_EQ(hit_groups[0].vtable_id, keywords_table_id); //physical table(keywords_table) vtable_id is 0
+ EXPECT_EQ(hit_groups[0].attribute_id, keywords_table_id); //physical table(keywords_table) attribute_id is 0
EXPECT_EQ(hit_groups[1].item_id, item3_id);
EXPECT_EQ(hit_groups[1].group_id, group3_id);
- EXPECT_EQ(hit_groups[1].vtable_id, ip_table_id);
+ EXPECT_EQ(hit_groups[1].attribute_id, ip_table_id);
ret = maat_stream_scan(stream, keywords2, strlen(keywords2), results,
ARRAY_SIZE, &n_hit_result, state);
@@ -9309,11 +9309,11 @@ TEST_F(MaatCmd, HitGroup) {
EXPECT_EQ(hit_groups[0].item_id, item5_id);
EXPECT_EQ(hit_groups[0].group_id, group1_id);
- EXPECT_EQ(hit_groups[0].vtable_id, keywords_table_id); //physical table(keywords_table) vtable_id is 0
+ EXPECT_EQ(hit_groups[0].attribute_id, keywords_table_id); //physical table(keywords_table) attribute_id is 0
EXPECT_EQ(hit_groups[1].item_id, item4_id);
EXPECT_EQ(hit_groups[1].group_id, group4_id);
- EXPECT_EQ(hit_groups[1].vtable_id, keywords_table_id); //physical table(keywords_table) vtable_id is 0
+ EXPECT_EQ(hit_groups[1].attribute_id, keywords_table_id); //physical table(keywords_table) attribute_id is 0
n_last_hit_group = maat_state_get_last_hit_group_cnt(state);
maat_state_get_last_hit_groups(state, last_hit_groups, 128);
@@ -9321,15 +9321,15 @@ TEST_F(MaatCmd, HitGroup) {
EXPECT_EQ(last_hit_groups[0].item_id, item5_id);
EXPECT_EQ(last_hit_groups[0].group_id, group1_id);
- EXPECT_EQ(last_hit_groups[0].vtable_id, keywords_table_id);
+ EXPECT_EQ(last_hit_groups[0].attribute_id, keywords_table_id);
EXPECT_EQ(last_hit_groups[1].item_id, item4_id);
EXPECT_EQ(last_hit_groups[1].group_id, group4_id);
- EXPECT_EQ(last_hit_groups[1].vtable_id, keywords_table_id);
+ EXPECT_EQ(last_hit_groups[1].attribute_id, keywords_table_id);
EXPECT_EQ(last_hit_groups[2].item_id, 0);
EXPECT_EQ(last_hit_groups[2].group_id, group11_id);
- EXPECT_EQ(last_hit_groups[2].vtable_id, keywords_table_id);
+ EXPECT_EQ(last_hit_groups[2].attribute_id, keywords_table_id);
maat_stream_free(stream);
maat_state_free(state);
@@ -9462,7 +9462,7 @@ TEST_F(MaatCmd, HitPathBasic) {
EXPECT_EQ(hit_path[path_idx].item_id, item1_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group1_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, group11_id);
- EXPECT_EQ(hit_path[path_idx].vtable_id, http_req_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, http_req_table_id);
EXPECT_EQ(hit_path[path_idx].rule_id, -1);
path_idx++;
@@ -9470,7 +9470,7 @@ TEST_F(MaatCmd, HitPathBasic) {
EXPECT_EQ(hit_path[path_idx].item_id, item1_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group1_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, -1);
- EXPECT_EQ(hit_path[path_idx].vtable_id, http_req_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, http_req_table_id);
EXPECT_EQ(hit_path[path_idx].rule_id, -1);
int http_res_table_id = maat_get_table_id(maat_inst, "HTTP_RESPONSE_HEADER");
@@ -9519,7 +9519,7 @@ TEST_F(MaatCmd, HitPathBasic) {
EXPECT_EQ(hit_path[path_idx].item_id, item2_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group2_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, group21_id);
- EXPECT_EQ(hit_path[path_idx].vtable_id, http_res_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, http_res_table_id);
EXPECT_EQ(hit_path[path_idx].rule_id, rule1_id);
path_idx++;
@@ -9528,7 +9528,7 @@ TEST_F(MaatCmd, HitPathBasic) {
EXPECT_EQ(hit_path[path_idx].item_id, item2_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group2_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, -1);
- EXPECT_EQ(hit_path[path_idx].vtable_id, http_res_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, http_res_table_id);
EXPECT_EQ(hit_path[path_idx].rule_id, -1);
const char* keywords1="In graph theory, a path in a graph is a finite or infinite \
sequence of edges which joins a sequence of vertices which, by most definitions,\
@@ -9562,7 +9562,7 @@ that the edges be all directed in the same direction.";
EXPECT_EQ(hit_path[path_idx].item_id, item4_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group4_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, -1);
- EXPECT_EQ(hit_path[path_idx].vtable_id, keywords_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, keywords_table_id);
EXPECT_EQ(hit_path[path_idx].rule_id, -1);
int ip_table_id = maat_get_table_id(maat_inst, ip_table_name);
@@ -9592,7 +9592,7 @@ that the edges be all directed in the same direction.";
EXPECT_EQ(hit_path[path_idx].item_id, item3_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group3_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, -1);
- EXPECT_EQ(hit_path[path_idx].vtable_id, ip_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, ip_table_id);
EXPECT_EQ(hit_path[path_idx].rule_id, -1);
Nth_scan++;
@@ -9616,7 +9616,7 @@ that the edges be all directed in the same direction.";
EXPECT_EQ(hit_path[path_idx].item_id, item4_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group4_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, -1);
- EXPECT_EQ(hit_path[path_idx].vtable_id, keywords_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, keywords_table_id);
EXPECT_EQ(hit_path[path_idx].rule_id, -1);
maat_stream_free(stream);
maat_state_free(state);
@@ -9803,7 +9803,7 @@ TEST_F(MaatCmd, HitPathAdvanced) {
EXPECT_EQ(hit_path[path_idx].item_id, item1_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group1_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, -1);
- EXPECT_EQ(hit_path[path_idx].vtable_id, keywords_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, keywords_table_id);
EXPECT_EQ(hit_path[path_idx].clause_index, -1);
EXPECT_EQ(hit_path[path_idx].rule_id, -1);
@@ -9822,7 +9822,7 @@ TEST_F(MaatCmd, HitPathAdvanced) {
EXPECT_EQ(hit_path[path_idx].item_id, item1_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group1_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, group1_id);
- EXPECT_EQ(hit_path[path_idx].vtable_id, keywords_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, keywords_table_id);
EXPECT_EQ(hit_path[path_idx].clause_index, 1);
EXPECT_EQ(hit_path[path_idx].rule_id, rule1_id);
@@ -9832,7 +9832,7 @@ TEST_F(MaatCmd, HitPathAdvanced) {
EXPECT_EQ(hit_path[path_idx].item_id, item2_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group2_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, group21_id);
- EXPECT_EQ(hit_path[path_idx].vtable_id, keywords_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, keywords_table_id);
EXPECT_EQ(hit_path[path_idx].clause_index, 2);
EXPECT_EQ(hit_path[path_idx].rule_id, rule1_id);
@@ -9842,7 +9842,7 @@ TEST_F(MaatCmd, HitPathAdvanced) {
EXPECT_EQ(hit_path[path_idx].item_id, item2_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group2_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, -1);
- EXPECT_EQ(hit_path[path_idx].vtable_id, keywords_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, keywords_table_id);
EXPECT_EQ(hit_path[path_idx].clause_index, -1);
EXPECT_EQ(hit_path[path_idx].rule_id, -1);
@@ -9867,7 +9867,7 @@ TEST_F(MaatCmd, HitPathAdvanced) {
EXPECT_EQ(hit_path[path_idx].item_id, item1_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group1_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, group1_id);
- EXPECT_EQ(hit_path[path_idx].vtable_id, keywords_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, keywords_table_id);
EXPECT_EQ(hit_path[path_idx].clause_index, 1);
EXPECT_EQ(hit_path[path_idx].rule_id, rule1_id);
@@ -9877,7 +9877,7 @@ TEST_F(MaatCmd, HitPathAdvanced) {
EXPECT_EQ(hit_path[path_idx].item_id, item2_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group2_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, group21_id);
- EXPECT_EQ(hit_path[path_idx].vtable_id, keywords_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, keywords_table_id);
EXPECT_EQ(hit_path[path_idx].clause_index, 3);
EXPECT_EQ(hit_path[path_idx].rule_id, rule2_id);
@@ -9887,7 +9887,7 @@ TEST_F(MaatCmd, HitPathAdvanced) {
EXPECT_EQ(hit_path[path_idx].item_id, item2_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group2_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, -1);
- EXPECT_EQ(hit_path[path_idx].vtable_id, keywords_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, keywords_table_id);
EXPECT_EQ(hit_path[path_idx].clause_index, -1);
EXPECT_EQ(hit_path[path_idx].rule_id, -1);
@@ -9897,7 +9897,7 @@ TEST_F(MaatCmd, HitPathAdvanced) {
EXPECT_EQ(hit_path[path_idx].item_id, item3_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group3_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, group3_id);
- EXPECT_EQ(hit_path[path_idx].vtable_id, ip_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, ip_table_id);
EXPECT_EQ(hit_path[path_idx].clause_index, 4);
EXPECT_EQ(hit_path[path_idx].rule_id, rule2_id);
@@ -9907,7 +9907,7 @@ TEST_F(MaatCmd, HitPathAdvanced) {
EXPECT_EQ(hit_path[path_idx].item_id, item2_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group2_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, group21_id);
- EXPECT_EQ(hit_path[path_idx].vtable_id, keywords_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, keywords_table_id);
EXPECT_EQ(hit_path[path_idx].clause_index, 2);
EXPECT_EQ(hit_path[path_idx].rule_id, rule1_id);
@@ -9928,7 +9928,7 @@ TEST_F(MaatCmd, HitPathAdvanced) {
EXPECT_EQ(hit_path[path_idx].item_id, item1_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group1_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, group1_id);
- EXPECT_EQ(hit_path[path_idx].vtable_id, keywords_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, keywords_table_id);
EXPECT_EQ(hit_path[path_idx].clause_index, 1);
EXPECT_EQ(hit_path[path_idx].rule_id, rule1_id);
@@ -9938,7 +9938,7 @@ TEST_F(MaatCmd, HitPathAdvanced) {
EXPECT_EQ(hit_path[path_idx].item_id, item2_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group2_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, group21_id);
- EXPECT_EQ(hit_path[path_idx].vtable_id, keywords_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, keywords_table_id);
EXPECT_EQ(hit_path[path_idx].clause_index, 3);
EXPECT_EQ(hit_path[path_idx].rule_id, rule2_id);
@@ -9948,7 +9948,7 @@ TEST_F(MaatCmd, HitPathAdvanced) {
EXPECT_EQ(hit_path[path_idx].item_id, item2_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group2_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, -1);
- EXPECT_EQ(hit_path[path_idx].vtable_id, keywords_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, keywords_table_id);
EXPECT_EQ(hit_path[path_idx].clause_index, -1);
EXPECT_EQ(hit_path[path_idx].rule_id, -1);
@@ -9958,7 +9958,7 @@ TEST_F(MaatCmd, HitPathAdvanced) {
EXPECT_EQ(hit_path[path_idx].item_id, item3_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group3_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, group3_id);
- EXPECT_EQ(hit_path[path_idx].vtable_id, ip_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, ip_table_id);
EXPECT_EQ(hit_path[path_idx].clause_index, 5);
EXPECT_EQ(hit_path[path_idx].rule_id, rule3_id);
@@ -9968,7 +9968,7 @@ TEST_F(MaatCmd, HitPathAdvanced) {
EXPECT_EQ(hit_path[path_idx].item_id, item4_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group4_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, group4_id);
- EXPECT_EQ(hit_path[path_idx].vtable_id, keywords_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, keywords_table_id);
EXPECT_EQ(hit_path[path_idx].clause_index, 6);
EXPECT_EQ(hit_path[path_idx].rule_id, rule3_id);
@@ -9978,7 +9978,7 @@ TEST_F(MaatCmd, HitPathAdvanced) {
EXPECT_EQ(hit_path[path_idx].item_id, item3_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group3_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, group3_id);
- EXPECT_EQ(hit_path[path_idx].vtable_id, ip_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, ip_table_id);
EXPECT_EQ(hit_path[path_idx].clause_index, 4);
EXPECT_EQ(hit_path[path_idx].rule_id, rule2_id);
@@ -9988,7 +9988,7 @@ TEST_F(MaatCmd, HitPathAdvanced) {
EXPECT_EQ(hit_path[path_idx].item_id, item2_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group2_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, group21_id);
- EXPECT_EQ(hit_path[path_idx].vtable_id, keywords_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, keywords_table_id);
EXPECT_EQ(hit_path[path_idx].clause_index, 2);
EXPECT_EQ(hit_path[path_idx].rule_id, rule1_id);
@@ -10121,7 +10121,7 @@ TEST_F(MaatCmd, HitPathHasNotGroup) {
EXPECT_EQ(hit_path[path_idx].item_id, -1);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group1_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, group11_id);
- EXPECT_EQ(hit_path[path_idx].vtable_id, http_req_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, http_req_table_id);
EXPECT_EQ(hit_path[path_idx].NOT_flag, 1);
EXPECT_EQ(hit_path[path_idx].rule_id, -1);
@@ -10130,7 +10130,7 @@ TEST_F(MaatCmd, HitPathHasNotGroup) {
EXPECT_EQ(hit_path[path_idx].item_id, -1);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group1_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, -1);
- EXPECT_EQ(hit_path[path_idx].vtable_id, http_req_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, http_req_table_id);
EXPECT_EQ(hit_path[path_idx].NOT_flag, 1);
EXPECT_EQ(hit_path[path_idx].rule_id, -1);
@@ -10182,7 +10182,7 @@ TEST_F(MaatCmd, HitPathHasNotGroup) {
EXPECT_EQ(hit_path[path_idx].item_id, item2_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group2_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, group21_id);
- EXPECT_EQ(hit_path[path_idx].vtable_id, http_res_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, http_res_table_id);
EXPECT_EQ(hit_path[path_idx].NOT_flag, 0);
EXPECT_EQ(hit_path[path_idx].rule_id, rule1_id);
@@ -10192,7 +10192,7 @@ TEST_F(MaatCmd, HitPathHasNotGroup) {
EXPECT_EQ(hit_path[path_idx].item_id, item2_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group2_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, -1);
- EXPECT_EQ(hit_path[path_idx].vtable_id, http_res_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, http_res_table_id);
EXPECT_EQ(hit_path[path_idx].NOT_flag, 0);
EXPECT_EQ(hit_path[path_idx].rule_id, -1);
@@ -10224,7 +10224,7 @@ TEST_F(MaatCmd, HitPathHasNotGroup) {
EXPECT_EQ(hit_path[path_idx].item_id, item4_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group4_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, -1);
- EXPECT_EQ(hit_path[path_idx].vtable_id, keywords_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, keywords_table_id);
EXPECT_EQ(hit_path[path_idx].NOT_flag, 0);
EXPECT_EQ(hit_path[path_idx].rule_id, -1);
@@ -10254,7 +10254,7 @@ TEST_F(MaatCmd, HitPathHasNotGroup) {
EXPECT_EQ(hit_path[path_idx].item_id, item3_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group3_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, -1);
- EXPECT_EQ(hit_path[path_idx].vtable_id, ip_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, ip_table_id);
EXPECT_EQ(hit_path[path_idx].NOT_flag, 0);
EXPECT_EQ(hit_path[path_idx].rule_id, -1);
@@ -10279,7 +10279,7 @@ TEST_F(MaatCmd, HitPathHasNotGroup) {
EXPECT_EQ(hit_path[path_idx].item_id, item4_id);
EXPECT_EQ(hit_path[path_idx].sub_group_id, group4_id);
EXPECT_EQ(hit_path[path_idx].top_group_id, -1);
- EXPECT_EQ(hit_path[path_idx].vtable_id, keywords_table_id);
+ EXPECT_EQ(hit_path[path_idx].attribute_id, keywords_table_id);
EXPECT_EQ(hit_path[path_idx].NOT_flag, 0);
EXPECT_EQ(hit_path[path_idx].rule_id, -1);
diff --git a/test/maat_json.json b/test/maat_json.json
index 234091f..35ec96d 100644
--- a/test/maat_json.json
+++ b/test/maat_json.json
@@ -219,7 +219,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "IP_CONFIG",
+ "attribute": "IP_CONFIG",
"group_name": "123_IP_group",
"group_id": 100,
"regions": [
@@ -240,7 +240,7 @@
]
},
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "123_url_group",
"group_id": 101,
"regions": [
@@ -266,11 +266,11 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table":"IP_CONFIG",
+ "attribute":"IP_CONFIG",
"group_name": "123_IP_group"
},
{
- "virtual_table": "CONTENT_SIZE",
+ "attribute": "CONTENT_SIZE",
"group_name": "124_interval_group",
"group_id": 102,
"regions": [
@@ -295,7 +295,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table":"HTTP_URL",
+ "attribute":"HTTP_URL",
"group_name": "125_url_group",
"group_id": 103,
"regions": [
@@ -321,7 +321,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "126_url_group",
"group_id": 105,
"regions": [
@@ -336,7 +336,7 @@
]
},
{
- "virtual_table": "CONTENT_SIZE",
+ "attribute": "CONTENT_SIZE",
"group_name": "126_interval_group",
"group_id": 106,
"regions": [
@@ -361,7 +361,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_SIGNATURE",
+ "attribute": "HTTP_SIGNATURE",
"group_name": "128_expr_plus_group",
"group_id": 107,
"regions": [
@@ -388,7 +388,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "129_url_group",
"group_id": 108,
"regions": [
@@ -414,7 +414,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "KEYWORDS_TABLE",
+ "attribute": "KEYWORDS_TABLE",
"group_name": "130_keywords_group",
"group_id": 109,
"regions": [
@@ -440,7 +440,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "KEYWORDS_TABLE",
+ "attribute": "KEYWORDS_TABLE",
"group_name": "131_keywords_group",
"group_id": 110,
"regions": [
@@ -466,7 +466,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "KEYWORDS_TABLE",
+ "attribute": "KEYWORDS_TABLE",
"group_name": "TakeMeHome",
"group_id": 111,
"regions": [
@@ -492,7 +492,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_HOST",
+ "attribute": "HTTP_HOST",
"group_name": "133_host_group",
"group_id": 112,
"regions": [
@@ -518,7 +518,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "134_url_group",
"group_id": 113,
"regions": [
@@ -544,7 +544,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "IMAGE_FP",
+ "attribute": "IMAGE_FP",
"group_name": "136_expr_group",
"group_id": 114,
"regions": [
@@ -570,7 +570,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "IMAGE_FP",
+ "attribute": "IMAGE_FP",
"group_name": "137_expr_group",
"group_id": 115,
"regions": [
@@ -598,7 +598,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "138_url_group",
"group_id": 116,
"regions": [
@@ -626,7 +626,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "139_url_group",
"group_id": 117,
"regions": [
@@ -652,7 +652,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "KEYWORDS_TABLE",
+ "attribute": "KEYWORDS_TABLE",
"group_name": "140_keywords_group",
"group_id": 118,
"regions": [
@@ -680,7 +680,7 @@
"groups": [
{
"g2c_table_name": "GROUP2RULE_ALIAS",
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "141_url_group",
"group_id": 119,
"regions": [
@@ -706,7 +706,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "142_url_group",
"group_id": 120,
"regions": [
@@ -732,7 +732,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL_FILTER",
+ "attribute": "HTTP_URL_FILTER",
"group_name": "143_url_group1",
"group_id": 121,
"not_flag": 0,
@@ -748,7 +748,7 @@
]
},
{
- "virtual_table": "HTTP_URL_FILTER",
+ "attribute": "HTTP_URL_FILTER",
"group_name": "143_url_group2",
"group_id": 122,
"not_flag": 1,
@@ -775,7 +775,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL_FILTER",
+ "attribute": "HTTP_URL_FILTER",
"group_name": "144_url_group",
"group_id": 123,
"not_flag": 0,
@@ -791,7 +791,7 @@
]
},
{
- "virtual_table": "HTTP_RESPONSE_KEYWORDS",
+ "attribute": "HTTP_RESPONSE_KEYWORDS",
"group_name": "144_keywords_group",
"group_id": 124,
"not_flag": 1,
@@ -818,7 +818,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "145_url_group",
"group_id": 125,
"not_flag": 0,
@@ -834,7 +834,7 @@
]
},
{
- "virtual_table": "VIRTUAL_IP_CONFIG",
+ "attribute": "ATTRIBUTE_IP_CONFIG",
"group_name": "123_IP_group",
"not_flag": 1
}
@@ -850,7 +850,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL_FILTER",
+ "attribute": "HTTP_URL_FILTER",
"group_name": "146_url_group",
"group_id": 126,
"not_flag": 0,
@@ -867,7 +867,7 @@
]
},
{
- "virtual_table": "HTTP_RESPONSE_KEYWORDS",
+ "attribute": "HTTP_RESPONSE_KEYWORDS",
"group_name": "146_keywords_group",
"group_id": 127,
"not_flag": 1,
@@ -884,7 +884,7 @@
]
},
{
- "virtual_table": "VIRTUAL_IP_CONFIG",
+ "attribute": "ATTRIBUTE_IP_CONFIG",
"group_name": "123_IP_group",
"not_flag": 1,
"clause_index": 2
@@ -901,7 +901,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_RESPONSE_KEYWORDS_1",
+ "attribute": "HTTP_RESPONSE_KEYWORDS_1",
"group_name": "147_keywords_group1",
"group_id": 128,
"not_flag": 1,
@@ -918,7 +918,7 @@
]
},
{
- "virtual_table": "HTTP_RESPONSE_KEYWORDS_2",
+ "attribute": "HTTP_RESPONSE_KEYWORDS_2",
"group_name": "147_keywords_group2",
"group_id": 129,
"not_flag": 1,
@@ -935,7 +935,7 @@
]
},
{
- "virtual_table": "HTTP_RESPONSE_KEYWORDS_3",
+ "attribute": "HTTP_RESPONSE_KEYWORDS_3",
"group_name": "147_keywords_group3",
"group_id": 130,
"not_flag": 1,
@@ -952,7 +952,7 @@
]
},
{
- "virtual_table": "HTTP_RESPONSE_KEYWORDS_4",
+ "attribute": "HTTP_RESPONSE_KEYWORDS_4",
"group_name": "147_keywords_group4",
"group_id": 131,
"not_flag": 1,
@@ -969,7 +969,7 @@
]
},
{
- "virtual_table": "HTTP_RESPONSE_KEYWORDS_5",
+ "attribute": "HTTP_RESPONSE_KEYWORDS_5",
"group_name": "147_keywords_group5",
"group_id": 132,
"not_flag": 1,
@@ -986,7 +986,7 @@
]
},
{
- "virtual_table": "HTTP_RESPONSE_KEYWORDS_6",
+ "attribute": "HTTP_RESPONSE_KEYWORDS_6",
"group_name": "147_keywords_group6",
"group_id": 133,
"not_flag": 1,
@@ -1003,7 +1003,7 @@
]
},
{
- "virtual_table": "HTTP_RESPONSE_KEYWORDS_7",
+ "attribute": "HTTP_RESPONSE_KEYWORDS_7",
"group_name": "147_keywords_group7",
"group_id": 134,
"not_flag": 1,
@@ -1020,7 +1020,7 @@
]
},
{
- "virtual_table": "HTTP_RESPONSE_KEYWORDS_8",
+ "attribute": "HTTP_RESPONSE_KEYWORDS_8",
"group_name": "147_keywords_group8",
"group_id": 135,
"not_flag": 1,
@@ -1048,7 +1048,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "148_url_group",
"group_id": 136,
"regions": [
@@ -1074,7 +1074,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "APP_PAYLOAD",
+ "attribute": "APP_PAYLOAD",
"group_name": "149_app_group",
"group_id": 137,
"regions": [
@@ -1101,7 +1101,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "TROJAN_PAYLOAD",
+ "attribute": "TROJAN_PAYLOAD",
"group_name": "billgates_regist1",
"group_id": 138,
"regions": [
@@ -1116,7 +1116,7 @@
]
},
{
- "virtual_table": "TROJAN_PAYLOAD",
+ "attribute": "TROJAN_PAYLOAD",
"group_name": "billgates_regist2",
"group_id": 139,
"regions": [
@@ -1142,7 +1142,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "MAIL_ADDR",
+ "attribute": "MAIL_ADDR",
"group_name": "151_expr_group",
"group_id": 140,
"regions": [
@@ -1168,7 +1168,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "MAIL_ADDR",
+ "attribute": "MAIL_ADDR",
"group_name": "152_mail_addr",
"group_id": 141,
"regions": [
@@ -1191,7 +1191,7 @@
]
},
{
- "virtual_table": "CONTENT_SIZE",
+ "attribute": "CONTENT_SIZE",
"group_name": "interval_group_refered",
"group_id": 142,
"sub_groups": [
@@ -1212,7 +1212,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "MAIL_ADDR",
+ "attribute": "MAIL_ADDR",
"group_name": "153_expr_group",
"group_id": 143,
"not_flag": 0,
@@ -1228,13 +1228,13 @@
],
"sub_groups": [
{
- "virtual_table": "MAIL_ADDR",
+ "attribute": "MAIL_ADDR",
"group_name": "152_mail_addr"
}
]
},
{
- "virtual_table": "IP_CONFIG",
+ "attribute": "IP_CONFIG",
"group_name": "IP_group_refered",
"group_id": 144,
"sub_groups": [
@@ -1255,7 +1255,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "IP_PLUS_CONFIG",
+ "attribute": "IP_PLUS_CONFIG",
"group_name": "154_IP_group",
"group_id": 145,
"not_flag": 0,
@@ -1281,7 +1281,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "IP_PLUS_CONFIG",
+ "attribute": "IP_PLUS_CONFIG",
"group_name": "155_IP_group",
"group_id": 146,
"not_flag": 0,
@@ -1307,7 +1307,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_SIGNATURE",
+ "attribute": "HTTP_SIGNATURE",
"group_name": "156_expr_group",
"group_id": 147,
"regions": [
@@ -1334,7 +1334,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "TROJAN_PAYLOAD",
+ "attribute": "TROJAN_PAYLOAD",
"group_name": "157_expr_group",
"group_id": 148,
"regions": [
@@ -1360,7 +1360,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "IP_PLUS_CONFIG",
+ "attribute": "IP_PLUS_CONFIG",
"group_name": "158_IP_group",
"group_id": 149,
"regions": [
@@ -1385,7 +1385,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "IP_PLUS_CONFIG",
+ "attribute": "IP_PLUS_CONFIG",
"group_name": "159_IP_group",
"group_id": 150,
"regions": [
@@ -1406,16 +1406,16 @@
"action": 0,
"do_blacklist": 0,
"do_log": 0,
- "user_region": "VirtualWithOnePhysical",
+ "user_region": "AttributeWithOnePhysical",
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_RESPONSE_KEYWORDS",
+ "attribute": "HTTP_RESPONSE_KEYWORDS",
"group_name": "TakeMeHome",
"not_flag": 0
},
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "160_url_group",
"group_id": 151,
"not_flag": 0,
@@ -1438,11 +1438,11 @@
"action": 0,
"do_blacklist": 0,
"do_log": 0,
- "user_region": "virtual_table_test_temp",
+ "user_region": "attribute_test_temp",
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_SIGNATURE",
+ "attribute": "HTTP_SIGNATURE",
"group_name": "vt_grp_http_sig1",
"group_id": 152,
"not_flag": 0,
@@ -1459,7 +1459,7 @@
]
},
{
- "virtual_table": "HTTP_SIGNATURE",
+ "attribute": "HTTP_SIGNATURE",
"group_name": "vt_grp_http_sig2",
"group_id": 153,
"not_flag": 0,
@@ -1492,16 +1492,16 @@
"action": 0,
"do_blacklist": 0,
"do_log": 0,
- "user_region": "VirtualWithVirtual",
+ "user_region": "AttributeWithAttribute",
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_REQUEST_HEADER",
+ "attribute": "HTTP_REQUEST_HEADER",
"group_name": "vt_grp_http_sig1",
"not_flag": 0
},
{
- "virtual_table": "HTTP_RESPONSE_HEADER",
+ "attribute": "HTTP_RESPONSE_HEADER",
"group_name": "vt_grp_http_sig2",
"not_flag": 0
}
@@ -1513,16 +1513,16 @@
"action": 0,
"do_blacklist": 0,
"do_log": 0,
- "user_region": "OneGroupInTwoVirtual",
+ "user_region": "OneGroupInTwoAttribute",
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_REQUEST_HEADER",
+ "attribute": "HTTP_REQUEST_HEADER",
"group_name": "vt_grp_http_sig2",
"not_flag": 0
},
{
- "virtual_table": "HTTP_RESPONSE_HEADER",
+ "attribute": "HTTP_RESPONSE_HEADER",
"group_name": "vt_grp_http_sig2",
"not_flag": 0
}
@@ -1538,7 +1538,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "KEYWORDS_TABLE",
+ "attribute": "KEYWORDS_TABLE",
"group_name": "164_keywords_group",
"group_id": 154,
"regions": [
@@ -1565,7 +1565,7 @@
"evaluation_order": "2.111",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "165_url_group",
"group_id": 155,
"regions": [
@@ -1580,7 +1580,7 @@
]
},
{
- "virtual_table": "IP_PLUS_CONFIG",
+ "attribute": "IP_PLUS_CONFIG",
"group_name": "165_IP_group",
"group_id": 156,
"not_flag": 0,
@@ -1607,7 +1607,7 @@
"evaluation_order": "100.233",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "166_url_group",
"group_id": 157,
"regions": [
@@ -1634,7 +1634,7 @@
"evaluation_order": "300.999",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "167_url_group",
"group_id": 158,
"clause_index": 1,
@@ -1650,7 +1650,7 @@
]
},
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "167_url_group",
"group_id": 158,
"clause_index": 3
@@ -1668,13 +1668,13 @@
"evaluation_order": "0",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "167_url_group",
"group_id": 158,
"clause_index": 2
},
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "167_url_group",
"group_id": 158,
"clause_index": 6
@@ -1691,7 +1691,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "IP_PLUS_CONFIG",
+ "attribute": "IP_PLUS_CONFIG",
"group_name": "169_IP_group",
"group_id": 160,
"clause_index": 0,
@@ -1714,12 +1714,12 @@
"action": 0,
"do_blacklist": 0,
"do_log": 0,
- "user_region": "IPScan.IPv4_virtual.source",
+ "user_region": "IPScan.IPv4_attribute.source",
"is_valid": "no",
"groups": [
{
- "virtual_table": "IP_PLUS_CONFIG",
- "group_name": "ipv4_virtual.source",
+ "attribute": "IP_PLUS_CONFIG",
+ "group_name": "ipv4_attribute.source",
"group_id": 161,
"not_flag": 0,
"regions": [
@@ -1740,12 +1740,12 @@
"action": 0,
"do_blacklist": 0,
"do_log": 0,
- "user_region": "IPScan.IPv4_virtual.destination",
+ "user_region": "IPScan.IPv4_attribute.destination",
"is_valid": "no",
"groups": [
{
- "virtual_table": "IP_PLUS_CONFIG",
- "group_name": "ipv4_virtual.destination",
+ "attribute": "IP_PLUS_CONFIG",
+ "group_name": "ipv4_attribute.destination",
"group_id": 162,
"not_flag": 0,
"regions": [
@@ -1770,13 +1770,13 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "ASN_NOT_LOGIC",
+ "attribute": "ASN_NOT_LOGIC",
"group_name": ["ASN1234", "ASN6789", "ASN9001"],
"not_flag": 1,
"clause_index": 0
},
{
- "virtual_table": "DESTINATION_IP_ASN",
+ "attribute": "DESTINATION_IP_ASN",
"group_name": "ASN2345",
"not_flag": 0,
"clause_index": 1
@@ -1793,13 +1793,13 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "SOURCE_IP_ASN",
+ "attribute": "SOURCE_IP_ASN",
"group_name": ["ASN1234", "ASN6789", "ASN9001"],
"not_flag": 0,
"clause_index": 0
},
{
- "virtual_table": "DESTINATION_IP_ASN",
+ "attribute": "DESTINATION_IP_ASN",
"group_name": "ASN2345",
"not_flag": 0,
"clause_index": 1
@@ -1816,7 +1816,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "INTERGER_PLUS",
+ "attribute": "INTERGER_PLUS",
"group_name": "179_interval_group",
"group_id": 166,
"regions": [
@@ -1842,19 +1842,19 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "SOURCE_IP_ASN",
+ "attribute": "SOURCE_IP_ASN",
"group_name": ["ASN1234", "ASN6789", "ASN9001"],
"not_flag": 0,
"clause_index": 0
},
{
- "virtual_table": "SOURCE_IP_GEO",
+ "attribute": "SOURCE_IP_GEO",
"group_name": "Country-Sparta-IP",
"not_flag": 0,
"clause_index": 0
},
{
- "virtual_table": "IP_CONFIG",
+ "attribute": "IP_CONFIG",
"group_name": "financial-department-ip",
"not_flag": 0,
"clause_index": 1
@@ -1871,19 +1871,19 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "SOURCE_IP_ASN",
+ "attribute": "SOURCE_IP_ASN",
"group_name": ["ASN1234", "ASN6789", "ASN9001"],
"not_flag": 1,
"clause_index": 0
},
{
- "virtual_table": "IP_PLUS_CONFIG",
+ "attribute": "IP_PLUS_CONFIG",
"group_name": "develop-department-ip",
"not_flag": 1,
"clause_index": 0
},
{
- "virtual_table": "SOURCE_IP_GEO",
+ "attribute": "SOURCE_IP_GEO",
"group_name": "Country-Sparta-IP",
"not_flag": 0,
"clause_index": 1
@@ -1900,7 +1900,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "KEYWORDS_TABLE",
+ "attribute": "KEYWORDS_TABLE",
"group_name": "182_keywords_group",
"group_id": 167,
"regions": [
@@ -1927,7 +1927,7 @@
"service": 0,
"groups": [
{
- "virtual_table": "IP_CONFIG",
+ "attribute": "IP_CONFIG",
"group_name": "184_IP_group",
"group_id": 169,
"regions": [
@@ -1948,35 +1948,35 @@
"action": 1,
"do_blacklist": 1,
"do_log": 1,
- "user_region": "NOTLogic.SameVtableInMultiClause",
+ "user_region": "NOTLogic.SameAttributeInMultiClause",
"is_valid": "yes",
"groups": [
{
- "virtual_table": "DESTINATION_IP_ASN",
+ "attribute": "DESTINATION_IP_ASN",
"group_name": ["ASN1234", "ASN6789", "ASN9001"],
"not_flag": 1,
"clause_index": 0
},
{
- "virtual_table": "SOURCE_IP_GEO",
+ "attribute": "SOURCE_IP_GEO",
"group_name": "Country-Sparta-IP",
"not_flag": 1,
"clause_index": 0
},
{
- "virtual_table": "DESTINATION_IP_ASN",
+ "attribute": "DESTINATION_IP_ASN",
"group_name": "ASN9002",
"not_flag": 1,
"clause_index": 1
},
{
- "virtual_table": "DESTINATION_IP_ASN",
+ "attribute": "DESTINATION_IP_ASN",
"group_name": "ASN9003",
"not_flag": 0,
"clause_index": 2
},
{
- "virtual_table": "IP_PLUS_CONFIG",
+ "attribute": "IP_PLUS_CONFIG",
"group_name": "security-department-ip",
"not_flag": 0,
"clause_index": 3
@@ -1993,7 +1993,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL_FILTER",
+ "attribute": "HTTP_URL_FILTER",
"group_name": "186_expr_group",
"group_id": 170,
"not_flag": 1,
@@ -2009,7 +2009,7 @@
]
},
{
- "virtual_table": "IP_PLUS_CONFIG",
+ "attribute": "IP_PLUS_CONFIG",
"group_name": "186_IP_group",
"group_id": 171,
"not_flag": 0,
@@ -2035,7 +2035,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL_FILTER",
+ "attribute": "HTTP_URL_FILTER",
"group_name": "187_url_group",
"group_id": 172,
"not_flag": 1,
@@ -2051,7 +2051,7 @@
]
},
{
- "virtual_table": "IP_PLUS_CONFIG",
+ "attribute": "IP_PLUS_CONFIG",
"group_name": "187_IP_group",
"group_id": 173,
"not_flag": 0,
@@ -2077,7 +2077,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL_FILTER",
+ "attribute": "HTTP_URL_FILTER",
"group_name": "188_url_group",
"group_id": 174,
"not_flag": 1,
@@ -2093,7 +2093,7 @@
]
},
{
- "virtual_table": "IP_PLUS_CONFIG",
+ "attribute": "IP_PLUS_CONFIG",
"group_name": "188_IP_group",
"group_id": 175,
"not_flag": 0,
@@ -2119,7 +2119,7 @@
"user_region": "StringScan.ShouldNotHitExprPlus",
"groups": [
{
- "virtual_table": "APP_PAYLOAD",
+ "attribute": "APP_PAYLOAD",
"group_name": "189_app_group",
"group_id": 176,
"regions": [
@@ -2146,7 +2146,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_SIGNATURE",
+ "attribute": "HTTP_SIGNATURE",
"group_name": "190_expr_group",
"group_id": 177,
"regions": [
@@ -2173,7 +2173,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "KEYWORDS_TABLE",
+ "attribute": "KEYWORDS_TABLE",
"group_name": "191_keywords_group",
"group_id": 178,
"regions": [
@@ -2199,7 +2199,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "FLAG_CONFIG",
+ "attribute": "FLAG_CONFIG",
"group_name": "192_flag_group",
"group_id": 179,
"regions": [
@@ -2225,7 +2225,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "FLAG_CONFIG",
+ "attribute": "FLAG_CONFIG",
"group_name": "193_flag_group",
"group_id": 180,
"regions": [
@@ -2240,7 +2240,7 @@
]
},
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "193_url_group",
"group_id": 181,
"regions": [
@@ -2266,7 +2266,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "FLAG_CONFIG",
+ "attribute": "FLAG_CONFIG",
"group_name": "194_flag_group",
"group_id": 182,
"regions": [
@@ -2292,7 +2292,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_SIGNATURE",
+ "attribute": "HTTP_SIGNATURE",
"group_name": "195_signature_group",
"group_id": 183,
"regions": [
@@ -2308,7 +2308,7 @@
]
},
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "195_url_group",
"group_id": 184,
"regions": [
@@ -2334,7 +2334,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "FLAG_PLUS_CONFIG",
+ "attribute": "FLAG_PLUS_CONFIG",
"group_name": "196_flag_group",
"group_id": 185,
"regions": [
@@ -2361,7 +2361,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "197_url_group",
"group_id": 186,
"regions": [
@@ -2389,7 +2389,7 @@
"groups": [
{
"g2c_table_name": "GROUP2RULE_FIREWALL",
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "198_url_group",
"group_id": 187,
"regions": [
@@ -2415,7 +2415,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "ExcludeLogicGroup199",
"group_id": 188,
"sub_groups":[
@@ -2465,12 +2465,12 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "ExcludeLogicGroup200",
"group_id": 191,
"sub_groups":[
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "ExcludeLogicGroup200_1",
"group_id": 192,
"is_exclude": 0,
@@ -2487,7 +2487,7 @@
]
},
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "ExcludeLogicGroup200_2",
"group_id": 193,
"is_exclude": 1,
@@ -2517,7 +2517,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "VIRTUAL_IP_PLUS_TABLE",
+ "attribute": "ATTRIBUTE_IP_PLUS_TABLE",
"group_name": "ExcludeLogicGroup202",
"group_id": 194,
"clause_index": 0,
@@ -2578,7 +2578,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "VIRTUAL_IP_PLUS_SOURCE",
+ "attribute": "ATTRIBUTE_IP_PLUS_SOURCE",
"group_name": "ExcludeLogicGroup203_1",
"group_id": 198,
"clause_index": 0,
@@ -2594,7 +2594,7 @@
]
},
{
- "virtual_table": "VIRTUAL_IP_PLUS_DESTINATION",
+ "attribute": "ATTRIBUTE_IP_PLUS_DESTINATION",
"group_name": "ExcludeLogicGroup203_2",
"group_id": 199,
"clause_index": 1,
@@ -2609,7 +2609,7 @@
]
},
{
- "virtual_table": "HTTP_RESPONSE_KEYWORDS",
+ "attribute": "HTTP_RESPONSE_KEYWORDS",
"group_name": "ExcludeLogicGroup203_3",
"group_id": 200,
"clause_index": 2,
@@ -2658,7 +2658,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "VIRTUAL_IP_PLUS_SOURCE",
+ "attribute": "ATTRIBUTE_IP_PLUS_SOURCE",
"group_name": "ExcludeLogicGroup204_1",
"group_id": 203,
"clause_index": 0,
@@ -2674,7 +2674,7 @@
]
},
{
- "virtual_table": "VIRTUAL_IP_PLUS_DESTINATION",
+ "attribute": "ATTRIBUTE_IP_PLUS_DESTINATION",
"group_name": "ExcludeLogicGroup204_2",
"group_id":204,
"clause_index": 1,
@@ -2689,7 +2689,7 @@
]
},
{
- "virtual_table": "HTTP_RESPONSE_KEYWORDS",
+ "attribute": "HTTP_RESPONSE_KEYWORDS",
"group_name": "ExcludeLogicGroup204_3",
"group_id": 205,
"clause_index": 2,
@@ -2760,7 +2760,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "KEYWORDS_TABLE",
+ "attribute": "KEYWORDS_TABLE",
"group_name": "205_keywords_group",
"group_id": 210,
"regions": [
@@ -2786,7 +2786,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "KEYWORDS_TABLE",
+ "attribute": "KEYWORDS_TABLE",
"group_name": "206_keywords_group",
"group_id": 211,
"regions": [
@@ -2812,7 +2812,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "FLAG_CONFIG",
+ "attribute": "FLAG_CONFIG",
"group_name": "207_flag_group",
"group_id": 212,
"regions": [
@@ -2838,7 +2838,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "IP_PLUS_CONFIG",
+ "attribute": "IP_PLUS_CONFIG",
"group_name": "208_IP_group",
"group_id": 213,
"not_flag": 0,
@@ -2864,7 +2864,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "INTERGER_PLUS",
+ "attribute": "INTERGER_PLUS",
"group_name": "209_interval_group",
"group_id": 214,
"regions": [
@@ -2890,7 +2890,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "IP_PLUS_CONFIG",
+ "attribute": "IP_PLUS_CONFIG",
"group_name": "210_IP_group",
"group_id": 215,
"regions": [
@@ -2915,7 +2915,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "IP_PERF_CONFIG",
+ "attribute": "IP_PERF_CONFIG",
"group_name": "211_IP_group",
"group_id": 216,
"not_flag": 0,
@@ -2941,7 +2941,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "INTEGER_PERF_CONFIG",
+ "attribute": "INTEGER_PERF_CONFIG",
"group_name": "212_interval_group",
"group_id": 217,
"regions": [
@@ -2966,7 +2966,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "EXPR_LITERAL_PERF_CONFIG",
+ "attribute": "EXPR_LITERAL_PERF_CONFIG",
"group_name": "213_expr_group",
"group_id": 218,
"regions": [
@@ -2992,7 +2992,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "FLAG_PERF_CONFIG",
+ "attribute": "FLAG_PERF_CONFIG",
"group_name": "214_flag_group",
"group_id": 219,
"regions": [
@@ -3018,7 +3018,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "EXPR_REGEX_PERF_CONFIG",
+ "attribute": "EXPR_REGEX_PERF_CONFIG",
"group_name": "215_expr_group",
"group_id": 220,
"regions": [
@@ -3044,13 +3044,13 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL_FILTER",
+ "attribute": "HTTP_URL_FILTER",
"group_name": "ExcludeLogicGroup200",
"not_flag": 0,
"clause_index": 0
},
{
- "virtual_table": "HTTP_RESPONSE_KEYWORDS",
+ "attribute": "HTTP_RESPONSE_KEYWORDS",
"group_name": "NOTClauseAndExcludeGroup216",
"group_id": 221,
"not_flag": 1,
@@ -3078,7 +3078,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL_FILTER",
+ "attribute": "HTTP_URL_FILTER",
"group_name": "NOTClauseAndExcludeGroup217_1",
"group_id": 222,
"not_flag": 1,
@@ -3117,7 +3117,7 @@
]
},
{
- "virtual_table": "HTTP_RESPONSE_KEYWORDS",
+ "attribute": "HTTP_RESPONSE_KEYWORDS",
"group_name": "NOTClauseAndExcludeGroup217_2",
"group_id": 225,
"not_flag": 0,
@@ -3145,7 +3145,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "CONTENT_SIZE",
+ "attribute": "CONTENT_SIZE",
"group_name": "218_interval_group",
"group_id": 226,
"regions": [
@@ -3170,7 +3170,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_DUMMY",
+ "attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup219_1",
"group_id": 227,
"not_flag": 0,
@@ -3187,7 +3187,7 @@
]
},
{
- "virtual_table": "HTTP_DUMMY",
+ "attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup219_2",
"group_id": 228,
"not_flag": 1,
@@ -3204,7 +3204,7 @@
]
},
{
- "virtual_table": "HTTP_DUMMY",
+ "attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup219_3",
"group_id": 229,
"not_flag": 1,
@@ -3221,7 +3221,7 @@
]
},
{
- "virtual_table": "HTTP_DUMMY",
+ "attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup219_4",
"group_id": 230,
"not_flag": 1,
@@ -3238,7 +3238,7 @@
]
},
{
- "virtual_table": "HTTP_DUMMY",
+ "attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup219_5",
"group_id": 231,
"not_flag": 1,
@@ -3255,7 +3255,7 @@
]
},
{
- "virtual_table": "HTTP_DUMMY",
+ "attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup219_6",
"group_id": 232,
"not_flag": 1,
@@ -3272,7 +3272,7 @@
]
},
{
- "virtual_table": "HTTP_DUMMY",
+ "attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup219_7",
"group_id": 233,
"not_flag": 1,
@@ -3289,7 +3289,7 @@
]
},
{
- "virtual_table": "HTTP_DUMMY",
+ "attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup219_8",
"group_id": 234,
"not_flag": 1,
@@ -3317,7 +3317,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_DUMMY",
+ "attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup220_1",
"group_id": 235,
"not_flag": 0,
@@ -3334,7 +3334,7 @@
]
},
{
- "virtual_table": "HTTP_DUMMY",
+ "attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup220_2",
"group_id": 236,
"not_flag": 1,
@@ -3351,7 +3351,7 @@
]
},
{
- "virtual_table": "HTTP_DUMMY",
+ "attribute": "HTTP_DUMMY",
"group_name": "NOTClauseAndExcludeGroup220_3",
"group_id": 237,
"not_flag": 1,
@@ -3379,7 +3379,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_REQUEST_HEADER",
+ "attribute": "HTTP_REQUEST_HEADER",
"group_name": "NOTLogicGroup_221_1",
"group_id": 238,
"not_flag": 1,
@@ -3396,7 +3396,7 @@
]
},
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "NOTLogicGroup_221_2",
"group_id": 239,
"not_flag": 0,
@@ -3423,7 +3423,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_NOT_LOGIC_1",
+ "attribute": "HTTP_NOT_LOGIC_1",
"group_name": "NOTLogicGroup_222",
"group_id": 240,
"not_flag": 1,
@@ -3451,7 +3451,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_NOT_LOGIC",
+ "attribute": "HTTP_NOT_LOGIC",
"group_name": "NOTLogicGroup_223_1",
"group_id": 241,
"not_flag": 1,
@@ -3468,7 +3468,7 @@
]
},
{
- "virtual_table": "HTTP_NOT_LOGIC",
+ "attribute": "HTTP_NOT_LOGIC",
"group_name": "NOTLogicGroup_223_2",
"group_id": 242,
"not_flag": 1,
@@ -3485,7 +3485,7 @@
]
},
{
- "virtual_table": "HTTP_NOT_LOGIC",
+ "attribute": "HTTP_NOT_LOGIC",
"group_name": "NOTLogicGroup_223_1",
"group_id": 243,
"not_flag": 1,
@@ -3513,7 +3513,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "KEYWORDS_TABLE",
+ "attribute": "KEYWORDS_TABLE",
"group_name": "NOTLogicGroup_224_1",
"group_id": 244,
"not_flag": 1,
@@ -3530,7 +3530,7 @@
]
},
{
- "virtual_table": "HTTP_RESPONSE_KEYWORDS",
+ "attribute": "HTTP_RESPONSE_KEYWORDS",
"group_name": "NOTLogicGroup_224_2",
"group_id": 245,
"not_flag": 0,
@@ -3558,7 +3558,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "KEYWORDS_TABLE",
+ "attribute": "KEYWORDS_TABLE",
"group_name": "EscapeGroup_225_1",
"group_id": 246,
"not_flag": 0,
@@ -3586,7 +3586,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "KEYWORDS_TABLE",
+ "attribute": "KEYWORDS_TABLE",
"group_name": "226_url_group",
"group_id":247
}
@@ -3603,7 +3603,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "KEYWORDS_TABLE",
+ "attribute": "KEYWORDS_TABLE",
"group_name": "227_url_group",
"group_id": 248,
"g2c_table_name": "GROUP2RULE_FIREWALL"
@@ -3620,7 +3620,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "228_url_group",
"group_id": 249,
"not_flag": 0,
@@ -3637,7 +3637,7 @@
]
},
{
- "virtual_table": "VIRTUAL_IP_CONFIG",
+ "attribute": "ATTRIBUTE_IP_CONFIG",
"group_name": "228_IP_group",
"group_id": 250,
"not_flag": 1,
@@ -3664,7 +3664,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_URL",
+ "attribute": "HTTP_URL",
"group_name": "229_url_group",
"group_id": 251,
"regions": [
@@ -3690,7 +3690,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "IP_PLUS_CONFIG",
+ "attribute": "IP_PLUS_CONFIG",
"group_name": "230_IP_group",
"group_id": 256,
"regions": [
@@ -3716,7 +3716,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "IP_PLUS_CONFIG",
+ "attribute": "IP_PLUS_CONFIG",
"group_name": "231_IP_group",
"group_id": 257,
"regions": [
@@ -3742,7 +3742,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "IP_PLUS_CONFIG",
+ "attribute": "IP_PLUS_CONFIG",
"group_name": "232_IP_group",
"group_id": 258,
"regions": [
@@ -3768,7 +3768,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "HTTP_RESPONSE_KEYWORDS",
+ "attribute": "HTTP_RESPONSE_KEYWORDS",
"group_name": "233_url_group",
"group_id": 259
}
@@ -3784,7 +3784,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "KEYWORDS_TABLE",
+ "attribute": "KEYWORDS_TABLE",
"group_name": "EscapeGroup_234_1",
"group_id": 260,
"not_flag": 0,
@@ -3812,7 +3812,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "KEYWORDS_TABLE",
+ "attribute": "KEYWORDS_TABLE",
"group_name": "EscapeGroup_235_1",
"group_id": 261,
"not_flag": 0,
@@ -3840,7 +3840,7 @@
"is_valid": "yes",
"groups": [
{
- "virtual_table": "KEYWORDS_TABLE",
+ "attribute": "KEYWORDS_TABLE",
"group_name": "236_keywords_group",
"group_id": 262,
"regions": [
diff --git a/test/table_info.conf b/test/table_info.conf
index 139e84c..8c65d26 100644
--- a/test/table_info.conf
+++ b/test/table_info.conf
@@ -48,7 +48,7 @@
"group_id":1,
"rule_id":2,
"not_flag":3,
- "virtual_table_name":4,
+ "attribute_name":4,
"clause_index":5
}
},
@@ -85,7 +85,7 @@
"group_id":1,
"rule_id":2,
"not_flag":3,
- "virtual_table_name":4,
+ "attribute_name":4,
"clause_index":5
}
},
@@ -316,29 +316,29 @@
{
"table_id":25,
"table_name":"HTTP_RESPONSE_KEYWORDS",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table": "KEYWORDS_TABLE",
- "schema_tag": "{\"http_response_keywords\": \"virtual\"}"
+ "schema_tag": "{\"http_response_keywords\": \"attribute\"}"
},
{
"table_id":26,
"table_name":"HTTP_REQUEST_HEADER",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table": "HTTP_SIGNATURE"
},
{
"table_id":27,
"table_name":"HTTP_RESPONSE_HEADER",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table": "HTTP_SIGNATURE"
},
{
"table_id":28,
- "table_name":"VIRTUAL_IP_PLUS_TABLE",
- "db_tables":["VIRTUAL_IP_PLUS_SOURCE", "VIRTUAL_IP_PLUS_DESTINATION"],
- "table_type":"virtual",
+ "table_name":"ATTRIBUTE_IP_PLUS_TABLE",
+ "db_tables":["ATTRIBUTE_IP_PLUS_SOURCE", "ATTRIBUTE_IP_PLUS_DESTINATION"],
+ "table_type":"attribute",
"physical_table": "IP_PLUS_CONFIG",
- "schema_tag": "{\"virtual_ip_plus_table\": \"virtual\"}"
+ "schema_tag": "{\"attribute_ip_plus_table\": \"attribute\"}"
},
{
"table_id":29,
@@ -366,13 +366,13 @@
{
"table_id":31,
"table_name":"SOURCE_IP_ASN",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table":"AS_NUMBER"
},
{
"table_id":32,
"table_name":"DESTINATION_IP_ASN",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table":"AS_NUMBER"
},
{
@@ -390,7 +390,7 @@
{
"table_id":34,
"table_name":"SOURCE_IP_GEO",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table":"GeoLocation"
},
{
@@ -527,7 +527,7 @@
{
"table_id":46,
"table_name":"HTTP_URL_FILTER",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table": "HTTP_URL"
},
{
@@ -605,80 +605,80 @@
},
{
"table_id":53,
- "table_name":"VIRTUAL_IP_CONFIG",
- "table_type":"virtual",
+ "table_name":"ATTRIBUTE_IP_CONFIG",
+ "table_type":"attribute",
"physical_table": "IP_CONFIG"
},
{
"table_id":54,
"table_name":"HTTP_RESPONSE_KEYWORDS_1",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table": "KEYWORDS_TABLE"
},
{
"table_id":55,
"table_name":"HTTP_RESPONSE_KEYWORDS_2",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table": "KEYWORDS_TABLE"
},
{
"table_id":56,
"table_name":"HTTP_RESPONSE_KEYWORDS_3",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table": "KEYWORDS_TABLE"
},
{
"table_id":57,
"table_name":"HTTP_RESPONSE_KEYWORDS_4",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table": "KEYWORDS_TABLE"
},
{
"table_id":58,
"table_name":"HTTP_RESPONSE_KEYWORDS_5",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table": "KEYWORDS_TABLE"
},
{
"table_id":59,
"table_name":"HTTP_RESPONSE_KEYWORDS_6",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table": "KEYWORDS_TABLE"
},
{
"table_id":60,
"table_name":"HTTP_RESPONSE_KEYWORDS_7",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table": "KEYWORDS_TABLE"
},
{
"table_id":61,
"table_name":"HTTP_RESPONSE_KEYWORDS_8",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table": "KEYWORDS_TABLE"
},
{
"table_id":62,
"table_name":"HTTP_DUMMY",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table": "KEYWORDS_TABLE"
},
{
"table_id":63,
"table_name":"HTTP_NOT_LOGIC",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table": "KEYWORDS_TABLE"
},
{
"table_id":64,
"table_name":"HTTP_NOT_LOGIC_1",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table": "KEYWORDS_TABLE"
},
{
"table_id":65,
"table_name":"ASN_NOT_LOGIC",
- "table_type":"virtual",
+ "table_type":"attribute",
"physical_table":"AS_NUMBER"
},
{
diff --git a/test/test_utils.cpp b/test/test_utils.cpp
index 5ba40bb..f22ee1f 100644
--- a/test/test_utils.cpp
+++ b/test/test_utils.cpp
@@ -171,12 +171,12 @@ int rule_table_set_line(struct maat *maat_inst, const char *table_name,
int group2rule_table_set_line(struct maat *maat_inst, const char *table_name,
enum maat_operation op, long long group_id,
long long rule_id, int not_flag,
- const char *vtable_name, int clause_index,
+ const char *attribute_name, int clause_index,
int expire_after)
{
char table_line[128] = {0};
sprintf(table_line, "%lld\t%lld\t%d\t%s\t%d\t%d",
- group_id, rule_id, not_flag, vtable_name, clause_index, op);
+ group_id, rule_id, not_flag, attribute_name, clause_index, op);
struct maat_cmd_line line_rule;
line_rule.rule_id = TO_GROUP2X_KEY(group_id, rule_id, clause_index);
diff --git a/test/test_utils.h b/test/test_utils.h
index ff47fe7..24e2561 100644
--- a/test/test_utils.h
+++ b/test/test_utils.h
@@ -21,7 +21,7 @@ int rule_table_set_line(struct maat *maat_inst, const char *table_name,
int group2rule_table_set_line(struct maat *maat_inst, const char *table_name,
enum maat_operation op, long long group_id,
long long rule_id, int not_flag,
- const char *vtable_name, int clause_index,
+ const char *attribute_name, int clause_index,
int expire_after);
int group2group_table_set_line(struct maat *maat_inst, const char *table_name,
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-30 20:52:28 +0000